Skip to contentSkip to conversation

Patch "drm/i915: A hotfix for making aliasing PPGTT work for GVT-g" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 6, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: A hotfix for making aliasing PPGTT work for GVT-g

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-a-hotfix-for-making-aliasing-ppgtt-work-for-gvt-g.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3e52d71ede206df75b56208e7c7a277ef157bb71 Mon Sep 17 00:00:00 2001

From: Zhi Wang <[email protected]>
Date: Wed, 8 Feb 2017 21:03:33 +0800
Subject: drm/i915: A hotfix for making aliasing PPGTT work for GVT-g

From: Zhi Wang <[email protected]>

commit 3e52d71ede206df75b56208e7c7a277ef157bb71 upstream.

This patch makes PPGTT page table non-shrinkable when using aliasing PPGTT mode. It's just a temporary solution for making GVT-g work.

Fixes 2ce5179fe826 ("drm/i915/gtt: Free unused lower-level page tables")
Cc Tvrtko Ursulin <[email protected]>
Cc Michal Winiarski <[email protected]>
Cc Michel Thierry <[email protected]>
Cc Mika Kuoppala <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Zhenyu Wang <[email protected]>
Cc Zhiyuan Lv <[email protected]>
(cherry picked from commit e81ecb5e31db6c2a259d694738cf620d9fa70861)
---
 drivers/gpu/drm/i915/i915_gem_gtt.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -3
@@ -735,9 +735,10 @@ static bool gen8_ppgtt_clear_pt(struct i
 	GEM_BUG_ON(pte_end > GEN8_PTES);
 
 	bitmap_clear(pt->used_ptes, pte, num_entries);
-
-	if (bitmap_empty(pt->used_ptes, GEN8_PTES))
-		return true;
+	if (USES_FULL_PPGTT(vm->i915)) {
+		if (bitmap_empty(pt->used_ptes, GEN8_PTES))
+			return true;
+	}
 
 	pt_vaddr = kmap_px(pt);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/drm-i915-let-execlist_update_context-cover-full_ppgtt-mode.patch queue-4.10/drm-i915-move-the-release-of-pt-page-to-the-upper-caller.patch queue-4.10/drm-i915-kvmgt-hold-struct-kvm-reference.patch queue-4.10/drm-i915-a-hotfix-for-making-aliasing-ppgtt-work-for-gvt-g.patch