On Mon, 29 Jun 2015, Daniel Vetter <daniel@xxxxxxxx> wrote: > On Sun, Jun 28, 2015 at 02:18:16PM +0100, Chris Wilson wrote: >> 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@xxxxxxxxxxxxxxxxxx> >> 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@xxxxxxxxx> >> 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@xxxxxxxxxxxxxxxxxx> >> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> >> Cc: stable@xxxxxxxxxxxxxxx > > Oops, can't count how often we've committed this mistake. > Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> Pushed to drm-intel-next-fixes, thanks for the patch and review. BR, Jani. > >> --- >> drivers/char/agp/intel-gtt.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c >> index 3bb678ef033a..7c6857620175 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) >> /* 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; >> -- >> 2.1.4 >> > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
