<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
From: "Antonino A. Daplas" &lt;adaplas@hotpop.com&gt;

Do not tap VGA ports if arch is not X86.

Signed-off-by: Antonino Daplas &lt;adaplas@pol.net&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
---

 25-akpm/drivers/video/riva/fbdev.c  |    5 ++++-
 25-akpm/drivers/video/riva/rivafb.h |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -puN drivers/video/riva/fbdev.c~rivafb-do-not-tap-vga-ports-if-not-x86 drivers/video/riva/fbdev.c
--- 25/drivers/video/riva/fbdev.c~rivafb-do-not-tap-vga-ports-if-not-x86	2004-07-28 20:42:10.269908960 -0700
+++ 25-akpm/drivers/video/riva/fbdev.c	2004-07-28 20:42:10.284906680 -0700
@@ -1090,13 +1090,14 @@ static int rivafb_open(struct fb_info *i
 
 	NVTRACE_ENTER();
 	if (!cnt) {
+#ifdef CONFIG_X86
 		memset(&amp;par-&gt;state, 0, sizeof(struct vgastate));
 		par-&gt;state.flags = VGA_SAVE_MODE  | VGA_SAVE_FONTS;
 		/* save the DAC for Riva128 */
 		if (par-&gt;riva.Architecture == NV_ARCH_03)
 			par-&gt;state.flags |= VGA_SAVE_CMAP;
 		save_vga(&amp;par-&gt;state);
-
+#endif
 		RivaGetConfig(&amp;par-&gt;riva, par-&gt;Chipset);
 		/* vgaHWunlock() + riva unlock (0x7F) */
 		CRTCout(par, 0x11, 0xFF);
@@ -1121,7 +1122,9 @@ static int rivafb_release(struct fb_info
 		par-&gt;riva.LockUnlock(&amp;par-&gt;riva, 0);
 		par-&gt;riva.LoadStateExt(&amp;par-&gt;riva, &amp;par-&gt;initial_state.ext);
 		riva_load_state(par, &amp;par-&gt;initial_state);
+#ifdef CONFIG_X86
 		restore_vga(&amp;par-&gt;state);
+#endif
 		par-&gt;riva.LockUnlock(&amp;par-&gt;riva, 1);
 	}
 	atomic_dec(&amp;par-&gt;ref_count);
diff -puN drivers/video/riva/rivafb.h~rivafb-do-not-tap-vga-ports-if-not-x86 drivers/video/riva/rivafb.h
--- 25/drivers/video/riva/rivafb.h~rivafb-do-not-tap-vga-ports-if-not-x86	2004-07-28 20:42:10.279907440 -0700
+++ 25-akpm/drivers/video/riva/rivafb.h	2004-07-28 20:42:10.284906680 -0700
@@ -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;
_
</pre></body></html>