summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorChris Wilson2010-08-07 12:01:38 +0200
committerEric Anholt2010-08-09 20:24:36 +0200
commit560b85bb750c3c539641993dd508b61260c9e874 (patch)
treec38da64b64e8ce03865514bf16cc03d3dcd61d93 /drivers/gpu/drm/i915/intel_drv.h
parentdrm/i915: FBC is updated within set_base() so remove second call in mode_set() (diff)
downloadkernel-qcow2-linux-560b85bb750c3c539641993dd508b61260c9e874.tar.gz
kernel-qcow2-linux-560b85bb750c3c539641993dd508b61260c9e874.tar.xz
kernel-qcow2-linux-560b85bb750c3c539641993dd508b61260c9e874.zip
drm/i915: Only update i845/i865 CURBASE when disabled (v2)
The i845 and i865 have a peculiarlity in that CURBASE is not the trigger for the vsync update of the cursor registers but instead the modification of that register is prohibited whilst the cursor is enabled. Reorder the write sequence for CURPOS, CURCNTR and CURBASE on i845 to i865 to match. v2: Remove the checks for i845/i865 from within i9xx_cursor_update() Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 2a3eaaf64b24..6ba56e1796ce 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -168,7 +168,7 @@ struct intel_crtc {
uint32_t cursor_addr;
int16_t cursor_x, cursor_y;
int16_t cursor_width, cursor_height;
- bool cursor_visble, cursor_on;
+ bool cursor_visible, cursor_on;
};
#define to_intel_crtc(x) container_of(x, struct intel_crtc, base)