Attachment 22959 Details for Bug 19304 – patch ported to 2.4.1

[patch] patch ported to 2.4.1

29_i830-fifo-watermark-conservative.patch (text/plain), 2.82 KB, created by Martin Pitt on 2009-02-15 03:49:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Pitt

Created: 2009-02-15 03:49:23 UTC

Size: 2.82 KB

patch

obsolete

># http://bugs.freedesktop.org/show_bug.cgi?id=19304
>Index: xserver-xorg-video-intel-2.4.1/src/i830_debug.c
>===================================================================
>--- xserver-xorg-video-intel-2.4.1.orig/src/i830_debug.c	2008-08-15 02:23:39.000000000 +0000
>+++ xserver-xorg-video-intel-2.4.1/src/i830_debug.c	2009-02-15 11:35:30.000000000 +0000
>@@ -509,6 +509,8 @@
>     DEFINEREG(DSPFW1),
>     DEFINEREG(DSPFW2),
>     DEFINEREG(DSPFW3),
>+    DEFINEREG(FWATER_BLC),
>+    DEFINEREG(FWATER_BLC2),
> 
>     DEFINEREG2(ADPA, i830_debug_adpa),
>     DEFINEREG2(LVDS, i830_debug_lvds),
>Index: xserver-xorg-video-intel-2.4.1/src/i830_display.c
>===================================================================
>--- xserver-xorg-video-intel-2.4.1.orig/src/i830_display.c	2009-02-15 11:31:37.000000000 +0000
>+++ xserver-xorg-video-intel-2.4.1/src/i830_display.c	2009-02-15 11:37:47.000000000 +0000
>@@ -1103,7 +1103,9 @@
>    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
>    I830Ptr pI830 = I830PTR(pScrn);
>    int total_hdisplay = 0, planea_hdisplay = 0, planeb_hdisplay = 0;
>-   int fifo_entries = 0, planea_entries = 0, planeb_entries = 0, i;
>+   int fifo_entries = 0, planea_entries = 0, planeb_entries = 0,
>+       planec_entries = 0, i;
>+   uint32_t watermark = (3 << 8) | 1;
> 
>    if ((INREG(DSPACNTR) & DISPLAY_PLANE_ENABLE) &&
>        (INREG(DSPBCNTR) & DISPLAY_PLANE_ENABLE))
>@@ -1113,18 +1115,22 @@
>   /*
>     * FIFO entries will be split based on programmed modes
>     */
>-   if (IS_I965GM(pI830) || IS_GM45(pI830))
>+   if (IS_I965GM(pI830) || IS_GM45(pI830)) {
>        fifo_entries = 127;
>-   else if (IS_I9XX(pI830))
>+       planec_entries = 40;
>+   } else if (IS_I9XX(pI830)) {
>        fifo_entries = 95;
>-   else if (IS_MOBILE(pI830)) {
>+       planec_entries = 30;
>+   } else if (IS_MOBILE(pI830)) {
>        fifo_entries = 255;
>+       planec_entries = 96;
>    } else {
> 	/* The 845/865 only have a AEND field.  Though the field size would
> 	* allow 128 entries, the 865 rendered the cursor wrong then.
> 	* The BIOS set it up for 96.
> 	*/
> 	fifo_entries = 95;
>+        planec_entries = 30;
>    }
> 
>    for (i = 0; i < xf86_config->num_crtc; i++) {
>@@ -1139,14 +1145,17 @@
>       }
>    }
> 
>+   fifo_entries -= planec_entries;
>    planea_entries = fifo_entries * planea_hdisplay / total_hdisplay;
>    planeb_entries = fifo_entries * planeb_hdisplay / total_hdisplay;
> 
>-   if (IS_I9XX(pI830))
>+   if (IS_I9XX(pI830)) {
>+       OUTREG(FWATER_BLC, (watermark << 16) | watermark);
>+       OUTREG(FWATER_BLC2, watermark);
>        OUTREG(DSPARB,
> 	      ((planea_entries + planeb_entries) << DSPARB_CSTART_SHIFT) |
> 	      (planea_entries << DSPARB_BSTART_SHIFT));
>-   else if (IS_MOBILE(pI830))
>+   } else if (IS_MOBILE(pI830))
>        OUTREG(DSPARB,
> 	      ((planea_entries + planeb_entries) << DSPARB_BEND_SHIFT) |
> 	      (planea_entries << DSPARB_AEND_SHIFT));

Actions: View | Splinter Review

Attachments on bug 19304: 21511 | 21512 | 21513 | 22944 | 22945 | 22946 | 22956 | 22957 | 22959 | 23007 | 24431 | 24438 | 24465 | 24471 | 24493 | 24651 | 24653 | 24816 | 25075 | 25080 | 25116 | 26930 | 27329 | 27540 | 27575

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.