summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@aurora.(none)>2008-01-30 16:16:10 +0100
committerJakob Bornecrantz <jakob@aurora.(none)>2008-01-30 16:16:10 +0100
commitabed0995585050d5fd179958d01f14f7e430e795 (patch)
treea75397ee8d968be08b31a329f90042c55c5657cd /linux-core
parent841ef9eb8da8058d6495e9f8e1b14af2709dfaa1 (diff)
Fix for cursor off
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/intel_display.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux-core/intel_display.c b/linux-core/intel_display.c
index 88cf653c..5b7a510b 100644
--- a/linux-core/intel_display.c
+++ b/linux-core/intel_display.c
@@ -985,6 +985,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
struct intel_crtc *intel_crtc = crtc->driver_private;
int pipe = intel_crtc->pipe;
uint32_t control = (pipe == 0) ? CURSOR_A_CONTROL : CURSOR_B_CONTROL;
+ uint32_t base = (pipe == 0) ? CURSOR_A_BASE : CURSOR_B_BASE;
uint32_t temp;
size_t adder;
@@ -998,6 +999,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
temp |= CURSOR_MODE_DISABLE;
I915_WRITE(control, temp);
+ I915_WRITE(base, 0);
return 0;
}
@@ -1026,8 +1028,8 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
DRM_DEBUG("cusror base %x\n", adder);
- I915_WRITE((pipe == 0) ? CURSOR_A_CONTROL : CURSOR_B_CONTROL, temp);
- I915_WRITE((pipe == 0) ? CURSOR_A_BASE : CURSOR_B_BASE, adder);
+ I915_WRITE(control, temp);
+ I915_WRITE(base, adder);
return 0;
}