mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-drm: Turn zpos duplicate check into an hard assert

Browse Source 
This way we make sure we find out (if we have assigned invalid zpos
values) much faster.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad
2019-11-15 14:32:08 +02:00
parent 788e80db77
commit 48bc5efa7c
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-drm/state-propose.c
+5 -16
View File
@@ -593,12 +593,10 @@ out:
return ps; return ps;
} }
static int static void
drm_output_check_zpos_plane_states(struct drm_output_state *state) drm_output_check_zpos_plane_states(struct drm_output_state *state)
{ {
struct drm_backend *b = state->pending_state->backend;
struct drm_plane_state *ps; struct drm_plane_state *ps;
int ret = 0;
wl_list_for_each(ps, &state->plane_list, link) { wl_list_for_each(ps, &state->plane_list, link) {
struct wl_list *next_node = ps->link.next; struct wl_list *next_node = ps->link.next;
@@ -628,14 +626,10 @@ drm_output_check_zpos_plane_states(struct drm_output_state *state)
next_node = next_node->next; next_node = next_node->next;
} }
if (found_dup) { /* this should never happen so exit hard in case
ret = 1; * we screwed up that bad */
drm_debug(b, "\t\t\t[plane] found duplicate zpos values\n"); assert(!found_dup);
break;
}
} }
return ret;
} }
static struct drm_plane_state * static struct drm_plane_state *
@@ -988,12 +982,7 @@ drm_output_propose_state(struct weston_output *output_base,
return state; return state;
/* check if we have invalid zpos values, like duplicate(s) */ /* check if we have invalid zpos values, like duplicate(s) */
ret = drm_output_check_zpos_plane_states(state); drm_output_check_zpos_plane_states(state);
if (ret != 0) {
drm_debug(b, "\t\t[view] failing state generation: "
"zpos values are in-consistent\n");
goto err;
}
/* Check to see if this state will actually work. */ /* Check to see if this state will actually work. */
ret = drm_pending_state_test(state->pending_state); ret = drm_pending_state_test(state->pending_state);