summaryrefslogtreecommitdiff
path: root/src/radeon_present.c
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-08-01 18:45:53 +0900
committerMichel Dänzer <michel@daenzer.net>2017-08-17 15:23:34 +0900
commit49cc61ab970ee28d4509b4e2dd0a57165136889f (patch)
tree9b36f6bbe85fde115a3715ee3f25db77a2d47bde /src/radeon_present.c
parent3f120fa1d5d921656a367751bc079e020e9ab105 (diff)
Pass reference CRTC to radeon_do_pageflip directly
Simplifies the code slightly. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_present.c')
-rw-r--r--src/radeon_present.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/radeon_present.c b/src/radeon_present.c
index 4d43733e..c01ba95f 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -325,8 +325,6 @@ radeon_present_flip(RRCrtcPtr crtc, uint64_t event_id, uint64_t target_msc,
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
RADEONInfoPtr info = RADEONPTR(scrn);
struct radeon_present_vblank_event *event;
- xf86CrtcPtr xf86_crtc = crtc->devPrivate;
- int crtc_id = xf86_crtc ? drmmode_get_crtc_id(xf86_crtc) : -1;
Bool ret;
if (!radeon_present_check_flip(crtc, screen->root, pixmap, sync_flip))
@@ -341,7 +339,7 @@ radeon_present_flip(RRCrtcPtr crtc, uint64_t event_id, uint64_t target_msc,
radeon_cs_flush_indirect(scrn);
ret = radeon_do_pageflip(scrn, RADEON_DRM_QUEUE_CLIENT_DEFAULT, pixmap,
- event_id, event, crtc_id,
+ event_id, event, crtc->devPrivate,
radeon_present_flip_event,
radeon_present_flip_abort,
sync_flip ? FLIP_VSYNC : FLIP_ASYNC,
@@ -385,7 +383,7 @@ radeon_present_unflip(ScreenPtr screen, uint64_t event_id)
event->unflip = TRUE;
if (radeon_do_pageflip(scrn, RADEON_DRM_QUEUE_CLIENT_DEFAULT, pixmap,
- event_id, event, -1, radeon_present_flip_event,
+ event_id, event, NULL, radeon_present_flip_event,
radeon_present_flip_abort, flip_sync, 0))
return;