---

yaml --- r: 318631 b: refs/heads/master c: 87207ca h: refs/heads/master i: 318629: af2ceed 318627: c144e27 318623: 4c3c869 v: v3
git-mirror · Jun 25, 2012 · a47ff6a · a47ff6a
1 parent ef2c412
commit a47ff6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 =