Commit a036aa1f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/lvds: switch to drm_edid_read_switcheroo() 



Use drm_edid_read_switcheroo() to switch from struct edid to struct
drm_edid.

Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/429cd6f23366cb4cace4fa13cf92ad068aca64dd.1685437501.git.jani.nikula@intel.com
parent 6c46f644

drivers/gpu/drm/i915/display/intel_lvds.c

+2 −11
Original line number Diff line number Diff line
@@ -944,17 +944,8 @@ void intel_lvds_init(struct drm_i915_private *i915) 
	 */

	mutex_lock(&i915->drm.mode_config.mutex);

	if (vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC) {

		const struct edid *edid;



		/* FIXME: Make drm_get_edid_switcheroo() return drm_edid */

		edid = drm_get_edid_switcheroo(&connector->base,

		drm_edid = drm_edid_read_switcheroo(&connector->base,

						    intel_gmbus_get_adapter(i915, pin));

		if (edid) {

			drm_edid = drm_edid_alloc(edid, (edid->extensions + 1) * EDID_LENGTH);

			kfree(edid);

		} else {

			drm_edid = NULL;

		}

	} else {

		drm_edid = drm_edid_read_ddc(&connector->base,

					     intel_gmbus_get_adapter(i915, pin));