drm/nouveau/kms/nv50-: remove nv_encoder.audio.connector

- use nv_encoder.conn instead, outp->conn never changes

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Danilo Krummrich <me@dakr.org>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-17-lyude@redhat.com

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 5c88d2e5321b1a908866d2102d4083cdfae82c18..a72cb74184472326c57668bef6bee1f5da8c5a12 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -611,7 +611,7 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,
                        continue; /* TODO */
 
                nv_encoder = nouveau_encoder(encoder);
-               nv_connector = nouveau_connector(nv_encoder->audio.connector);
+               nv_connector = nv_encoder->conn;
                nv_crtc = nouveau_crtc(nv_encoder->crtc);
 
                if (!nv_crtc || nv_encoder->outp.or.id != port || nv_crtc->index != dev_id)
@@ -723,7 +723,6 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
        mutex_lock(&drm->audio.lock);
        if (nv_encoder->audio.enabled) {
                nv_encoder->audio.enabled = false;
-               nv_encoder->audio.connector = NULL;
                nvif_outp_hda_eld(&nv_encoder->outp, nv_crtc->index, NULL, 0);
        }
        mutex_unlock(&drm->audio.lock);
@@ -748,7 +747,6 @@ nv50_audio_enable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc,
        nvif_outp_hda_eld(&nv_encoder->outp, nv_crtc->index, nv_connector->base.eld,
                          drm_eld_size(nv_connector->base.eld));
        nv_encoder->audio.enabled = true;
-       nv_encoder->audio.connector = &nv_connector->base;
 
        mutex_unlock(&drm->audio.lock);
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
index b1554ad9d929b660ccf8042ab271c568c62ee0f2..ea8ef10e71aaee6744c86cf7c184852bef1f7f69 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
@@ -62,7 +62,6 @@ struct nouveau_encoder {
        /* Protected by nouveau_drm.audio.lock */
        struct {
                bool enabled;
-               struct drm_connector *connector;
        } audio;
 
        struct drm_display_mode mode;