summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_hw.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-19 09:55:17 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-18 14:53:30 (GMT)
commit662af0d8228ced3c7b3d3012a73dce929fc27574 (patch)
tree5aeb260ed1d1573415a46b84b025b12050c9be86 /drivers/gpu/drm/armada/armada_hw.h
parent96f60e37dc66091bde8d5de136ff6fda09f2d799 (diff)
downloadlinux-662af0d8228ced3c7b3d3012a73dce929fc27574.tar.xz
DRM: Armada: Add support for ARGB 32x64 or 64x32 hardware cursors
This patch adds ARGB hardware cursor support to the DRM driver for the Marvell Armada SoCs. ARGB cursors are supported at either 32x64 or 64x32 resolutions. Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_hw.h')
-rw-r--r--drivers/gpu/drm/armada/armada_hw.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_hw.h b/drivers/gpu/drm/armada/armada_hw.h
index 216a4b5..27319a8 100644
--- a/drivers/gpu/drm/armada/armada_hw.h
+++ b/drivers/gpu/drm/armada/armada_hw.h
@@ -168,8 +168,10 @@ enum {
SRAM_READ = 0 << 14,
SRAM_WRITE = 2 << 14,
SRAM_INIT = 3 << 14,
- SRAM_HWC32_RAMR = 0xc << 8,
- SRAM_HWC32_RAMG = 0xd << 8,
+ SRAM_HWC32_RAM1 = 0xc << 8,
+ SRAM_HWC32_RAM2 = 0xd << 8,
+ SRAM_HWC32_RAMR = SRAM_HWC32_RAM1,
+ SRAM_HWC32_RAMG = SRAM_HWC32_RAM2,
SRAM_HWC32_RAMB = 0xe << 8,
SRAM_HWC32_TRAN = 0xf << 8,
SRAM_HWC = 0xf << 8,