From a47ff6a3ebcc525ee62b71a306394464dbec0746 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 24 Jun 2012 20:51:36 +0200 Subject: [PATCH] --- yaml --- r: 318631 b: refs/heads/master c: 87207ca20eeb519aa0333b754db9cf3c369ea6f7 h: refs/heads/master i: 318629: af2ceed2c73ad53026ab1a9ba5ce73540c58cfcf 318627: c144e27f278547238488212091fc79c214d7722d 318623: 4c3c86943d257e05298ebab6f3c4552dea98ed76 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6de7a5ca400b..134f3633a8aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79f5b2c7599270aa3dcfffb445f8f520c05a7fc5 +refs/heads/master: 87207ca20eeb519aa0333b754db9cf3c369ea6f7 diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index 9563ab8390e7..216651917fd5 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -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 =