1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4bb50e0e7110..e1743ab276dc 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1428,7 +1428,10 @@ struct edid *drm_get_edid(struct drm_connector *connector,
 {
         struct edid *edid;
 
-        if (!drm_probe_ddc(adapter))
+        if (connector->force == DRM_FORCE_OFF)
+                return NULL;
+
+        if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter))
                 return NULL;
 
         edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter);