Commit 61a517a0 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds

gxfb/lxfb: use VSA definitions when fetching framebuffer size

..Rather than using magic constants.
Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4537f93a
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/geode.h>
#include "gxfb.h" #include "gxfb.h"
...@@ -28,10 +29,10 @@ unsigned int gx_frame_buffer_size(void) ...@@ -28,10 +29,10 @@ unsigned int gx_frame_buffer_size(void)
/* Virtual register class = 0x02 */ /* Virtual register class = 0x02 */
/* VG_MEM_SIZE(512Kb units) = 0x00 */ /* VG_MEM_SIZE(512Kb units) = 0x00 */
outw(0xFC53, 0xAC1C); outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
outw(0x0200, 0xAC1C); 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); return (val << 19);
} }
......
...@@ -333,10 +333,10 @@ unsigned int lx_framebuffer_size(void) ...@@ -333,10 +333,10 @@ unsigned int lx_framebuffer_size(void)
/* Virtual Register Class = 0x02 */ /* Virtual Register Class = 0x02 */
/* VG_MEM_SIZE (1MB units) = 0x00 */ /* VG_MEM_SIZE (1MB units) = 0x00 */
outw(0xFC53, 0xAC1C); outw(VSA_VR_UNLOCK, VSA_VRC_INDEX);
outw(0x0200, 0xAC1C); 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); return (val << 20);
} }
......
...@@ -109,6 +109,7 @@ extern int geode_get_dev_base(unsigned int dev); ...@@ -109,6 +109,7 @@ extern int geode_get_dev_base(unsigned int dev);
#define VSA_VRC_DATA 0xAC1E #define VSA_VRC_DATA 0xAC1E
#define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */ #define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */
#define VSA_VR_SIGNATURE 0x0003 #define VSA_VR_SIGNATURE 0x0003
#define VSA_VR_MEM_SIZE 0x0200
#define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */ #define VSA_SIG 0x4132 /* signature is ascii 'VSA2' */
/* GPIO */ /* GPIO */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment