OSDN Git Service

drm/i915/sdvo: ignore returned broken edid on intel_sdvo_tmds_sink_detect
authorJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Thu, 3 Aug 2023 14:35:30 +0000 (17:35 +0300)
committerJouni Högander <jouni.hogander@intel.com>
Fri, 4 Aug 2023 13:12:20 +0000 (16:12 +0300)
If drm_edid_raw returned NULL on error don't try accessing anything behind
that NULL

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230803143530.27601-1-juhapekka.heikkila@gmail.com
drivers/gpu/drm/i915/display/intel_sdvo.c

index 8298a86..065e619 100644 (file)
@@ -2097,7 +2097,7 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                const struct edid *edid = drm_edid_raw(drm_edid);
 
                /* DDC bus is shared, match EDID to connector type */
-               if (edid->input & DRM_EDID_INPUT_DIGITAL)
+               if (edid && edid->input & DRM_EDID_INPUT_DIGITAL)
                        status = connector_status_connected;
                else
                        status = connector_status_disconnected;