Przeglądaj źródła

drm/i915: Only apply legacy PDE overflow detection to 3lvl machines

Prevent the overflow check from firing on machines with the full 4lvl
page tables, that are not restricted to GEN8_LEGACY_PDES.

v2: Also fix the off-by-one in the compare

Fixes: 894ccebee2b0 ("drm/i915: Micro-optimise gen8_ppgtt_insert_entries()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170217141455.19877-1-chris@chris-wilson.co.uk
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Chris Wilson 8 lat temu
rodzic
commit
5a55b527af
1 zmienionych plików z 2 dodań i 1 usunięć
  1. 2 1
      drivers/gpu/drm/i915/i915_gem_gtt.c

+ 2 - 1
drivers/gpu/drm/i915/i915_gem_gtt.c

@@ -854,7 +854,8 @@ gen8_ppgtt_insert_pte_entries(struct i915_hw_ppgtt *ppgtt,
 					break;
 				}
 
-				GEM_BUG_ON(pdpe > GEN8_LEGACY_PDPES);
+				GEM_BUG_ON(!i915_vm_is_48bit(&ppgtt->base) &&
+					   pdpe >= GEN8_LEGACY_PDPES);
 				pd = pdp->page_directory[pdpe];
 				pde = 0;
 			}