Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6
* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6: agp/intel: Fix broken ® symbol in device name. agp/intel: add support for G41 chipset
This commit is contained in:
commit
a4ba2e9e36
|
@ -40,6 +40,8 @@
|
||||||
#define PCI_DEVICE_ID_INTEL_Q45_IG 0x2E12
|
#define PCI_DEVICE_ID_INTEL_Q45_IG 0x2E12
|
||||||
#define PCI_DEVICE_ID_INTEL_G45_HB 0x2E20
|
#define PCI_DEVICE_ID_INTEL_G45_HB 0x2E20
|
||||||
#define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22
|
#define PCI_DEVICE_ID_INTEL_G45_IG 0x2E22
|
||||||
|
#define PCI_DEVICE_ID_INTEL_G41_HB 0x2E30
|
||||||
|
#define PCI_DEVICE_ID_INTEL_G41_IG 0x2E32
|
||||||
|
|
||||||
/* cover 915 and 945 variants */
|
/* cover 915 and 945 variants */
|
||||||
#define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \
|
#define IS_I915 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || \
|
||||||
|
@ -63,7 +65,8 @@
|
||||||
#define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \
|
#define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G45_HB || \
|
||||||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB)
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_GM45_HB || \
|
||||||
|
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G41_HB)
|
||||||
|
|
||||||
extern int agp_memory_reserved;
|
extern int agp_memory_reserved;
|
||||||
|
|
||||||
|
@ -1196,6 +1199,7 @@ static void intel_i965_get_gtt_range(int *gtt_offset, int *gtt_size)
|
||||||
case PCI_DEVICE_ID_INTEL_IGD_E_HB:
|
case PCI_DEVICE_ID_INTEL_IGD_E_HB:
|
||||||
case PCI_DEVICE_ID_INTEL_Q45_HB:
|
case PCI_DEVICE_ID_INTEL_Q45_HB:
|
||||||
case PCI_DEVICE_ID_INTEL_G45_HB:
|
case PCI_DEVICE_ID_INTEL_G45_HB:
|
||||||
|
case PCI_DEVICE_ID_INTEL_G41_HB:
|
||||||
*gtt_offset = *gtt_size = MB(2);
|
*gtt_offset = *gtt_size = MB(2);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -2156,13 +2160,15 @@ static const struct intel_driver_description {
|
||||||
{ PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33",
|
{ PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33",
|
||||||
NULL, &intel_g33_driver },
|
NULL, &intel_g33_driver },
|
||||||
{ PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0,
|
{ PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0,
|
||||||
"Mobile Intel? GM45 Express", NULL, &intel_i965_driver },
|
"Mobile Intel® GM45 Express", NULL, &intel_i965_driver },
|
||||||
{ PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0,
|
{ PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0,
|
||||||
"Intel Integrated Graphics Device", NULL, &intel_i965_driver },
|
"Intel Integrated Graphics Device", NULL, &intel_i965_driver },
|
||||||
{ PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0,
|
{ PCI_DEVICE_ID_INTEL_Q45_HB, PCI_DEVICE_ID_INTEL_Q45_IG, 0,
|
||||||
"Q45/Q43", NULL, &intel_i965_driver },
|
"Q45/Q43", NULL, &intel_i965_driver },
|
||||||
{ PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0,
|
{ PCI_DEVICE_ID_INTEL_G45_HB, PCI_DEVICE_ID_INTEL_G45_IG, 0,
|
||||||
"G45/G43", NULL, &intel_i965_driver },
|
"G45/G43", NULL, &intel_i965_driver },
|
||||||
|
{ PCI_DEVICE_ID_INTEL_G41_HB, PCI_DEVICE_ID_INTEL_G41_IG, 0,
|
||||||
|
"G41", NULL, &intel_i965_driver },
|
||||||
{ 0, 0, 0, NULL, NULL, NULL }
|
{ 0, 0, 0, NULL, NULL, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2360,6 +2366,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
|
||||||
ID(PCI_DEVICE_ID_INTEL_IGD_E_HB),
|
ID(PCI_DEVICE_ID_INTEL_IGD_E_HB),
|
||||||
ID(PCI_DEVICE_ID_INTEL_Q45_HB),
|
ID(PCI_DEVICE_ID_INTEL_Q45_HB),
|
||||||
ID(PCI_DEVICE_ID_INTEL_G45_HB),
|
ID(PCI_DEVICE_ID_INTEL_G45_HB),
|
||||||
|
ID(PCI_DEVICE_ID_INTEL_G41_HB),
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in New Issue