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: Ander Conselvan de Oliveira <[email protected]> --- drivers/gpu/drm/i915/intel_display.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index dc604c9..69e07c1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12151,7 +12151,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; @@ -12160,18 +12159,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 @@ -12258,9 +12251,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); @@ -12274,7 +12264,6 @@ done: kfree(crtc_state_copy); } - kfree(saved_mode); return ret; } -- 2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
