[ubuntu-x] Patch for some of the i845 freezes

[Bryce Harrington]

On Fri, Apr 09, 2010 at 12:06:50PM +0200, Geir Ove Myhr wrote:
> There is a patch upstream to the intel DDX driver that will stop some,
> but not all, of the freezes on i845. Could we pull this into Lucid?
> The commit is http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0c47195ca805881e3fbd5b9224be5c930feeeb8c

Hi Geir, thanks for spotting this.  The patch looks safe enough that I
went ahead and added it for lucid.

> i830: Clip solid fills to surface.
> There is a reasonable surfeit of evidence to support this error, for
> instance: http://bugs.freedesktop.org/attachment.cgi?id=34417
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> 
> I've backported it to 2.9.1 and had it in my PPA (on top of
> 2.9.1-3ubuntu1 and 2.9.1-1ubuntu17) for a while and those that have
> used it report that it freezes less often. I wasn't familiar enough
> with quilt to put a patch in debian/patches, but the diff is:

Actually, there's no magic to using quilt.  Basically you just copy the
patch into debian/patches/ and append the filename to the end of the
series file.

There's probably fancy quilt tools, but 99% of the time the above is all
you have to do, particularly for packages like -intel that tend to have
relatively few patches.

Bryce

> --- xserver-xorg-video-intel-2.9.1.orig/src/i830_uxa.c
> +++ xserver-xorg-video-intel-2.9.1/src/i830_uxa.c
> @@ -212,6 +212,15 @@
>      unsigned long pitch;
>      uint32_t cmd;
> 
> +    if (x1 < 0)
> +        x1 = 0;
> +    if (y1 < 0)
> +        y1 = 0;
> +    if (x2 > pPixmap->drawable.width)
> +        x2 = pPixmap->drawable.width;
> +    if (y2 > pPixmap->drawable.height)
> +        y2 = pPixmap->drawable.height;
> +
>      pitch = i830_pixmap_pitch(pPixmap);
> 
>      {
> 
> the only difference from the upstream commit is that pixmap is changed
> to pPixmap and that the indentation style is changed (it was changed
> upstream at 2.10.0).
> 
> Geir Ove
> 
> -- 
> Ubuntu-x mailing list
> Ubuntu-x at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-x