From: Andres Salomon Date: Mon, 28 Apr 2008 09:15:30 +0000 (-0700) Subject: gxfb/lxfb: use VSA definitions when fetching framebuffer size X-Git-Tag: v2.6.26-rc1~795 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=61a517a063abf659cbf61df11f8e2131fdafccec;p=linux-2.6-omap-h63xx.git gxfb/lxfb: use VSA definitions when fetching framebuffer size ..Rather than using magic constants. Signed-off-by: Andres Salomon Cc: Jordan Crouse Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/geode/display_gx.c b/drivers/video/geode/display_gx.c index 3743c8766a0..1e82ecc367d 100644 --- a/drivers/video/geode/display_gx.c +++ b/drivers/video/geode/display_gx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "gxfb.h" @@ -28,10 +29,10 @@ unsigned int gx_frame_buffer_size(void) /* Virtual register class = 0x02 */ /* VG_MEM_SIZE(512Kb units) = 0x00 */ - outw(0xFC53, 0xAC1C); - outw(0x0200, 0xAC1C); + outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); + outw(VSA_VR_MEM_SIZE, VSA_VRC_INDEX); - val = (unsigned int)(inw(0xAC1E)) & 0xFFl; + val = (unsigned int)(inw(VSA_VRC_DATA)) & 0xFFl; return (val << 19); } diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c index 531fcdcdd75..e42e12489f6 100644 --- a/drivers/video/geode/lxfb_ops.c +++ b/drivers/video/geode/lxfb_ops.c @@ -333,10 +333,10 @@ unsigned int lx_framebuffer_size(void) /* Virtual Register Class = 0x02 */ /* VG_MEM_SIZE (1MB units) = 0x00 */ - outw(0xFC53, 0xAC1C); - outw(0x0200, 0xAC1C); + outw(VSA_VR_UNLOCK, VSA_VRC_INDEX); + outw(VSA_VR_MEM_SIZE, VSA_VRC_INDEX); - val = (unsigned int)(inw(0xAC1E)) & 0xFE; + val = (unsigned int)(inw(VSA_VRC_DATA)) & 0xFE; return (val << 20); } diff --git a/include/asm-x86/geode.h b/include/asm-x86/geode.h index 3978200f126..4fb2f62e277 100644 --- a/include/asm-x86/geode.h +++ b/include/asm-x86/geode.h @@ -109,6 +109,7 @@ extern int geode_get_dev_base(unsigned int dev); #define VSA_VRC_DATA 0xAC1E #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ #define VSA_VR_SIGNATURE 0x0003 +#define VSA_VR_MEM_SIZE 0x0200 #define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ /* GPIO */