frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: Pass CRTC pointer to TearFree flip handlers 

The CRTC pointer will soon be needed in the TearFree flip handlers, so pass
it in instead of passing in drmmode_tearfree_ptr.

No functional change.

Signed-off-by: Sultan Alsawaf <sultan@kerneltoast.com>
Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
This commit is contained in:
Sultan Alsawaf 2023-01-22 20:57:14 -08:00
parent 1fd9d79ae0
commit be864d8e18
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/drivers/modesetting/pageflip.c
View File

@ -476,7 +476,9 @@ error_out:
static void static void
ms_tearfree_flip_abort(void *data) ms_tearfree_flip_abort(void *data)
{ {
drmmode_tearfree_ptr trf = data; xf86CrtcPtr crtc = data;
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_tearfree_ptr trf = &drmmode_crtc->tearfree;
trf->flip_seq = 0; trf->flip_seq = 0;
} }
@ -484,7 +486,9 @@ ms_tearfree_flip_abort(void *data)
static void static void
ms_tearfree_flip_handler(uint64_t msc, uint64_t usec, void *data) ms_tearfree_flip_handler(uint64_t msc, uint64_t usec, void *data)
{ {
drmmode_tearfree_ptr trf = data; xf86CrtcPtr crtc = data;
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_tearfree_ptr trf = &drmmode_crtc->tearfree;
/* Swap the buffers and complete the flip */ /* Swap the buffers and complete the flip */
trf->back_idx ^= 1; trf->back_idx ^= 1;
@ -498,7 +502,7 @@ ms_do_tearfree_flip(ScreenPtr screen, xf86CrtcPtr crtc)
drmmode_tearfree_ptr trf = &drmmode_crtc->tearfree; drmmode_tearfree_ptr trf = &drmmode_crtc->tearfree;
uint32_t idx = trf->back_idx, seq; uint32_t idx = trf->back_idx, seq;
seq = ms_drm_queue_alloc(crtc, trf, ms_tearfree_flip_handler, seq = ms_drm_queue_alloc(crtc, crtc, ms_tearfree_flip_handler,
ms_tearfree_flip_abort); ms_tearfree_flip_abort);
if (!seq) if (!seq)
goto no_flip; goto no_flip;