diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-04 11:59:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 11:59:31 +1000 |
| commit | b15eb4ea1533b82762932d32cb220ddf75a09b3d (patch) | |
| tree | 414207499aab787c1f0fdb73831e86a9254da679 /drivers/gpu/drm/radeon/radeon_mode.h | |
| parent | 5536141dddc265882fa8ddf4366ad0ed85d08a68 (diff) | |
| download | talos-op-linux-b15eb4ea1533b82762932d32cb220ddf75a09b3d.tar.gz talos-op-linux-b15eb4ea1533b82762932d32cb220ddf75a09b3d.zip | |
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_mode.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_mode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index ea72ad889a11..718be1a932ac 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -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; |
