[2.6.22.y] {08/17} - intel-agp-965gme-fix - series for stable kernel #2

[Oliver Pinter (Pintér Olivér)]

mainline: dde4787642ee3cb85aef80bdade04b6f8ddc3df8


-- 
Thanks,
Oliver
> --- Begin Message ---
> Intel_agp: really fix 945/965GME
>
> Fix some missing places to check with device id info, which
> should probe the device gart correctly.
>
> Signed-off-by: Wang Zhenyu <zhenyu.z.wang@xxxxxxxxx>
> Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> Acked-by: Takashi Iwai <tiwai@xxxxxxx>
>
> ---
> commit dde4787642ee3cb85aef80bdade04b6f8ddc3df8
> tree e99908c8c61a08244b6bb03b87782999a5a3847d
> parent a51b34593f691a0837d752a1394dcee19483c607
> author Zhenyu Wang <zhenyu.z.wang@xxxxxxxxx> Thu, 26 Jul 2007 09:18:09 +0800
> committer Dave Airlie <airlied@xxxxxxxxxx> Fri, 27 Jul 2007 10:48:13 +1000
>
>  drivers/char/agp/intel-agp.c |   17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
>
> --- a/drivers/char/agp/intel-agp.c	2007-07-08 19:32:17.000000000 -0400
> +++ b/drivers/char/agp/intel-agp.c	2007-08-27 14:01:47.000000000 -0400
> @@ -20,7 +20,9 @@
>  #define PCI_DEVICE_ID_INTEL_82965G_IG       0x29A2
>  #define PCI_DEVICE_ID_INTEL_82965GM_HB      0x2A00
>  #define PCI_DEVICE_ID_INTEL_82965GM_IG      0x2A02
> +#define PCI_DEVICE_ID_INTEL_82965GME_HB     0x2A10
>  #define PCI_DEVICE_ID_INTEL_82965GME_IG     0x2A12
> +#define PCI_DEVICE_ID_INTEL_82945GME_HB     0x27AC
>  #define PCI_DEVICE_ID_INTEL_82945GME_IG     0x27AE
>  #define PCI_DEVICE_ID_INTEL_G33_HB          0x29C0
>  #define PCI_DEVICE_ID_INTEL_G33_IG          0x29C2
> @@ -33,7 +35,8 @@
>                   agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
>                   agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
>                   agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
> -                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB)
> +                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \
> +                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB)
>  
>  #define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \
>  		agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \
> @@ -527,6 +530,7 @@ static void intel_i830_init_gtt_entries(
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB ||
> +			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GME_HB ||
>  			    IS_I965 || IS_G33)
>  				gtt_entries = MB(48) - KB(size);
>  			else
> @@ -538,6 +542,7 @@ static void intel_i830_init_gtt_entries(
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB ||
>  			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB ||
> +			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GME_HB ||
>  			    IS_I965 || IS_G33)
>  				gtt_entries = MB(64) - KB(size);
>  			else
> @@ -1848,9 +1853,9 @@ static const struct intel_driver_descrip
>  		NULL, &intel_915_driver },
>  	{ PCI_DEVICE_ID_INTEL_82945G_HB, PCI_DEVICE_ID_INTEL_82945G_IG, 0, "945G",
>  		NULL, &intel_915_driver },
> -	{ PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GM_IG, 1, "945GM",
> +	{ PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GM_IG, 0, "945GM",
>  		NULL, &intel_915_driver },
> -	{ PCI_DEVICE_ID_INTEL_82945GM_HB, PCI_DEVICE_ID_INTEL_82945GME_IG, 0, "945GME",
> +	{ PCI_DEVICE_ID_INTEL_82945GME_HB, PCI_DEVICE_ID_INTEL_82945GME_IG, 0, "945GME",
>  		NULL, &intel_915_driver },
>  	{ PCI_DEVICE_ID_INTEL_82946GZ_HB, PCI_DEVICE_ID_INTEL_82946GZ_IG, 0, "946GZ",
>  		NULL, &intel_i965_driver },
> @@ -1860,9 +1865,9 @@ static const struct intel_driver_descrip
>  		NULL, &intel_i965_driver },
>  	{ PCI_DEVICE_ID_INTEL_82965G_HB, PCI_DEVICE_ID_INTEL_82965G_IG, 0, "965G",
>  		NULL, &intel_i965_driver },
> -	{ PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GM_IG, 1, "965GM",
> +	{ PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GM_IG, 0, "965GM",
>  		NULL, &intel_i965_driver },
> -	{ PCI_DEVICE_ID_INTEL_82965GM_HB, PCI_DEVICE_ID_INTEL_82965GME_IG, 0, "965GME/GLE",
> +	{ PCI_DEVICE_ID_INTEL_82965GME_HB, PCI_DEVICE_ID_INTEL_82965GME_IG, 0, "965GME/GLE",
>  		NULL, &intel_i965_driver },
>  	{ PCI_DEVICE_ID_INTEL_7505_0, 0, 0, "E7505", &intel_7505_driver, NULL },
>  	{ PCI_DEVICE_ID_INTEL_7205_0, 0, 0, "E7205", &intel_7505_driver, NULL },
> @@ -2051,11 +2056,13 @@ static struct pci_device_id agp_intel_pc
>  	ID(PCI_DEVICE_ID_INTEL_82915GM_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82945G_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82945GM_HB),
> +	ID(PCI_DEVICE_ID_INTEL_82945GME_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82946GZ_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82965G_1_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82965G_HB),
>  	ID(PCI_DEVICE_ID_INTEL_82965GM_HB),
> +	ID(PCI_DEVICE_ID_INTEL_82965GME_HB),
>  	ID(PCI_DEVICE_ID_INTEL_G33_HB),
>  	ID(PCI_DEVICE_ID_INTEL_Q35_HB),
>  	ID(PCI_DEVICE_ID_INTEL_Q33_HB),
>
> --- End Message ---