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

Commit 00245266 authored by Michel Thierry's avatar Michel Thierry Committed by Jani Nikula
Browse files

drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path 

If for some reason [1], the page directory/table does not exist, clear_range
would end up in an infinite while loop.

Introduced by commit 06fda602 ("drm/i915: Create page table allocators").

[1] This is already being addressed in one of Mika's patches:
http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com



Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: stable@vger.kernel.org
Reported-by: default avatarJohn Harrison <john.c.harrison@intel.com>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ac88cd73

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −3
Original line number Diff line number Diff line
@@ -516,17 +516,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm, 
		struct page *page_table;



		if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))

			continue;

			break;



		pd = ppgtt->pdp.page_directory[pdpe];



		if (WARN_ON(!pd->page_table[pde]))

			continue;

			break;



		pt = pd->page_table[pde];



		if (WARN_ON(!pt->page))

			continue;

			break;



		page_table = pt->page;