agp/intel: Fix typo in needs_ilk_vtd_wa()
diff mbox

Message ID 1435497496-5488-1-git-send-email-chris@chris-wilson.co.uk
State New
Headers show

Commit Message

Chris Wilson June 28, 2015, 1:18 p.m. UTC
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
---
 drivers/char/agp/intel-gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Vetter June 29, 2015, 7:59 a.m. UTC | #1
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@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

Oops, can't count how often we've committed this mistake.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  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
>
Jani Nikula June 29, 2015, 11:27 a.m. UTC | #2
On Mon, 29 Jun 2015, Daniel Vetter <daniel@ffwll.ch> 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@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
>
> Oops, can't count how often we've committed this mistake.
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

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
Shuang He June 29, 2015, 5:55 p.m. UTC | #3
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6657
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
ILK                                  302/302              302/302
SNB                                  312/316              312/316
IVB                                  343/343              343/343
BYT                                  287/287              287/287
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
Note: You need to pay more attention to line start with '*'

Patch
diff mbox

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;