diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2023-05-25 10:31:06 +1000 |
|---|---|---|
| committer |   Karol Herbst <kherbst@redhat.com> | 2023-07-06 17:22:33 +0200 |
| commit | ca3545cf8b2a21eae79dec4e5a990bbf95ee808a (patch) | |
| tree | b1ac665f0e880cc468754549fc98adbdca49c654 | |
| parent | drm/nouveau/nvif: fix potential double-free (diff) | |
| download | wireguard-linux-ca3545cf8b2a21eae79dec4e5a990bbf95ee808a.tar.xz wireguard-linux-ca3545cf8b2a21eae79dec4e5a990bbf95ee808a.zip | |
drm/nouveau/kms: don't call drm_dp_cec_set_edid() on TMDS
RM complains very loudly at the aux transaction attempts.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230525003106.3853741-10-skeggsb@gmail.com
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index f75c6f09dd2a..52c966139677 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -619,7 +619,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) nouveau_connector_set_encoder(connector, nv_encoder); conn_status = connector_status_connected; - drm_dp_cec_set_edid(&nv_connector->aux, nv_connector->edid); + + if (nv_encoder->dcb->type == DCB_OUTPUT_DP) + drm_dp_cec_set_edid(&nv_connector->aux, nv_connector->edid); + goto out; } else { nouveau_connector_set_edid(nv_connector, NULL); |