Commit b15eb4ea authored by Dave Airlie's avatar Dave Airlie

Revert "drm/radeon: rework page flip handling v3"

This reverts commit 1aab5514.

Apply the fixed up version instead.
parent 5536141d
......@@ -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_unpin_work {
struct work_struct work;
struct radeon_device *rdev;
int crtc_id;
struct drm_framebuffer *fb;
struct radeon_fence *fence;
struct drm_pending_vblank_event *event;
struct radeon_bo *old_rbo;
struct radeon_bo *new_rbo;
struct radeon_fence *fence;
u64 new_crtc_base;
};
struct r500_irq_stat_regs {
......
This diff is collapsed.
......@@ -325,8 +325,8 @@ struct radeon_crtc {
struct drm_display_mode native_mode;
int pll_id;
/* page flipping */
struct workqueue_struct *flip_queue;
struct radeon_flip_work *flip_work;
struct radeon_unpin_work *unpin_work;
int deferred_flip_completion;
/* pll sharing */
struct radeon_atom_ss ss;
bool ss_enabled;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment