diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-03-31 15:25:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 08:59:34 -0700 |
| commit | 84d9077b3391e6966813e380e63b57f53e58e120 (patch) | |
| tree | 9799833f8f4f27a00d7e361f29a76b4b4be1abf1 /drivers/video | |
| parent | 98da329581e3e6a08eba418ba6da64c05bacd029 (diff) | |
| download | linux-3.10-84d9077b3391e6966813e380e63b57f53e58e120.tar.gz linux-3.10-84d9077b3391e6966813e380e63b57f53e58e120.tar.bz2 linux-3.10-84d9077b3391e6966813e380e63b57f53e58e120.zip | |
fb: hide hardware cursor in graphics mode (Mach64)
A hardware cursor is left enabled in the fb_set_par() which is called when a
new console is created. This is inconsistent with software cursor's
behaviour.
Also, this makes a hardware cursor always visible in the Xfbdev (Xorg kdrive)
server.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Risto Suominen <risto.suominen@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/aty/mach64_accel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/aty/mach64_accel.c b/drivers/video/aty/mach64_accel.c index a8f60c33863..0cc9724e61a 100644 --- a/drivers/video/aty/mach64_accel.c +++ b/drivers/video/aty/mach64_accel.c @@ -39,7 +39,8 @@ void aty_reset_engine(const struct atyfb_par *par) { /* reset engine */ aty_st_le32(GEN_TEST_CNTL, - aty_ld_le32(GEN_TEST_CNTL, par) & ~GUI_ENGINE_ENABLE, par); + aty_ld_le32(GEN_TEST_CNTL, par) & + ~(GUI_ENGINE_ENABLE | HWCURSOR_ENABLE), par); /* enable engine */ aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par) | GUI_ENGINE_ENABLE, par); |