Bug#420462: xserver-xorg-video-intel: FTBFS without DRI
Hi,
Samuel Thibault, le Sun 22 Apr 2007 15:27:31 +0200, a écrit :
> Here is a patch.
Ooops, I forgot a small part, here is an updated version.
Samuel
Only in xserver-xorg-video-intel-2.0.0: .pc
Only in xserver-xorg-video-intel-2.0.0: obj-i486-gnu
diff -ur xserver-xorg-video-intel-2.0.0.orig/src/i830.h
xserver-xorg-video-intel-2.0.0/src/i830.h
--- xserver-xorg-video-intel-2.0.0.orig/src/i830.h 2007-04-22
14:00:51.0 +
+++ xserver-xorg-video-intel-2.0.0/src/i830.h 2007-04-22 14:01:11.0
+
@@ -306,6 +306,9 @@
int *used3D;
i830_memory *logical_context;
+
+ unsigned int front_tiled;
+
#ifdef XF86DRI
i830_memory *back_buffer;
i830_memory *third_buffer;
@@ -318,7 +321,6 @@
int mmModeFlags;
int mmSize;
- unsigned int front_tiled;
unsigned int back_tiled;
unsigned int third_tiled;
unsigned int depth_tiled;
diff -ur xserver-xorg-video-intel-2.0.0.orig/src/i830_memory.c
xserver-xorg-video-intel-2.0.0/src/i830_memory.c
--- xserver-xorg-video-intel-2.0.0.orig/src/i830_memory.c 2007-04-22
14:00:51.0 +
+++ xserver-xorg-video-intel-2.0.0/src/i830_memory.c2007-04-22
14:01:24.0 +
@@ -231,11 +231,13 @@
pI830->exa_965_state = NULL;
pI830->overlay_regs = NULL;
pI830->logical_context = NULL;
+#ifdef XF86DRI
pI830->back_buffer = NULL;
pI830->third_buffer = NULL;
pI830->depth_buffer = NULL;
pI830->textures = NULL;
pI830->memory_manager = NULL;
+#endif
pI830->LpRing->mem = NULL;
/* Reset the fence register allocation. */
@@ -248,6 +250,7 @@
{
I830Ptr pI830 = I830PTR(pScrn);
+#ifdef XF86_DRI
i830_free_memory(pScrn, pI830->back_buffer);
pI830->back_buffer = NULL;
i830_free_memory(pScrn, pI830->third_buffer);
@@ -258,6 +261,7 @@
pI830->textures = NULL;
i830_free_memory(pScrn, pI830->memory_manager);
pI830->memory_manager = NULL;
+#endif
}
/**
@@ -602,6 +606,7 @@
i830_describe_tiling(pScrn, verbosity, prefix, pI830->front_buffer,
pI830->front_tiled);
}
+#ifdef XF86DRI
if (pI830->back_buffer != NULL) {
i830_describe_tiling(pScrn, verbosity, prefix, pI830->back_buffer,
pI830->back_tiled);
@@ -614,6 +619,7 @@
i830_describe_tiling(pScrn, verbosity, prefix, pI830->depth_buffer,
pI830->depth_tiled);
}
+#endif
}
static Bool
@@ -1243,7 +1249,6 @@
}
#endif
-#ifdef XF86DRI
/**
* Sets up a fence area for the hardware.
*
@@ -1442,7 +1447,6 @@
pI830->fence[nr] = val;
}
-#endif
/**
* Called at EnterVT to grab the AGP GART and bind our allocations.
Only in xserver-xorg-video-intel-2.0.0: stampdir
Bug#420462: xserver-xorg-video-intel: FTBFS without DRI
Package: xserver-xorg-video-intel
Version: 2.0.0-1
Severity: important
Tags: patch
Hi,
It currently FTBFS because of some mismatched #ifdef XF86DRI. Here is a
patch.
Samuel
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (900, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-686
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
--
Samuel Thibault <[EMAIL PROTECTED]>
diff -ur xserver-xorg-video-intel-2.0.0.orig/src/i830.h
xserver-xorg-video-intel-2.0.0/src/i830.h
--- xserver-xorg-video-intel-2.0.0.orig/src/i830.h 2007-04-19
20:37:56.0 +
+++ xserver-xorg-video-intel-2.0.0/src/i830.h 2007-04-22 13:17:56.0
+
@@ -306,6 +306,9 @@
int *used3D;
i830_memory *logical_context;
+
+ unsigned int front_tiled;
+
#ifdef XF86DRI
i830_memory *back_buffer;
i830_memory *third_buffer;
@@ -318,7 +321,6 @@
int mmModeFlags;
int mmSize;
- unsigned int front_tiled;
unsigned int back_tiled;
unsigned int third_tiled;
unsigned int depth_tiled;
diff -ur xserver-xorg-video-intel-2.0.0.orig/src/i830_memory.c
xserver-xorg-video-intel-2.0.0/src/i830_memory.c
--- xserver-xorg-video-intel-2.0.0.orig/src/i830_memory.c 2007-04-19
20:39:16.0 +
+++ xserver-xorg-video-intel-2.0.0/src/i830_memory.c2007-04-22
13:17:25.0 +
@@ -231,11 +231,13 @@
pI830->exa_965_state = NULL;
pI830->overlay_regs = NULL;
pI830->logical_context = NULL;
+#ifdef XF86DRI
pI830->back_buffer = NULL;
pI830->third_buffer = NULL;
pI830->depth_buffer = NULL;
pI830->textures = NULL;
pI830->memory_manager = NULL;
+#endif
pI830->LpRing->mem = NULL;
/* Reset the fence register allocation. */
@@ -248,6 +250,7 @@
{
I830Ptr pI830 = I830PTR(pScrn);
+#ifdef XF86_DRI
i830_free_memory(pScrn, pI830->back_buffer);
pI830->back_buffer = NULL;
i830_free_memory(pScrn, pI830->third_buffer);
@@ -258,6 +261,7 @@
pI830->textures = NULL;
i830_free_memory(pScrn, pI830->memory_manager);
pI830->memory_manager = NULL;
+#endif
}
/**
@@ -602,6 +606,7 @@
i830_describe_tiling(pScrn, verbosity, prefix, pI830->front_buffer,
pI830->front_tiled);
}
+#ifdef XF86DRI
if (pI830->back_buffer != NULL) {
i830_describe_tiling(pScrn, verbosity, prefix, pI830->back_buffer,
pI830->back_tiled);
@@ -614,6 +619,7 @@
i830_describe_tiling(pScrn, verbosity, prefix, pI830->depth_buffer,
pI830->depth_tiled);
}
+#endif
}
static Bool
