From e9d5de6e986d7f26f3b061abce681b97ecce3823 Mon Sep 17 00:00:00 2001
From: reinoud <reinoud@NetBSD.org>
Date: Mon, 9 Apr 2001 13:59:44 +0000
Subject: [PATCH] Patch the hardware scrolling to be only used when using VRAM
 until it is working perfectly with DRAM only.

---
 sys/arch/arm32/vidc/vidcvideo.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/arch/arm32/vidc/vidcvideo.c b/sys/arch/arm32/vidc/vidcvideo.c
index 5fcb2d4b10ac..d7abb491e367 100644
--- a/sys/arch/arm32/vidc/vidcvideo.c
+++ b/sys/arch/arm32/vidc/vidcvideo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vidcvideo.c,v 1.4 2001/04/01 20:16:25 reinoud Exp $ */
+/* $NetBSD: vidcvideo.c,v 1.5 2001/04/09 13:59:44 reinoud Exp $ */
 
 /*
  * Copyright (c) 2001 Reinoud Zandijk
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.4 2001/04/01 20:16:25 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.5 2001/04/09 13:59:44 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,6 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.4 2001/04/01 20:16:25 reinoud Exp $"
 /* for vidc_mode ... needs to be MI indepenent one day */
 #include <machine/vidc.h>
 #include <arm32/vidc/vidc20config.h>
+#include <machine/bootconfig.h>
 
 #define machine_btop(x) arm_byte_to_page(x)
 #define MACHINE_KSEG0_TO_PHYS(x) vtophys(x)
@@ -855,7 +856,7 @@ static void vv_copyrows(id, srcrow, dstrow, nrows)
 	scrollup   = (srcrow + nrows >= ri->ri_rows);
 	scrolldown = (dstrow + nrows >= ri->ri_rows);
 
-	if (scrollup || scrolldown) {
+	if ((scrollup || scrolldown) && (videomemory.vidm_type == VIDEOMEM_TYPE_VRAM)) {
 		ri->ri_bits = vidcvideo_hwscroll(offset);
 		vidcvideo_progr_scroll();	/* sadistic ; shouldnt this be on vsync? */