fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 15:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm: Remove unnecessary parameter from drm_output_state_alloc()

Browse source 
We never pass this anything but NULL.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2024-08-19 10:25:25 -05:00
parent 49278973c0
commit 60d777803d
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libweston/backend-drm/drm-internal.h
View file

@ -822,8 +822,8 @@ enum drm_output_state_duplicate_mode {
}; };
struct drm_output_state * struct drm_output_state *
drm_output_state_alloc(struct drm_output *output, drm_output_state_alloc(struct drm_output *output);
struct drm_pending_state *pending_state);
struct drm_output_state * struct drm_output_state *
drm_output_state_duplicate(struct drm_output_state *src, drm_output_state_duplicate(struct drm_output_state *src,
struct drm_pending_state *pending_state, struct drm_pending_state *pending_state,

2
libweston/backend-drm/drm-virtual.c
View file

@ -375,7 +375,7 @@ drm_virtual_output_create(struct weston_compositor *c, char *name,
output->base.attach_head = NULL; output->base.attach_head = NULL;
output->backend = b; output->backend = b;
output->state_cur = drm_output_state_alloc(output, NULL); output->state_cur = drm_output_state_alloc(output);
weston_compositor_add_pending_output(&output->base, c); weston_compositor_add_pending_output(&output->base, c);

2
libweston/backend-drm/drm.c
View file

@ -2859,7 +2859,7 @@ drm_output_create(struct weston_backend *backend, const char *name)
output->destroy_pending = false; output->destroy_pending = false;
output->disable_pending = false; output->disable_pending = false;
output->state_cur = drm_output_state_alloc(output, NULL); output->state_cur = drm_output_state_alloc(output);
weston_compositor_add_pending_output(&output->base, b->compositor); weston_compositor_add_pending_output(&output->base, b->compositor);

2
libweston/backend-drm/kms.c
View file

@ -1660,7 +1660,7 @@ drm_pending_state_apply(struct drm_pending_state *pending_state)
output->base.name); output->base.name);
weston_output_repaint_failed(&output->base); weston_output_repaint_failed(&output->base);
drm_output_state_free(output->state_cur); drm_output_state_free(output->state_cur);
output->state_cur = drm_output_state_alloc(output, NULL); output->state_cur = drm_output_state_alloc(output);
device->state_invalid = true; device->state_invalid = true;
if (b->compositor->renderer->type == WESTON_RENDERER_GL) { if (b->compositor->renderer->type == WESTON_RENDERER_GL) {
drm_output_fini_egl(output); drm_output_fini_egl(output);

7
libweston/backend-drm/state-helpers.c
View file

@ -370,8 +370,7 @@ drm_output_state_get_plane(struct drm_output_state *state_output,
* in the repaint cycle; see drm_output_state_duplicate. * in the repaint cycle; see drm_output_state_duplicate.
*/ */
struct drm_output_state * struct drm_output_state *
drm_output_state_alloc(struct drm_output *output, drm_output_state_alloc(struct drm_output *output)
struct drm_pending_state *pending_state)
{ {
struct drm_output_state *state = zalloc(sizeof(*state)); struct drm_output_state *state = zalloc(sizeof(*state));
@ -379,10 +378,6 @@ drm_output_state_alloc(struct drm_output *output,
state->output = output; state->output = output;
state->dpms = WESTON_DPMS_OFF; state->dpms = WESTON_DPMS_OFF;
state->protection = WESTON_HDCP_DISABLE; state->protection = WESTON_HDCP_DISABLE;
state->pending_state = pending_state;
if (pending_state)
wl_list_insert(&pending_state->output_list, &state->link);
else
wl_list_init(&state->link); wl_list_init(&state->link);
wl_list_init(&state->plane_list); wl_list_init(&state->plane_list);