diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-02 10:08:35 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-02 15:59:07 +0200 |
commit | 650dc07ec3b0eba8ff21da706d2b1876ada59fc3 (patch) | |
tree | 337809fc7c960a6c525f473d498c339aa7075ab3 /include | |
parent | cc22a938fc1db0c8ef5e693a69b159c4b851dab3 (diff) | |
download | linux-stable-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.tar.gz linux-stable-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.tar.bz2 linux-stable-650dc07ec3b0eba8ff21da706d2b1876ada59fc3.zip |
drm/i915: disable ppgtt on snb when dmar is enabled
Totally unexpected that this regressed. Luckily it sounds like we just
need to have dmar disable on the igfx, not the entire system. At least
that's what a few days of testing between Tony Vroon and me indicates.
Reported-by: Tony Vroon <tony@linx.net>
Cc: Tony Vroon <tony@linx.net>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43024
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/intel-gtt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h index 0a0001b9dc78..923afb5dcf0c 100644 --- a/include/drm/intel-gtt.h +++ b/include/drm/intel-gtt.h @@ -44,4 +44,8 @@ void intel_gtt_insert_pages(unsigned int first_entry, unsigned int num_entries, /* flag for GFDT type */ #define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) +#ifdef CONFIG_INTEL_IOMMU +extern int intel_iommu_gfx_mapped; +#endif + #endif |