diff options
| author | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
| commit | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (patch) | |
| tree | 40178e87d98efeb4bd9e0030b989a31e2090b9c9 /linux-core/drm_agpsupport.c | |
| parent | 3a0bc518e35c62bb9c64c9105f836584d949653f (diff) | |
| parent | 02c4e0e757b69cd6ae38b8ab2c078b3f06fea661 (diff) | |
Merge branch 'master' into bo-set-pin
Diffstat (limited to 'linux-core/drm_agpsupport.c')
| -rw-r--r-- | linux-core/drm_agpsupport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c index df54360d..4618823c 100644 --- a/linux-core/drm_agpsupport.c +++ b/linux-core/drm_agpsupport.c @@ -183,7 +183,6 @@ int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode) #else agp_enable(dev->agp->bridge, mode.mode); #endif - dev->agp->base = dev->agp->agp_info.aper_base; dev->agp->enabled = 1; return 0; } @@ -441,6 +440,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; } |