diff options
author | Eric Anholt <eric@anholt.net> | 2007-11-22 01:40:37 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 00:09:38 -0500 |
commit | 8b40958032fd236194de57d29be9cf2c1f2643ee (patch) | |
tree | f9fb723d3d4d8ef1f860ee85c9000c2b1ebcfb8d /drivers/char/drm/drm_agpsupport.c | |
parent | ded23359ccb884605336ac2193608a7af9a3b117 (diff) |
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/drm_agpsupport.c')
-rw-r--r-- | drivers/char/drm/drm_agpsupport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c index 214f4fbcba73..9468c7889ff1 100644 --- a/drivers/char/drm/drm_agpsupport.c +++ b/drivers/char/drm/drm_agpsupport.c | |||
@@ -166,7 +166,6 @@ int drm_agp_enable(struct drm_device * dev, struct drm_agp_mode mode) | |||
166 | 166 | ||
167 | dev->agp->mode = mode.mode; | 167 | dev->agp->mode = mode.mode; |
168 | agp_enable(dev->agp->bridge, mode.mode); | 168 | agp_enable(dev->agp->bridge, mode.mode); |
169 | dev->agp->base = dev->agp->agp_info.aper_base; | ||
170 | dev->agp->enabled = 1; | 169 | dev->agp->enabled = 1; |
171 | return 0; | 170 | return 0; |
172 | } | 171 | } |
@@ -417,7 +416,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) | |||
417 | INIT_LIST_HEAD(&head->memory); | 416 | INIT_LIST_HEAD(&head->memory); |
418 | head->cant_use_aperture = head->agp_info.cant_use_aperture; | 417 | head->cant_use_aperture = head->agp_info.cant_use_aperture; |
419 | head->page_mask = head->agp_info.page_mask; | 418 | head->page_mask = head->agp_info.page_mask; |
420 | 419 | head->base = head->agp_info.aper_base; | |
421 | return head; | 420 | return head; |
422 | } | 421 | } |
423 | 422 | ||