Commit b42218c1 authored Nov 02, 2013 by Ville Syrjälä Committed by Daniel Vetter Nov 08, 2013

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 <ben@bwidawsk.net>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent a5f3d68e

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1182,6 +1182,7 @@ 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);
		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);