drm/nouveau/kms: Don't change EDID when it hasn't actually changed

[ Upstream commit f28e32d3906eac2e1cb3291b448f0d528ec93996 ]

Currently in nouveau_connector_ddc_detect() and
nouveau_connector_detect_lvds(), we start the connector probing process
by releasing the previous EDID and informing DRM of the change. However,
since commit 5186421cbfe2 ("drm: Introduce epoch counter to
drm_connector") drm_connector_update_edid_property() actually checks
whether the new EDID we've specified is different from the previous one,
and updates the connector's epoch accordingly if it is. But, because we
always set the EDID to NULL first in nouveau_connector_ddc_detect() and
nouveau_connector_detect_lvds() we end up making DRM think that the EDID
changes every single time we do a connector probe - which isn't needed.

So, let's fix this by not clearing the EDID at the start of the
connector probing process, and instead simply changing or removing it
once near the end of the probing process. This will help prevent us from
sending unneeded hotplug events to userspace when nothing has actually
changed.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200826182456.322681-19-lyude@redhat.com
Stable-dep-of: 55b94bb8c424 ("drm/nouveau: add nv_encoder pointer check for NULL")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 18c3aae91be267f65236af4111d4ca1f3f5791bb..048a04701910e54f76e30442b86b412095438534 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -538,6 +538,17 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
        }
 }
 
+static void
+nouveau_connector_set_edid(struct nouveau_connector *nv_connector,
+                          struct edid *edid)
+{
+       struct edid *old_edid = nv_connector->edid;
+
+       drm_connector_update_edid_property(&nv_connector->base, edid);
+       kfree(old_edid);
+       nv_connector->edid = edid;
+}
+
 static enum drm_connector_status
 nouveau_connector_detect(struct drm_connector *connector, bool force)
 {
@@ -551,13 +562,6 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
        int ret;
        enum drm_connector_status conn_status = connector_status_disconnected;
 
-       /* Cleanup the previous EDID block. */
-       if (nv_connector->edid) {
-               drm_connector_update_edid_property(connector, NULL);
-               kfree(nv_connector->edid);
-               nv_connector->edid = NULL;
-       }
-
        /* Outputs are only polled while runtime active, so resuming the
         * device here is unnecessary (and would deadlock upon runtime suspend
         * because it waits for polling to finish). We do however, want to
@@ -570,22 +574,23 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                ret = pm_runtime_get_sync(dev->dev);
                if (ret < 0 && ret != -EACCES) {
                        pm_runtime_put_autosuspend(dev->dev);
+                       nouveau_connector_set_edid(nv_connector, NULL);
                        return conn_status;
                }
        }
 
        nv_encoder = nouveau_connector_ddc_detect(connector);
        if (nv_encoder && (i2c = nv_encoder->i2c) != NULL) {
+               struct edid *new_edid;
+
                if ((vga_switcheroo_handler_flags() &
                     VGA_SWITCHEROO_CAN_SWITCH_DDC) &&
                    nv_connector->type == DCB_CONNECTOR_LVDS)
-                       nv_connector->edid = drm_get_edid_switcheroo(connector,
-                                                                    i2c);
+                       new_edid = drm_get_edid_switcheroo(connector, i2c);
                else
-                       nv_connector->edid = drm_get_edid(connector, i2c);
+                       new_edid = drm_get_edid(connector, i2c);
 
-               drm_connector_update_edid_property(connector,
-                                                       nv_connector->edid);
+               nouveau_connector_set_edid(nv_connector, new_edid);
                if (!nv_connector->edid) {
                        NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
                                 connector->name);
@@ -619,6 +624,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                conn_status = connector_status_connected;
                drm_dp_cec_set_edid(&nv_connector->aux, nv_connector->edid);
                goto out;
+       } else {
+               nouveau_connector_set_edid(nv_connector, NULL);
        }
 
        nv_encoder = nouveau_connector_of_detect(connector);
@@ -661,18 +668,12 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_connector *nv_connector = nouveau_connector(connector);
        struct nouveau_encoder *nv_encoder = NULL;
+       struct edid *edid = NULL;
        enum drm_connector_status status = connector_status_disconnected;
 
-       /* Cleanup the previous EDID block. */
-       if (nv_connector->edid) {
-               drm_connector_update_edid_property(connector, NULL);
-               kfree(nv_connector->edid);
-               nv_connector->edid = NULL;
-       }
-
        nv_encoder = find_encoder(connector, DCB_OUTPUT_LVDS);
        if (!nv_encoder)
-               return connector_status_disconnected;
+               goto out;
 
        /* Try retrieving EDID via DDC */
        if (!drm->vbios.fp_no_ddc) {
@@ -691,7 +692,8 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
         * valid - it's not (rh#613284)
         */
        if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) {
-               if ((nv_connector->edid = nouveau_acpi_edid(dev, connector))) {
+               edid = nouveau_acpi_edid(dev, connector);
+               if (edid) {
                        status = connector_status_connected;
                        goto out;
                }
@@ -711,12 +713,10 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
         * stored for the panel stored in them.
         */
        if (!drm->vbios.fp_no_ddc) {
-               struct edid *edid =
-                       (struct edid *)nouveau_bios_embedded_edid(dev);
+               edid = (struct edid *)nouveau_bios_embedded_edid(dev);
                if (edid) {
-                       nv_connector->edid =
-                                       kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
-                       if (nv_connector->edid)
+                       edid = kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
+                       if (edid)
                                status = connector_status_connected;
                }
        }
@@ -729,7 +729,7 @@ out:
                status = connector_status_unknown;
 #endif
 
-       drm_connector_update_edid_property(connector, nv_connector->edid);
+       nouveau_connector_set_edid(nv_connector, edid);
        nouveau_connector_set_encoder(connector, nv_encoder);
        return status;
 }