diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2009-09-22 19:47:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:53 -0400 |
commit | 5016af53ebbd1450c2656c94dfbd1dad15c19f60 (patch) | |
tree | 96c6ec0f311d0ce8ff5b0b2e963814dd12632e71 /drivers/video/via/viafbdev.h | |
parent | afbd3c12aca5a29f1627c0c68e6bc77f32459935 (diff) |
viafb: cleanup viafb_cursor
Clean the hardware cursor handling up.
The most notable change is that it no longer buffers the values in
viacursor but uses the ones in cursor instead as they are guaranteed to be
always valid.
Furthermore it uses local instead global variables where possible, moves
the cursor variable in shared as only one hardware cursor is supported and
returns an error if memory allocation fails. Last but not least it fixes
a too small buffer (as u32 has only 4 and not 32 bytes) but this did not
produce any known problems.
This is mostly a code cleanup, no negative runtime changes are expected.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/via/viafbdev.h')
-rw-r--r-- | drivers/video/via/viafbdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h index beb470392db1..ca39ec1689e1 100644 --- a/drivers/video/via/viafbdev.h +++ b/drivers/video/via/viafbdev.h | |||
@@ -51,6 +51,7 @@ struct viafb_shared { | |||
51 | struct chip_information chip_info; | 51 | struct chip_information chip_info; |
52 | 52 | ||
53 | /* hardware acceleration stuff */ | 53 | /* hardware acceleration stuff */ |
54 | u32 cursor_vram_addr; | ||
54 | int (*hw_bitblt)(void __iomem *engine, u8 op, u32 width, u32 height, | 55 | int (*hw_bitblt)(void __iomem *engine, u8 op, u32 width, u32 height, |
55 | u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y, | 56 | u8 dst_bpp, u32 dst_addr, u32 dst_pitch, u32 dst_x, u32 dst_y, |
56 | u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y, | 57 | u32 *src_mem, u32 src_addr, u32 src_pitch, u32 src_x, u32 src_y, |
@@ -65,7 +66,6 @@ struct viafb_par { | |||
65 | unsigned int memsize; /*size of fbmem */ | 66 | unsigned int memsize; /*size of fbmem */ |
66 | u32 fbmem_free; /* Free FB memory */ | 67 | u32 fbmem_free; /* Free FB memory */ |
67 | u32 fbmem_used; /* Use FB memory size */ | 68 | u32 fbmem_used; /* Use FB memory size */ |
68 | u32 cursor_start; /* Cursor Start Address */ | ||
69 | u32 VQ_start; /* Virtual Queue Start Address */ | 69 | u32 VQ_start; /* Virtual Queue Start Address */ |
70 | u32 VQ_end; /* Virtual Queue End Address */ | 70 | u32 VQ_end; /* Virtual Queue End Address */ |
71 | u32 iga_path; | 71 | u32 iga_path; |