[Intel-gfx] [PATCH 10/13] drm/i915/lvds: switch to drm_edid_read_switcheroo()

[Lukas Wunner]

On Fri, Apr 21, 2023 at 02:47:48PM +0300, Jani Nikula wrote:
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -943,17 +943,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,
> -					       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;
> -		}
> +		drm_edid = drm_edid_read_switcheroo(&connector->base,
> +						    intel_gmbus_get_adapter(i915, pin));
>  	} else {
>  		drm_edid = drm_edid_read_ddc(&connector->base,
>  					     intel_gmbus_get_adapter(i915, pin));

No need for curly braces anymore, but regardless:

Reviewed-by: Lukas Wunner <lukas at wunner.de>