evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm: Allow override_edid to override the firmware EDID"

Browse source
This commit is contained in:
Linux Build Service Account 2019-07-24 22:36:05 -07:00 • committed by Gerrit - the friendly Code Review server
commit bef923715e
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpu/drm/drm_probe_helper.c
View file

@ -199,17 +199,16 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
goto prune; goto prune;
} }
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE if (connector->override_edid) {
count = drm_load_edid_firmware(connector); struct edid *edid = (struct edid *) connector->edid_blob_ptr->data;
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); count = drm_add_edid_modes(connector, edid);
drm_edid_to_eld(connector, edid); drm_edid_to_eld(connector, edid);
} else } else {
#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
count = drm_load_edid_firmware(connector);
if (count == 0)
#endif
count = (*connector_funcs->get_modes)(connector); count = (*connector_funcs->get_modes)(connector);
} }