aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_object.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-02-18 11:59:17 -0500
committerDave Airlie <airlied@redhat.com>2011-02-22 19:34:47 -0500
commit7e4d15d90afe46d34b510f3c70217d3469a7dd70 (patch)
tree8ad4fd3c7e93d1518a879bb72afd8859b27ef51c /drivers/gpu/drm/radeon/radeon_object.c
parent441921d5309cfe098747d9840fd71bdc6ca2a93b (diff)
drm/radeon: introduce gem_to_radeon_bo helper
... and switch it to container_of upcasting. v2: converted new pageflip code-paths. 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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 9324c881d640..2be18960409e 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -128,7 +128,7 @@ retry:
128 } 128 }
129 bo->rdev = rdev; 129 bo->rdev = rdev;
130 bo->gobj = &bo->gem_base; 130 bo->gobj = &bo->gem_base;
131 bo->gem_base.driver_private = bo; 131 bo->gem_base.driver_private = NULL;
132 bo->surface_reg = -1; 132 bo->surface_reg = -1;
133 INIT_LIST_HEAD(&bo->list); 133 INIT_LIST_HEAD(&bo->list);
134 radeon_ttm_placement_from_domain(bo, domain); 134 radeon_ttm_placement_from_domain(bo, domain);
@@ -282,7 +282,6 @@ void radeon_bo_force_delete(struct radeon_device *rdev)
282 list_del_init(&bo->list); 282 list_del_init(&bo->list);
283 mutex_unlock(&bo->rdev->gem.mutex); 283 mutex_unlock(&bo->rdev->gem.mutex);
284 radeon_bo_unref(&bo); 284 radeon_bo_unref(&bo);
285 gobj->driver_private = NULL;
286 drm_gem_object_unreference(gobj); 285 drm_gem_object_unreference(gobj);
287 mutex_unlock(&rdev->ddev->struct_mutex); 286 mutex_unlock(&rdev->ddev->struct_mutex);
288 } 287 }