[src/trunk]: src/sys/dev/pci Add back the code that clears "odd" in VCHR. Th...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91512a75eb93
branches:  trunk
changeset: 500743:91512a75eb93
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Dec 17 22:23:12 2000 +0000

description:
Add back the code that clears "odd" in VCHR.  This shouldn't be
necessary, but we haven't made X cope with the wierd size yet.

diffstat:

 sys/dev/pci/tga.c |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r d72928acb616 -r 91512a75eb93 sys/dev/pci/tga.c
--- a/sys/dev/pci/tga.c Sun Dec 17 22:09:12 2000 +0000
+++ b/sys/dev/pci/tga.c Sun Dec 17 22:23:12 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.28 2000/06/30 00:01:22 mjacob Exp $ */
+/* $NetBSD: tga.c,v 1.29 2000/12/17 22:23:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -262,6 +262,17 @@
                break;
        }
 
+       /*
+        * XXX XXX Turning off "odd" shouldn't be necessary,
+        * XXX XXX but I can't make X work with the weird size.
+        */
+       if ((TGARREG(dc, TGA_REG_VHCR) & 0x00000001) != 0 &&    /* XXX */
+           (TGARREG(dc, TGA_REG_VHCR) & 0x80000000) != 0) {    /* XXX */
+               TGAWREG(dc, TGA_REG_VHCR,
+                   (TGARREG(dc, TGA_REG_VHCR) & ~0x80000001));
+               dc->dc_wid -= 4;
+       }
+
        dc->dc_rowbytes = dc->dc_wid * (dc->dc_tgaconf->tgac_phys_depth / 8);
        dc->dc_ht = (TGARREG(dc, TGA_REG_VVCR) & 0x7ff);        /* XXX */