Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13be665 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

drm/i915: Remove saved_mode from __intel_set_mode() 



There's no way that function can fail after it sets crtc->mode anymore,
so there's no need to save the old mode for the failure case.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0a9ab303

drivers/gpu/drm/i915/intel_display.c

+0 −11
Original line number Diff line number Diff line
@@ -12239,7 +12239,6 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, 
{

	struct drm_device *dev = modeset_crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_display_mode *saved_mode;

	struct drm_atomic_state *state = pipe_config->base.state;

	struct intel_crtc_state *crtc_state_copy = NULL;

	struct intel_crtc *intel_crtc;
@@ -12248,18 +12247,12 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, 
	int ret = 0;

	int i;



	saved_mode = kmalloc(sizeof(*saved_mode), GFP_KERNEL);

	if (!saved_mode)

		return -ENOMEM;



	crtc_state_copy = kmalloc(sizeof(*crtc_state_copy), GFP_KERNEL);

	if (!crtc_state_copy) {

		ret = -ENOMEM;

		goto done;

	}



	*saved_mode = modeset_crtc->mode;



	/*

	 * See if the config requires any additional preparation, e.g.

	 * to adjust global state with pipes off.  We need to do this
@@ -12346,9 +12339,6 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, 


	/* FIXME: add subpixel order */

done:

	if (ret && modeset_crtc->state->enable)

		modeset_crtc->mode = *saved_mode;



	if (ret == 0 && pipe_config) {

		struct intel_crtc *intel_crtc = to_intel_crtc(modeset_crtc);
@@ -12362,7 +12352,6 @@ static int __intel_set_mode(struct drm_crtc *modeset_crtc, 
		kfree(crtc_state_copy);

	}



	kfree(saved_mode);

	return ret;

}