No behavior change. In the following commits we'll add x, so y better matches that.
Signed-off-by: Leandro Ribeiro <[email protected]> --- drivers/gpu/drm/vkms/tests/vkms_color_test.c | 2 +- drivers/gpu/drm/vkms/vkms_composer.c | 10 +++++----- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- drivers/gpu/drm/vkms/vkms_luts.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/vkms/tests/vkms_color_test.c b/drivers/gpu/drm/vkms/tests/vkms_color_test.c index 28614edb8eb1..cfcd7e8e7640 100644 --- a/drivers/gpu/drm/vkms/tests/vkms_color_test.c +++ b/drivers/gpu/drm/vkms/tests/vkms_color_test.c @@ -81,7 +81,7 @@ static const struct vkms_color_test_lerp_params color_test_lerp_cases[] = { }; static const struct vkms_color_lut test_linear_lut = { - .base = test_linear_array, + .y = test_linear_array, .lut_length = ARRAY_SIZE(test_linear_array), .channel_value2index_ratio = 0xf000fll }; diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index bd539ee4c5be..a022554e4b1a 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -114,12 +114,12 @@ VISIBLE_IF_KUNIT u16 apply_lut_to_channel_value(const struct vkms_color_lut *lut */ static_assert(sizeof(struct drm_color_lut) == sizeof(__u16) * 4); - lut_y_floor = &lut->base[drm_fixp2int(lut_index)]; + lut_y_floor = &lut->y[drm_fixp2int(lut_index)]; if (drm_fixp2int(lut_index) == (lut->lut_length - 1)) /* We're at the end of the LUT array, use same value for ceil and floor */ lut_y_ceil = lut_y_floor; else - lut_y_ceil = &lut->base[drm_fixp2int_ceil(lut_index)]; + lut_y_ceil = &lut->y[drm_fixp2int_ceil(lut_index)]; floor_channel_value = lut_channel_value(lut_y_floor, channel); ceil_channel_value = lut_channel_value(lut_y_ceil, channel); @@ -132,7 +132,7 @@ EXPORT_SYMBOL_IF_KUNIT(apply_lut_to_channel_value); static void apply_lut(const struct vkms_crtc_state *crtc_state, struct line_buffer *output_buffer) { - if (!crtc_state->gamma_lut.base) + if (!crtc_state->gamma_lut.y) return; if (!crtc_state->gamma_lut.lut_length) @@ -641,7 +641,7 @@ void vkms_composer_worker(struct work_struct *work) s64 max_lut_index_fp; s64 u16_max_fp = drm_int2fixp(0xffff); - crtc_state->gamma_lut.base = (struct drm_color_lut *)crtc->state->gamma_lut->data; + crtc_state->gamma_lut.y = (struct drm_color_lut *)crtc->state->gamma_lut->data; crtc_state->gamma_lut.lut_length = crtc->state->gamma_lut->length / sizeof(struct drm_color_lut); max_lut_index_fp = drm_int2fixp(crtc_state->gamma_lut.lut_length - 1); @@ -649,7 +649,7 @@ void vkms_composer_worker(struct work_struct *work) u16_max_fp); } else { - crtc_state->gamma_lut.base = NULL; + crtc_state->gamma_lut.y = NULL; } spin_unlock_irq(&out->composer_lock); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 1975843abe92..55a3ea184e44 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -159,7 +159,7 @@ struct vkms_plane { }; struct vkms_color_lut { - struct drm_color_lut *base; + struct drm_color_lut *y; size_t lut_length; s64 channel_value2index_ratio; }; diff --git a/drivers/gpu/drm/vkms/vkms_luts.c b/drivers/gpu/drm/vkms/vkms_luts.c index d0e96df2c120..7b0c8eaf83b8 100644 --- a/drivers/gpu/drm/vkms/vkms_luts.c +++ b/drivers/gpu/drm/vkms/vkms_luts.c @@ -272,7 +272,7 @@ static struct drm_color_lut srgb_array[] = { }; const struct vkms_color_lut srgb_eotf = { - .base = srgb_array, + .y = srgb_array, .lut_length = ARRAY_SIZE(srgb_array), .channel_value2index_ratio = 0xff00ffll }; @@ -538,7 +538,7 @@ static struct drm_color_lut srgb_inv_array[] = { }; const struct vkms_color_lut srgb_inv_eotf = { - .base = srgb_inv_array, + .y = srgb_inv_array, .lut_length = ARRAY_SIZE(srgb_inv_array), .channel_value2index_ratio = 0xff00ffll }; -- 2.55.0
