drm/i915: Enable stolen for iommu on snb/ivb

Submitted by Chris Wilson on Sept. 13, 2019, 4:43 p.m.

Details

Message ID 20190913164337.25829-1-chris@chris-wilson.co.uk
State New
Headers show
Series "drm/i915: Enable stolen for iommu on snb/ivb" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Chris Wilson Sept. 13, 2019, 4:43 p.m.
Now that we have CI testing of iommu, let's enable stolen + iommu with a
lot more confidence that we can diagnose any potential erors.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Martin Peres <martin.peres@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 7 -------
 1 file changed, 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index bfbc3e3daf92..c52ecf525c24 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -369,13 +369,6 @@  int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
 		return 0;
 	}
 
-	if (intel_vtd_active() && INTEL_GEN(dev_priv) < 8) {
-		dev_notice(dev_priv->drm.dev,
-			   "%s, disabling use of stolen memory\n",
-			   "DMAR active");
-		return 0;
-	}
-
 	if (resource_size(&intel_graphics_stolen_res) == 0)
 		return 0;
 

Comments

On 13/09/2019 19:43, Chris Wilson wrote:
> Now that we have CI testing of iommu, let's enable stolen + iommu with a
> lot more confidence that we can diagnose any potential erors.

AFAIK, we still haven't checked that these machines indeed have the
IOMMU enabled yet. Am I wrong?

If I am not, then let's hold the merging of this patch :)

Martin

> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Martin Peres <martin.peres@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
> index bfbc3e3daf92..c52ecf525c24 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
> @@ -369,13 +369,6 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
>  		return 0;
>  	}
>  
> -	if (intel_vtd_active() && INTEL_GEN(dev_priv) < 8) {
> -		dev_notice(dev_priv->drm.dev,
> -			   "%s, disabling use of stolen memory\n",
> -			   "DMAR active");
> -		return 0;
> -	}
> -
>  	if (resource_size(&intel_graphics_stolen_res) == 0)
>  		return 0;
>  
>
Quoting Martin Peres (2019-09-17 12:39:13)
> On 13/09/2019 19:43, Chris Wilson wrote:
> > Now that we have CI testing of iommu, let's enable stolen + iommu with a
> > lot more confidence that we can diagnose any potential erors.
> 
> AFAIK, we still haven't checked that these machines indeed have the
> IOMMU enabled yet. Am I wrong?

Hmm, let's have a quick look,

https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6906/fi-snb-2600/boot0.txt
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6907/fi-snb-2520m/boot0.txt
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-snb6/boot1.txt
No iommu

https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-hsw8/boot1.txt
<6>[    1.540343] pci 0000:00:02.0: Adding to iommu group 1

So only a smattering of coverage on Haswell (didn't check the farm1
ivb/hsw/byt).

So indeed hard to draw any conclusion from our test results at present.
Hopefully, Tomi will have some success in fighting with the BIOS.
-Chris