From: Ben Skeggs Date: Sun, 21 Jun 2020 07:40:51 +0000 (+1000) Subject: drm/nouveau/kms/nv50-: use NVIDIA's headers for core or_get_caps() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ca31b0c01a2759d5ac40695e51287962e08826fe;p=linux.git drm/nouveau/kms/nv50-: use NVIDIA's headers for core or_get_caps() Signed-off-by: Ben Skeggs Reviewed-by: Lyude Paul --- diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c index db09cc5af5f65..c86cd8fa61d6b 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c +++ b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c @@ -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