diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2004-08-22 22:50:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 22:50:37 -0700 |
| commit | 27f8601a4ee9fb9a0aacd53e592f63020b3048cc (patch) | |
| tree | 1ec38fa8374320bef59a26044fa0892c02ac8b53 /drivers | |
| parent | c4295bc2ad539837cecf0cf5997c6667509106e3 (diff) | |
| download | history-27f8601a4ee9fb9a0aacd53e592f63020b3048cc.tar.gz | |
[PATCH] rivafb: Do not tap VGA ports if not X86
Do not tap VGA ports if arch is not X86.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 5 | ||||
| -rw-r--r-- | drivers/video/riva/rivafb.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 354edb240a94ee..1bde6fc3fc168e 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -1090,13 +1090,14 @@ static int rivafb_open(struct fb_info *info, int user) NVTRACE_ENTER(); if (!cnt) { +#ifdef CONFIG_X86 memset(&par->state, 0, sizeof(struct vgastate)); par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS; /* save the DAC for Riva128 */ if (par->riva.Architecture == NV_ARCH_03) par->state.flags |= VGA_SAVE_CMAP; save_vga(&par->state); - +#endif RivaGetConfig(&par->riva, par->Chipset); /* vgaHWunlock() + riva unlock (0x7F) */ CRTCout(par, 0x11, 0xFF); @@ -1121,7 +1122,9 @@ static int rivafb_release(struct fb_info *info, int user) par->riva.LockUnlock(&par->riva, 0); par->riva.LoadStateExt(&par->riva, &par->initial_state.ext); riva_load_state(par, &par->initial_state); +#ifdef CONFIG_X86 restore_vga(&par->state); +#endif par->riva.LockUnlock(&par->riva, 1); } atomic_dec(&par->ref_count); diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h index 198a29c3ce588b..b678b57653a5a9 100644 --- a/drivers/video/riva/rivafb.h +++ b/drivers/video/riva/rivafb.h @@ -50,7 +50,9 @@ struct riva_par { struct riva_regs initial_state; /* initial startup video mode */ struct riva_regs current_state; +#ifdef CONFIG_X86 struct vgastate state; +#endif atomic_t ref_count; u32 cursor_data[32 * 32/4]; int cursor_reset; |