summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-03-18 17:11:47 +0900
committerMichel Dänzer <michel@daenzer.net>2016-03-23 18:58:19 +0900
commite0ed26151bfeadf309da53d001751c0a014dbd24 (patch)
tree2965c1670534f1a27a0377729f6b33b8a8275cb0
parentacd5da56f502d6ad115501e77bce06fe72b1895c (diff)
Remove amdgpu_scanout_flip_handler
No longer necessary now that amdgpu_drm_queue_handler can handle e->handler == NULL. (Ported from radeon commit d5dbb07db22d5420c81dfebc060f0dd86e7b8a20) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/amdgpu_kms.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 7bbef32..e6e3d5f 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -396,12 +396,6 @@ amdgpu_scanout_flip_abort(ScrnInfoPtr scrn, void *event_data)
}
static void
-amdgpu_scanout_flip_handler(ScrnInfoPtr scrn, uint32_t frame, uint64_t usec, void *event_data)
-{
- amdgpu_scanout_flip_abort(scrn, event_data);
-}
-
-static void
amdgpu_scanout_flip(ScreenPtr pScreen, AMDGPUInfoPtr info,
xf86CrtcPtr xf86_crtc)
{
@@ -421,8 +415,7 @@ amdgpu_scanout_flip(ScreenPtr pScreen, AMDGPUInfoPtr info,
scrn = xf86_crtc->scrn;
drm_queue_entry = amdgpu_drm_queue_alloc(scrn, AMDGPU_DRM_QUEUE_CLIENT_DEFAULT,
AMDGPU_DRM_QUEUE_ID_DEFAULT,
- drmmode_crtc,
- amdgpu_scanout_flip_handler,
+ drmmode_crtc, NULL,
amdgpu_scanout_flip_abort);
if (!drm_queue_entry) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,