drm/i915: die, i915_probe_agp, die
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 6 Sep 2010 18:08:44 +0000 (20:08 +0200)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 8 Sep 2010 20:20:21 +0000 (21:20 +0100)
commit19966754328d99ee003ddfc7a8c31ceb115483ac
treec057dfaf9f9354168102e5ae450ebefbc158bd28
parentac622a9cdb742cad90648d95f2c4877774518f19
drm/i915: die, i915_probe_agp, die

Use the detection from intel-gtt.ko instead. Hooray!

Also move the stolen mem allocator to the other gtt stuff in dev_prv->mem.

v2: Chris Wilson noted that my error handling was crap. Fix it. He also
said that this fixes a problem on his i845. Indeed, i915_probe_agp
misses a special case for i830/i845 stolen mem detection.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=25476
Cc: stable@kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/char/agp/intel-gtt.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
include/drm/intel-gtt.h