drm/nouveau/kms/nv50-: use NVIDIA's headers for core or_get_caps()
authorBen Skeggs <bskeggs@redhat.com>
Sun, 21 Jun 2020 07:40:51 +0000 (17:40 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 24 Jul 2020 08:51:01 +0000 (18:51 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/sor907d.c

index db09cc5..c86cd8f 100644 (file)
@@ -45,10 +45,10 @@ sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
 static void
 sor907d_get_caps(struct nv50_disp *disp, struct nouveau_encoder *outp, int or)
 {
+       struct nouveau_bo *bo = disp->sync;
        const int off = or * 2;
-       u32 tmp = nouveau_bo_rd32(disp->sync, 0x000014 + off);
-
-       outp->caps.dp_interlace = !!(tmp & 0x04000000);
+       outp->caps.dp_interlace =
+               NVBO_RV32(bo, off, NV907D_CORE_NOTIFIER_3, CAPABILITIES_CAP_SOR0_20, DP_INTERLACE);
 }
 
 const struct nv50_outp_func