]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: don't use dev->agp
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 24 Jun 2012 18:51:36 +0000 (20:51 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 25 Jun 2012 19:08:44 +0000 (21:08 +0200)
This single leftover use is due to a patch that went into 3.5 through
-fixes. With the fake agp stuff on demise, at least for gen6+ we can't
use this any more.

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c

index 9563ab8390e7cc92a2d67f9da23554492c1c4f33..216651917fd592d77d41f8c000bfa0932c6e7ef3 100644 (file)
@@ -1414,7 +1414,7 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
        if (!ap)
                return;
 
-       ap->ranges[0].base = dev_priv->dev->agp->base;
+       ap->ranges[0].base = dev_priv->mm.gtt->gma_bus_addr;
        ap->ranges[0].size =
                dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;
        primary =