git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
agp/intel: Fix typo in needs_ilk_vtd_wa()
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
intel-gtt.c
diff --git
a/drivers/char/agp/intel-gtt.c
b/drivers/char/agp/intel-gtt.c
index
c92424c
..
59d4697
100644
(file)
--- a/
drivers/char/agp/intel-gtt.c
+++ b/
drivers/char/agp/intel-gtt.c
@@
-1195,7
+1195,7
@@
static inline int needs_idle_maps(void)
/* Query intel_iommu to see if we need the workaround. Presumably that
* was loaded first.
*/
/* Query intel_iommu to see if we need the workaround. Presumably that
* was loaded first.
*/
- if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_
M_HB
||
+ if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_
D_IG
||
gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
intel_iommu_gfx_mapped)
return 1;
gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) &&
intel_iommu_gfx_mapped)
return 1;
@@
-1459,6
+1459,8
@@
static const struct intel_gtt_driver_description {
"Ivybridge", &sandybridge_gtt_driver },
{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,
"Ivybridge", &sandybridge_gtt_driver },
"Ivybridge", &sandybridge_gtt_driver },
{ PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT1_IG,
"Ivybridge", &sandybridge_gtt_driver },
+ { PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_GT2_IG,
+ "Ivybridge", &sandybridge_gtt_driver },
{ 0, NULL, NULL }
};
{ 0, NULL, NULL }
};