From a2b03574060de6ee21fc3a05ca22e938323262c1 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 11 Jun 2009 16:16:10 +1000 Subject: [PATCH] --- yaml --- r: 148719 b: refs/heads/master c: df4f7fe7bd516b3833e25c692c3970e22038a6ca h: refs/heads/master i: 148717: 4e587fd149fbafacc5d6c7f79f8e59918e2f8056 148715: de20aeb920da74aa6f1591a2d6c2af4720e62743 148711: 8d0410df5b3e27a35e6bfd6d25e1ac72c1b5956f 148703: de005fec4b14e98c7fd9a4b6063f1c616ecd5731 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_cp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e7c786f1a7e4..56ff10b44cf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ff2e8a3e1898e692b604424c384f134009dea80 +refs/heads/master: df4f7fe7bd516b3833e25c692c3970e22038a6ca diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cp.c b/trunk/drivers/gpu/drm/radeon/radeon_cp.c index 77a7a4d84650..521ef6a65356 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_cp.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_cp.c @@ -2109,7 +2109,7 @@ int radeon_master_create(struct drm_device *dev, struct drm_master *master) /* prebuild the SAREA */ sareapage = max_t(unsigned long, SAREA_MAX, PAGE_SIZE); - ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER, + ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &master_priv->sarea); if (ret) { DRM_ERROR("SAREA setup failed\n");