diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-09-06 20:08:44 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 21:20:21 +0100 |
| commit | 19966754328d99ee003ddfc7a8c31ceb115483ac (patch) | |
| tree | c057dfaf9f9354168102e5ae450ebefbc158bd28 /drivers/char | |
| parent | ac622a9cdb742cad90648d95f2c4877774518f19 (diff) | |
| download | kernel_samsung_smdk4412-19966754328d99ee003ddfc7a8c31ceb115483ac.zip kernel_samsung_smdk4412-19966754328d99ee003ddfc7a8c31ceb115483ac.tar.gz kernel_samsung_smdk4412-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 'drivers/char')
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 6eb64c1..9cb7c98 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1714,6 +1714,12 @@ int intel_gmch_probe(struct pci_dev *pdev, } EXPORT_SYMBOL(intel_gmch_probe); +struct intel_gtt *intel_gtt_get(void) +{ + return &intel_private.base; +} +EXPORT_SYMBOL(intel_gtt_get); + void intel_gmch_remove(struct pci_dev *pdev) { if (intel_private.pcidev) |