Without AGP support radeondrm(4) does not work on my G5.  The machine
freezes when X starts and it's impossible to debug.

So I'd like to enable agp(4) in GENERIC again...  but leaving it disable
for Uninorth (G4) machines.  On such machines w/ AGP enabled the GPU locks
up and then the driver disable acceleration completely.

ok?

Index: dev/pci/agp_apple.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/agp_apple.c,v
retrieving revision 1.5
diff -u -p -r1.5 agp_apple.c
--- dev/pci/agp_apple.c 29 Mar 2014 18:09:30 -0000      1.5
+++ dev/pci/agp_apple.c 18 Dec 2015 14:03:16 -0000
@@ -81,6 +81,8 @@ agp_apple_match(struct device *parent, v
                case PCI_PRODUCT_APPLE_UNINORTH2_AGP:
                case PCI_PRODUCT_APPLE_UNINORTH_AGP3:
                case PCI_PRODUCT_APPLE_INTREPID2_AGP:
+                       /* XXX until radeondrm(4) is fixed with such bridge. */
+                       return (0);
                case PCI_PRODUCT_APPLE_U3_AGP:
                case PCI_PRODUCT_APPLE_U3L_AGP:
                case PCI_PRODUCT_APPLE_K2_AGP:
Index: arch/macppc/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/macppc/conf/GENERIC,v
retrieving revision 1.253
diff -u -p -r1.253 GENERIC
--- arch/macppc/conf/GENERIC    23 Nov 2015 10:30:02 -0000      1.253
+++ arch/macppc/conf/GENERIC    18 Dec 2015 11:43:00 -0000
@@ -351,8 +351,8 @@ ral*                at cardbus?     # Ralink RT2500/RT2501
 
 wsdisplay*     at vgafb?
 
-#appleagp*     at pchb?
-#agp*          at appleagp?    # AGP bridges
+appleagp*      at pchb?
+agp*           at appleagp?    # AGP bridges
 
 radeondrm*     at pci?         # ATI Radeon DRM driver
 drm*           at radeondrm?

Reply via email to