diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 47a38272f54c36f558c7ef304c542df2996e28b2..a5162cbc0ea022ffaac9f9236f4ada938601ad4f 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/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;
 			}