From: Ville Syrjälä Date: Sun, 3 Nov 2013 04:07:29 +0000 (-0700) Subject: drm/i915/bdw: Don't muck with gtt_size on Gen8 when PPGTT setup fails X-Git-Tag: upstream/snapshot3+hdmi~3958^2~8^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b42218c19f3c57d2272241e3b4944a6af0d5f14a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git drm/i915/bdw: Don't muck with gtt_size on Gen8 when PPGTT setup fails v2: Resolve rebase conflicts and switch to gen < 8 color for GenX checking. v3: Rebase on top of the address space refactoring. Reviewed-by: Ben Widawsky Signed-off-by: Ville Syrjälä (v1) Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 4fb0efa..3620a1b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1182,7 +1182,8 @@ void i915_gem_init_global_gtt(struct drm_device *dev) DRM_ERROR("Aliased PPGTT setup failed %d\n", ret); drm_mm_takedown(&dev_priv->gtt.base.mm); - gtt_size += GEN6_PPGTT_PD_ENTRIES * PAGE_SIZE; + if (INTEL_INFO(dev)->gen < 8) + gtt_size += GEN6_PPGTT_PD_ENTRIES*PAGE_SIZE; } i915_gem_setup_global_gtt(dev, 0, mappable_size, gtt_size); }