From d2742a35a440ac3854e3f46dbf41cf31ccc89eb4 Mon Sep 17 00:00:00 2001 From: Aurelien Rebourg Date: Mon, 10 Oct 2022 15:32:33 +0200 Subject: [PATCH] fix: compile --- hw/xfree86/drivers/modesetting/driver.c | 1 - hw/xfree86/drivers/modesetting/drmmode_display.c | 1 - hw/xfree86/drivers/modesetting/pageflip.c | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 8822d814c6..6ec2db101a 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -542,7 +542,6 @@ ms_update_scanout_damages(ScrnInfoPtr scrn, DamagePtr damage) RegionIntersect(&pixregion, &pixregion, dmg_region); RegionUnion(&drmmode_crtc->shadow_nonrotated->screen_damage, &drmmode_crtc->shadow_nonrotated->screen_damage, -  &pixregion); /* also update the shadow backbuffer's damages if available */ diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 33554ffac1..52295f754a 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1417,7 +1417,6 @@ drmmode_update_scanout_buffer(xf86CrtcPtr crtc, drmmode_shadow_scanout_ptr scano subWindowMode.val = IncludeInferiors; ChangeGC(NullClient, pGC, GCSubwindowMode, &subWindowMode); -   +12 } ValidateGC(&dst->drawable, pGC); diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c index 67c53adc0b..3e7a84d4dd 100644 --- a/hw/xfree86/drivers/modesetting/pageflip.c +++ b/hw/xfree86/drivers/modesetting/pageflip.c @@ -229,7 +229,7 @@ queue_flip_on_crtc(ScreenPtr screen, xf86CrtcPtr crtc, if (!ret) { /* Aborting will also decrement flip_count and free(flip). */ ms_drm_abort_seq(scrn, seq); - return QUEUE_FLIP_QUEUE_ALLOC_FAILED + return QUEUE_FLIP_QUEUE_ALLOC_FAILED; } /* The page flip succeeded. */ @@ -512,7 +512,7 @@ ms_do_tearfree_flip(xf86CrtcPtr crtc) uint32_t seq; /* exit if the current crtc is off or not using tear-free */ - if (!ms_crtc_on(crtc) || !drmmode_crtc->shadow_nonrotated_back) + if (!xf86_crtc_on(crtc) || !drmmode_crtc->shadow_nonrotated_back) return; /* exit if an update has already been scheduled */