diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-02-18 11:59:18 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-22 19:35:17 -0500 |
| commit | 31c3603d83a774df4acdfe3a89ce64719d0db0d8 (patch) | |
| tree | ea30e9fd8184331cd8235b529213acb7ef848c97 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | 7e4d15d90afe46d34b510f3c70217d3469a7dd70 (diff) | |
drm/radeon: kill radeon_bo->gobj pointer
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 2be18960409e..8758d02cca1a 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
| @@ -127,7 +127,6 @@ retry: | |||
| 127 | return r; | 127 | return r; |
| 128 | } | 128 | } |
| 129 | bo->rdev = rdev; | 129 | bo->rdev = rdev; |
| 130 | bo->gobj = &bo->gem_base; | ||
| 131 | bo->gem_base.driver_private = NULL; | 130 | bo->gem_base.driver_private = NULL; |
| 132 | bo->surface_reg = -1; | 131 | bo->surface_reg = -1; |
| 133 | INIT_LIST_HEAD(&bo->list); | 132 | INIT_LIST_HEAD(&bo->list); |
| @@ -266,7 +265,6 @@ int radeon_bo_evict_vram(struct radeon_device *rdev) | |||
| 266 | void radeon_bo_force_delete(struct radeon_device *rdev) | 265 | void radeon_bo_force_delete(struct radeon_device *rdev) |
| 267 | { | 266 | { |
| 268 | struct radeon_bo *bo, *n; | 267 | struct radeon_bo *bo, *n; |
| 269 | struct drm_gem_object *gobj; | ||
| 270 | 268 | ||
| 271 | if (list_empty(&rdev->gem.objects)) { | 269 | if (list_empty(&rdev->gem.objects)) { |
| 272 | return; | 270 | return; |
| @@ -274,15 +272,14 @@ void radeon_bo_force_delete(struct radeon_device *rdev) | |||
| 274 | dev_err(rdev->dev, "Userspace still has active objects !\n"); | 272 | dev_err(rdev->dev, "Userspace still has active objects !\n"); |
| 275 | list_for_each_entry_safe(bo, n, &rdev->gem.objects, list) { | 273 | list_for_each_entry_safe(bo, n, &rdev->gem.objects, list) { |
| 276 | mutex_lock(&rdev->ddev->struct_mutex); | 274 | mutex_lock(&rdev->ddev->struct_mutex); |
| 277 | gobj = bo->gobj; | ||
| 278 | dev_err(rdev->dev, "%p %p %lu %lu force free\n", | 275 | dev_err(rdev->dev, "%p %p %lu %lu force free\n", |
| 279 | gobj, bo, (unsigned long)gobj->size, | 276 | &bo->gem_base, bo, (unsigned long)bo->gem_base.size, |
| 280 | *((unsigned long *)&gobj->refcount)); | 277 | *((unsigned long *)&bo->gem_base.refcount)); |
| 281 | mutex_lock(&bo->rdev->gem.mutex); | 278 | mutex_lock(&bo->rdev->gem.mutex); |
| 282 | list_del_init(&bo->list); | 279 | list_del_init(&bo->list); |
| 283 | mutex_unlock(&bo->rdev->gem.mutex); | 280 | mutex_unlock(&bo->rdev->gem.mutex); |
| 284 | radeon_bo_unref(&bo); | 281 | radeon_bo_unref(&bo); |
| 285 | drm_gem_object_unreference(gobj); | 282 | drm_gem_object_unreference(&bo->gem_base); |
| 286 | mutex_unlock(&rdev->ddev->struct_mutex); | 283 | mutex_unlock(&rdev->ddev->struct_mutex); |
| 287 | } | 284 | } |
| 288 | } | 285 | } |