Attachment 9687 Details for Bug 10714 – updated patch

[patch] updated patch

intel-patch (text/plain), 2.45 KB, created by Samuel Thibault on 2007-04-22 07:19:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Thibault

Created: 2007-04-22 07:19:02 UTC

Size: 2.45 KB

patch

obsolete

>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.000000000 +0000
>+++ xserver-xorg-video-intel-2.0.0/src/i830.h	2007-04-22 14:01:11.000000000 +0000
>@@ -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.000000000 +0000
>+++ xserver-xorg-video-intel-2.0.0/src/i830_memory.c	2007-04-22 14:01:24.000000000 +0000
>@@ -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

Actions: View | Splinter Review

Attachments on bug 10714: 9685 | 9687

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.