diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-24 22:36:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-24 22:36:05 -0700 |
| commit | bef923715ee90aba1209b28c3ca9cf523f9537cc (patch) | |
| tree | 2a7864af3b2424a29958f89e7de452c7d2aebe97 | |
| parent | 9401ae085688cc18db703b0e13af47aea9b177b4 (diff) | |
| parent | 02b5c4706b7983ba4ccc582797611855e2c3f210 (diff) | |
Merge "drm: Allow override_edid to override the firmware EDID"
| -rw-r--r-- | drivers/gpu/drm/drm_probe_helper.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 1fe4b8e6596b..b7383f53358c 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -199,17 +199,16 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect goto prune; } + if (connector->override_edid) { + struct edid *edid = (struct edid *) connector->edid_blob_ptr->data; + + count = drm_add_edid_modes(connector, edid); + drm_edid_to_eld(connector, edid); + } else { #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE - count = drm_load_edid_firmware(connector); - if (count == 0) + count = drm_load_edid_firmware(connector); + if (count == 0) #endif - { - if (connector->override_edid) { - struct edid *edid = (struct edid *) connector->edid_blob_ptr->data; - - count = drm_add_edid_modes(connector, edid); - drm_edid_to_eld(connector, edid); - } else count = (*connector_funcs->get_modes)(connector); } |