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

backend-drm: Pass paint node through to plane_state find

Browse Source 
This lets us clean up a bit of code.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2021-12-09 16:54:16 +00:00
parent 0ace8b66af
commit a2c5709e71
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-drm/state-propose.c
+7 -7
View File
@@ -419,11 +419,10 @@ dmabuf_feedback_maybe_update(struct drm_backend *b, struct weston_view *ev,
static struct drm_plane_state * static struct drm_plane_state *
drm_output_find_plane_for_view(struct drm_output_state *state, drm_output_find_plane_for_view(struct drm_output_state *state,
struct weston_view *ev, struct weston_paint_node *pnode,
enum drm_output_propose_state_mode mode, enum drm_output_propose_state_mode mode,
struct drm_plane_state *scanout_state, struct drm_plane_state *scanout_state,
uint64_t current_lowest_zpos, uint64_t current_lowest_zpos)
uint32_t *try_view_on_plane_failure_reasons)
{ {
struct drm_output *output = state->output; struct drm_output *output = state->output;
struct drm_backend *b = to_drm_backend(output->base.compositor); struct drm_backend *b = to_drm_backend(output->base.compositor);
@@ -431,6 +430,7 @@ drm_output_find_plane_for_view(struct drm_output_state *state,
struct drm_plane_state *ps = NULL; struct drm_plane_state *ps = NULL;
struct drm_plane *plane; struct drm_plane *plane;
struct weston_view *ev = pnode->view;
struct weston_buffer *buffer; struct weston_buffer *buffer;
struct wl_shm_buffer *shmbuf; struct wl_shm_buffer *shmbuf;
struct drm_fb *fb = NULL; struct drm_fb *fb = NULL;
@@ -471,7 +471,8 @@ drm_output_find_plane_for_view(struct drm_output_state *state,
return NULL; return NULL;
} }
fb = drm_fb_get_from_view(state, ev, try_view_on_plane_failure_reasons); fb = drm_fb_get_from_view(state, ev,
&pnode->try_view_on_plane_failure_reasons);
if (!fb) if (!fb)
return NULL; return NULL;
@@ -780,10 +781,9 @@ drm_output_propose_state(struct weston_output *output_base,
if (!force_renderer) { if (!force_renderer) {
drm_debug(b, "\t\t\t[plane] started with zpos %"PRIu64"\n", drm_debug(b, "\t\t\t[plane] started with zpos %"PRIu64"\n",
current_lowest_zpos); current_lowest_zpos);
ps = drm_output_find_plane_for_view(state, ev, mode, ps = drm_output_find_plane_for_view(state, pnode, mode,
scanout_state, scanout_state,
current_lowest_zpos, current_lowest_zpos);
&pnode->try_view_on_plane_failure_reasons);
/* If we were able to place the view in a plane, set /* If we were able to place the view in a plane, set
* failure reasons to none. */ * failure reasons to none. */
if (ps) if (ps)