diff options
| author | Ville Syrjälä | 2014-08-13 10:57:05 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-13 14:23:38 +0200 |
| commit | dc41c154ffc30afb7ee7e891140dead26fce5c39 (patch) | |
| tree | 645f8aa91896ad6a42d8693db346a89cc8382756 /drivers/gpu/drm/i915/i915_reg.h | |
| parent | drm/i915: Unify ivb_update_cursor() and i9xx_update_cursor() (diff) | |
| download | kernel-qcow2-linux-dc41c154ffc30afb7ee7e891140dead26fce5c39.tar.gz kernel-qcow2-linux-dc41c154ffc30afb7ee7e891140dead26fce5c39.tar.xz kernel-qcow2-linux-dc41c154ffc30afb7ee7e891140dead26fce5c39.zip | |
drm/i915: Add support for variable cursor size on 845/865
845/865 support different cursor sizes as well, albeit a bit differently
than later platforms. Add the necessary code to make them work.
Untested due to lack of hardware.
v2: Warn but accept invalid stride (Chris)
Rewrite the cursor size checks for other platforms (Chris)
v3: More polish and magic to the cursor size checks (Chris)
v4: Moar polish and a comment (Chris)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index f79c20d49d99..203062e93452 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4128,7 +4128,8 @@ enum punit_power_well { /* Old style CUR*CNTR flags (desktop 8xx) */ #define CURSOR_ENABLE 0x80000000 #define CURSOR_GAMMA_ENABLE 0x40000000 -#define CURSOR_STRIDE_MASK 0x30000000 +#define CURSOR_STRIDE_SHIFT 28 +#define CURSOR_STRIDE(x) ((ffs(x)-9) << CURSOR_STRIDE_SHIFT) /* 256,512,1k,2k */ #define CURSOR_PIPE_CSC_ENABLE (1<<24) #define CURSOR_FORMAT_SHIFT 24 #define CURSOR_FORMAT_MASK (0x07 << CURSOR_FORMAT_SHIFT) |