diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2017-04-28 16:32:43 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-01 11:21:42 -0400 |
commit | 98da65d5e32583d89a1b1c760293b601816a98d3 (patch) | |
tree | 25c62b8a2c07982f41f8c82bcd76d8538dbc5ed5 /drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |
parent | c81a1a74037f61c578f6b8218b079aa434e300b4 (diff) |
Revert "drm/amdgpu: Refactor flip into prepare submit and submit. (v3)"
This reverts commit cb341a319f7e66f879d69af929c3dadfc1a8f31e.
The purpose of the refactor was for amdgpu_crtc_prepare/submit_flip to
be used by the DC code, but that's no longer the case.
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index db8f8dda209c..dbd10618ec20 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | |||
@@ -597,21 +597,6 @@ int amdgpu_crtc_page_flip_target(struct drm_crtc *crtc, | |||
597 | struct drm_pending_vblank_event *event, | 597 | struct drm_pending_vblank_event *event, |
598 | uint32_t page_flip_flags, uint32_t target, | 598 | uint32_t page_flip_flags, uint32_t target, |
599 | struct drm_modeset_acquire_ctx *ctx); | 599 | struct drm_modeset_acquire_ctx *ctx); |
600 | void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work, | ||
601 | struct amdgpu_bo *new_abo); | ||
602 | int amdgpu_crtc_prepare_flip(struct drm_crtc *crtc, | ||
603 | struct drm_framebuffer *fb, | ||
604 | struct drm_pending_vblank_event *event, | ||
605 | uint32_t page_flip_flags, | ||
606 | uint32_t target, | ||
607 | struct amdgpu_flip_work **work, | ||
608 | struct amdgpu_bo **new_abo); | ||
609 | |||
610 | void amdgpu_crtc_submit_flip(struct drm_crtc *crtc, | ||
611 | struct drm_framebuffer *fb, | ||
612 | struct amdgpu_flip_work *work, | ||
613 | struct amdgpu_bo *new_abo); | ||
614 | |||
615 | extern const struct drm_mode_config_funcs amdgpu_mode_funcs; | 600 | extern const struct drm_mode_config_funcs amdgpu_mode_funcs; |
616 | 601 | ||
617 | #endif | 602 | #endif |