From 374ea6afd828d80acbb43df72347fac28d788e04 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 5 Jun 2026 12:06:44 +0300 Subject: [PATCH] drm: constify drm_colorop_3x1d_lut_blob I discovered there are things we can make const, so I decided to do it all over the place. Having things const has documentary value. Signed-off-by: Pekka Paalanen --- libweston/backend-drm/colorops.c | 14 +++++++------- libweston/backend-drm/colorops.h | 12 ++++++------ libweston/backend-drm/drm-internal.h | 2 +- libweston/backend-drm/drm.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libweston/backend-drm/colorops.c b/libweston/backend-drm/colorops.c index 029c26e66..5594fed18 100644 --- a/libweston/backend-drm/colorops.c +++ b/libweston/backend-drm/colorops.c @@ -63,14 +63,14 @@ drm_colorop_3x1d_lut_blob_destroy_handler(struct wl_listener *l, void *data) * \param quantization The colorop 3x1D LUT quantization (U32 or U16). * \param lut_len How many taps each of the 1D LUT has. */ -struct drm_colorop_3x1d_lut_blob * -drm_colorop_3x1d_lut_blob_search(struct drm_device *device, - struct weston_color_transform *xform, +const struct drm_colorop_3x1d_lut_blob * +drm_colorop_3x1d_lut_blob_search(const struct drm_device *device, + const struct weston_color_transform *xform, enum weston_color_curve_step curve_step, enum drm_colorop_3x1d_lut_blob_quantization quantization, uint32_t lut_len) { - struct drm_colorop_3x1d_lut_blob *lut; + const struct drm_colorop_3x1d_lut_blob *lut; wl_list_for_each(lut, &device->drm_colorop_3x1d_lut_blob_list, link) if (lut->xform == xform && lut->curve_step == curve_step && @@ -206,7 +206,7 @@ lowering_curve_policy_str(enum lowering_curve_policy policy) return "???"; } -static struct drm_colorop_3x1d_lut_blob * +static const struct drm_colorop_3x1d_lut_blob * drm_colorop_3x1d_lut_blob_from_curve(struct drm_device *device, struct weston_color_transform *xform, enum weston_color_curve_step curve_step, @@ -214,7 +214,7 @@ drm_colorop_3x1d_lut_blob_from_curve(struct drm_device *device, { struct weston_compositor *compositor = xform->cm->compositor; struct drm_backend *b = device->backend; - struct drm_colorop_3x1d_lut_blob *colorop_lut; + const struct drm_colorop_3x1d_lut_blob *colorop_lut; char *err_msg; struct weston_vec3f *cm_lut; @@ -889,7 +889,7 @@ curve_create_colorop_state(struct drm_color_pipeline_state *pipeline_state, struct drm_color_pipeline *pipeline = pipeline_state->pipeline; struct weston_compositor *compositor = pipeline->plane->base.compositor; struct drm_device *device = pipeline->plane->device; - struct drm_colorop_3x1d_lut_blob *lut_blob; + const struct drm_colorop_3x1d_lut_blob *lut_blob; struct weston_color_curve *curve; struct drm_colorop_state_object so = { 0 }; struct drm_colorop *colorop_curve; diff --git a/libweston/backend-drm/colorops.h b/libweston/backend-drm/colorops.h index e0e7edb53..0ed19f559 100644 --- a/libweston/backend-drm/colorops.h +++ b/libweston/backend-drm/colorops.h @@ -132,9 +132,9 @@ drm_colorop_3x1d_lut_blob_create(struct drm_device *device, enum drm_colorop_3x1d_lut_blob_quantization quantization, struct weston_vec3f *cm_lut, uint32_t lut_len); -struct drm_colorop_3x1d_lut_blob * -drm_colorop_3x1d_lut_blob_search(struct drm_device *device, - struct weston_color_transform *xform, +const struct drm_colorop_3x1d_lut_blob * +drm_colorop_3x1d_lut_blob_search(const struct drm_device *device, + const struct weston_color_transform *xform, enum weston_color_curve_step curve_step, enum drm_colorop_3x1d_lut_blob_quantization quantization, uint32_t lut_len); @@ -164,9 +164,9 @@ drm_color_pipeline_state_from_xform(struct drm_plane *plane, return NULL; } -static inline struct drm_colorop_3x1d_lut_blob * -drm_colorop_3x1d_lut_blob_create(struct drm_device *device, - struct weston_color_transform *xform, +static inline const struct drm_colorop_3x1d_lut_blob * +drm_colorop_3x1d_lut_blob_create(const struct drm_device *device, + const struct weston_color_transform *xform, enum weston_color_curve_step curve_step, enum drm_colorop_3x1d_lut_blob_quantization quantization, struct weston_vec3f *cm_lut, uint32_t lut_len) diff --git a/libweston/backend-drm/drm-internal.h b/libweston/backend-drm/drm-internal.h index 5280b4a39..1d7b66643 100644 --- a/libweston/backend-drm/drm-internal.h +++ b/libweston/backend-drm/drm-internal.h @@ -669,7 +669,7 @@ struct drm_output { bool legacy_gamma_not_supported; uint16_t legacy_gamma_size; - struct drm_colorop_3x1d_lut_blob *blend_to_output_xform; + const struct drm_colorop_3x1d_lut_blob *blend_to_output_xform; /* Plane being displayed directly on the CRTC */ struct drm_plane_handle *scanout_handle; diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c index b01301a61..d9e230e7f 100644 --- a/libweston/backend-drm/drm.c +++ b/libweston/backend-drm/drm.c @@ -2285,7 +2285,7 @@ drm_output_pick_blend_to_output(struct drm_output *output) struct weston_compositor *compositor = output->base.compositor; struct drm_device *device = output->device; struct drm_backend *b = device->backend; - struct drm_colorop_3x1d_lut_blob *colorop_lut; + const struct drm_colorop_3x1d_lut_blob *colorop_lut; struct weston_color_transform *xform; enum weston_color_curve_step curve_step; size_t lut_len;