From: Greg Kroah-Hartman Date: Tue, 23 May 2017 19:48:47 +0000 (+0200) Subject: drop queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch X-Git-Tag: v3.18.55~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7511aaa6a41bb212e8d0c3cf3d4aed5d54f51d7;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch --- diff --git a/queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch b/queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch deleted file mode 100644 index 9c6d7bf4e93..00000000000 --- a/queue-4.4/drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 04a68a35ce6d7b54749989f943993020f48fed62 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Wed, 9 Nov 2016 10:39:05 +0000 -Subject: drm/i915/gvt: Disable access to stolen memory as a guest - -From: Chris Wilson - -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 -Cc: Zhenyu Wang -Cc: Joonas Lahtinen -Link: http://patchwork.freedesktop.org/patch/msgid/20161109103905.17860-1-chris@chris-wilson.co.uk -Reviewed-by: Zhenyu Wang -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_gem_stolen.c | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/drivers/gpu/drm/i915/i915_gem_stolen.c -+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c -@@ -405,6 +405,11 @@ int i915_gem_init_stolen(struct drm_devi - - mutex_init(&dev_priv->mm.stolen_lock); - -+ 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_INFO(dev)->gen < 8) { - DRM_INFO("DMAR active, disabling use of stolen memory\n"); diff --git a/queue-4.4/series b/queue-4.4/series index 7b5f83074aa..5d217f275bf 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -101,4 +101,3 @@ pci-freeze-pme-scan-before-suspending-devices.patch drm-edid-add-10-bpc-quirk-for-lgd-764-panel-in-hp-zbook-17-g2.patch nfsd-encoders-mustn-t-use-unitialized-values-in-error-cases.patch drivers-char-mem-check-for-address-space-wraparound-with-mmap.patch -drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch