AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 01:32:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Remove saved_mode from __intel_set_mode()

Browse Source 
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 <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-04-21 17:13:05 +03:00 committed by Daniel Vetter
parent 0a9ab303b8
commit e13be66517
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/i915/intel_display.c
View File

@ -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;
}