xf86-video-intel: 2 commits - src/common.h src/intel_dri.c src/intel.h

[Chris Wilson]

 src/common.h    |    5 -----
 src/intel.h     |    5 +++++
 src/intel_dri.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8507ef50ba08061ac158848a7c4c136e1755d87e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 13 09:45:59 2010 +0100

    Fix driverName regression for i830 from 4083197a
    
    Reported-by: Stefan Glasenhardt <stefan at glasen-hardt.de>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30808
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index 97f9c4a..67f7be9 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -1180,7 +1180,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen)
 	intel->deviceName = drmGetDeviceNameFromFd(intel->drmSubFD);
 	memset(&info, '\0', sizeof(info));
 	info.fd = intel->drmSubFD;
-	info.driverName = IS_GEN3(intel) ? "i915" : "i965";
+	info.driverName = INTEL_INFO(intel)->gen < 40 ? "i915" : "i965";
 	info.deviceName = intel->deviceName;
 
 #if DRI2INFOREC_VERSION == 1
commit 15aab1ef982fb67eb2ea463089f070afd9a2cfe5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 13 09:50:25 2010 +0100

    Move EDID_COMPLETE_RAWDATA define to intel.h to avoid redifinition warning
    
    The compiler was simply warning that we defined the name prior to
    including the original definition, so reorder.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/common.h b/src/common.h
index 800e17f..6f23cdd 100644
--- a/src/common.h
+++ b/src/common.h
@@ -172,11 +172,6 @@ static inline void memcpy_volatile(volatile void *dst, const void *src,
 
 #define PIPE_NAME(n)			('A' + (n))
 
-/* remain compatible to xorg-server 1.6 */
-#ifndef MONITOR_EDID_COMPLETE_RAWDATA
-#define MONITOR_EDID_COMPLETE_RAWDATA EDID_COMPLETE_RAWDATA
-#endif
-
 struct pci_device *
 intel_host_bridge (void);
 
diff --git a/src/intel.h b/src/intel.h
index b74a061..6b05997 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -160,6 +160,11 @@ list_is_empty(struct list *head)
 	     pos = list_entry(pos->member.next, type, member))
 #endif
 
+/* remain compatible to xorg-server 1.6 */
+#ifndef MONITOR_EDID_COMPLETE_RAWDATA
+#define MONITOR_EDID_COMPLETE_RAWDATA EDID_COMPLETE_RAWDATA
+#endif
+
 struct intel_pixmap {
 	dri_bo *bo;