summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sprite.c
diff options
context:
space:
mode:
authorDaniel Vetter2014-06-18 13:59:03 +0200
committerDaniel Vetter2014-06-19 09:58:58 +0200
commite6e559d4a90b539b711d8b7a70b7673031c48191 (patch)
tree6f642f2fc9292ed3556680d2546efd55040a8e91 /drivers/gpu/drm/i915/intel_sprite.c
parentdrm/i915: Drop unecessary complexity from psr_inactivate (diff)
downloadkernel-qcow2-linux-e6e559d4a90b539b711d8b7a70b7673031c48191.tar.gz
kernel-qcow2-linux-e6e559d4a90b539b711d8b7a70b7673031c48191.tar.xz
kernel-qcow2-linux-e6e559d4a90b539b711d8b7a70b7673031c48191.zip
drm/i915: Ditch intel_edp_psr_update
We have _enable/_disable interfaces now for the modeset sequence and intel_edp_psr_exit for workarounds. The callsites in intel_display.c are all redundant with the modeset sequence enable/disable calls in intel_ddi.c. The one in intel_sprite.c is real and needs to be switched to psr_exit. If this breaks anything then we need to augment the enable/disable functions accordingly. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 404335d53a89..2a211c64ec8d 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1051,7 +1051,7 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
mutex_unlock(&dev->struct_mutex);
}
- intel_edp_psr_update(dev);
+ intel_edp_psr_exit(dev, true);
return 0;
}