diff options
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cc146119b38d..2187dd03759f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1999,7 +1999,7 @@ struct drm_i915_cmd_table { #ifdef CONFIG_32BIT # define HAS_48B_PPGTT(dev) false #else -# define HAS_48B_PPGTT(dev) (IS_BROADWELL(dev) && false) +# define HAS_48B_PPGTT(dev) IS_BROADWELL(dev) #endif #define HAS_OVERLAY(dev) (INTEL_INFO(dev)->has_overlay) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 584a4e3bc39e..16cd8b82e92f 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -989,9 +989,6 @@ static int gen8_ppgtt_alloc_pagedirs(struct i915_address_space *vm, BUG_ON(!bitmap_empty(new_pds, pdpes)); - /* FIXME: PPGTT container_of won't work for 64b */ - BUG_ON((start + length) > 0x800000000ULL); - gen8_for_each_pdpe(unused, pdp, start, length, temp, pdpe) { struct i915_pagedir *pd; if (unused) |