From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 66/68] drm/i915/bdw: Flip the 48b switch Date: Thu, 21 Aug 2014 20:12:29 -0700 Message-ID: <1408677155-1840-67-git-send-email-benjamin.widawsky@intel.com> References: <1408677155-1840-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F8146E899 for ; Thu, 21 Aug 2014 20:14:06 -0700 (PDT) In-Reply-To: <1408677155-1840-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel GFX Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 8d46993..00d9ab3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2079,7 +2079,7 @@ struct drm_i915_cmd_table { #define USES_PPGTT(dev) (i915.enable_ppgtt) #define USES_FULL_PPGTT(dev) (i915.enable_ppgtt == 2) #ifdef CONFIG_64BIT -# define HAS_48B_PPGTT(dev) (IS_BROADWELL(dev) && false) +# define HAS_48B_PPGTT(dev) IS_BROADWELL(dev) #else # define HAS_48B_PPGTT(dev) false #endif diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 5c23f5b..f5b8aea 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1013,9 +1013,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(pd, pdp, start, length, temp, pdpe) { if (pd) continue; -- 2.0.4