Module Name: src
Committed By: macallan
Date: Thu Jun 28 17:22:09 UTC 2018
Modified Files:
src/sys/dev/pci: radeonfb.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/pci/radeonfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.98 src/sys/dev/pci/radeonfb.c:1.99
--- src/sys/dev/pci/radeonfb.c:1.98 Sat Jun 16 01:25:23 2018
+++ src/sys/dev/pci/radeonfb.c Thu Jun 28 17:22:09 2018
@@ -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 @@ radeonfb_attach(device_t parent, device_
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
