Le 18/09/2025 à 02:43, Nícolas F. R. A. Prado a écrit :
> Print the value of the color pipeline in the CRTC state as part of the
> CRTC state print.
>
> Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
> ---
> drivers/gpu/drm/drm_atomic.c | 8 +++++---
> drivers/gpu/drm/drm_colorop.c | 26 ++++++++++++++++++++++++++
> include/drm/drm_colorop.h | 3 +++
> 3 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 3ab32fe7fe1cbf9057c3763d979638dce013d82b..6982c978dc530b838353ace60f748660c3b4524d 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -472,6 +472,8 @@ static void drm_atomic_crtc_print_state(struct drm_printer *p,
> drm_printf(p, "\tplane_mask=%x\n", state->plane_mask);
> drm_printf(p, "\tconnector_mask=%x\n", state->connector_mask);
> drm_printf(p, "\tencoder_mask=%x\n", state->encoder_mask);
> + drm_printf(p, "\tcolor-pipeline=%d\n",
> + state->color_pipeline ? state->color_pipeline->base.id : 0);
> drm_printf(p, "\tmode: " DRM_MODE_FMT "\n", DRM_MODE_ARG(&state->mode));
>
> if (crtc->funcs->atomic_print_state)
> @@ -617,7 +619,7 @@ drm_atomic_get_colorop_state(struct drm_atomic_state *state,
> if (colorop_state)
> return colorop_state;
>
> - ret = drm_modeset_lock(&colorop->plane->mutex, state->acquire_ctx);
> + ret = drm_colorop_modeset_lock(colorop, state->acquire_ctx);
> if (ret)
> return ERR_PTR(ret);
>
> @@ -2004,10 +2006,10 @@ static void __drm_state_dump(struct drm_device *dev, struct drm_printer *p,
>
> list_for_each_entry(colorop, &config->colorop_list, head) {
> if (take_locks)
> - drm_modeset_lock(&colorop->plane->mutex, NULL);
> + drm_colorop_modeset_lock(colorop, NULL);
> drm_atomic_colorop_print_state(p, colorop->state);
> if (take_locks)
> - drm_modeset_unlock(&colorop->plane->mutex);
> + drm_colorop_modeset_unlock(colorop);
> }
>
> list_for_each_entry(plane, &config->plane_list, head) {
> diff --git a/drivers/gpu/drm/drm_colorop.c b/drivers/gpu/drm/drm_colorop.c
> index a1b36cd488f0a014425a9192ffe5fcc4d2c1afaa..1384a259605fa4945aa74402901886d7e1fde0d1 100644
> --- a/drivers/gpu/drm/drm_colorop.c
> +++ b/drivers/gpu/drm/drm_colorop.c
> @@ -24,6 +24,7 @@
> *
> */
>
> +#include <drm/drm_crtc.h>
> #include <drm/drm_colorop.h>
> #include <drm/drm_print.h>
> #include <drm/drm_drv.h>
> @@ -595,3 +596,28 @@ void drm_colorop_set_next_property(struct drm_colorop *colorop, struct drm_color
> colorop->next = next;
> }
> EXPORT_SYMBOL(drm_colorop_set_next_property);
> +
> +int drm_colorop_modeset_lock(struct drm_colorop *colorop, struct drm_modeset_acquire_ctx *ctx)
> +{
> + if (colorop->plane)
> + return drm_modeset_lock(&colorop->plane->mutex, ctx);
> +
> + if (colorop->crtc)
> + return drm_modeset_lock(&colorop->crtc->mutex, ctx);
> +
> + drm_err(colorop->dev, "Dangling colorop, it must be attached to a plane or a CRTC\n");
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL(drm_colorop_modeset_lock);
> +
> +
> +void drm_colorop_modeset_unlock(struct drm_colorop *colorop)
> +{
> + if (colorop->plane)
> + drm_modeset_unlock(&colorop->plane->mutex);
> + else if (colorop->crtc)
> + drm_modeset_unlock(&colorop->crtc->mutex);
> + else
> + drm_err(colorop->dev, "Dangling colorop, it must be attached to a plane or a CRTC\n");
> +}
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
> +EXPORT_SYMBOL(drm_colorop_modeset_unlock);
> diff --git a/include/drm/drm_colorop.h b/include/drm/drm_colorop.h
> index 7a4e0d0c4a3d594abecef304b1d5990434cdb231..3e223f3b3597978c5d702ce7622ae30b8aa9dddb 100644
> --- a/include/drm/drm_colorop.h
> +++ b/include/drm/drm_colorop.h
> @@ -29,6 +29,7 @@
>
> #include <drm/drm_mode_object.h>
> #include <drm/drm_mode.h>
> +#include <drm/drm_modeset_lock.h>
> #include <drm/drm_property.h>
>
> /* DRM colorop flags */
> @@ -444,5 +445,7 @@ const char *drm_get_colorop_lut1d_interpolation_name(enum drm_colorop_lut1d_inte
> const char *drm_get_colorop_lut3d_interpolation_name(enum drm_colorop_lut3d_interpolation_type type);
>
> void drm_colorop_set_next_property(struct drm_colorop *colorop, struct drm_colorop *next);
> +int drm_colorop_modeset_lock(struct drm_colorop *colorop, struct drm_modeset_acquire_ctx *ctx);
> +void drm_colorop_modeset_unlock(struct drm_colorop *colorop);
>
> #endif /* __DRM_COLOROP_H__ */
>
--
--
Louis Chauvet, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com