1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index d22676b89cbb..db7d250f7ac7 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -130,7 +130,14 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
         count = drm_load_edid_firmware(connector);
         if (count == 0)
 #endif
-                count = (*connector_funcs->get_modes)(connector);
+        {
+                if (connector->override_edid) {
+                        struct edid *edid = (struct edid *) connector->edid_blob_ptr->data;
+
+                        count = drm_add_edid_modes(connector, edid);
+                } else
+                        count = (*connector_funcs->get_modes)(connector);
+        }
 
         if (count == 0 && connector->status == connector_status_connected)
                 count = drm_add_modes_noedid(connector, 1024, 768);