O 06/01, Harry Wentland wrote: > > > On 5/23/23 18:15, Melissa Wen wrote: > > Wire up DC 3D LUT to DM CRTC color management (post-blending). On AMD > > display HW, we have to set a shaper LUT to delinearize or normalize the > > color space before applying a 3D LUT (since we have a reduced number of > > LUT entries). Therefore, we map DC shaper LUT to DM CRTC color mgmt in > > the next patch. > > > > Signed-off-by: Melissa Wen <mwen@xxxxxxxxxx> > > --- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 + > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 17 ++ > > .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 158 +++++++++++++++++- > > 3 files changed, 180 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index 0be62fe436b0..a6dd982d7e77 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -9976,6 +9976,12 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, > > goto fail; > > } > > > > + ret = amdgpu_dm_verify_lut3d_size(adev, new_crtc_state); > > + if (ret) { > > + drm_dbg_driver(dev, "amdgpu_dm_verify_lut_sizes() failed\n"); > > + goto fail; > > + } > > + > > if (!new_crtc_state->enable) > > continue; > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > index e5f9db5a43f4..eebe12c353ad 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h > > @@ -797,6 +797,21 @@ struct dm_crtc_state { > > > > int abm_level; > > > > + /* AMD driver-private CRTC color management > > + * > > + * DRM provides CRTC degamma/ctm/gamma color mgmt features, but AMD HW > > + * has a larger set of post-blending color calibration. Here, DC MPC > > + * color caps are wired up to DM CRTC state: > > + */ > > + /** > > + * @lut3d: > > + * > > + * Post-blending 3D Lookup table for converting pixel data. When > > + * supported by HW (DCN 3+), it is positioned just before post-blending > > + * regamma and always assumes a preceding shaper LUT. The blob (if not > > + * NULL) is an array of &struct drm_color_lut. > > + */ > > + struct drm_property_blob *lut3d; > > /** > > * @regamma_tf: > > * > > @@ -868,6 +883,8 @@ void amdgpu_dm_trigger_timing_sync(struct drm_device *dev); > > /* 3D LUT max size is 17x17x17 */ > > #define MAX_COLOR_3DLUT_ENTRIES 4913 > > #define MAX_COLOR_3DLUT_BITDEPTH 12 > > +int amdgpu_dm_verify_lut3d_size(struct amdgpu_device *adev, > > + const struct drm_crtc_state *crtc_state); > > /* 1D LUT size */ > > #define MAX_COLOR_LUT_ENTRIES 4096 > > /* Legacy gamm LUT users such as X doesn't like large LUT sizes */ > > 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.c > > index 161807e19886..cef8d0d7f37b 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 > > @@ -364,6 +364,96 @@ static int __set_input_tf(struct dc_transfer_func *func, > > return res ? 0 : -ENOMEM; > > } > > > > +static void __to_dc_lut3d_color(struct dc_rgb *rgb, > > + const struct drm_color_lut lut, > > + int bit_precision) > > +{ > > + rgb->red = drm_color_lut_extract(lut.red, bit_precision); > > + rgb->green = drm_color_lut_extract(lut.green, bit_precision); > > + rgb->blue = drm_color_lut_extract(lut.blue, bit_precision); > > +} > > + > > +static void __drm_3dlut_to_dc_3dlut(const struct drm_color_lut *lut, > > + uint32_t lut3d_size, > > + struct tetrahedral_params *params, > > + bool use_tetrahedral_9, > > + int bit_depth) > > +{ > > + struct dc_rgb *lut0; > > + struct dc_rgb *lut1; > > + struct dc_rgb *lut2; > > + struct dc_rgb *lut3; > > + int lut_i, i; > > + > > + > > + if (use_tetrahedral_9) { > > + lut0 = params->tetrahedral_9.lut0; > > + lut1 = params->tetrahedral_9.lut1; > > + lut2 = params->tetrahedral_9.lut2; > > + lut3 = params->tetrahedral_9.lut3; > > + } else { > > + lut0 = params->tetrahedral_17.lut0; > > + lut1 = params->tetrahedral_17.lut1; > > + lut2 = params->tetrahedral_17.lut2; > > + lut3 = params->tetrahedral_17.lut3; > > + } > > + > > + for (lut_i = 0, i = 0; i < lut3d_size - 4; lut_i++, i += 4) { > > + /* We should consider the 3dlut RGB values are distributed > > + * along four arrays lut0-3 where the first sizes 1229 and the > > + * other 1228. The bit depth supported for 3dlut channel is > > + * 12-bit, but DC also supports 10-bit. > > + * > > + * TODO: improve color pipeline API to enable the userspace set > > + * bit depth and 3D LUT size/stride, as specified by VA-API. > > + */ > > + __to_dc_lut3d_color(&lut0[lut_i], lut[i], bit_depth); > > + __to_dc_lut3d_color(&lut1[lut_i], lut[i + 1], bit_depth); > > + __to_dc_lut3d_color(&lut2[lut_i], lut[i + 2], bit_depth); > > + __to_dc_lut3d_color(&lut3[lut_i], lut[i + 3], bit_depth); > > + } > > + /* lut0 has 1229 points (lut_size/4 + 1) */ > > + __to_dc_lut3d_color(&lut0[lut_i], lut[i], bit_depth); > > +} > > + > > +/* amdgpu_dm_atomic_lut3d - set DRM 3D LUT to DC stream > > + * @drm_lut3d: DRM CRTC (user) 3D LUT > > + * @drm_lut3d_size: size of 3D LUT > > + * @lut3d: DC 3D LUT > > + * > > + * Map DRM CRTC 3D LUT to DC 3D LUT and all necessary bits to program it > > + * on DCN MPC accordingly. > > + */ > > +static void amdgpu_dm_atomic_lut3d(const struct drm_color_lut *drm_lut, > > + uint32_t drm_lut3d_size, > > + struct dc_3dlut *lut) > > +{ > > + if (!drm_lut3d_size) { > > + lut->state.bits.initialized = 0; > > + } else { > > + /* Stride and bit depth are not programmable by API yet. > > + * Therefore, only supports 17x17x17 3D LUT (12-bit). > > + */ > > + lut->lut_3d.use_tetrahedral_9 = false; > > + lut->lut_3d.use_12bits = true; > > + lut->state.bits.initialized = 1; > > + __drm_3dlut_to_dc_3dlut(drm_lut, drm_lut3d_size, &lut->lut_3d, > > + lut->lut_3d.use_tetrahedral_9, > > + MAX_COLOR_3DLUT_BITDEPTH); > > + } > > +} > > + > > +static int amdgpu_dm_atomic_shaper_lut(struct dc_transfer_func *func_shaper) > > +{ > > + /* We don't get DRM shaper LUT yet. We assume the input color space is already > > + * delinearized, so we don't need a shaper LUT and we can just BYPASS > > + */ > > This assumption won't be true for all compositors. This comment will > be misleading when someone looks at this in the future. I'm thinking we > might not want to merge patches 16-22 since we have no way to exercise > this code. Oh, in the end it was a temporary comment that is overwritten in the next patch. I'll remove it to avoid misunderstanding. > > We'll definitely want MPC 3DLUT support in the future, with the driver-agnostic > API. So these patches still have value. I'm okay on remove MPC shaper+3D LUT handling from DM if you think it's a cleaner approach. I just need to detach shaper and 3D LUT helpers from these patches and attach to DPP shaper+3D LUT, since we reuse the helpers for plane shaper+3D LUT support. > > Harry > > > + func_shaper->type = TF_TYPE_BYPASS; > > + func_shaper->tf = TRANSFER_FUNCTION_LINEAR; > > + > > + return 0; > > +} > > + > > /* amdgpu_dm_atomic_shaper_lut3d - set DRM CRTC shaper LUT and 3D LUT to DC > > * interface > > * @dc: Display Core control structure > > @@ -404,6 +494,57 @@ static int amdgpu_dm_atomic_shaper_lut3d(struct dc *dc, > > stream->func_shaper = func_shaper; > > stream->lut3d_func = lut3d_func; > > > > + if (!acquire) > > + return 0; > > + > > + amdgpu_dm_atomic_lut3d(drm_lut3d, drm_lut3d_size, lut3d_func); > > + > > + return amdgpu_dm_atomic_shaper_lut(func_shaper); > > +} > > + > > +/** > > + * amdgpu_dm_lut3d_size - get expected size according to hw color caps > > + * @adev: amdgpu device > > + * @lut_size: default size > > + * > > + * Return: > > + * lut_size if DC 3D LUT is supported, zero otherwise. > > + */ > > +static uint32_t amdgpu_dm_get_lut3d_size(struct amdgpu_device *adev, > > + uint32_t lut_size) > > +{ > > + return adev->dm.dc->caps.color.mpc.num_3dluts ? lut_size : 0; > > +} > > + > > +/** > > + * amdgpu_dm_verify_lut3d_size - verifies if 3D LUT is supported and if DRM 3D > > + * LUT matches the hw supported size > > + * @adev: amdgpu device > > + * @crtc_state: the DRM CRTC state > > + * > > + * Verifies if post-blending (MPC) 3D LUT is supported by the HW (DCN 3.0 or > > + * newer) and if the DRM 3D LUT matches the supported size. > > + * > > + * Returns: > > + * 0 on success. -EINVAL if lut size are invalid. > > + */ > > +int amdgpu_dm_verify_lut3d_size(struct amdgpu_device *adev, > > + const struct drm_crtc_state *crtc_state) > > +{ > > + const struct drm_color_lut *lut3d = NULL; > > + struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc_state); > > + uint32_t exp_size, size; > > + > > + exp_size = amdgpu_dm_get_lut3d_size(adev, MAX_COLOR_3DLUT_ENTRIES); > > + > > + lut3d = __extract_blob_lut(acrtc_state->lut3d, &size); > > + > > + if (lut3d && size != exp_size) { > > + drm_dbg(&adev->ddev, "Invalid 3D LUT size. Should be %u but got %u.\n", > > + exp_size, size); > > + return -EINVAL; > > + } > > + > > return 0; > > } > > > > @@ -478,6 +619,14 @@ int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state *crtc, > > bool has_regamma, has_degamma; > > bool is_legacy; > > int r; > > + const struct drm_color_lut *lut3d; > > + uint32_t lut3d_size; > > + > > + r = amdgpu_dm_verify_lut3d_size(adev, &crtc->base); > > + if (r) > > + return r; > > + > > + lut3d = __extract_blob_lut(crtc->lut3d, &lut3d_size); > > > > r = amdgpu_dm_verify_lut_sizes(&crtc->base); > > if (r) > > @@ -526,10 +675,17 @@ int amdgpu_dm_update_crtc_color_mgmt(struct dm_crtc_state *crtc, > > if (r) > > return r; > > } else { > > + /* We are not exposing CRTC 3D LUT properties yet, so DC 3D LUT > > + * programming is expected to be set to bypass mode, since > > + * there is no user-blob. > > + */ > > + lut3d_size = lut3d != NULL ? lut3d_size : 0; > > r = amdgpu_dm_atomic_shaper_lut3d(adev->dm.dc, ctx, stream, > > - NULL, 0, NULL, 0); > > + NULL, 0, > > + lut3d, lut3d_size); > > if (r) > > return r; > > + > > /* Note: OGAM is disabled if 3D LUT is successfully programmed. > > * See params and set_output_gamma in > > * dcn30_set_output_transfer_func() >
Attachment:
signature.asc
Description: PGP signature