summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-06 20:08:44 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-08 21:20:21 +0100
commit19966754328d99ee003ddfc7a8c31ceb115483ac (patch)
treec057dfaf9f9354168102e5ae450ebefbc158bd28 /include/drm
parentac622a9cdb742cad90648d95f2c4877774518f19 (diff)
downloadlinux-19966754328d99ee003ddfc7a8c31ceb115483ac.tar.bz2
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>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/intel-gtt.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/intel-gtt.h b/include/drm/intel-gtt.h
index 6769cb704e9b..b3aa7ab72d09 100644
--- a/include/drm/intel-gtt.h
+++ b/include/drm/intel-gtt.h
@@ -14,5 +14,7 @@ struct intel_gtt {
unsigned int gtt_mappable_entries;
};
+struct intel_gtt *intel_gtt_get(void);
+
#endif