aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-11-09 05:39:05 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-14 22:02:50 -0400
commit868a747c77cbf1d5e183dbceb912baa4db2be913 (patch)
tree4d5b2ad18422e288f46835aadc209951bfffedaf /drivers/gpu/drm
parentf72b751f434062deaf16a1aca2c5f53ddf71ed8f (diff)
drm/i915/gvt: Disable access to stolen memory as a guest
commit ddd09373628adcbdc3f7b9098d22328834f8d772 upstream. Explicitly disable stolen memory when running as a guest in a virtual machine, since the memory is not mediated between clients and reserved entirely for the host. The actual size should be reported as zero, but like every other quirk we want to tell the user what is happening. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99028 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Zhenyu Wang <zhenyuw@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161109103905.17860-1-chris@chris-wilson.co.uk Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com> (cherry picked from commit 04a68a35ce6d7b54749989f943993020f48fed62) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_stolen.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 9a71ed546b90..f46aac1e85fb 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -415,6 +415,11 @@ int i915_gem_init_stolen(struct drm_device *dev)
415 415
416 mutex_init(&dev_priv->mm.stolen_lock); 416 mutex_init(&dev_priv->mm.stolen_lock);
417 417
418 if (intel_vgpu_active(dev_priv)) {
419 DRM_INFO("iGVT-g active, disabling use of stolen memory\n");
420 return 0;
421 }
422
418#ifdef CONFIG_INTEL_IOMMU 423#ifdef CONFIG_INTEL_IOMMU
419 if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) { 424 if (intel_iommu_gfx_mapped && INTEL_INFO(dev)->gen < 8) {
420 DRM_INFO("DMAR active, disabling use of stolen memory\n"); 425 DRM_INFO("DMAR active, disabling use of stolen memory\n");