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

drm: program color pipeline with plane_add_prop()

Browse source 
Drop the open-coding of plane_add_prop() in
drm_color_pipeline_program().

The debug print ordering changes, but one can see the beginning of the
colorops in the pipeline by looking for the colorop whose ID gets
programmed into WDRM_PLANE_COLOR_PIPELINE.

struct drm_plane::pipeline_props_id becomes unused and is removed.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2026-06-12 12:50:28 +03:00 • committed by Leandro Ribeiro
parent 7fbf121043
commit fe46e43c36
3 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libweston/backend-drm/colorops.c
View file

@ -1253,7 +1253,6 @@ drm_plane_populate_color_pipelines(struct drm_plane *plane,
}
plane->pipelines = xzalloc(plane->num_color_pipelines *
sizeof(*plane->pipelines));
plane->pipeline_props_id = color_pipeline_props->prop_id;
/* Populate pipelines. */
pipeline_i = 0;

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

@ -516,7 +516,6 @@ struct drm_plane {
struct weston_drm_format_array formats;
uint32_t pipeline_props_id;
uint32_t num_color_pipelines;
struct drm_color_pipeline *pipelines;
};

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

@ -1706,12 +1706,6 @@ drm_color_pipeline_program(drmModeAtomicReq *req,
int ret_drm;
bool ret;
drm_debug(b, "%s[PLANE:%lu] %lu (%s) -> %llu (0x%llx)\n",
indent, (unsigned long) plane->plane_id,
(unsigned long) plane->pipeline_props_id, "COLOR_PIPELINE",
(unsigned long long) pipeline_state->pipeline->id,
(unsigned long long) pipeline_state->pipeline->id);
colorop_state = drm_colorop_state_iter(pipeline_state,
NULL /* previous colorop state (none) */);
wl_list_for_each(colorop, &pipeline->colorop_list, link) {
@ -1739,10 +1733,7 @@ drm_color_pipeline_program(drmModeAtomicReq *req,
}
weston_assert_ptr_null(b->compositor, colorop_state);
/* Set plane pipeline. */
drmModeAtomicAddProperty(req, plane->plane_id,
plane->pipeline_props_id, pipeline->id);
return 0;
return plane_add_prop(req, plane, WDRM_PLANE_COLOR_PIPELINE, pipeline->id);
err:
drm_debug(b, "%s%s[colorop] failed to program pipeline\n", indent, indent);