Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci restrict a magic number 'fix' inherited from xf8...



details:   https://anonhg.NetBSD.org/src/rev/f3c599f4dd6e
branches:  trunk
changeset: 323746:f3c599f4dd6e
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Jun 28 17:22:09 2018 +0000

description:
restrict a magic number 'fix' inherited from xf86-video-radeon to actual
rv100 chips instead of applying it to anything older than r300.
Now DVI output works properly on 1st generation Mac Minis.
tested by christos

diffstat:

 sys/dev/pci/radeonfb.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 610f2ca2612d -r f3c599f4dd6e sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c    Thu Jun 28 15:21:52 2018 +0000
+++ b/sys/dev/pci/radeonfb.c    Thu Jun 28 17:22:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeonfb.c,v 1.98 2018/06/16 01:25:23 macallan Exp $ */
+/*     $NetBSD: radeonfb.c,v 1.99 2018/06/28 17:22:09 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.98 2018/06/16 01:25:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.99 2018/06/28 17:22:09 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -589,7 +589,14 @@
        PRINTREG(RADEON_FP_H_SYNC_STRT_WID);
        PRINTREG(RADEON_CRTC2_H_SYNC_STRT_WID);
        PRINTREG(RADEON_FP_H2_SYNC_STRT_WID);
-       if (IS_RV100(sc))
+
+/*
+ * XXX
+ * This was if (IS_RV100()), which is set for all pre-R3xx chips.
+ * I suspect this only makes sense on Sun XVR-100 with firmware that doesn't
+ * support DVI, so for now let's restrict it to only actual RV100
+ */
+       if (sc->sc_family == RADEON_RV100)
                PUT32(sc, RADEON_TMDS_PLL_CNTL, 0xa27);
 
        /* XXX



Home | Main Index | Thread Index | Old Index