aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Thierry <michel.thierry@intel.com>2015-06-25 07:59:38 -0400
committerJani Nikula <jani.nikula@intel.com>2015-06-26 05:40:35 -0400
commit00245266b4be4fbe989ee073663f56716da6c1f3 (patch)
tree2a24caaae35ffc13a67d240b00d4007b37c8190b
parentac88cd738425e04dbed3706621cf613a00708834 (diff)
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 06fda602dbca ("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: John Harrison <john.c.harrison@intel.com> Signed-off-by: Michel Thierry <michel.thierry@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 619dad1b2386..9daa2883ac18 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -516,17 +516,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
516 struct page *page_table; 516 struct page *page_table;
517 517
518 if (WARN_ON(!ppgtt->pdp.page_directory[pdpe])) 518 if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
519 continue; 519 break;
520 520
521 pd = ppgtt->pdp.page_directory[pdpe]; 521 pd = ppgtt->pdp.page_directory[pdpe];
522 522
523 if (WARN_ON(!pd->page_table[pde])) 523 if (WARN_ON(!pd->page_table[pde]))
524 continue; 524 break;
525 525
526 pt = pd->page_table[pde]; 526 pt = pd->page_table[pde];
527 527
528 if (WARN_ON(!pt->page)) 528 if (WARN_ON(!pt->page))
529 continue; 529 break;
530 530
531 page_table = pt->page; 531 page_table = pt->page;
532 532