diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2015-06-28 09:18:16 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2015-06-29 07:26:09 -0400 |
commit | 8b572a4200828b4e75cc22ed2f494b58d5372d65 (patch) | |
tree | 2595595013ded10a4b49f824729f863e91dd70a7 /drivers/char/agp | |
parent | 00245266b4be4fbe989ee073663f56716da6c1f3 (diff) |
agp/intel: Fix typo in needs_ilk_vtd_wa()
In needs_ilk_vtd_wa(), we pass in the GPU device but compared it against
the ids for the mobile GPU and the mobile host bridge. That latter is
impossible and so likely was just a typo for the desktop GPU device id
(which is also buggy).
Fixes commit da88a5f7f7d434e2cde1b3e19d952e6d84533662
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 13 09:31:53 2013 +0000
drm/i915: Disable WC PTE updates to w/a buggy IOMMU on ILK
Reported-by: Ting-Wei Lan <lantw44@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91127
References: https://bugzilla.freedesktop.org/show_bug.cgi?id=60391
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r-- | drivers/char/agp/intel-gtt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 0b4188b9af7c..c6dea3f6917b 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
@@ -581,7 +581,7 @@ static inline int needs_ilk_vtd_wa(void) | |||
581 | /* Query intel_iommu to see if we need the workaround. Presumably that | 581 | /* Query intel_iommu to see if we need the workaround. Presumably that |
582 | * was loaded first. | 582 | * was loaded first. |
583 | */ | 583 | */ |
584 | if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB || | 584 | if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || |
585 | gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && | 585 | gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && |
586 | intel_iommu_gfx_mapped) | 586 | intel_iommu_gfx_mapped) |
587 | return 1; | 587 | return 1; |