[Jaunty SRU] i915: add support for G41 chipset

[Amit Kucheria]

On Thu, Apr 30, 2009 at 01:01:57PM +0800, Ike Panhc wrote:
> >Description
> SRU Justification:
> 
> Impact:
> 	1. Can not enable 3D and visual effects
> 	2. Whenever I open cheese, system logged out automatically with the following error:
> 		gdm[3245]: WARNING: gdm_slave_xioerror_handler: Fatal X error - Restarting :0
> 	3. GDM restart fail after suspend/resume
> 
> Fix: add support for G41 chipset in DRI
> 
> >Request-pull
> The following changes since commit 424dcf69eb73ecb4f3c75cc5dfd2cded1ac902cb:
>   Daniel T Chen (1):
>         UBUNTU: SAUCE: [jaunty] ALSA: Add retry for Intel8x0 clock measurement
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/ikepanhc/ike-jaunty.git lp#365958
> 
> Ike Panhc (1):
>       i915: add support for G41 chipset
> 
>  drivers/gpu/drm/i915/i915_drv.h |    6 ++++--
>  include/drm/drm_pciids.h        |    1 +
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> >Patch
> From e46e1ce72f3963cf80ccb2ae252544cb3abb34a5 Mon Sep 17 00:00:00 2001
> From: Ike Panhc <ike.pan at canonical.com>
> Date: Tue, 28 Apr 2009 15:04:42 +0800
> Subject: [PATCH] [DRM] i915: add support for G41 chipset
> 
> OriginalAuthor: Zhenyu Wang <zhenyu.z.wang at intel.com>
> OriginalLocation: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg36886.html
> 
> Bug: #365958
> BugLink: https://bugs.launchpad.net/ubuntu/jaunty/+source/linux/+bug/365958
> 
> We need to enable DRI in kernel for G41 graphic.
> 
> Signed-off-by: Ike Panhc <ike.pan at canonical.com>
> Tested-by: David Chen <david.chen at canonical.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h |    6 ++++--
>  include/drm/drm_pciids.h        |    1 +
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 24dd428..1b16482 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -653,7 +653,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
>  		       (dev)->pci_device == 0x2A42 || \
>  		       (dev)->pci_device == 0x2E02 || \
>  		       (dev)->pci_device == 0x2E12 || \
> -		       (dev)->pci_device == 0x2E22)
> +		       (dev)->pci_device == 0x2E22 || \
> +		       (dev)->pci_device == 0x2E32)
>  
>  #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
>  
> @@ -661,7 +662,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
>  
>  #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
>  		     (dev)->pci_device == 0x2E12 || \
> -		     (dev)->pci_device == 0x2E22)
> +		     (dev)->pci_device == 0x2E22 || \
> +		     (dev)->pci_device == 0x2E32)
>  
>  #define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||	\
>  			(dev)->pci_device == 0x29B2 ||	\
> diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
> index ecb9761..6533450 100644
> --- a/include/drm/drm_pciids.h
> +++ b/include/drm/drm_pciids.h
> @@ -531,4 +531,5 @@
>  	{0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
>  	{0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
>  	{0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
> +	{0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
>  	{0, 0, 0}
> -- 
> 1.5.6.3

ACK.

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit at canonical.com
----------------------------------------------------------------------