[Intel-gfx] [PATCH 1/2] i915: Move pci ids to i915 driver.

[Eric Anholt]

On Tue, 2009-04-07 at 11:48 -0400, krh at bitplanet.net wrote:
> From: Kristian Høgsberg <krh at redhat.com>
> 
> The intel drm driver upstream is now in-tree, so move the pci ids out
> of the generated file from drm.git and into the i915 driver.

Did you actually test this change?  It made the DRM stop probing here.

--
> Signed-off-by: Kristian Høgsberg <krh at redhat.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c |   36 ++++++++++++++++++++++++++++++++++--
>  1 files changed, 34 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 2c01676..afc2772 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -33,7 +33,6 @@
>  #include "i915_drm.h"
>  #include "i915_drv.h"
>  
> -#include "drm_pciids.h"
>  #include <linux/console.h>
>  
>  static unsigned int i915_modeset = -1;
> @@ -44,9 +43,42 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
>  
>  static struct drm_driver driver;
>  
> +#define CHIPSET(chip_id) {			\
> +	.vendor = 0x8086,			\
> +	.device = chip_id,			\
> +	.class = PCI_CLASS_DISPLAY_VGA << 8,	\
> +	.class_mask = 0xffff00			\
> +}
> +
>  static struct pci_device_id pciidlist[] = {
> -	i915_PCI_IDS
> +	CHIPSET(0x3577),
> +	CHIPSET(0x2562),
> +	CHIPSET(0x3582),
> +	CHIPSET(0x2572),
> +	CHIPSET(0x2582),
> +	CHIPSET(0x258a),
> +	CHIPSET(0x2592),
> +	CHIPSET(0x2772),
> +	CHIPSET(0x27a2),
> +	CHIPSET(0x27ae),
> +	CHIPSET(0x2972),
> +	CHIPSET(0x2982),
> +	CHIPSET(0x2992),
> +	CHIPSET(0x29a2),
> +	CHIPSET(0x29b2),
> +	CHIPSET(0x29c2),
> +	CHIPSET(0x29d2),
> +	CHIPSET(0x2a02),
> +	CHIPSET(0x2a12),
> +	CHIPSET(0x2a42),
> +	CHIPSET(0x2e02),
> +	CHIPSET(0x2e12),
> +	CHIPSET(0x2e22),
> +	CHIPSET(0xa001),
> +	CHIPSET(0xa011),
> +	{ 0, 0, 0 }
>  };
> +#undef CHIPSET
>  
>  #if defined(CONFIG_DRM_I915_KMS)
>  MODULE_DEVICE_TABLE(pci, pciidlist);
-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090407/3ec845de/attachment.sig>