Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e81ecb5e authored by Zhi Wang's avatar Zhi Wang Committed by Chris Wilson
Browse files

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



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: 2ce5179f ("drm/i915/gtt: Free unused lower-level page tables")
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhiyuan Lv <zhiyuan.lv@intel.com>
Signed-off-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486559013-25251-2-git-send-email-zhi.a.wang@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b71953a1

drivers/gpu/drm/i915/i915_gem_gtt.c

+4 −3
Original line number Diff line number Diff line
@@ -755,9 +755,10 @@ static bool gen8_ppgtt_clear_pt(struct i915_address_space *vm, 
	GEM_BUG_ON(pte_end > GEN8_PTES);



	bitmap_clear(pt->used_ptes, pte, num_entries);



	if (USES_FULL_PPGTT(vm->i915)) {

		if (bitmap_empty(pt->used_ptes, GEN8_PTES))

			return true;

	}



	pt_vaddr = kmap_px(pt);