drm/i915: Don't clobber the GTT when it's within stolen memory
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 5 Jun 2014 17:02:59 +0000 (20:02 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 9 Jul 2014 07:52:13 +0000 (09:52 +0200)
On most gen2-4 platforms the GTT can be (or maybe always is?)
inside the stolen memory region. If that's the case, reduce the
size of the stolen memory appropriately to make make sure we
don't clobber the GTT.

v2: Deal with gen4 36 bit physical address

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80151
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/i915_reg.h

Simple merge