]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/gvt: Disable access to stolen memory as a guest
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 9 Nov 2016 10:39:05 +0000 (10:39 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 May 2017 13:46:30 +0000 (15:46 +0200)
commit 04a68a35ce6d7b54749989f943993020f48fed62 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/i915_gem_stolen.c

index 9673bcc3b6ad6e76096403a892f0bf2852adc417..ed9a8e934d9a8c59654f4e4337c09782cb6705f9 100644 (file)
@@ -410,6 +410,11 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
                return 0;
        }
 
+       if (intel_vgpu_active(dev_priv)) {
+               DRM_INFO("iGVT-g active, disabling use of stolen memory\n");
+               return 0;
+       }
+
 #ifdef CONFIG_INTEL_IOMMU
        if (intel_iommu_gfx_mapped && INTEL_GEN(dev_priv) < 8) {
                DRM_INFO("DMAR active, disabling use of stolen memory\n");