From 5b471c987ccc140f6817f3260698316bdbbdacd3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 22 Nov 2007 16:40:37 +1000 Subject: [PATCH] --- yaml --- r: 84023 b: refs/heads/master c: 8b40958032fd236194de57d29be9cf2c1f2643ee h: refs/heads/master i: 84021: 8b38227ded89e64e742cd2218445ef75c5892ff1 84019: 21fad9d1915a806f4abb74767304231cd203f132 84015: f92f4c5177fe37c187d5745766b8a961ad4a1016 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_agpsupport.c | 3 +-- trunk/drivers/char/drm/i915_dma.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3922c2db82d2..1c0c209bf525 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ded23359ccb884605336ac2193608a7af9a3b117 +refs/heads/master: 8b40958032fd236194de57d29be9cf2c1f2643ee diff --git a/trunk/drivers/char/drm/drm_agpsupport.c b/trunk/drivers/char/drm/drm_agpsupport.c index 214f4fbcba73..9468c7889ff1 100644 --- a/trunk/drivers/char/drm/drm_agpsupport.c +++ b/trunk/drivers/char/drm/drm_agpsupport.c @@ -166,7 +166,6 @@ int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode) dev->agp->mode = mode.mode; agp_enable(dev->agp->bridge, mode.mode); - dev->agp->base = dev->agp->agp_info.aper_base; dev->agp->enabled = 1; return 0; } @@ -417,7 +416,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) INIT_LIST_HEAD(&head->memory); head->cant_use_aperture = head->agp_info.cant_use_aperture; head->page_mask = head->agp_info.page_mask; - + head->base = head->agp_info.aper_base; return head; } diff --git a/trunk/drivers/char/drm/i915_dma.c b/trunk/drivers/char/drm/i915_dma.c index 9e4fc96aa0a0..842db3233e9e 100644 --- a/trunk/drivers/char/drm/i915_dma.c +++ b/trunk/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;