Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu Kernel Team (http://www.linux-archive.org/ubuntu-kernel-team/)
-   -   SRU request for LP#204762 (http://www.linux-archive.org/ubuntu-kernel-team/83787-sru-request-lp-204762-a.html)

Stefan Bader 05-07-2008 04:07 PM

SRU request for LP#204762
 
https://bugs.launchpad.net/ubuntu/+bug/204762

SRU Justification

Impact: Regression for DRI and Intel 945GM

Fix description: Simple patch that adds an ID to a macro.

Testcase: Starting X with Intel 945GM card gives DRI error messages.

commit 3bf48468fe84468a148e4f19465e0a725c0f977b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sun Apr 6 11:55:04 2008 -0700

fix IS_I9XX macro in i915 DRM driver

Now that we're mapping registers in the DRM driver at load time, the
driver actually checks the PCI ID, so we need to make sure the macros
have all the right bits (and longer term use the DRM headers as the sole
copy of the PCI & register definitions).

This patch adds 945GME support to the DRM headers, fixing a regression
reported in http://bugzilla.kernel.org/show_bug.cgi?id=10395.

Tested-by: Alexander Oltu <alexander@all-2.com>
Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index c10d128..675d88b 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev,
int n,
#define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device
== 0x25
#define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
#define IS_I945G(dev) ((dev)->pci_device == 0x2772)
-#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
-
+#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||
+ (dev)->pci_device == 0x27AE)
#define IS_I965G(dev) ((dev)->pci_device == 0x2972 ||
(dev)->pci_device == 0x2982 ||
(dev)->pci_device == 0x2992 ||

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Tim Gardner 05-07-2008 04:58 PM

SRU request for LP#204762
 
Stefan Bader wrote:
> https://bugs.launchpad.net/ubuntu/+bug/204762
>
> SRU Justification
>
> Impact: Regression for DRI and Intel 945GM
>
> Fix description: Simple patch that adds an ID to a macro.
>
> Testcase: Starting X with Intel 945GM card gives DRI error messages.
>
> commit 3bf48468fe84468a148e4f19465e0a725c0f977b
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date: Sun Apr 6 11:55:04 2008 -0700
>
> fix IS_I9XX macro in i915 DRM driver
>
> Now that we're mapping registers in the DRM driver at load time, the
> driver actually checks the PCI ID, so we need to make sure the macros
> have all the right bits (and longer term use the DRM headers as the sole
> copy of the PCI & register definitions).
>
> This patch adds 945GME support to the DRM headers, fixing a regression
> reported in http://bugzilla.kernel.org/show_bug.cgi?id=10395.
>
> Tested-by: Alexander Oltu <alexander@all-2.com>
> Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
> diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
> index c10d128..675d88b 100644
> --- a/drivers/char/drm/i915_drv.h
> +++ b/drivers/char/drm/i915_drv.h
> @@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev,
> int n,
> #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device
> == 0x25
> #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
> #define IS_I945G(dev) ((dev)->pci_device == 0x2772)
> -#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
> -
> +#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||
> + (dev)->pci_device == 0x27AE)
> #define IS_I965G(dev) ((dev)->pci_device == 0x2972 ||
> (dev)->pci_device == 0x2982 ||
> (dev)->pci_device == 0x2992 ||
>

ACK

--
Tim Gardner tim.gardner@ubuntu.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team


All times are GMT. The time now is 10:53 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.