Support a 1D gamma LUT for each color channel on the VKMS driver. Add a
check for the LUT length by creating vkms_atomic_check().
Tested with:
igt@kms_color@gamma
igt@kms_color@legacy-gamma
igt@kms_color@invalid-gamma-lut-sizes
Signed-off-by: Arthur Grillo <arthurgri...@riseup.net>
---
drivers/gpu/drm/vkms/vkms_composer.c | 28 ++++++++++++++++++++++++++++
drivers/gpu/drm/vkms/vkms_crtc.c | 3 +++
drivers/gpu/drm/vkms/vkms_drv.c | 20 +++++++++++++++++++-
drivers/gpu/drm/vkms/vkms_drv.h | 2 ++
4 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
b/drivers/gpu/drm/vkms/vkms_composer.c
index 906d3df40cdb..7ec9ebe28d5a 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -89,6 +89,32 @@ static void fill_background(const struct pixel_argb_u16
*background_color,
output_buffer->pixels[i] = *background_color;
}
+static void apply_lut(const struct vkms_crtc_state *crtc_state, struct
line_buffer *output_buffer)
+{
+ struct drm_color_lut *lut;
+ size_t lut_length;
+
+ if (!crtc_state->base.gamma_lut)
+ return;
+
+ lut = (struct drm_color_lut *)crtc_state->base.gamma_lut->data;
+
+ lut_length = crtc_state->base.gamma_lut->length / sizeof(*lut);
+
+ if (!lut_length)
+ return;
+
+ for (size_t x = 0; x < output_buffer->n_pixels; x++) {
+ size_t lut_r_index = output_buffer->pixels[x].r * (lut_length -
1) / 0xffff;
+ size_t lut_g_index = output_buffer->pixels[x].g * (lut_length -
1) / 0xffff;
+ size_t lut_b_index = output_buffer->pixels[x].b * (lut_length -
1) / 0xffff;
+
+ output_buffer->pixels[x].r = lut[lut_r_index].red;
+ output_buffer->pixels[x].g = lut[lut_g_index].green;
+ output_buffer->pixels[x].b = lut[lut_b_index].blue;
+ }
+}
+
/**
* @wb_frame_info: The writeback frame buffer metadata
* @crtc_state: The crtc state
@@ -128,6 +154,8 @@ static void blend(struct vkms_writeback_job *wb,
output_buffer);
}
+ apply_lut(crtc_state, output_buffer);
+
*crc32 = crc32_le(*crc32, (void *)output_buffer->pixels,
row_size);
if (wb)
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index 515f6772b866..61e500b8c9da 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -290,6 +290,9 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc
*crtc,
drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
+ drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE);
+ drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE);
+
spin_lock_init(&vkms_out->lock);
spin_lock_init(&vkms_out->composer_lock);
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index e3c9c9571c8d..dd0af086e7fa 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -120,9 +120,27 @@ static const struct drm_driver vkms_driver = {
.minor = DRIVER_MINOR,
};
+static int vkms_atomic_check(struct drm_device *dev, struct drm_atomic_state
*state)
+{
+ struct drm_crtc *crtc;
+ struct drm_crtc_state *new_crtc_state;
+ int i;
+
+ for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+ if (!new_crtc_state->gamma_lut ||
!new_crtc_state->color_mgmt_changed)
+ continue;
+
+ if (new_crtc_state->gamma_lut->length / sizeof(struct
drm_color_lut *)
+ > VKMS_LUT_SIZE)
+ return -EINVAL;
+ }
+
+ return drm_atomic_helper_check(dev, state);
+}
+
static const struct drm_mode_config_funcs vkms_mode_funcs = {
.fb_create = drm_gem_fb_create,
- .atomic_check = drm_atomic_helper_check,
+ .atomic_check = vkms_atomic_check,
.atomic_commit = drm_atomic_helper_commit,
};
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 5f1a0a44a78c..a3b7025c1b9a 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -23,6 +23,8 @@
#define NUM_OVERLAY_PLANES 8
+#define VKMS_LUT_SIZE 256
+
struct vkms_frame_info {
struct drm_framebuffer *fb;
struct drm_rect src, dst;
--
2.40.1
