Movatterモバイル変換

[PATCH V8 34/43] drm/amd/display: add 3x4 matrix colorop

• Previous message (by thread):[PATCH V8 33/43] drm/amd/display: add shaper and blend colorops for 1D Curve Custom LUT
• Next message (by thread):[PATCH V8 35/43] drm/colorop: Add mutliplier type
• Messages sorted by:[ date ][ thread ][ subject ][ author ]

This adds support for a 3x4 color transformation matrix.With this change the following IGT tests pass:kms_colorop --run plane-XR30-XR30-ctm_3x4_50_desatkms_colorop --run plane-XR30-XR30-ctm_3x4_overdrivekms_colorop --run plane-XR30-XR30-ctm_3x4_oversaturatekms_colorop --run plane-XR30-XR30-ctm_3x4_bt709_enckms_colorop --run plane-XR30-XR30-ctm_3x4_bt709_decThe color pipeline now consists of the following colorops:1. 1D curve colorop2. 3x4 CTM3. 1D curve colorop4. 1D LUT5. 1D curve colorop6. 1D LUTSigned-off-by: Alex Hung <alex.hung at amd.com>Signed-off-by: Harry Wentland <harry.wentland at amd.com>---v8: - Return -EINVAL when drm_color_ctm_3x4's size mismatches (Leo Li)v7: - Change %lu to %zu for sizeof() when In drm_warnv6: - fix warnings in dbg prints .../amd/display/amdgpu_dm/amdgpu_dm_color.c   | 52 +++++++++++++++++++ .../amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 16 ++++++ 2 files changed, 68 insertions(+)diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.cindex 7e81088804fe..8a9404339da0 100644--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c@@ -1211,6 +1211,47 @@ __set_dm_plane_colorop_degamma(struct drm_plane_state *plane_state, return __set_colorop_in_tf_1d_curve(dc_plane_state, colorop_state); } +static int+__set_dm_plane_colorop_3x4_matrix(struct drm_plane_state *plane_state,+  struct dc_plane_state *dc_plane_state,+  struct drm_colorop *colorop)+{+struct drm_colorop *old_colorop;+struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;+struct drm_atomic_state *state = plane_state->state;+const struct drm_device *dev = colorop->dev;+const struct drm_property_blob *blob;+struct drm_color_ctm_3x4 *ctm = NULL;+int i = 0;++/* 3x4 matrix */+old_colorop = colorop;+for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) {+if (new_colorop_state->colorop == old_colorop &&+    new_colorop_state->colorop->type == DRM_COLOROP_CTM_3X4) {+colorop_state = new_colorop_state;+break;+}+}++if (colorop_state && !colorop_state->bypass && colorop->type == DRM_COLOROP_CTM_3X4) {+drm_dbg(dev, "3x4 matrix colorop with ID: %d\n", colorop->base.id);+blob = colorop_state->data;+if (blob->length == sizeof(struct drm_color_ctm_3x4)) {+ctm = blob ? (struct drm_color_ctm_3x4 *) blob->data : NULL;+__drm_ctm_3x4_to_dc_matrix(ctm, dc_plane_state->gamut_remap_matrix.matrix);+dc_plane_state->gamut_remap_matrix.enable_remap = true;+dc_plane_state->input_csc_color_matrix.enable_adjustment = false;+} else {+drm_warn(dev, "blob->length (%lu) isn't equal to drm_color_ctm_3x4 (%zu)\n",+ blob->length, sizeof(struct drm_color_ctm_3x4));+return -EINVAL;+}+}++return 0;+}+ static int __set_dm_plane_colorop_shaper(struct drm_plane_state *plane_state,       struct dc_plane_state *dc_plane_state,@@ -1414,6 +1455,17 @@ amdgpu_dm_plane_set_colorop_properties(struct drm_plane_state *plane_state, if (ret) return ret; +/* 3x4 matrix */+colorop = colorop->next;+if (!colorop) {+drm_dbg(dev, "no 3x4 matrix colorop found\n");+return -EINVAL;+}++ret = __set_dm_plane_colorop_3x4_matrix(plane_state, dc_plane_state, colorop);+if (ret)+return ret;+ /* 1D Curve & LUT - SHAPER TF & LUT */ colorop = colorop->next; if (!colorop) {diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.cindex 8a5e15083f11..9a9386bf85ec 100644--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c@@ -75,6 +75,22 @@ int amdgpu_dm_initialize_default_pipeline(struct drm_plane *plane, struct drm_pr  i++; +/* 3x4 matrix */+ops[i] = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL);+if (!ops[i]) {+DRM_ERROR("KMS: Failed to allocate colorop\n");+ret = -ENOMEM;+goto cleanup;+}++ret = drm_colorop_ctm_3x4_init(dev, ops[i], plane);+if (ret)+goto cleanup;++drm_colorop_set_next_property(ops[i-1], ops[i]);++i++;+ /* 1D curve - SHAPER TF */ ops[i] = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL); if (!ops[i]) {-- 2.43.0

• Previous message (by thread):[PATCH V8 33/43] drm/amd/display: add shaper and blend colorops for 1D Curve Custom LUT
• Next message (by thread):[PATCH V8 35/43] drm/colorop: Add mutliplier type
• Messages sorted by:[ date ][ thread ][ subject ][ author ]