Merge "drm: Allow override_edid to override the firmware EDID" (bef92371) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/drm/drm_probe_helper.c

+8 −9

Original line number	Diff line number	Diff line
		@@ -199,17 +199,16 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
		goto prune;
		}

		#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
		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
		} else {
		#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
		count = drm_load_edid_firmware(connector);
		if (count == 0)
		#endif
		count = (*connector_funcs->get_modes)(connector);
		}