File u_Fix-build-for-non-DRI-1-Xserver.patch of Package xf86-video-ati

Overview Repositories Revisions Requests Users Attributes Meta

File u_Fix-build-for-non-DRI-1-Xserver.patch of Package xf86-video-ati (Revision 192c3ca574cc77caa3269ca232039afc)

Currently displaying revision 192c3ca574cc77caa3269ca232039afc , Show latest

From: Egbert Eich <Egbert Eich eich@suse.de>
Date: Tue Nov 26 16:38:12 2013 +0100
Subject: [PATCH]Fix build for non-DRI(1) Xserver
Patch-Mainline: to be upstreamed
Git-commit: 5a86f510480d28f1be7fcfe3a209d622b759b500
Git-repo: 
References: 
Signed-off-by: Egbert Eich <eich@suse.com>

- Comment out dri.h and sarea.h.
- Replace DRICreatePCIBusID() by simple print.
---
 src/drmmode_display.c | 2 +-
 src/radeon_probe.c    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

Index: xf86-video-ati-7.3.0/src/drmmode_display.c
===================================================================
--- xf86-video-ati-7.3.0.orig/src/drmmode_display.c
+++ xf86-video-ati-7.3.0/src/drmmode_display.c
@@ -37,7 +37,7 @@
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_drm.h"
-#include "sarea.h"
+//#include "sarea.h"
 
 #include "drmmode_display.h"
 
Index: xf86-video-ati-7.3.0/src/radeon_probe.c
===================================================================
--- xf86-video-ati-7.3.0.orig/src/radeon_probe.c
+++ xf86-video-ati-7.3.0/src/radeon_probe.c
@@ -48,7 +48,7 @@
 #include "xf86.h"
 
 #include "xf86drmMode.h"
-#include "dri.h"
+//#include "dri.h"
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <xf86_OSproc.h>
@@ -87,14 +87,17 @@ static Bool radeon_kernel_mode_enabled(S
 {
     char *busIdString;
     int ret;
-
+#if 0
     if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
       xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
 		   "[KMS] No DRICreatePCIBusID symbol, no kernel modesetting.\n");
 	return FALSE;
     }
-
     busIdString = DRICreatePCIBusID(pci_dev);
+#else
+    busIdString = XNFprintf("pci:%04x:%02x:%02x.%d",
+		      pci_dev->domain, pci_dev->bus, pci_dev->dev, pci_dev->func);
+#endif
     ret = drmCheckModesettingSupported(busIdString);
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     if (ret) {

Places

File u_Fix-build-for-non-DRI-1-Xserver.patch of Package xf86-video-ati (Revision 192c3ca574cc77caa3269ca232039afc)

Places