OSDN Git Service

drm/nouveau/kms/nv50-: Use nouveau_encoder->crtc in get_eld callback
authorLyude Paul <lyude@redhat.com>
Sat, 14 Nov 2020 00:14:16 +0000 (19:14 -0500)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 29 Jan 2021 06:49:14 +0000 (16:49 +1000)
drm_encoder->crtc is deprecated for atomic drivers, but
nouveau_encoder->crtc is safe.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/disp.c

index 205d30d..d4b6f83 100644 (file)
@@ -644,7 +644,7 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,
                if (!nv_connector)
                        continue;
 
-               nv_crtc = nouveau_crtc(encoder->crtc);
+               nv_crtc = nouveau_crtc(nv_encoder->crtc);
                if (!nv_crtc || nv_encoder->or != port ||
                    nv_crtc->index != dev_id)
                        continue;