Attachment 300155 Details for Bug 437922 – fix direct rendering with the new driver running against our old server.

[patch] fix direct rendering with the new driver running against our old server.

intel-2.2.1-fix-direct-rendering.patch (text/plain), 2.76 KB, created by Dave Airlie on 2008-04-03 00:20:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2008-04-03 00:20:54 UTC

Size: 2.76 KB

patch

obsolete

>
>The Intel driver isn't compatible with the current DRI infrastructure in the RHEL 5.2 server.
>
>As we won't ever see a TTM based kernel with this driver running just punt on the problem.
>
>Allocate the buffers before setting up DRI like used to happen before.
>
>
>diff -ur xf86-video-intel-2.2.1/src/i830_dri.c xf86-video-intel-2.2.1.da/src/i830_dri.c
>--- xf86-video-intel-2.2.1/src/i830_dri.c	2008-02-23 03:51:39.000000000 +1000
>+++ xf86-video-intel-2.2.1.da/src/i830_dri.c	2008-04-03 10:06:14.000000000 +1000
>@@ -130,7 +130,7 @@
> 
> #if (DRIINFO_MAJOR_VERSION > 5 || \
>      (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 4))
>-#define DRI_DRIVER_FRAMEBUFFER_MAP 1
>+#define DRI_DRIVER_FRAMEBUFFER_MAP 0
> #else
> #define DRI_DRIVER_FRAMEBUFFER_MAP 0
> #endif
>@@ -613,9 +613,9 @@
> #else
>    /* Supply a dummy mapping info required by DRI setup.
>     */
>-   pDRIInfo->frameBufferPhysicalAddress = (char *) pI830->LinearAddr;
>-   pDRIInfo->frameBufferSize = GTT_PAGE_SIZE;
>-   pDRIInfo->frameBufferStride = 1;
>+   pDRIInfo->frameBufferPhysicalAddress = (char *) pI830->LinearAddr + pI830->front_buffer->offset;
>+   pDRIInfo->frameBufferSize = pI830->front_buffer->size;
>+   pDRIInfo->frameBufferStride = pScrn->displayWidth;
> #endif
> 
>    pDRIInfo->TransitionTo2d = I830DRITransitionTo2d;
>diff -ur xf86-video-intel-2.2.1/src/i830_driver.c xf86-video-intel-2.2.1.da/src/i830_driver.c
>--- xf86-video-intel-2.2.1/src/i830_driver.c	2008-04-03 10:12:22.000000000 +1000
>+++ xf86-video-intel-2.2.1.da/src/i830_driver.c	2008-04-03 10:11:35.000000000 +1000
>@@ -2453,22 +2453,12 @@
> 		 pScrn->videoRam & ~3, pScrn->videoRam);
>       pScrn->videoRam &= ~3;
>    }
>-
> #ifdef XF86DRI
>    /* Check for appropriate bpp and module support to initialize DRI. */
>    if (!I830CheckDRIAvailable(pScrn)) {
>       pI830->directRenderingDisabled = TRUE;
>-   }
>-
>-   /* If DRI hasn't been explicitly disabled, try to initialize it.
>-    * It will be used by the memory allocator.
>-    */
>-   if (!pI830->directRenderingDisabled)
>-      pI830->directRenderingEnabled = I830DRIScreenInit(pScreen);
>-   else
>-      pI830->directRenderingEnabled = FALSE;
>-#else
>-   pI830->directRenderingEnabled = FALSE;
>+   } else
>+      pI830->directRenderingEnabled = TRUE;
> #endif
> 
>    /* Set up our video memory allocator for the chosen videoRam */
>@@ -2661,6 +2651,18 @@
>       allocation_done = TRUE;
>    }
> 
>+#ifdef XF86DRI
>+
>+   /* If DRI hasn't been explicitly disabled, try to initialize it.
>+    * It will be used by the memory allocator.
>+    */
>+   if (!pI830->directRenderingDisabled)
>+      pI830->directRenderingEnabled = I830DRIScreenInit(pScreen);
>+   else
>+      pI830->directRenderingEnabled = FALSE;
>+#else
>+   pI830->directRenderingEnabled = FALSE;
>+#endif
>    I830UnmapMMIO(pScrn);
> 
>    if (!IS_I965G(pI830) && pScrn->displayWidth > 2048) {

Actions: View | Diff

Attachments on bug 437922: 298340 | 298341 | 298342 | 300155