From 0967873a208794edd67ffdec4b9d24b1e435107b Mon Sep 17 00:00:00 2001 From: Rose Hudson Date: Fri, 28 Jul 2023 11:57:46 +0100 Subject: [PATCH] output: remove old frame scheduling --- backend/drm/drm.c | 4 --- backend/headless/output.c | 29 ------------------ backend/wayland/output.c | 2 -- backend/x11/output.c | 2 -- include/backend/headless.h | 5 ---- include/wlr/interfaces/wlr_output.h | 6 ---- include/wlr/types/wlr_output.h | 10 ------- types/output/output.c | 46 +---------------------------- 8 files changed, 1 insertion(+), 103 deletions(-) diff --git a/backend/drm/drm.c b/backend/drm/drm.c index d2f75f71f..21bae02a2 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -2081,10 +2081,6 @@ static void handle_page_flip(int fd, unsigned seq, .flags = present_flags, }; wlr_output_send_present(&conn->output, &present_event); - - if (drm->session->active) { - wlr_output_send_frame(&conn->output); - } } int handle_drm_event(int fd, uint32_t mask, void *data) { diff --git a/backend/headless/output.c b/backend/headless/output.c index 0464e0d1b..d6206ac47 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -22,15 +22,6 @@ static struct wlr_headless_output *headless_output_from_output( return output; } -static void output_update_refresh(struct wlr_headless_output *output, - int32_t refresh) { - if (refresh <= 0) { - refresh = HEADLESS_DEFAULT_REFRESH; - } - - output->frame_delay = 1000000 / refresh; -} - static bool output_test(struct wlr_output *wlr_output, const struct wlr_output_state *state) { uint32_t unsupported = state->committed & ~SUPPORTED_OUTPUT_STATE; @@ -55,25 +46,16 @@ static bool output_test(struct wlr_output *wlr_output, static bool output_commit(struct wlr_output *wlr_output, const struct wlr_output_state *state) { - struct wlr_headless_output *output = - headless_output_from_output(wlr_output); - if (!output_test(wlr_output, state)) { return false; } - if (state->committed & WLR_OUTPUT_STATE_MODE) { - output_update_refresh(output, state->custom_mode.refresh); - } - if (output_pending_enabled(wlr_output, state)) { struct wlr_output_event_present present_event = { .commit_seq = wlr_output->commit_seq + 1, .presented = true, }; output_defer_present(wlr_output, present_event); - - wl_event_source_timer_update(output->frame_timer, output->frame_delay); } return true; @@ -94,7 +76,6 @@ static void output_destroy(struct wlr_output *wlr_output) { wlr_output_finish(wlr_output); wl_list_remove(&output->link); - wl_event_source_remove(output->frame_timer); free(output); } @@ -110,12 +91,6 @@ bool wlr_output_is_headless(const struct wlr_output *wlr_output) { return wlr_output->impl == &output_impl; } -static int signal_frame(void *data) { - struct wlr_headless_output *output = data; - wlr_output_send_frame(&output->wlr_output); - return 0; -} - struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, unsigned int width, unsigned int height) { struct wlr_headless_backend *backend = @@ -136,8 +111,6 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, wlr_output_init(wlr_output, &backend->backend, &output_impl, backend->event_loop, &state); wlr_output_state_finish(&state); - output_update_refresh(output, 0); - size_t output_num = ++last_output_num; char name[64]; @@ -148,8 +121,6 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, snprintf(description, sizeof(description), "Headless output %zu", output_num); wlr_output_set_description(wlr_output, description); - output->frame_timer = wl_event_loop_add_timer(backend->event_loop, signal_frame, output); - wl_list_insert(&backend->outputs, &output->link); if (backend->started) { diff --git a/backend/wayland/output.c b/backend/wayland/output.c index c3442f411..d677c751b 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -72,8 +72,6 @@ static void surface_frame_callback(void *data, struct wl_callback *cb, assert(output->frame_callback == cb); wl_callback_destroy(cb); output->frame_callback = NULL; - - wlr_output_send_frame(&output->wlr_output); } static const struct wl_callback_listener frame_listener = { diff --git a/backend/x11/output.c b/backend/x11/output.c index 40e601f0b..c9c8cfdd5 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -795,8 +795,6 @@ void handle_x11_present_event(struct wlr_x11_backend *x11, }; timespec_from_nsec(&present_event.when, complete_notify->ust * 1000); wlr_output_send_present(&output->wlr_output, &present_event); - - wlr_output_send_frame(&output->wlr_output); break; default: wlr_log(WLR_DEBUG, "Unhandled Present event %"PRIu16, event->event_type); diff --git a/include/backend/headless.h b/include/backend/headless.h index 21df86ea6..8f564b5a9 100644 --- a/include/backend/headless.h +++ b/include/backend/headless.h @@ -4,8 +4,6 @@ #include #include -#define HEADLESS_DEFAULT_REFRESH (60 * 1000) // 60 Hz - struct wlr_headless_backend { struct wlr_backend backend; struct wl_event_loop *event_loop; @@ -19,9 +17,6 @@ struct wlr_headless_output { struct wlr_headless_backend *backend; struct wl_list link; - - struct wl_event_source *frame_timer; - int frame_delay; // ms }; struct wlr_headless_backend *headless_backend_from_backend( diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 6da2c2c54..2481b9b40 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -117,12 +117,6 @@ void wlr_output_finish(struct wlr_output *output); * output changes. */ void wlr_output_update_needs_frame(struct wlr_output *output); -/** - * Send a frame event. - * - * See wlr_output.events.frame. - */ -void wlr_output_send_frame(struct wlr_output *output); /** * Send a present event. * diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index c8e44b0e6..06dba854d 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -220,8 +220,6 @@ struct wlr_output { bool adaptive_sync_supported; bool needs_frame; - // damage for cursors and fullscreen surface, in output-local coordinates - bool frame_pending; // true for example with VR headsets bool non_desktop; @@ -230,8 +228,6 @@ struct wlr_output { uint32_t commit_seq; struct { - // Request to render a frame - struct wl_signal frame; // Emitted when software cursors or backend-specific logic damage the // output struct wl_signal damage; // struct wlr_output_event_damage @@ -252,7 +248,6 @@ struct wlr_output { struct wl_signal destroy; } events; - struct wl_event_source *idle_frame; struct wl_event_source *idle_done; int attach_render_locks; // number of locks forcing rendering @@ -406,11 +401,6 @@ bool wlr_output_test_state(struct wlr_output *output, */ bool wlr_output_commit_state(struct wlr_output *output, const struct wlr_output_state *state); -/** - * Manually schedules a `frame` event. If a `frame` event is already pending, - * it is a no-op. - */ -void wlr_output_schedule_frame(struct wlr_output *output); /** * Returns the maximum length of each gamma ramp, or 0 if unsupported. */ diff --git a/types/output/output.c b/types/output/output.c index 025d7d591..ff2f6130c 100644 --- a/types/output/output.c +++ b/types/output/output.c @@ -367,7 +367,7 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, wl_list_init(&output->layers); wl_list_init(&output->resources); - wl_signal_init(&output->events.frame); + wl_signal_init(&output->events.damage); wl_signal_init(&output->events.needs_frame); wl_signal_init(&output->events.precommit); @@ -397,7 +397,6 @@ void wlr_output_finish(struct wlr_output *output) { wl_signal_emit_mutable(&output->events.destroy, output); wlr_addon_set_finish(&output->addons); - assert(wl_list_empty(&output->events.frame.listener_list)); assert(wl_list_empty(&output->events.damage.listener_list)); assert(wl_list_empty(&output->events.needs_frame.listener_list)); assert(wl_list_empty(&output->events.precommit.listener_list)); @@ -430,10 +429,6 @@ void wlr_output_finish(struct wlr_output *output) { wlr_swapchain_destroy(output->swapchain); - if (output->idle_frame != NULL) { - wl_event_source_remove(output->idle_frame); - } - if (output->idle_done != NULL) { wl_event_source_remove(output->idle_done); } @@ -763,12 +758,6 @@ bool output_prepare_commit(struct wlr_output *output, const struct wlr_output_st return false; } - if ((state->committed & WLR_OUTPUT_STATE_BUFFER) && - output->idle_frame != NULL) { - wl_event_source_remove(output->idle_frame); - output->idle_frame = NULL; - } - struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); @@ -786,7 +775,6 @@ void output_apply_commit(struct wlr_output *output, const struct wlr_output_stat output->commit_seq++; if (output_pending_enabled(output, state)) { - output->frame_pending = true; output->needs_frame = false; } @@ -844,38 +832,6 @@ bool wlr_output_commit_state(struct wlr_output *output, return true; } -void wlr_output_send_frame(struct wlr_output *output) { - output->frame_pending = false; - if (output->enabled) { - wl_signal_emit_mutable(&output->events.frame, output); - } -} - -static void schedule_frame_handle_idle_timer(void *data) { - struct wlr_output *output = data; - output->idle_frame = NULL; - if (!output->frame_pending) { - wlr_output_send_frame(output); - } -} - -void wlr_output_schedule_frame(struct wlr_output *output) { - // Make sure the compositor commits a new frame. This is necessary to make - // clients which ask for frame callbacks without submitting a new buffer - // work. - // TODO(rose): figure out why - wlr_output_update_needs_frame(output); - - if (output->frame_pending || output->idle_frame != NULL) { - return; - } - - // We're using an idle timer here in case a buffer swap happens right after - // this function is called - output->idle_frame = wl_event_loop_add_idle(output->event_loop, - schedule_frame_handle_idle_timer, output); -} - void wlr_output_send_present(struct wlr_output *output, struct wlr_output_event_present *event) { assert(event);