diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-02 16:07:36 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-11-02 16:07:36 +0100 |
| commit | 9906c7e54bdb9fa172155eaa57b7e6c47ab01c58 (patch) | |
| tree | e6ee03061c11e7a82d64593e4ae03e5ebe00470e /shared-core | |
| parent | 629c8b0dbf975632473d848f60606baf309f2f3b (diff) | |
| parent | 94c22c334948a49641f4a1fa84687f992e5cc5cb (diff) | |
Merge branch 'master' into modesetting-101
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/radeon_cp.c | 5 | ||||
| -rw-r--r-- | shared-core/radeon_drv.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 006d04f3..f58c95d8 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1716,7 +1716,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) dev_priv->gart_info.bus_addr = dev_priv->pcigart_offset + dev_priv->fb_location; dev_priv->gart_info.mapping.offset = - dev_priv->gart_info.bus_addr; + dev_priv->pcigart_offset + dev_priv->fb_aper_offset; dev_priv->gart_info.mapping.size = dev_priv->gart_info.table_size; @@ -2317,7 +2317,8 @@ int radeon_driver_firstopen(struct drm_device *dev) if (ret != 0) return ret; - ret = drm_addmap(dev, drm_get_resource_start(dev, 0), + dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0); + ret = drm_addmap(dev, dev_priv->fb_aper_offset, drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, &map); if (ret != 0) diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index f74fe933..1acae73a 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -307,6 +307,7 @@ typedef struct drm_radeon_private { /* starting from here on, data is preserved accross an open */ uint32_t flags; /* see radeon_chip_flags */ + unsigned long fb_aper_offset; } drm_radeon_private_t; |