Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dde47876 authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Dave Airlie
Browse files

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: default avatarWang Zhenyu <zhenyu.z.wang@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a51b3459

drivers/char/agp/intel-agp.c

+12 −5
Original line number Diff line number Diff line
@@ -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 || \
@@ -525,6 +528,7 @@ static void intel_i830_init_gtt_entries(void) 
			    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
@@ -536,6 +540,7 @@ static void intel_i830_init_gtt_entries(void) 
			    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
@@ -1846,9 +1851,9 @@ static const struct intel_driver_description { 
		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 },
@@ -1858,9 +1863,9 @@ static const struct intel_driver_description { 
		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 },
@@ -2049,11 +2054,13 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	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),