diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-06-11 02:16:10 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-11 02:16:10 -0400 |
| commit | df4f7fe7bd516b3833e25c692c3970e22038a6ca (patch) | |
| tree | 69d2b384e184985d1b0864a18c3fdee375619c71 /drivers/gpu | |
| parent | 2ff2e8a3e1898e692b604424c384f134009dea80 (diff) | |
radeon: remove _DRM_DRIVER from the preadded sarea map
This shouldn't be there and is what broke r600 late in the 2.6.30
release cycle with Ben's patch.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index 77a7a4d84650..521ef6a65356 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
| @@ -2109,7 +2109,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master) | |||
| 2109 | 2109 | ||
| 2110 | /* prebuild the SAREA */ | 2110 | /* prebuild the SAREA */ |
| 2111 | sareapage = max_t(unsigned long, SAREA_MAX, PAGE_SIZE); | 2111 | sareapage = max_t(unsigned long, SAREA_MAX, PAGE_SIZE); |
| 2112 | ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER, | 2112 | ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, |
| 2113 | &master_priv->sarea); | 2113 | &master_priv->sarea); |
| 2114 | if (ret) { | 2114 | if (ret) { |
| 2115 | DRM_ERROR("SAREA setup failed\n"); | 2115 | DRM_ERROR("SAREA setup failed\n"); |