summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_dma.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-11-22 07:40:37 +0100
committerDave Airlie <airlied@redhat.com>2008-02-07 06:09:38 +0100
commit8b40958032fd236194de57d29be9cf2c1f2643ee (patch)
treef9fb723d3d4d8ef1f860ee85c9000c2b1ebcfb8d /drivers/char/drm/i915_dma.c
parentdrm: move two function extern into the correct block (diff)
downloadlinux-8b40958032fd236194de57d29be9cf2c1f2643ee.tar.xz
linux-8b40958032fd236194de57d29be9cf2c1f2643ee.zip
drm: Initialize the AGP structure's base address at init rather than enable.
Not all drivers call enable (intel), but they would still like to use this member in driver code. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_dma.c')
-rw-r--r--drivers/char/drm/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 9e4fc96aa0a0..842db3233e9e 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -757,7 +757,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);
- dev_priv->hws_map.offset = dev->agp->agp_info.aper_base + hws->addr;
+ dev_priv->hws_map.offset = dev->agp->base + hws->addr;
dev_priv->hws_map.size = 4*1024;
dev_priv->hws_map.type = 0;
dev_priv->hws_map.flags = 0;