[Intel-gfx] [PATCH] drm/i915: remove indirection in the PCI ID macros

[Damien Lespiau]

On Tue, Feb 03, 2015 at 02:34:05PM +0200, Jani Nikula wrote:
> Spell all the PCI IDs out to be able to quickly grep for the IDs. No
> functional changes.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> 
> ---
> 
> I tested this by comparing the results of
> 
> $ make drivers/gpu/drm/i915/i915_drv.s
> $ make arch/x86/kernel/early-quirks.s
> 
> before and after the patch. No change.

I'm sold by the test so:

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

I did double check with the specs though and found:

  - 0x160B is marked as reserved
  - 0x161B is marked as reserved
  - A few more ids are reserved than the ones in the reserved define

The reserved ones are non existing SKUs, so meh.

-- 
Damien

> ---
>  include/drm/i915_pciids.h | 49 ++++++++++++++++++++++++-----------------------
>  1 file changed, 25 insertions(+), 24 deletions(-)
> 
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 180ad0e6de21..eb79a64947da 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -208,40 +208,41 @@
>  #define INTEL_VLV_D_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0155, info)
>  
> -#define _INTEL_BDW_M(gt, id, info) \
> -	INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
> -#define _INTEL_BDW_D(gt, id, info) \
> -	INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
> -
> -#define _INTEL_BDW_M_IDS(gt, info) \
> -	_INTEL_BDW_M(gt, 0x1602, info), /* ULT */ \
> -	_INTEL_BDW_M(gt, 0x1606, info), /* ULT */ \
> -	_INTEL_BDW_M(gt, 0x160B, info), /* Iris */ \
> -	_INTEL_BDW_M(gt, 0x160E, info) /* ULX */
> -
> -#define _INTEL_BDW_D_IDS(gt, info) \
> -	_INTEL_BDW_D(gt, 0x160A, info), /* Server */ \
> -	_INTEL_BDW_D(gt, 0x160D, info) /* Workstation */
> -
> -#define INTEL_BDW_GT12M_IDS(info) \
> -	_INTEL_BDW_M_IDS(1, info), \
> -	_INTEL_BDW_M_IDS(2, info)
> +#define INTEL_BDW_GT12M_IDS(info)  \
> +	INTEL_VGA_DEVICE(0x1602, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x1606, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x160B, info), /* Iris */ \
> +	INTEL_VGA_DEVICE(0x160E, info), /* ULX */ \
> +	INTEL_VGA_DEVICE(0x1612, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x1616, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x161B, info), /* Iris */ \
> +	INTEL_VGA_DEVICE(0x161E, info)  /* ULX */
>  
>  #define INTEL_BDW_GT12D_IDS(info) \
> -	_INTEL_BDW_D_IDS(1, info), \
> -	_INTEL_BDW_D_IDS(2, info)
> +	INTEL_VGA_DEVICE(0x160A, info), /* Server */ \
> +	INTEL_VGA_DEVICE(0x160D, info), /* Workstation */ \
> +	INTEL_VGA_DEVICE(0x161A, info), /* Server */ \
> +	INTEL_VGA_DEVICE(0x161D, info)  /* Workstation */
>  
>  #define INTEL_BDW_GT3M_IDS(info) \
> -	_INTEL_BDW_M_IDS(3, info)
> +	INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \
> +	INTEL_VGA_DEVICE(0x162E, info)  /* ULX */
>  
>  #define INTEL_BDW_GT3D_IDS(info) \
> -	_INTEL_BDW_D_IDS(3, info)
> +	INTEL_VGA_DEVICE(0x162A, info), /* Server */ \
> +	INTEL_VGA_DEVICE(0x162D, info)  /* Workstation */
>  
>  #define INTEL_BDW_RSVDM_IDS(info) \
> -	_INTEL_BDW_M_IDS(4, info)
> +	INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \
> +	INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \
> +	INTEL_VGA_DEVICE(0x163E, info)  /* ULX */
>  
>  #define INTEL_BDW_RSVDD_IDS(info) \
> -	_INTEL_BDW_D_IDS(4, info)
> +	INTEL_VGA_DEVICE(0x163A, info), /* Server */ \
> +	INTEL_VGA_DEVICE(0x163D, info)  /* Workstation */
>  
>  #define INTEL_BDW_M_IDS(info) \
>  	INTEL_BDW_GT12M_IDS(info), \
> -- 
> 2.1.4
>