fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-20 23:28:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wsi/x11: Only accept VRR refresh rates when we're flipping.

Browse source 
Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39551>
This commit is contained in:
Hans-Kristian Arntzen 2026-02-19 13:50:14 +01:00 • committed by Marge Bot
parent c3e3e758dc
commit 8b0dcdb1fe
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vulkan/wsi/wsi_common_x11.c
View file

@ -1326,7 +1326,7 @@ static bool x11_refresh_rate_estimate_is_stable(struct x11_swapchain *swapchain,
}
static void x11_present_update_refresh_cycle_estimate(struct x11_swapchain *swapchain,
uint64_t msc, uint64_t ust)
uint64_t msc, uint64_t ust, bool flip)
{
uint64_t randr_refresh_ns = swapchain->randr_current_refresh_ns;
@ -1364,6 +1364,9 @@ static void x11_present_update_refresh_cycle_estimate(struct x11_swapchain *swap
/* Our refresh rates are only estimates, so expect some deviation (+/- 1us). */
wsi_swapchain_present_timing_update_refresh_rate(&swapchain->base, refresh_ns, refresh_ns, 1000);
} else if (!flip) {
/* If we're not flipping, we're not getting VRR. If MSC estimate is unstable for whatever reason, fallback to randr query. */
wsi_swapchain_present_timing_update_refresh_rate(&swapchain->base, randr_refresh_ns, randr_refresh_ns, 0);
} else {
/* If we have enabled adaptive sync, and we're seeing highly irregular MSC values, we assume
* we're driving the display VRR. */
@ -1380,11 +1383,11 @@ static void x11_present_update_refresh_cycle_estimate(struct x11_swapchain *swap
static void x11_present_complete(struct x11_swapchain *swapchain,
struct x11_image *image, uint32_t index,
uint64_t msc, uint64_t ust)
uint64_t msc, uint64_t ust, bool flip)
{
/* Update estimate for refresh rate. */
if (swapchain->base.present_timing.active)
x11_present_update_refresh_cycle_estimate(swapchain, msc, ust);
x11_present_update_refresh_cycle_estimate(swapchain, msc, ust, flip);
/* Make sure to signal present timings before signalling present wait,
* this way we get minimal latency for reports. */
@ -1650,7 +1653,8 @@ x11_handle_dri3_present_event(struct x11_swapchain *chain,
struct x11_image *image = &chain->images[i];
for (j = 0; j < image->present_queued_count; j++) {
if (image->pending_completions[j].serial == complete->serial) {
x11_present_complete(chain, image, j, complete->msc, ust);
x11_present_complete(chain, image, j, complete->msc, ust,
complete->mode == XCB_PRESENT_COMPLETE_MODE_FLIP);
}
}
}