[Intel-gfx] [PATCH xf86-video-intel v3] Sync i915_pciids upto 8717c6b7414f

[Liwei Song]

On 4/21/20 00:21, Ville Syrjälä wrote:
> On Mon, Apr 20, 2020 at 04:22:07PM +0800, Liwei Song wrote:
>> Import the kernel's i915_pciids.h, up to:
>>
>> commit 8717c6b7414ffb890672276dccc284c23078ac0e
>> Author: Lee Shawn C <shawn.c.lee at intel.com>
>> Date:   Tue Dec 10 23:04:15 2019 +0800
>>
>>     drm/i915/cml: Separate U series pci id from origianl list.
>>
>> Signed-off-by: Liwei Song <liwei.song at windriver.com>
>> ---
>> V2 -> V3:
>>    Add 4 new info blocks and add sound support for them.
>>
>> Change since V1:
>>   replace old definition in intel_module.c and dri3-test.c
>> ---
>>  src/i915_pciids.h     | 265 ++++++++++++++++++++++++++++++++----------
>>  src/intel_module.c    |  92 ++++++++++++++-
>>  src/sna/gen9_render.c |  48 ++++++++
>>  test/dri3-test.c      |   2 +-
>>  4 files changed, 344 insertions(+), 63 deletions(-)
>>
>> diff --git a/src/i915_pciids.h b/src/i915_pciids.h
>> index fd965ffbb92e..1d2c12219f44 100644
>> --- a/src/i915_pciids.h
>> +++ b/src/i915_pciids.h
>> @@ -108,8 +108,10 @@
>>  	INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \
>>  	INTEL_VGA_DEVICE(0x2e92, info)	/* B43_G.1 */
>>  
>> -#define INTEL_PINEVIEW_IDS(info)			\
>> -	INTEL_VGA_DEVICE(0xa001, info),			\
>> +#define INTEL_PINEVIEW_G_IDS(info) \
>> +	INTEL_VGA_DEVICE(0xa001, info)
>> +
>> +#define INTEL_PINEVIEW_M_IDS(info) \
>>  	INTEL_VGA_DEVICE(0xa011, info)
>>  
>>  #define INTEL_IRONLAKE_D_IDS(info) \
>> @@ -166,7 +168,18 @@
> <snip>
>> @@ -357,7 +443,7 @@ static const struct pci_id_match intel_device_match[] = {
>>  	INTEL_I945GM_IDS(&intel_i945_info),
>>  
>>  	INTEL_G33_IDS(&intel_g33_info),
>> -	INTEL_PINEVIEW_IDS(&intel_g33_info),
>> +	INTEL_PINEVIEW_G_IDS(&intel_g33_info),
> 
> Lost the other PNV.

Got it, thanks, will add it in V4.

Liwei.


> 
>>  
>>  	INTEL_I965G_IDS(&intel_i965_info),
>>  	INTEL_I965GM_IDS(&intel_i965_info),
>