aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_legacy_crtc.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_legacy_crtc.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_legacy_crtc.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_legacy_crtc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
index cf0638c3b7c7..9ae599eb2e6d 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c
@@ -415,7 +415,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc,
415 415
416 /* Pin framebuffer & get tilling informations */ 416 /* Pin framebuffer & get tilling informations */
417 obj = radeon_fb->obj; 417 obj = radeon_fb->obj;
418 rbo = obj->driver_private; 418 rbo = gem_to_radeon_bo(obj);
419 r = radeon_bo_reserve(rbo, false); 419 r = radeon_bo_reserve(rbo, false);
420 if (unlikely(r != 0)) 420 if (unlikely(r != 0))
421 return r; 421 return r;
@@ -520,7 +520,7 @@ int radeon_crtc_do_set_base(struct drm_crtc *crtc,
520 520
521 if (!atomic && fb && fb != crtc->fb) { 521 if (!atomic && fb && fb != crtc->fb) {
522 radeon_fb = to_radeon_framebuffer(fb); 522 radeon_fb = to_radeon_framebuffer(fb);
523 rbo = radeon_fb->obj->driver_private; 523 rbo = gem_to_radeon_bo(radeon_fb->obj);
524 r = radeon_bo_reserve(rbo, false); 524 r = radeon_bo_reserve(rbo, false);
525 if (unlikely(r != 0)) 525 if (unlikely(r != 0))
526 return r; 526 return r;