summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMaarten Lankhorst2016-01-07 11:54:09 +0100
committerMaarten Lankhorst2016-01-07 13:50:44 +0100
commitf28580214407d1adeb08ad8dd0af059bf6220a51 (patch)
tree5fd75a0b2e1596f52d8353140e1baf1c63082b25 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Remove some visibility checks from intel_crtc_update_cursor. (diff)
downloadkernel-qcow2-linux-f28580214407d1adeb08ad8dd0af059bf6220a51.tar.gz
kernel-qcow2-linux-f28580214407d1adeb08ad8dd0af059bf6220a51.tar.xz
kernel-qcow2-linux-f28580214407d1adeb08ad8dd0af059bf6220a51.zip
drm/i915: Make disable_cursor_plane similar to commit_cursor_plane.
Update cursor_addr when disable_plane is called. This is required to make commit_cursor_plane take a crtc_state and a plane_state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1452164052-21752-5-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4fe0c4d02fda..0483c2429a9d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14256,6 +14256,9 @@ static void
intel_disable_cursor_plane(struct drm_plane *plane,
struct drm_crtc *crtc)
{
+ struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+
+ intel_crtc->cursor_addr = 0;
intel_crtc_update_cursor(crtc, false);
}