drm/i915: Fix gen2 mappable calculations
authorBen Widawsky <ben@bwidawsk.net>
Fri, 8 Feb 2013 19:32:47 +0000 (11:32 -0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 15 Feb 2013 09:30:38 +0000 (10:30 +0100)
commit41907ddc1b71aaa4ef5290f46f0ec49d581d6aac
tree5cb9829dfc0753d61713246f2cd60955827b19e8
parentd46da4377689bd938795e53c4e2fb54dbcaeea44
drm/i915: Fix gen2 mappable calculations

When I refactored the code initially, I forgot that gen2 uses a
different bar for the CPU mappable aperture. The agp-less code knows
nothing of generations less than 5, so we have to expand the gtt_probe
function to include the mappable base and end.

It was originally broken by me:
commit baa09f5fd8a6d033ec075355dda99a65b7f6a0f3
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Thu Jan 24 13:49:57 2013 -0800

    drm/i915: Add probe and remove to the gtt ops

Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/char/agp/intel-gtt.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
include/drm/intel-gtt.h