aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/radeon.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-06-04 11:59:31 +1000
committerDave Airlie <airlied@redhat.com>2014-06-04 11:59:31 +1000
commitb15eb4ea1533b82762932d32cb220ddf75a09b3d (patch)
tree414207499aab787c1f0fdb73831e86a9254da679 /drivers/gpu/drm/radeon/radeon.h
parent5536141dddc265882fa8ddf4366ad0ed85d08a68 (diff)
downloadlinux-stericsson-b15eb4ea1533b82762932d32cb220ddf75a09b3d.tar.gz
Revert "drm/radeon: rework page flip handling v3"
This reverts commit 1aab5514ca9604e0263f658a067da0189c86a35b. Apply the fixed up version instead.
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r--drivers/gpu/drm/radeon/radeon.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index dd4da88b3ab1..2eaa3300099e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -676,16 +676,14 @@ void radeon_doorbell_free(struct radeon_device *rdev, u32 doorbell);
* IRQS.
*/
-struct radeon_flip_work {
- struct work_struct flip_work;
- struct work_struct unpin_work;
- struct radeon_device *rdev;
- int crtc_id;
- struct drm_framebuffer *fb;
+struct radeon_unpin_work {
+ struct work_struct work;
+ struct radeon_device *rdev;
+ int crtc_id;
+ struct radeon_fence *fence;
struct drm_pending_vblank_event *event;
- struct radeon_bo *old_rbo;
- struct radeon_bo *new_rbo;
- struct radeon_fence *fence;
+ struct radeon_bo *old_rbo;
+ u64 new_crtc_base;
};
struct r500_irq_stat_regs {