Skip to content

Commit a036aa1

Browse files
committed
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: Lukas Wunner <lukas@wunner.de> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/429cd6f23366cb4cace4fa13cf92ad068aca64dd.1685437501.git.jani.nikula@intel.com
1 parent 6c46f64 commit a036aa1

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -944,17 +944,8 @@ void intel_lvds_init(struct drm_i915_private *i915)
944944
*/
945945
mutex_lock(&i915->drm.mode_config.mutex);
946946
if (vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC) {
947-
const struct edid *edid;
948-
949-
/* FIXME: Make drm_get_edid_switcheroo() return drm_edid */
950-
edid = drm_get_edid_switcheroo(&connector->base,
951-
intel_gmbus_get_adapter(i915, pin));
952-
if (edid) {
953-
drm_edid = drm_edid_alloc(edid, (edid->extensions + 1) * EDID_LENGTH);
954-
kfree(edid);
955-
} else {
956-
drm_edid = NULL;
957-
}
947+
drm_edid = drm_edid_read_switcheroo(&connector->base,
948+
intel_gmbus_get_adapter(i915, pin));
958949
} else {
959950
drm_edid = drm_edid_read_ddc(&connector->base,
960951
intel_gmbus_get_adapter(i915, pin));

0 commit comments

Comments
 (0)