diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-12-04 21:33:22 -0500 |
|---|---|---|
| committer | Jordan Crouse <jordan@cosmicpenguin.net> | 2008-12-09 08:00:28 -0700 |
| commit | fb2c1af124a56f34c4212bba16e1926889104cb4 (patch) | |
| tree | adf17dc3f168cf24bae5127239f02bbdc7e85592 /src/geode.h | |
| parent | 356dec75b96e7b235632bb8c5f7cc70002a590b1 (diff) | |
xf86-video-geode: fix up cursor size (again)
The geode hardware (and cimarron) expects cursor memory size to be 48x64,
and cimarron will zero out the excess when a smaller cursor is used. It
would be nice to be able to use the full cursor size, but xorg's interleaving
stuff requires a cursor width that's a multiple of 32. Thus, we're stuck
back at 32x32 for cursor size, but we allocate enough memory for a 48x64
cursor.
This fixes misc interleaving corruption that we see with 2bpp cursors (when
converting to ARGB).
Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'src/geode.h')
| -rw-r--r-- | src/geode.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/geode.h b/src/geode.h index 0ba32fe..b8ff455 100644 --- a/src/geode.h +++ b/src/geode.h @@ -92,8 +92,14 @@ #define DEFAULT_EXA_SCRATCH_BFRSZ 0x40000 -#define LX_CURSOR_MAX_WIDTH 48 -#define LX_CURSOR_MAX_HEIGHT 64 +/* the LX hardware (and Cimarron) require a cursor memory size of 48x64.. */ +#define LX_CURSOR_HW_WIDTH 48 +#define LX_CURSOR_HW_HEIGHT 64 + +/* ...but xorg requires the cursor width to be a multiple of 32. This is +the size of the *actual* cursor. */ +#define LX_CURSOR_MAX_WIDTH 32 +#define LX_CURSOR_MAX_HEIGHT 32 /* FIXME: Get rid of this from GX */ |