github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-26 18:12:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amd/display: Introduce dc_plane_cm and migrate surface update color path

Browse Source 
[Why]
Begin convergence with upstream Color Manager refactor
(fda768acb2a1 "drm/amd/display: Sync dcn42 with DC 3.2.373") by
consolidating fragmented per-plane CM state (shaper, 3DLUT, blend,
CM2) into a single dc_plane_cm structure shared by dc_plane_state
and dc_surface_update. Legacy fields are gated behind TRIM_CM2 so
that it keeps compatibility with other repositories.

[How]
Refactored to use newer structures.
No functional behavior change intended. Under !TRIM_CM2 the legacy
fields are still populated for compatibility with other repositories.

v2: squash in conflicting types fix

Reviewed-by: Dillon Varone <dillon.varone@amd.com>
Signed-off-by: Rafal Ostrowski <rafal.ostrowski@amd.com>
Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Rafal Ostrowski 2026-05-22 08:02:16 +02:00 committed by Alex Deucher
parent b3aa48ee3e
commit b008c67efb
18 changed files with 589 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -10321,9 +10321,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_commit *state,
bundle->surface_updates[planes_count].in_transfer_func = &dc_plane->in_transfer_func; bundle->surface_updates[planes_count].in_transfer_func = &dc_plane->in_transfer_func;
bundle->surface_updates[planes_count].gamut_remap_matrix = &dc_plane->gamut_remap_matrix; bundle->surface_updates[planes_count].gamut_remap_matrix = &dc_plane->gamut_remap_matrix;
bundle->surface_updates[planes_count].hdr_mult = dc_plane->hdr_mult; bundle->surface_updates[planes_count].hdr_mult = dc_plane->hdr_mult;
bundle->surface_updates[planes_count].func_shaper = &dc_plane->in_shaper_func; bundle->surface_updates[planes_count].cm = &dc_plane->cm;
bundle->surface_updates[planes_count].lut3d_func = &dc_plane->lut3d_func;
bundle->surface_updates[planes_count].blend_tf = &dc_plane->blend_tf;
} }
amdgpu_dm_plane_fill_dc_scaling_info(dm->adev, new_plane_state, amdgpu_dm_plane_fill_dc_scaling_info(dm->adev, new_plane_state,

69
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c
View File

@ -1051,26 +1051,28 @@ EXPORT_IF_KUNIT(__drm_3dlut32_to_dc_3dlut);
/* amdgpu_dm_atomic_lut3d - set DRM 3D LUT to DC stream /* amdgpu_dm_atomic_lut3d - set DRM 3D LUT to DC stream
* @drm_lut3d: user 3D LUT * @drm_lut3d: user 3D LUT
* @drm_lut3d_size: size of 3D LUT * @drm_lut3d_size: size of 3D LUT
* @lut3d: DC 3D LUT * @cm: DC Color Manager (includes 3D LUT)
* *
* Map user 3D LUT data to DC 3D LUT and all necessary bits to program it * Map user 3D LUT data to DC 3D LUT and all necessary bits to program it
* on DCN accordingly. * on DCN accordingly.
*/ */
STATIC_IFN_KUNIT void amdgpu_dm_atomic_lut3d(const struct drm_color_lut *drm_lut3d, STATIC_IFN_KUNIT void amdgpu_dm_atomic_lut3d(const struct drm_color_lut *drm_lut3d,
uint32_t drm_lut3d_size, uint32_t drm_lut3d_size,
struct dc_3dlut *lut) struct dc_plane_cm *cm)
{ {
if (!drm_lut3d_size) { if (!drm_lut3d_size) {
lut->state.bits.initialized = 0; cm->lut3d_func.state.bits.initialized = 0;
cm->flags.bits.lut3d_enable = 0;
} else { } else {
/* Stride and bit depth are not programmable by API yet. /* Stride and bit depth are not programmable by API yet.
* Therefore, only supports 17x17x17 3D LUT (12-bit). * Therefore, only supports 17x17x17 3D LUT (12-bit).
*/ */
lut->lut_3d.use_tetrahedral_9 = false; cm->lut3d_func.lut_3d.use_tetrahedral_9 = false;
lut->lut_3d.use_12bits = true; cm->lut3d_func.lut_3d.use_12bits = true;
lut->state.bits.initialized = 1; cm->lut3d_func.state.bits.initialized = 1;
__drm_3dlut_to_dc_3dlut(drm_lut3d, drm_lut3d_size, &lut->lut_3d, cm->flags.bits.lut3d_enable = 1;
lut->lut_3d.use_tetrahedral_9, __drm_3dlut_to_dc_3dlut(drm_lut3d, drm_lut3d_size, &cm->lut3d_func.lut_3d,
cm->lut3d_func.lut_3d.use_tetrahedral_9,
MAX_COLOR_3DLUT_BITDEPTH); MAX_COLOR_3DLUT_BITDEPTH);
} }
} }
@ -1080,7 +1082,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_atomic_shaper_lut(const struct drm_color_lut *sha
bool has_rom, bool has_rom,
enum dc_transfer_func_predefined tf, enum dc_transfer_func_predefined tf,
uint32_t shaper_size, uint32_t shaper_size,
struct dc_transfer_func *func_shaper) struct dc_plane_cm *cm)
{ {
int ret = 0; int ret = 0;
@ -1089,10 +1091,13 @@ STATIC_IFN_KUNIT int amdgpu_dm_atomic_shaper_lut(const struct drm_color_lut *sha
* If user shaper LUT is set, we assume a linear color space * If user shaper LUT is set, we assume a linear color space
* (linearized by degamma 1D LUT or not). * (linearized by degamma 1D LUT or not).
*/ */
__set_tf_distributed_points(func_shaper, tf); __set_tf_distributed_points(&cm->shaper_func, tf);
ret = __set_output_tf(func_shaper, shaper_lut, shaper_size, has_rom); cm->flags.bits.shaper_enable = 1;
ret = __set_output_tf(&cm->shaper_func, shaper_lut, shaper_size, has_rom);
} else { } else {
__set_tf_bypass(func_shaper); __set_tf_bypass(&cm->shaper_func);
cm->flags.bits.shaper_enable = 0;
} }
return ret; return ret;
@ -1103,7 +1108,7 @@ STATIC_IFN_KUNIT int amdgpu_dm_atomic_blend_lut(const struct drm_color_lut *blen
bool has_rom, bool has_rom,
enum dc_transfer_func_predefined tf, enum dc_transfer_func_predefined tf,
uint32_t blend_size, uint32_t blend_size,
struct dc_transfer_func *func_blend) struct dc_plane_cm *cm)
{ {
int ret = 0; int ret = 0;
@ -1115,10 +1120,13 @@ STATIC_IFN_KUNIT int amdgpu_dm_atomic_blend_lut(const struct drm_color_lut *blen
* module to fill the parameters that will be translated to HW * module to fill the parameters that will be translated to HW
* points. * points.
*/ */
__set_tf_distributed_points(func_blend, tf); __set_tf_distributed_points(&cm->blend_func, tf);
ret = __set_input_tf(NULL, func_blend, blend_lut, blend_size); cm->flags.bits.blend_enable = 1;
ret = __set_input_tf(NULL, &cm->blend_func, blend_lut, blend_size);
} else { } else {
__set_tf_bypass(func_blend); __set_tf_bypass(&cm->blend_func);
cm->flags.bits.blend_enable = 0;
} }
return ret; return ret;
@ -1635,7 +1643,7 @@ __set_dm_plane_colorop_shaper(struct drm_plane_state *plane_state,
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state; struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_commit *state = plane_state->state; struct drm_atomic_commit *state = plane_state->state;
enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR; enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR;
struct dc_transfer_func *tf = &dc_plane_state->in_shaper_func; struct dc_transfer_func *tf = &dc_plane_state->cm.shaper_func;
const struct drm_color_lut32 *shaper_lut; const struct drm_color_lut32 *shaper_lut;
struct drm_device *dev = colorop->dev; struct drm_device *dev = colorop->dev;
bool enabled = false; bool enabled = false;
@ -1696,8 +1704,12 @@ __set_dm_plane_colorop_shaper(struct drm_plane_state *plane_state,
} }
} }
if (!enabled) if (!enabled) {
tf->type = TF_TYPE_BYPASS; tf->type = TF_TYPE_BYPASS;
dc_plane_state->cm.flags.bits.shaper_enable = 0;
} else {
dc_plane_state->cm.flags.bits.shaper_enable = 1;
}
return 0; return 0;
} }
@ -1741,7 +1753,7 @@ __set_dm_plane_colorop_3dlut(struct drm_plane_state *plane_state,
{ {
struct drm_colorop *old_colorop; struct drm_colorop *old_colorop;
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state; struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct dc_transfer_func *tf = &dc_plane_state->in_shaper_func; struct dc_transfer_func *tf = &dc_plane_state->cm.shaper_func;
struct drm_atomic_commit *state = plane_state->state; struct drm_atomic_commit *state = plane_state->state;
const struct amdgpu_device *adev = drm_to_adev(colorop->dev); const struct amdgpu_device *adev = drm_to_adev(colorop->dev);
bool has_3dlut = adev->dm.dc->caps.color.dpp.hw_3d_lut || adev->dm.dc->caps.color.mpc.preblend; bool has_3dlut = adev->dm.dc->caps.color.dpp.hw_3d_lut || adev->dm.dc->caps.color.mpc.preblend;
@ -1769,13 +1781,15 @@ __set_dm_plane_colorop_3dlut(struct drm_plane_state *plane_state,
drm_dbg(dev, "3D LUT colorop with ID: %d\n", colorop->base.id); drm_dbg(dev, "3D LUT colorop with ID: %d\n", colorop->base.id);
lut3d = __extract_blob_lut32(colorop_state->data, &lut3d_size); lut3d = __extract_blob_lut32(colorop_state->data, &lut3d_size);
lut3d_size = lut3d != NULL ? lut3d_size : 0; lut3d_size = lut3d != NULL ? lut3d_size : 0;
ret = __set_colorop_3dlut(lut3d, lut3d_size, &dc_plane_state->lut3d_func); ret = __set_colorop_3dlut(lut3d, lut3d_size, &dc_plane_state->cm.lut3d_func);
if (ret) { if (ret) {
drm_dbg(dev, "3D LUT colorop with ID: %d has LUT size = %d\n", drm_dbg(dev, "3D LUT colorop with ID: %d has LUT size = %d\n",
colorop->base.id, lut3d_size); colorop->base.id, lut3d_size);
return ret; return ret;
} }
dc_plane_state->cm.flags.bits.lut3d_enable = 1;
/* 3D LUT requires shaper. If shaper colorop is bypassed, enable shaper curve /* 3D LUT requires shaper. If shaper colorop is bypassed, enable shaper curve
* with TRANSFER_FUNCTION_LINEAR * with TRANSFER_FUNCTION_LINEAR
*/ */
@ -1785,6 +1799,8 @@ __set_dm_plane_colorop_3dlut(struct drm_plane_state *plane_state,
tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE; tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE;
ret = __set_output_tf_32(tf, NULL, 0, false); ret = __set_output_tf_32(tf, NULL, 0, false);
} }
} else {
dc_plane_state->cm.flags.bits.lut3d_enable = 0;
} }
return ret; return ret;
@ -1799,12 +1815,14 @@ __set_dm_plane_colorop_blend(struct drm_plane_state *plane_state,
struct drm_colorop_state *colorop_state = NULL, *new_colorop_state; struct drm_colorop_state *colorop_state = NULL, *new_colorop_state;
struct drm_atomic_commit *state = plane_state->state; struct drm_atomic_commit *state = plane_state->state;
enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR; enum dc_transfer_func_predefined default_tf = TRANSFER_FUNCTION_LINEAR;
struct dc_transfer_func *tf = &dc_plane_state->blend_tf; struct dc_transfer_func *tf = &dc_plane_state->cm.blend_func;
const struct drm_color_lut32 *blend_lut = NULL; const struct drm_color_lut32 *blend_lut = NULL;
struct drm_device *dev = colorop->dev; struct drm_device *dev = colorop->dev;
uint32_t blend_size = 0; uint32_t blend_size = 0;
int i = 0; int i = 0;
dc_plane_state->cm.flags.bits.blend_enable = 0;
/* 1D Curve - BLND TF */ /* 1D Curve - BLND TF */
old_colorop = colorop; old_colorop = colorop;
for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) { for_each_new_colorop_in_state(state, colorop, new_colorop_state, i) {
@ -1821,6 +1839,7 @@ __set_dm_plane_colorop_blend(struct drm_plane_state *plane_state,
tf->type = TF_TYPE_DISTRIBUTED_POINTS; tf->type = TF_TYPE_DISTRIBUTED_POINTS;
tf->tf = default_tf = amdgpu_colorop_tf_to_dc_tf(colorop_state->curve_1d_type); tf->tf = default_tf = amdgpu_colorop_tf_to_dc_tf(colorop_state->curve_1d_type);
tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE; tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE;
dc_plane_state->cm.flags.bits.blend_enable = 1;
__set_input_tf_32(NULL, tf, blend_lut, blend_size); __set_input_tf_32(NULL, tf, blend_lut, blend_size);
} }
@ -1846,6 +1865,7 @@ __set_dm_plane_colorop_blend(struct drm_plane_state *plane_state,
tf->type = TF_TYPE_DISTRIBUTED_POINTS; tf->type = TF_TYPE_DISTRIBUTED_POINTS;
tf->tf = default_tf; tf->tf = default_tf;
tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE; tf->sdr_ref_white_level = SDR_WHITE_LEVEL_INIT_VALUE;
dc_plane_state->cm.flags.bits.blend_enable = 1;
blend_lut = __extract_blob_lut32(colorop_state->data, &blend_size); blend_lut = __extract_blob_lut32(colorop_state->data, &blend_size);
blend_size = blend_lut != NULL ? blend_size : 0; blend_size = blend_lut != NULL ? blend_size : 0;
@ -1876,11 +1896,11 @@ amdgpu_dm_plane_set_color_properties(struct drm_plane_state *plane_state,
lut3d = __extract_blob_lut(dm_plane_state->lut3d, &lut3d_size); lut3d = __extract_blob_lut(dm_plane_state->lut3d, &lut3d_size);
lut3d_size = lut3d != NULL ? lut3d_size : 0; lut3d_size = lut3d != NULL ? lut3d_size : 0;
amdgpu_dm_atomic_lut3d(lut3d, lut3d_size, &dc_plane_state->lut3d_func); amdgpu_dm_atomic_lut3d(lut3d, lut3d_size, &dc_plane_state->cm);
ret = amdgpu_dm_atomic_shaper_lut(shaper_lut, false, ret = amdgpu_dm_atomic_shaper_lut(shaper_lut, false,
amdgpu_tf_to_dc_tf(shaper_tf), amdgpu_tf_to_dc_tf(shaper_tf),
shaper_size, shaper_size,
&dc_plane_state->in_shaper_func); &dc_plane_state->cm);
if (ret) { if (ret) {
drm_dbg_kms(plane_state->plane->dev, drm_dbg_kms(plane_state->plane->dev,
"setting plane %d shaper LUT failed.\n", "setting plane %d shaper LUT failed.\n",
@ -1895,7 +1915,8 @@ amdgpu_dm_plane_set_color_properties(struct drm_plane_state *plane_state,
ret = amdgpu_dm_atomic_blend_lut(blend_lut, false, ret = amdgpu_dm_atomic_blend_lut(blend_lut, false,
amdgpu_tf_to_dc_tf(blend_tf), amdgpu_tf_to_dc_tf(blend_tf),
blend_size, &dc_plane_state->blend_tf); blend_size, &dc_plane_state->cm);
if (ret) { if (ret) {
drm_dbg_kms(plane_state->plane->dev, drm_dbg_kms(plane_state->plane->dev,
"setting plane %d gamma lut failed.\n", "setting plane %d gamma lut failed.\n",

8
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.h
View File

@ -87,10 +87,10 @@ void __drm_3dlut32_to_dc_3dlut(const struct drm_color_lut32 *lut,
struct tetrahedral_params *params, struct tetrahedral_params *params,
bool use_tetrahedral_9, bool use_tetrahedral_9,
int bit_depth); int bit_depth);
struct dc_3dlut; struct dc_plane_cm;
void amdgpu_dm_atomic_lut3d(const struct drm_color_lut *drm_lut3d, void amdgpu_dm_atomic_lut3d(const struct drm_color_lut *drm_lut3d,
uint32_t drm_lut3d_size, uint32_t drm_lut3d_size,
struct dc_3dlut *lut); struct dc_plane_cm *cm);
int __set_colorop_3dlut(const struct drm_color_lut32 *drm_lut3d, int __set_colorop_3dlut(const struct drm_color_lut32 *drm_lut3d,
uint32_t drm_lut3d_size, uint32_t drm_lut3d_size,
struct dc_3dlut *lut); struct dc_3dlut *lut);
@ -105,12 +105,12 @@ int amdgpu_dm_atomic_shaper_lut(const struct drm_color_lut *shaper_lut,
bool has_rom, bool has_rom,
enum dc_transfer_func_predefined tf, enum dc_transfer_func_predefined tf,
uint32_t shaper_size, uint32_t shaper_size,
struct dc_transfer_func *func_shaper); struct dc_plane_cm *cm);
int amdgpu_dm_atomic_blend_lut(const struct drm_color_lut *blend_lut, int amdgpu_dm_atomic_blend_lut(const struct drm_color_lut *blend_lut,
bool has_rom, bool has_rom,
enum dc_transfer_func_predefined tf, enum dc_transfer_func_predefined tf,
uint32_t blend_size, uint32_t blend_size,
struct dc_transfer_func *func_blend); struct dc_plane_cm *cm);
int __set_colorop_in_tf_1d_curve(struct dc_plane_state *dc_plane_state, int __set_colorop_in_tf_1d_curve(struct dc_plane_state *dc_plane_state,
struct drm_colorop_state *colorop_state); struct drm_colorop_state *colorop_state);
#endif #endif

64
drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_color_test.c
View File

@ -1159,19 +1159,19 @@ static void dm_test_verify_lut_sizes_invalid_degamma_valid_gamma(struct kunit *t
*/ */
static void dm_test_atomic_lut3d_zero_size(struct kunit *test) static void dm_test_atomic_lut3d_zero_size(struct kunit *test)
{ {
struct dc_3dlut *lut; struct dc_plane_cm *cm;
u32 initialized; u32 initialized;
lut = kunit_kzalloc(test, sizeof(*lut), GFP_KERNEL); cm = kunit_kzalloc(test, sizeof(*cm), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, lut); KUNIT_ASSERT_NOT_NULL(test, cm);
/* Pre-set initialized so we can confirm it is cleared */ /* Pre-set initialized so we can confirm it is cleared */
lut->state.bits.initialized = 1; cm->lut3d_func.state.bits.initialized = 1;
amdgpu_dm_atomic_lut3d(NULL, 0, lut); amdgpu_dm_atomic_lut3d(NULL, 0, cm);
/* Copy bit-field: typeof cannot be applied to a bit-field */ /* Copy bit-field: typeof cannot be applied to a bit-field */
initialized = lut->state.bits.initialized; initialized = cm->lut3d_func.state.bits.initialized;
KUNIT_EXPECT_EQ(test, initialized, 0U); KUNIT_EXPECT_EQ(test, initialized, 0U);
} }
@ -1183,22 +1183,22 @@ static void dm_test_atomic_lut3d_nonzero_state_bits(struct kunit *test)
{ {
const uint32_t lut3d_size = 5; const uint32_t lut3d_size = 5;
struct drm_color_lut *lut_data; struct drm_color_lut *lut_data;
struct dc_3dlut *lut; struct dc_plane_cm *cm;
u32 initialized; u32 initialized;
lut_data = kunit_kcalloc(test, lut3d_size, sizeof(*lut_data), GFP_KERNEL); lut_data = kunit_kcalloc(test, lut3d_size, sizeof(*lut_data), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, lut_data); KUNIT_ASSERT_NOT_NULL(test, lut_data);
lut = kunit_kzalloc(test, sizeof(*lut), GFP_KERNEL); cm = kunit_kzalloc(test, sizeof(*cm), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, lut); KUNIT_ASSERT_NOT_NULL(test, cm);
amdgpu_dm_atomic_lut3d(lut_data, lut3d_size, lut); amdgpu_dm_atomic_lut3d(lut_data, lut3d_size, cm);
/* Copy bit-field: typeof cannot be applied to a bit-field */ /* Copy bit-field: typeof cannot be applied to a bit-field */
initialized = lut->state.bits.initialized; initialized = cm->lut3d_func.state.bits.initialized;
KUNIT_EXPECT_EQ(test, initialized, 1U); KUNIT_EXPECT_EQ(test, initialized, 1U);
KUNIT_EXPECT_FALSE(test, lut->lut_3d.use_tetrahedral_9); KUNIT_EXPECT_FALSE(test, cm->lut3d_func.lut_3d.use_tetrahedral_9);
KUNIT_EXPECT_TRUE(test, lut->lut_3d.use_12bits); KUNIT_EXPECT_TRUE(test, cm->lut3d_func.lut_3d.use_12bits);
} }
/** /**
@ -1209,29 +1209,29 @@ static void dm_test_atomic_lut3d_data_forwarded(struct kunit *test)
{ {
const uint32_t lut3d_size = 5; const uint32_t lut3d_size = 5;
struct drm_color_lut *lut_data; struct drm_color_lut *lut_data;
struct dc_3dlut *lut; struct dc_plane_cm *cm;
lut_data = kunit_kcalloc(test, lut3d_size, sizeof(*lut_data), GFP_KERNEL); lut_data = kunit_kcalloc(test, lut3d_size, sizeof(*lut_data), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, lut_data); KUNIT_ASSERT_NOT_NULL(test, lut_data);
lut = kunit_kzalloc(test, sizeof(*lut), GFP_KERNEL); cm = kunit_kzalloc(test, sizeof(*cm), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, lut); KUNIT_ASSERT_NOT_NULL(test, cm);
lut_data[0].red = 0xFFFF; lut_data[0].red = 0xFFFF;
lut_data[0].green = 0x8000; lut_data[0].green = 0x8000;
lut_data[0].blue = 0x4000; lut_data[0].blue = 0x4000;
amdgpu_dm_atomic_lut3d(lut_data, lut3d_size, lut); amdgpu_dm_atomic_lut3d(lut_data, lut3d_size, cm);
/* /*
* use_tetrahedral_9 == false → data goes into tetrahedral_17. * use_tetrahedral_9 == false → data goes into tetrahedral_17.
* lut[0] maps to lut0[0] (first element of the first group). * lut[0] maps to lut0[0] (first element of the first group).
*/ */
KUNIT_EXPECT_EQ(test, lut->lut_3d.tetrahedral_17.lut0[0].red, KUNIT_EXPECT_EQ(test, cm->lut3d_func.lut_3d.tetrahedral_17.lut0[0].red,
drm_color_lut_extract(0xFFFF, MAX_COLOR_3DLUT_BITDEPTH)); drm_color_lut_extract(0xFFFF, MAX_COLOR_3DLUT_BITDEPTH));
KUNIT_EXPECT_EQ(test, lut->lut_3d.tetrahedral_17.lut0[0].green, KUNIT_EXPECT_EQ(test, cm->lut3d_func.lut_3d.tetrahedral_17.lut0[0].green,
drm_color_lut_extract(0x8000, MAX_COLOR_3DLUT_BITDEPTH)); drm_color_lut_extract(0x8000, MAX_COLOR_3DLUT_BITDEPTH));
KUNIT_EXPECT_EQ(test, lut->lut_3d.tetrahedral_17.lut0[0].blue, KUNIT_EXPECT_EQ(test, cm->lut3d_func.lut_3d.tetrahedral_17.lut0[0].blue,
drm_color_lut_extract(0x4000, MAX_COLOR_3DLUT_BITDEPTH)); drm_color_lut_extract(0x4000, MAX_COLOR_3DLUT_BITDEPTH));
} }
@ -1398,19 +1398,19 @@ static void dm_test_set_atomic_regamma_bypass(struct kunit *test)
*/ */
static void dm_test_atomic_shaper_lut_bypass(struct kunit *test) static void dm_test_atomic_shaper_lut_bypass(struct kunit *test)
{ {
struct dc_transfer_func *func_shaper; struct dc_plane_cm *cm;
func_shaper = kunit_kzalloc(test, sizeof(*func_shaper), GFP_KERNEL); cm = kunit_kzalloc(test, sizeof(*cm), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, func_shaper); KUNIT_ASSERT_NOT_NULL(test, cm);
/* size=0 and tf=LINEAR: must take the bypass branch */ /* size=0 and tf=LINEAR: must take the bypass branch */
KUNIT_EXPECT_EQ(test, KUNIT_EXPECT_EQ(test,
amdgpu_dm_atomic_shaper_lut(NULL, false, amdgpu_dm_atomic_shaper_lut(NULL, false,
TRANSFER_FUNCTION_LINEAR, TRANSFER_FUNCTION_LINEAR,
0, func_shaper), 0, cm),
0); 0);
KUNIT_EXPECT_EQ(test, (int)func_shaper->type, (int)TF_TYPE_BYPASS); KUNIT_EXPECT_EQ(test, (int)cm->shaper_func.type, (int)TF_TYPE_BYPASS);
KUNIT_EXPECT_EQ(test, (int)func_shaper->tf, (int)TRANSFER_FUNCTION_LINEAR); KUNIT_EXPECT_EQ(test, (int)cm->shaper_func.tf, (int)TRANSFER_FUNCTION_LINEAR);
} }
/** /**
@ -1419,19 +1419,19 @@ static void dm_test_atomic_shaper_lut_bypass(struct kunit *test)
*/ */
static void dm_test_atomic_blend_lut_bypass(struct kunit *test) static void dm_test_atomic_blend_lut_bypass(struct kunit *test)
{ {
struct dc_transfer_func *func_blend; struct dc_plane_cm *cm;
func_blend = kunit_kzalloc(test, sizeof(*func_blend), GFP_KERNEL); cm = kunit_kzalloc(test, sizeof(*cm), GFP_KERNEL);
KUNIT_ASSERT_NOT_NULL(test, func_blend); KUNIT_ASSERT_NOT_NULL(test, cm);
/* size=0 and tf=LINEAR: must take the bypass branch */ /* size=0 and tf=LINEAR: must take the bypass branch */
KUNIT_EXPECT_EQ(test, KUNIT_EXPECT_EQ(test,
amdgpu_dm_atomic_blend_lut(NULL, false, amdgpu_dm_atomic_blend_lut(NULL, false,
TRANSFER_FUNCTION_LINEAR, TRANSFER_FUNCTION_LINEAR,
0, func_blend), 0, cm),
0); 0);
KUNIT_EXPECT_EQ(test, (int)func_blend->type, (int)TF_TYPE_BYPASS); KUNIT_EXPECT_EQ(test, (int)cm->blend_func.type, (int)TF_TYPE_BYPASS);
KUNIT_EXPECT_EQ(test, (int)func_blend->tf, (int)TRANSFER_FUNCTION_LINEAR); KUNIT_EXPECT_EQ(test, (int)cm->blend_func.tf, (int)TRANSFER_FUNCTION_LINEAR);
} }
/* ---- Tests for __set_colorop_in_tf_1d_curve ---- */ /* ---- Tests for __set_colorop_in_tf_1d_curve ---- */

132
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -2964,16 +2964,28 @@ static struct surface_update_descriptor det_surface_update(
elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM); elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM);
} }
if (u->blend_tf || (u->gamma && dce_use_lut(u->plane_info ? u->plane_info->format : u->surface->format))) { if ((u->cm && u->cm->flags.bits.blend_enable) ||
(u->gamma && dce_use_lut(u->plane_info ? u->plane_info->format : u->surface->format))) {
update_flags->bits.gamma_change = 1; update_flags->bits.gamma_change = 1;
elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM); elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM);
} }
if (u->lut3d_func || u->func_shaper) { if (u->cm && (u->cm->flags.bits.lut3d_enable || u->cm->flags.bits.shaper_enable)) {
update_flags->bits.lut_3d = 1; update_flags->bits.lut_3d = 1;
elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM); elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM);
} }
if (u->cm && u->cm->flags.bits.lut3d_dma_enable != u->surface->cm.flags.bits.lut3d_dma_enable &&
u->cm->flags.bits.lut3d_enable && u->surface->cm.flags.bits.lut3d_enable) {
/* Toggling 3DLUT loading between DMA and Host is illegal */
BREAK_TO_DEBUGGER();
}
if (u->cm && u->cm->flags.bits.lut3d_enable && !u->cm->flags.bits.lut3d_dma_enable) {
/* Host loading 3DLUT requires full update but only stream lock */
elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_STREAM);
}
if (u->hdr_mult.value) if (u->hdr_mult.value)
if (u->hdr_mult.value != u->surface->hdr_mult.value) { if (u->hdr_mult.value != u->surface->hdr_mult.value) {
// TODO: Should be fast? // TODO: Should be fast?
@ -2992,17 +3004,30 @@ static struct surface_update_descriptor det_surface_update(
update_flags->bits.cm_hist_change = 1; update_flags->bits.cm_hist_change = 1;
elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM); elevate_update_type(&overall_type, UPDATE_TYPE_FAST, LOCK_DESCRIPTOR_STREAM);
} }
if (u->cm2_params) {
if (u->cm2_params->component_settings.shaper_3dlut_setting != u->surface->mcm_shaper_3dlut_setting if (u->cm) {
|| u->cm2_params->component_settings.lut1d_enable != u->surface->mcm_lut1d_enable const union dc_plane_cm_flags blend_only_flags = {
|| u->cm2_params->cm2_luts.lut3d_data.lut3d_src != u->surface->mcm_luts.lut3d_data.lut3d_src) { .bits = {
.blend_enable = 1,
}
};
if (u->cm->flags.bits.shaper_enable != u->surface->cm.flags.bits.shaper_enable
|| u->cm->flags.bits.blend_enable != u->surface->cm.flags.bits.blend_enable
|| u->cm->flags.bits.lut3d_enable != u->surface->cm.flags.bits.lut3d_enable
|| u->cm->flags.bits.lut3d_dma_enable != u->surface->cm.flags.bits.lut3d_dma_enable) {
update_flags->bits.mcm_transfer_function_enable_change = 1; update_flags->bits.mcm_transfer_function_enable_change = 1;
elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_GLOBAL); elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_GLOBAL);
} }
if ((u->cm->flags.all != blend_only_flags.all && u->cm->flags.all != 0) ||
(u->surface->cm.flags.all != blend_only_flags.all && u->surface->cm.flags.all != 0)) {
elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_GLOBAL);
}
} }
if (update_flags->bits.lut_3d && if (update_flags->bits.lut_3d &&
u->surface->mcm_luts.lut3d_data.lut3d_src != DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM) { !u->surface->cm.flags.bits.lut3d_dma_enable) {
elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_GLOBAL); elevate_update_type(&overall_type, UPDATE_TYPE_FULL, LOCK_DESCRIPTOR_GLOBAL);
} }
@ -3304,24 +3329,55 @@ static void copy_surface_update_to_plane(
sizeof(struct dc_transfer_func_distributed_points)); sizeof(struct dc_transfer_func_distributed_points));
} }
if (srf_update->cm2_params) { /* Shaper, 3DLUT, 1DLUT */
surface->mcm_shaper_3dlut_setting = srf_update->cm2_params->component_settings.shaper_3dlut_setting; if (srf_update->cm) {
surface->mcm_lut1d_enable = srf_update->cm2_params->component_settings.lut1d_enable; struct kref refcount = surface->cm.refcount;
surface->mcm_luts = srf_update->cm2_params->cm2_luts;
memcpy(&surface->cm, srf_update->cm, sizeof(surface->cm));
surface->cm.refcount = refcount;
#ifndef TRIM_CM2
/* Populate mcm_luts from cm for legacy consumers (dml2, hwseq) */
surface->mcm_luts.lut1d_func = &surface->cm.blend_func;
surface->mcm_luts.shaper = &surface->cm.shaper_func;
if (srf_update->cm->flags.bits.lut3d_dma_enable) {
surface->mcm_luts.lut3d_data.lut3d_src = DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM;
surface->mcm_luts.lut3d_data.gpu_mem_params.addr = surface->cm.lut3d_dma.addr;
surface->mcm_luts.lut3d_data.gpu_mem_params.layout =
(surface->cm.lut3d_dma.swizzle == CM_LUT_3D_SWIZZLE_LINEAR_RGB) ?
DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_RGB :
(surface->cm.lut3d_dma.swizzle == CM_LUT_3D_SWIZZLE_LINEAR_BGR) ?
DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_BGR :
DC_CM2_GPU_MEM_LAYOUT_1D_PACKED_LINEAR;
surface->mcm_luts.lut3d_data.gpu_mem_params.format_params.format =
(surface->cm.lut3d_dma.format == CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB) ?
DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12MSB :
(surface->cm.lut3d_dma.format == CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB) ?
DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12LSB :
DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10;
surface->mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.bias =
surface->cm.lut3d_dma.bias;
surface->mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.scale =
surface->cm.lut3d_dma.scale;
surface->mcm_luts.lut3d_data.gpu_mem_params.component_order =
DC_CM2_GPU_MEM_PIXEL_COMPONENT_ORDER_RGBA;
surface->mcm_luts.lut3d_data.gpu_mem_params.size = DC_CM2_GPU_MEM_SIZE_TRANSFORMED;
surface->mcm_luts.lut3d_data.mpc_3dlut_enable = (srf_update->cm->flags.bits.lut3d_enable != 0);
} else {
surface->mcm_luts.lut3d_data.lut3d_src = DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM;
surface->mcm_luts.lut3d_data.lut3d_func = &surface->cm.lut3d_func;
}
if (srf_update->cm->flags.bits.shaper_enable &&
srf_update->cm->flags.bits.lut3d_enable)
surface->mcm_shaper_3dlut_setting = DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT;
else if (srf_update->cm->flags.bits.shaper_enable)
surface->mcm_shaper_3dlut_setting = DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER;
else
surface->mcm_shaper_3dlut_setting = DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL;
#endif /* TRIM_CM2 */
} }
if (srf_update->func_shaper) {
memcpy(&surface->in_shaper_func, srf_update->func_shaper,
sizeof(surface->in_shaper_func));
if (surface->mcm_shaper_3dlut_setting >= DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER)
surface->mcm_luts.shaper = &surface->in_shaper_func;
}
if (srf_update->lut3d_func)
memcpy(&surface->lut3d_func, srf_update->lut3d_func,
sizeof(surface->lut3d_func));
if (srf_update->hdr_mult.value) if (srf_update->hdr_mult.value)
surface->hdr_mult = surface->hdr_mult =
srf_update->hdr_mult; srf_update->hdr_mult;
@ -3330,15 +3386,10 @@ static void copy_surface_update_to_plane(
surface->sdr_white_level_nits = surface->sdr_white_level_nits =
srf_update->sdr_white_level_nits; srf_update->sdr_white_level_nits;
if (srf_update->blend_tf) { if (srf_update->cm &&
memcpy(&surface->blend_tf, srf_update->blend_tf, (srf_update->cm->flags.bits.blend_enable ||
sizeof(surface->blend_tf)); srf_update->cm->flags.bits.shaper_enable ||
srf_update->cm->flags.bits.lut3d_enable))
if (surface->mcm_lut1d_enable)
surface->mcm_luts.lut1d_func = &surface->blend_tf;
}
if (srf_update->cm2_params || srf_update->blend_tf)
surface->lut_bank_a = !surface->lut_bank_a; surface->lut_bank_a = !surface->lut_bank_a;
if (srf_update->input_csc_color_matrix) if (srf_update->input_csc_color_matrix)
@ -5073,11 +5124,9 @@ static void commit_planes_for_stream(struct dc *dc,
if (!should_update_pipe_for_plane(context, pipe_ctx, plane_state)) if (!should_update_pipe_for_plane(context, pipe_ctx, plane_state))
continue; continue;
if (srf_updates[i].cm2_params && if (srf_updates[i].cm &&
srf_updates[i].cm2_params->cm2_luts.lut3d_data.lut3d_src == srf_updates[i].cm->flags.bits.lut3d_enable &&
DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM && srf_updates[i].cm->flags.bits.lut3d_dma_enable &&
srf_updates[i].cm2_params->component_settings.shaper_3dlut_setting ==
DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT &&
dc->hwss.trigger_3dlut_dma_load) dc->hwss.trigger_3dlut_dma_load)
dc->hwss.trigger_3dlut_dma_load(dc, pipe_ctx); dc->hwss.trigger_3dlut_dma_load(dc, pipe_ctx);
@ -5792,14 +5841,9 @@ static bool full_update_required(
(srf_updates[i].sdr_white_level_nits && (srf_updates[i].sdr_white_level_nits &&
srf_updates[i].sdr_white_level_nits != srf_updates->surface->sdr_white_level_nits) || srf_updates[i].sdr_white_level_nits != srf_updates->surface->sdr_white_level_nits) ||
srf_updates[i].in_transfer_func || srf_updates[i].in_transfer_func ||
srf_updates[i].func_shaper ||
srf_updates[i].lut3d_func ||
srf_updates[i].surface->force_full_update || srf_updates[i].surface->force_full_update ||
(srf_updates[i].flip_addr && (srf_updates[i].flip_addr &&
srf_updates[i].flip_addr->address.tmz_surface != srf_updates[i].surface->address.tmz_surface) || srf_updates[i].flip_addr->address.tmz_surface != srf_updates[i].surface->address.tmz_surface)))
(srf_updates[i].cm2_params &&
(srf_updates[i].cm2_params->component_settings.shaper_3dlut_setting != srf_updates[i].surface->mcm_shaper_3dlut_setting ||
srf_updates[i].cm2_params->component_settings.lut1d_enable != srf_updates[i].surface->mcm_lut1d_enable))))
return true; return true;
} }
@ -7542,7 +7586,7 @@ bool dc_capture_register_software_state(struct dc *dc, struct dc_register_softwa
struct dc_plane_state *plane_state = pipe_ctx->plane_state; struct dc_plane_state *plane_state = pipe_ctx->plane_state;
/* MPCC blending tree and mode control - capture actual blend configuration */ /* MPCC blending tree and mode control - capture actual blend configuration */
state->mpc.mpcc_mode[i] = (plane_state->blend_tf.type != TF_TYPE_BYPASS) ? 1 : 0; state->mpc.mpcc_mode[i] = (plane_state->cm.blend_func.type != TF_TYPE_BYPASS) ? 1 : 0;
state->mpc.mpcc_alpha_blend_mode[i] = plane_state->per_pixel_alpha ? 1 : 0; state->mpc.mpcc_alpha_blend_mode[i] = plane_state->per_pixel_alpha ? 1 : 0;
state->mpc.mpcc_alpha_multiplied_mode[i] = plane_state->pre_multiplied_alpha ? 1 : 0; state->mpc.mpcc_alpha_multiplied_mode[i] = plane_state->pre_multiplied_alpha ? 1 : 0;
state->mpc.mpcc_blnd_active_overlap_only[i] = 0; /* Default - no overlap restriction */ state->mpc.mpcc_blnd_active_overlap_only[i] = 0; /* Default - no overlap restriction */

44
drivers/gpu/drm/amd/display/dc/core/dc_surface.c
View File

@ -45,14 +45,13 @@ void dc_plane_construct(struct dc_context *ctx, struct dc_plane_state *plane_sta
plane_state->in_transfer_func.type = TF_TYPE_BYPASS; plane_state->in_transfer_func.type = TF_TYPE_BYPASS;
plane_state->in_shaper_func.type = TF_TYPE_BYPASS;
plane_state->lut3d_func.state.raw = 0;
plane_state->blend_tf.type = TF_TYPE_BYPASS;
plane_state->pre_multiplied_alpha = true; plane_state->pre_multiplied_alpha = true;
/* CM */
plane_state->cm.shaper_func.type = TF_TYPE_BYPASS;
plane_state->cm.blend_func.type = TF_TYPE_BYPASS;
plane_state->cm.lut3d_func.state.raw = 0;
plane_state->cm.flags.all = 0;
} }
void dc_plane_destruct(struct dc_plane_state *plane_state) void dc_plane_destruct(struct dc_plane_state *plane_state)
@ -282,6 +281,39 @@ void dc_3dlut_func_retain(struct dc_3dlut *lut)
kref_get(&lut->refcount); kref_get(&lut->refcount);
} }
static void dc_plane_cm_free(struct kref *kref)
{
struct dc_plane_cm *cm = container_of(kref, struct dc_plane_cm, refcount);
kvfree(cm);
}
struct dc_plane_cm *dc_plane_cm_create(void)
{
struct dc_plane_cm *cm = kvzalloc(sizeof(*cm), GFP_KERNEL);
if (cm == NULL)
goto alloc_fail;
kref_init(&cm->refcount);
return cm;
alloc_fail:
return NULL;
}
void dc_plane_cm_release(struct dc_plane_cm *cm)
{
kref_put(&cm->refcount, dc_plane_cm_free);
}
void dc_plane_cm_retain(struct dc_plane_cm *cm)
{
kref_get(&cm->refcount);
}
void dc_plane_force_dcc_and_tiling_disable(struct dc_plane_state *plane_state, void dc_plane_force_dcc_and_tiling_disable(struct dc_plane_state *plane_state,
bool clear_tiling) bool clear_tiling)
{ {

72
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -1486,6 +1486,47 @@ struct dc_3dlut {
struct fixed31_32 hdr_multiplier; struct fixed31_32 hdr_multiplier;
union dc_3dlut_state state; union dc_3dlut_state state;
}; };
/* 3DLUT DMA (Fast Load) params */
struct dc_3dlut_dma {
struct dc_plane_address addr;
enum dc_cm_lut_swizzle swizzle;
enum dc_cm_lut_pixel_format format;
uint16_t bias; /* FP1.5.10 */
uint16_t scale; /* FP1.5.10 */
enum dc_cm_lut_size size;
};
/* color manager */
union dc_plane_cm_flags {
unsigned int all;
struct {
unsigned int shaper_enable : 1;
unsigned int lut3d_enable : 1;
unsigned int blend_enable : 1;
/* whether legacy (lut3d_func) or DMA is valid */
unsigned int lut3d_dma_enable : 1;
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
/* RMCM lut to be used instead of MCM */
unsigned int rmcm_enable : 1;
unsigned int reserved: 27;
#else
unsigned int reserved: 28;
#endif
} bits;
};
struct dc_plane_cm {
struct kref refcount;
struct dc_transfer_func shaper_func;
union {
struct dc_3dlut lut3d_func;
struct dc_3dlut_dma lut3d_dma;
};
struct dc_transfer_func blend_func;
union dc_plane_cm_flags flags;
};
/* /*
* This structure is filled in by dc_surface_get_status and contains * This structure is filled in by dc_surface_get_status and contains
* the last requested address and the currently active address so the called * the last requested address and the currently active address so the called
@ -1564,14 +1605,22 @@ struct dc_plane_state {
struct fixed31_32 hdr_mult; struct fixed31_32 hdr_mult;
struct colorspace_transform gamut_remap_matrix; struct colorspace_transform gamut_remap_matrix;
enum dc_color_space color_space;
#ifndef TRIM_CM2
// TODO: No longer used, remove // TODO: No longer used, remove
struct dc_hdr_static_metadata hdr_static_ctx; struct dc_hdr_static_metadata hdr_static_ctx;
enum dc_color_space color_space;
struct dc_3dlut lut3d_func; struct dc_3dlut lut3d_func;
struct dc_transfer_func in_shaper_func; struct dc_transfer_func in_shaper_func;
struct dc_transfer_func blend_tf; struct dc_transfer_func blend_tf;
enum dc_cm2_shaper_3dlut_setting mcm_shaper_3dlut_setting;
bool mcm_lut1d_enable;
struct dc_cm2_func_luts mcm_luts;
#endif /* TRIM_CM2 */
bool lut_bank_a;
enum mpcc_movable_cm_location mcm_location;
struct dc_plane_cm cm;
struct dc_transfer_func *gamcor_tf; struct dc_transfer_func *gamcor_tf;
enum surface_pixel_format format; enum surface_pixel_format format;
@ -1608,11 +1657,6 @@ struct dc_plane_state {
bool is_statically_allocated; bool is_statically_allocated;
enum chroma_cositing cositing; enum chroma_cositing cositing;
enum dc_cm2_shaper_3dlut_setting mcm_shaper_3dlut_setting;
bool mcm_lut1d_enable;
struct dc_cm2_func_luts mcm_luts;
bool lut_bank_a;
enum mpcc_movable_cm_location mcm_location;
struct dc_csc_transform cursor_csc_color_matrix; struct dc_csc_transform cursor_csc_color_matrix;
bool adaptive_sharpness_en; bool adaptive_sharpness_en;
int adaptive_sharpness_policy; int adaptive_sharpness_policy;
@ -1976,17 +2020,7 @@ struct dc_surface_update {
const struct dc_csc_transform *input_csc_color_matrix; const struct dc_csc_transform *input_csc_color_matrix;
const struct fixed31_32 *coeff_reduction_factor; const struct fixed31_32 *coeff_reduction_factor;
const struct dc_transfer_func *func_shaper;
const struct dc_3dlut *lut3d_func;
const struct dc_transfer_func *blend_tf;
const struct colorspace_transform *gamut_remap_matrix; const struct colorspace_transform *gamut_remap_matrix;
/*
* Color Transformations for pre-blend MCM (Shaper, 3DLUT, 1DLUT)
*
* change cm2_params.component_settings: Full update
* change cm2_params.cm2_luts: Fast update
*/
const struct dc_cm2_parameters *cm2_params;
const struct dc_plane_cm *cm; const struct dc_plane_cm *cm;
const struct dc_csc_transform *cursor_csc_color_matrix; const struct dc_csc_transform *cursor_csc_color_matrix;
unsigned int sdr_white_level_nits; unsigned int sdr_white_level_nits;
@ -2032,6 +2066,10 @@ struct dc_3dlut *dc_create_3dlut_func(void);
void dc_3dlut_func_release(struct dc_3dlut *lut); void dc_3dlut_func_release(struct dc_3dlut *lut);
void dc_3dlut_func_retain(struct dc_3dlut *lut); void dc_3dlut_func_retain(struct dc_3dlut *lut);
struct dc_plane_cm *dc_plane_cm_create(void);
void dc_plane_cm_release(struct dc_plane_cm *cm);
void dc_plane_cm_retain(struct dc_plane_cm *cm);
void dc_post_update_surfaces_to_stream( void dc_post_update_surfaces_to_stream(
struct dc *dc); struct dc *dc);

66
drivers/gpu/drm/amd/display/dc/dc_types.h
View File

@ -1397,6 +1397,39 @@ enum dc_hpd_enable_select {
HPD_EN_FOR_SECONDARY_EDP_ONLY, HPD_EN_FOR_SECONDARY_EDP_ONLY,
}; };
enum dc_cm_lut_swizzle {
CM_LUT_3D_SWIZZLE_LINEAR_RGB,
CM_LUT_3D_SWIZZLE_LINEAR_BGR,
CM_LUT_1D_PACKED_LINEAR
};
enum dc_cm_lut_pixel_format {
CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB,
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
CM_LUT_PIXEL_FORMAT_BGRA16161616_UNORM_12MSB,
#endif
CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB,
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
CM_LUT_PIXEL_FORMAT_BGRA16161616_UNORM_12LSB,
#endif
CM_LUT_PIXEL_FORMAT_RGBA16161616_FLOAT_FP1_5_10,
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
CM_LUT_PIXEL_FORMAT_BGRA16161616_FLOAT_FP1_5_10
#endif
};
enum dc_cm_lut_size {
CM_LUT_SIZE_NONE,
CM_LUT_SIZE_999,
CM_LUT_SIZE_171717,
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
CM_LUT_SIZE_333333,
CM_LUT_SIZE_454545,
CM_LUT_SIZE_656565,
#endif
};
#ifndef TRIM_CM2
enum dc_cm2_shaper_3dlut_setting { enum dc_cm2_shaper_3dlut_setting {
DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL, DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL,
DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER, DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER,
@ -1421,6 +1454,16 @@ enum dc_cm2_gpu_mem_format {
DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10 DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10
}; };
enum dc_cm2_gpu_mem_size {
DC_CM2_GPU_MEM_SIZE_171717,
DC_CM2_GPU_MEM_SIZE_333333,
DC_CM2_GPU_MEM_SIZE_454545,
DC_CM2_GPU_MEM_SIZE_656565,
DC_CM2_GPU_MEM_SIZE_TRANSFORMED,
};
#endif /* TRIM_CM2 */
#ifndef TRIM_CM2
struct dc_cm2_gpu_mem_format_parameters { struct dc_cm2_gpu_mem_format_parameters {
enum dc_cm2_gpu_mem_format format; enum dc_cm2_gpu_mem_format format;
union { union {
@ -1432,14 +1475,6 @@ struct dc_cm2_gpu_mem_format_parameters {
}; };
}; };
enum dc_cm2_gpu_mem_size {
DC_CM2_GPU_MEM_SIZE_171717,
DC_CM2_GPU_MEM_SIZE_333333,
DC_CM2_GPU_MEM_SIZE_454545,
DC_CM2_GPU_MEM_SIZE_656565,
DC_CM2_GPU_MEM_SIZE_TRANSFORMED,
};
struct dc_cm2_gpu_mem_parameters { struct dc_cm2_gpu_mem_parameters {
struct dc_plane_address addr; struct dc_plane_address addr;
enum dc_cm2_gpu_mem_layout layout; enum dc_cm2_gpu_mem_layout layout;
@ -1448,17 +1483,16 @@ struct dc_cm2_gpu_mem_parameters {
enum dc_cm2_gpu_mem_size size; enum dc_cm2_gpu_mem_size size;
uint16_t bit_depth; uint16_t bit_depth;
}; };
#endif /* TRIM_CM2 */
#ifndef TRIM_CM2
enum dc_cm2_transfer_func_source { enum dc_cm2_transfer_func_source {
DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM, DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM,
DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM
}; };
#endif /* TRIM_CM2 */
struct dc_cm2_component_settings { #ifndef TRIM_CM2
enum dc_cm2_shaper_3dlut_setting shaper_3dlut_setting;
bool lut1d_enable;
};
/* /*
* All pointers in this struct must remain valid for as long as the 3DLUTs are used * All pointers in this struct must remain valid for as long as the 3DLUTs are used
*/ */
@ -1478,11 +1512,7 @@ struct dc_cm2_func_luts {
} lut3d_data; } lut3d_data;
const struct dc_transfer_func *lut1d_func; const struct dc_transfer_func *lut1d_func;
}; };
#endif /* TRIM_CM2 */
struct dc_cm2_parameters {
struct dc_cm2_component_settings component_settings;
struct dc_cm2_func_luts cm2_luts;
};
enum mall_stream_type { enum mall_stream_type {
SUBVP_NONE, // subvp not in use SUBVP_NONE, // subvp not in use

2
drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c
View File

@ -136,7 +136,7 @@ void hubp401_program_3dlut_fl_config(
uint32_t mpc_width = {(cfg->width == 17) ? 0 : 1}; uint32_t mpc_width = {(cfg->width == 17) ? 0 : 1};
uint32_t width = {cfg->width}; uint32_t width = {cfg->width};
if (cfg->layout == DC_CM2_GPU_MEM_LAYOUT_1D_PACKED_LINEAR) if (cfg->layout == CM_LUT_1D_PACKED_LINEAR)
width = (cfg->width == 17) ? 4916 : 35940; width = (cfg->width == 17) ? 4916 : 35940;
REG_UPDATE_2(_3DLUT_FL_CONFIG, REG_UPDATE_2(_3DLUT_FL_CONFIG,

20
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
View File

@ -1066,11 +1066,11 @@ bool dcn20_set_blend_lut(
bool result = true; bool result = true;
const struct pwl_params *blend_lut = NULL; const struct pwl_params *blend_lut = NULL;
if (plane_state->blend_tf.type == TF_TYPE_HWPWL) if (plane_state->cm.blend_func.type == TF_TYPE_HWPWL)
blend_lut = &plane_state->blend_tf.pwl; blend_lut = &plane_state->cm.blend_func.pwl;
else if (plane_state->blend_tf.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
cm_helper_translate_curve_to_hw_format(plane_state->ctx, cm_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->blend_tf, &plane_state->cm.blend_func,
&dpp_base->regamma_params, false); &dpp_base->regamma_params, false);
blend_lut = &dpp_base->regamma_params; blend_lut = &dpp_base->regamma_params;
} }
@ -1086,19 +1086,19 @@ bool dcn20_set_shaper_3dlut(
bool result = true; bool result = true;
const struct pwl_params *shaper_lut = NULL; const struct pwl_params *shaper_lut = NULL;
if (plane_state->in_shaper_func.type == TF_TYPE_HWPWL) if (plane_state->cm.shaper_func.type == TF_TYPE_HWPWL)
shaper_lut = &plane_state->in_shaper_func.pwl; shaper_lut = &plane_state->cm.shaper_func.pwl;
else if (plane_state->in_shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
cm_helper_translate_curve_to_hw_format(plane_state->ctx, cm_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->in_shaper_func, &plane_state->cm.shaper_func,
&dpp_base->shaper_params, true); &dpp_base->shaper_params, true);
shaper_lut = &dpp_base->shaper_params; shaper_lut = &dpp_base->shaper_params;
} }
result = dpp_base->funcs->dpp_program_shaper_lut(dpp_base, shaper_lut); result = dpp_base->funcs->dpp_program_shaper_lut(dpp_base, shaper_lut);
if (plane_state->lut3d_func.state.bits.initialized == 1) if (plane_state->cm.lut3d_func.state.bits.initialized == 1)
result = dpp_base->funcs->dpp_program_3dlut(dpp_base, result = dpp_base->funcs->dpp_program_3dlut(dpp_base,
&plane_state->lut3d_func.lut_3d); &plane_state->cm.lut3d_func.lut_3d);
else else
result = dpp_base->funcs->dpp_program_3dlut(dpp_base, NULL); result = dpp_base->funcs->dpp_program_3dlut(dpp_base, NULL);

10
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c
View File

@ -239,11 +239,13 @@ bool dcn30_set_blend_lut(
bool result = true; bool result = true;
const struct pwl_params *blend_lut = NULL; const struct pwl_params *blend_lut = NULL;
if (plane_state->blend_tf.type == TF_TYPE_HWPWL) if (plane_state->cm.blend_func.type == TF_TYPE_HWPWL)
blend_lut = &plane_state->blend_tf.pwl; blend_lut = &plane_state->cm.blend_func.pwl;
else if (plane_state->blend_tf.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
result = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, result = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->blend_tf, &dpp_base->regamma_params, false); &plane_state->cm.blend_func,
&dpp_base->regamma_params,
false);
if (!result) if (!result)
return result; return result;

29
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
View File

@ -490,12 +490,14 @@ bool dcn32_set_mcm_luts(
const struct pwl_params *lut_params = NULL; const struct pwl_params *lut_params = NULL;
// 1D LUT // 1D LUT
if (plane_state->blend_tf.type == TF_TYPE_HWPWL) if (plane_state->cm.blend_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->blend_tf.pwl; lut_params = &plane_state->cm.blend_func.pwl;
else if (plane_state->blend_tf.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
result = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, result = cm3_helper_translate_curve_to_hw_format(
&plane_state->blend_tf, plane_state->ctx,
&dpp_base->regamma_params, false); &plane_state->cm.blend_func,
&dpp_base->regamma_params,
false);
if (!result) if (!result)
return result; return result;
@ -505,21 +507,22 @@ bool dcn32_set_mcm_luts(
lut_params = NULL; lut_params = NULL;
// Shaper // Shaper
if (plane_state->in_shaper_func.type == TF_TYPE_HWPWL) if (plane_state->cm.shaper_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->in_shaper_func.pwl; lut_params = &plane_state->cm.shaper_func.pwl;
else if (plane_state->in_shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
// TODO: dpp_base replace // TODO: dpp_base replace
rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->in_shaper_func, &plane_state->cm.shaper_func,
&dpp_base->shaper_params, true); &dpp_base->shaper_params,
true);
lut_params = rval ? &dpp_base->shaper_params : NULL; lut_params = rval ? &dpp_base->shaper_params : NULL;
} }
mpc->funcs->program_shaper(mpc, lut_params, mpcc_id); mpc->funcs->program_shaper(mpc, lut_params, mpcc_id);
// 3D // 3D
if (plane_state->lut3d_func.state.bits.initialized == 1) if (plane_state->cm.lut3d_func.state.bits.initialized == 1)
result = mpc->funcs->program_3dlut(mpc, &plane_state->lut3d_func.lut_3d, mpcc_id); result = mpc->funcs->program_3dlut(mpc, &plane_state->cm.lut3d_func.lut_3d, mpcc_id);
else else
result = mpc->funcs->program_3dlut(mpc, NULL, mpcc_id); result = mpc->funcs->program_3dlut(mpc, NULL, mpcc_id);

172
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
View File

@ -410,37 +410,27 @@ static void dcn401_get_mcm_lut_xable_from_pipe_ctx(struct dc *dc, struct pipe_ct
enum MCM_LUT_XABLE *lut3d_xable, enum MCM_LUT_XABLE *lut3d_xable,
enum MCM_LUT_XABLE *lut1d_xable) enum MCM_LUT_XABLE *lut1d_xable)
{ {
enum dc_cm2_shaper_3dlut_setting shaper_3dlut_setting = DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL;
bool lut1d_enable = false;
struct mpc *mpc = dc->res_pool->mpc; struct mpc *mpc = dc->res_pool->mpc;
int mpcc_id = pipe_ctx->plane_res.hubp->inst; int mpcc_id = pipe_ctx->plane_res.hubp->inst;
if (!pipe_ctx->plane_state) if (!pipe_ctx->plane_state)
return; return;
shaper_3dlut_setting = pipe_ctx->plane_state->mcm_shaper_3dlut_setting;
lut1d_enable = pipe_ctx->plane_state->mcm_lut1d_enable;
mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id); mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id);
pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE; pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE;
*lut1d_xable = lut1d_enable ? MCM_LUT_ENABLE : MCM_LUT_DISABLE; *lut1d_xable = pipe_ctx->plane_state->cm.flags.bits.blend_enable ?
MCM_LUT_ENABLE : MCM_LUT_DISABLE;
switch (shaper_3dlut_setting) { *shaper_xable = pipe_ctx->plane_state->cm.flags.bits.shaper_enable ?
case DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL: MCM_LUT_ENABLE : MCM_LUT_DISABLE;
*lut3d_xable = *shaper_xable = MCM_LUT_DISABLE; *lut3d_xable = (pipe_ctx->plane_state->cm.flags.bits.shaper_enable &&
break; pipe_ctx->plane_state->cm.flags.bits.lut3d_enable) ?
case DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER: MCM_LUT_ENABLE : MCM_LUT_DISABLE;
*lut3d_xable = MCM_LUT_DISABLE;
*shaper_xable = MCM_LUT_ENABLE;
break;
case DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT:
*lut3d_xable = *shaper_xable = MCM_LUT_ENABLE;
break;
}
} }
void dcn401_populate_mcm_luts(struct dc *dc, void dcn401_populate_mcm_luts(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
struct dc_cm2_func_luts mcm_luts, const struct dc_plane_cm *cm,
bool lut_bank_a) bool lut_bank_a)
{ {
struct dpp *dpp_base = pipe_ctx->plane_res.dpp; struct dpp *dpp_base = pipe_ctx->plane_res.dpp;
@ -448,14 +438,17 @@ void dcn401_populate_mcm_luts(struct dc *dc,
int mpcc_id = hubp->inst; int mpcc_id = hubp->inst;
struct mpc *mpc = dc->res_pool->mpc; struct mpc *mpc = dc->res_pool->mpc;
union mcm_lut_params m_lut_params; union mcm_lut_params m_lut_params;
enum dc_cm2_transfer_func_source lut3d_src = mcm_luts.lut3d_data.lut3d_src; const bool lut3d_dma = !!cm->flags.bits.lut3d_dma_enable;
enum hubp_3dlut_fl_format format = 0; enum hubp_3dlut_fl_format format = 0;
enum hubp_3dlut_fl_mode mode; enum hubp_3dlut_fl_mode mode;
enum hubp_3dlut_fl_width width = 0; /* Width was previously hard-coded to TRANSFORMED via local_mcm build,
* preserve identical behavior.
*/
enum hubp_3dlut_fl_width width = hubp_3dlut_fl_width_transformed;
enum hubp_3dlut_fl_addressing_mode addr_mode; enum hubp_3dlut_fl_addressing_mode addr_mode;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cr_r = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cr_r;
enum MCM_LUT_XABLE shaper_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE shaper_xable = MCM_LUT_DISABLE;
enum MCM_LUT_XABLE lut3d_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE lut3d_xable = MCM_LUT_DISABLE;
enum MCM_LUT_XABLE lut1d_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE lut1d_xable = MCM_LUT_DISABLE;
@ -464,13 +457,13 @@ void dcn401_populate_mcm_luts(struct dc *dc,
dcn401_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable); dcn401_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable);
/* 1D LUT */ /* 1D LUT */
if (mcm_luts.lut1d_func) { {
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (mcm_luts.lut1d_func->type == TF_TYPE_HWPWL) if (cm->blend_func.type == TF_TYPE_HWPWL)
m_lut_params.pwl = &mcm_luts.lut1d_func->pwl; m_lut_params.pwl = &cm->blend_func.pwl;
else if (mcm_luts.lut1d_func->type == TF_TYPE_DISTRIBUTED_POINTS) { else if (cm->blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx, rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx,
mcm_luts.lut1d_func, &cm->blend_func,
&dpp_base->regamma_params, false); &dpp_base->regamma_params, false);
m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL; m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL;
} }
@ -483,14 +476,14 @@ void dcn401_populate_mcm_luts(struct dc *dc,
} }
/* Shaper */ /* Shaper */
if (mcm_luts.shaper && mcm_luts.lut3d_data.mpc_3dlut_enable) { if (cm->flags.bits.lut3d_enable) {
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (mcm_luts.shaper->type == TF_TYPE_HWPWL) if (cm->shaper_func.type == TF_TYPE_HWPWL)
m_lut_params.pwl = &mcm_luts.shaper->pwl; m_lut_params.pwl = &cm->shaper_func.pwl;
else if (mcm_luts.shaper->type == TF_TYPE_DISTRIBUTED_POINTS) { else if (cm->shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
ASSERT(false); ASSERT(false);
rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx, rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx,
mcm_luts.shaper, &cm->shaper_func,
&dpp_base->regamma_params, true); &dpp_base->regamma_params, true);
m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL; m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL;
} }
@ -503,42 +496,43 @@ void dcn401_populate_mcm_luts(struct dc *dc,
} }
/* 3DLUT */ /* 3DLUT */
switch (lut3d_src) { if (!lut3d_dma) {
case DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM: /* SYSMEM (legacy lut3d_func) */
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (hubp->funcs->hubp_enable_3dlut_fl) if (hubp->funcs->hubp_enable_3dlut_fl)
hubp->funcs->hubp_enable_3dlut_fl(hubp, false); hubp->funcs->hubp_enable_3dlut_fl(hubp, false);
if (mcm_luts.lut3d_data.lut3d_func && mcm_luts.lut3d_data.lut3d_func->state.bits.initialized) { if (cm->lut3d_func.state.bits.initialized) {
m_lut_params.lut3d = &mcm_luts.lut3d_data.lut3d_func->lut_3d; m_lut_params.lut3d = &cm->lut3d_func.lut_3d;
if (mpc->funcs->populate_lut) if (mpc->funcs->populate_lut)
mpc->funcs->populate_lut(mpc, MCM_LUT_3DLUT, m_lut_params, lut_bank_a, mpcc_id); mpc->funcs->populate_lut(mpc, MCM_LUT_3DLUT, m_lut_params, lut_bank_a, mpcc_id);
if (mpc->funcs->program_lut_mode) if (mpc->funcs->program_lut_mode)
mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a,
mpcc_id); mpcc_id);
} }
break; } else {
case DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM: /* VIDMEM (3DLUT DMA Fast Load) */
switch (mcm_luts.lut3d_data.gpu_mem_params.size) {
case DC_CM2_GPU_MEM_SIZE_333333: /* Select width based on the requested LUT size */
switch (cm->lut3d_dma.size) {
#if defined(CONFIG_DRM_AMD_DC_DCN4_2)
case CM_LUT_SIZE_333333:
if (dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_33) if (dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_33)
width = hubp_3dlut_fl_width_33; width = hubp_3dlut_fl_width_33;
break; break;
case DC_CM2_GPU_MEM_SIZE_171717: #endif // CONFIG_DRM_AMD_DC_DCN4_2
case CM_LUT_SIZE_171717:
width = hubp_3dlut_fl_width_17; width = hubp_3dlut_fl_width_17;
break; break;
case DC_CM2_GPU_MEM_SIZE_TRANSFORMED:
width = hubp_3dlut_fl_width_transformed;
break;
default: default:
//TODO: handle default case /* keep default hubp_3dlut_fl_width_transformed */
break; break;
} }
//check for support //check for support
if (mpc->funcs->mcm.is_config_supported && if (mpc->funcs->mcm.is_config_supported &&
!mpc->funcs->mcm.is_config_supported(width)) !mpc->funcs->mcm.is_config_supported(width))
break; return;
if (mpc->funcs->program_lut_read_write_control) if (mpc->funcs->program_lut_read_write_control)
mpc->funcs->program_lut_read_write_control(mpc, MCM_LUT_3DLUT, lut_bank_a, mpcc_id); mpc->funcs->program_lut_read_write_control(mpc, MCM_LUT_3DLUT, lut_bank_a, mpcc_id);
@ -546,21 +540,24 @@ void dcn401_populate_mcm_luts(struct dc *dc,
mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpcc_id); mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpcc_id);
if (hubp->funcs->hubp_program_3dlut_fl_addr) if (hubp->funcs->hubp_program_3dlut_fl_addr)
hubp->funcs->hubp_program_3dlut_fl_addr(hubp, mcm_luts.lut3d_data.gpu_mem_params.addr); hubp->funcs->hubp_program_3dlut_fl_addr(hubp, cm->lut3d_dma.addr);
/* bit_depth was previously zero-initialized in local_mcm,
* preserve identical behavior.
*/
if (mpc->funcs->mcm.program_bit_depth) if (mpc->funcs->mcm.program_bit_depth)
mpc->funcs->mcm.program_bit_depth(mpc, mcm_luts.lut3d_data.gpu_mem_params.bit_depth, mpcc_id); mpc->funcs->mcm.program_bit_depth(mpc, 0, mpcc_id);
switch (mcm_luts.lut3d_data.gpu_mem_params.layout) { switch (cm->lut3d_dma.swizzle) {
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_RGB: case CM_LUT_3D_SWIZZLE_LINEAR_RGB:
mode = hubp_3dlut_fl_mode_native_1; mode = hubp_3dlut_fl_mode_native_1;
addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_BGR: case CM_LUT_3D_SWIZZLE_LINEAR_BGR:
mode = hubp_3dlut_fl_mode_native_2; mode = hubp_3dlut_fl_mode_native_2;
addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_1D_PACKED_LINEAR: case CM_LUT_1D_PACKED_LINEAR:
mode = hubp_3dlut_fl_mode_transform; mode = hubp_3dlut_fl_mode_transform;
addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear; addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear;
break; break;
@ -575,40 +572,38 @@ void dcn401_populate_mcm_luts(struct dc *dc,
if (hubp->funcs->hubp_program_3dlut_fl_addressing_mode) if (hubp->funcs->hubp_program_3dlut_fl_addressing_mode)
hubp->funcs->hubp_program_3dlut_fl_addressing_mode(hubp, addr_mode); hubp->funcs->hubp_program_3dlut_fl_addressing_mode(hubp, addr_mode);
switch (mcm_luts.lut3d_data.gpu_mem_params.format_params.format) { switch (cm->lut3d_dma.format) {
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12MSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB:
format = hubp_3dlut_fl_format_unorm_12msb_bitslice; format = hubp_3dlut_fl_format_unorm_12msb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12LSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB:
format = hubp_3dlut_fl_format_unorm_12lsb_bitslice; format = hubp_3dlut_fl_format_unorm_12lsb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10: case CM_LUT_PIXEL_FORMAT_RGBA16161616_FLOAT_FP1_5_10:
format = hubp_3dlut_fl_format_float_fp1_5_10; format = hubp_3dlut_fl_format_float_fp1_5_10;
break; break;
default:
break;
} }
if (hubp->funcs->hubp_program_3dlut_fl_format) if (hubp->funcs->hubp_program_3dlut_fl_format)
hubp->funcs->hubp_program_3dlut_fl_format(hubp, format); hubp->funcs->hubp_program_3dlut_fl_format(hubp, format);
if (hubp->funcs->hubp_update_3dlut_fl_bias_scale && if (hubp->funcs->hubp_update_3dlut_fl_bias_scale &&
mpc->funcs->mcm.program_bias_scale) { mpc->funcs->mcm.program_bias_scale) {
mpc->funcs->mcm.program_bias_scale(mpc, mpc->funcs->mcm.program_bias_scale(mpc,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.bias, cm->lut3d_dma.bias,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.scale, cm->lut3d_dma.scale,
mpcc_id); mpcc_id);
hubp->funcs->hubp_update_3dlut_fl_bias_scale(hubp, hubp->funcs->hubp_update_3dlut_fl_bias_scale(hubp,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.bias, cm->lut3d_dma.bias,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.scale); cm->lut3d_dma.scale);
} }
//navi 4x has a bug and r and blue are swapped and need to be worked around here in /* component_order was previously hard-coded to RGBA in local_mcm,
//TODO: need to make a method for get_xbar per asic OR do the workaround in program_crossbar for 4x * preserve identical behavior.
switch (mcm_luts.lut3d_data.gpu_mem_params.component_order) { */
case DC_CM2_GPU_MEM_PIXEL_COMPONENT_ORDER_RGBA: crossbar_bit_slice_cr_r = hubp_3dlut_fl_crossbar_bit_slice_0_15;
default: crossbar_bit_slice_y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31;
crossbar_bit_slice_cr_r = hubp_3dlut_fl_crossbar_bit_slice_0_15; crossbar_bit_slice_cb_b = hubp_3dlut_fl_crossbar_bit_slice_32_47;
crossbar_bit_slice_y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31;
crossbar_bit_slice_cb_b = hubp_3dlut_fl_crossbar_bit_slice_32_47;
break;
}
if (hubp->funcs->hubp_program_3dlut_fl_crossbar) if (hubp->funcs->hubp_program_3dlut_fl_crossbar)
hubp->funcs->hubp_program_3dlut_fl_crossbar(hubp, hubp->funcs->hubp_program_3dlut_fl_crossbar(hubp,
@ -634,8 +629,6 @@ void dcn401_populate_mcm_luts(struct dc *dc,
mpc->funcs->program_lut_mode(mpc, MCM_LUT_1DLUT, MCM_LUT_DISABLE, lut_bank_a, mpcc_id); mpc->funcs->program_lut_mode(mpc, MCM_LUT_1DLUT, MCM_LUT_DISABLE, lut_bank_a, mpcc_id);
} }
} }
break;
} }
} }
@ -660,19 +653,19 @@ bool dcn401_set_mcm_luts(struct pipe_ctx *pipe_ctx,
const struct pwl_params *lut_params = NULL; const struct pwl_params *lut_params = NULL;
bool rval; bool rval;
if (plane_state->mcm_luts.lut3d_data.lut3d_src == DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM) { if (plane_state->cm.flags.bits.lut3d_dma_enable) {
dcn401_populate_mcm_luts(dc, pipe_ctx, plane_state->mcm_luts, plane_state->lut_bank_a); dcn401_populate_mcm_luts(dc, pipe_ctx, &plane_state->cm, plane_state->lut_bank_a);
return true; return true;
} }
mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id); mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id);
pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE; pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE;
// 1D LUT // 1D LUT
if (plane_state->blend_tf.type == TF_TYPE_HWPWL) if (plane_state->cm.blend_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->blend_tf.pwl; lut_params = &plane_state->cm.blend_func.pwl;
else if (plane_state->blend_tf.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->blend_tf, &plane_state->cm.blend_func,
&dpp_base->regamma_params, false); &dpp_base->regamma_params, false);
lut_params = rval ? &dpp_base->regamma_params : NULL; lut_params = rval ? &dpp_base->regamma_params : NULL;
} }
@ -680,12 +673,12 @@ bool dcn401_set_mcm_luts(struct pipe_ctx *pipe_ctx,
lut_params = NULL; lut_params = NULL;
// Shaper // Shaper
if (plane_state->in_shaper_func.type == TF_TYPE_HWPWL) if (plane_state->cm.shaper_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->in_shaper_func.pwl; lut_params = &plane_state->cm.shaper_func.pwl;
else if (plane_state->in_shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
// TODO: dpp_base replace // TODO: dpp_base replace
rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->in_shaper_func, &plane_state->cm.shaper_func,
&dpp_base->shaper_params, true); &dpp_base->shaper_params, true);
lut_params = rval ? &dpp_base->shaper_params : NULL; lut_params = rval ? &dpp_base->shaper_params : NULL;
} }
@ -693,8 +686,8 @@ bool dcn401_set_mcm_luts(struct pipe_ctx *pipe_ctx,
// 3D // 3D
if (mpc->funcs->program_3dlut) { if (mpc->funcs->program_3dlut) {
if (plane_state->lut3d_func.state.bits.initialized == 1) if (plane_state->cm.lut3d_func.state.bits.initialized == 1)
result &= mpc->funcs->program_3dlut(mpc, &plane_state->lut3d_func.lut_3d, mpcc_id); result &= mpc->funcs->program_3dlut(mpc, &plane_state->cm.lut3d_func.lut_3d, mpcc_id);
else else
result &= mpc->funcs->program_3dlut(mpc, NULL, mpcc_id); result &= mpc->funcs->program_3dlut(mpc, NULL, mpcc_id);
} }
@ -1999,10 +1992,9 @@ void dcn401_perform_3dlut_wa_unlock(struct pipe_ctx *pipe_ctx)
for (odm_pipe = pipe_ctx; odm_pipe != NULL; odm_pipe = odm_pipe->next_odm_pipe) { for (odm_pipe = pipe_ctx; odm_pipe != NULL; odm_pipe = odm_pipe->next_odm_pipe) {
for (mpc_pipe = odm_pipe; mpc_pipe != NULL; mpc_pipe = mpc_pipe->bottom_pipe) { for (mpc_pipe = odm_pipe; mpc_pipe != NULL; mpc_pipe = mpc_pipe->bottom_pipe) {
if (mpc_pipe->plane_state && mpc_pipe->plane_state->mcm_luts.lut3d_data.lut3d_src if (mpc_pipe->plane_state &&
== DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM mpc_pipe->plane_state->cm.flags.bits.lut3d_enable &&
&& mpc_pipe->plane_state->mcm_shaper_3dlut_setting mpc_pipe->plane_state->cm.flags.bits.lut3d_dma_enable) {
== DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT) {
wa_pipes[wa_pipe_ct++] = mpc_pipe; wa_pipes[wa_pipe_ct++] = mpc_pipe;
} }
} }

2
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h
View File

@ -52,7 +52,7 @@ enum dc_status dcn401_enable_stream_timing(
void dcn401_enable_stream(struct pipe_ctx *pipe_ctx); void dcn401_enable_stream(struct pipe_ctx *pipe_ctx);
void dcn401_populate_mcm_luts(struct dc *dc, void dcn401_populate_mcm_luts(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
struct dc_cm2_func_luts mcm_luts, const struct dc_plane_cm *cm,
bool lut_bank_a); bool lut_bank_a);
void dcn401_setup_hpo_hw_control(const struct dce_hwseq *hws, bool enable); void dcn401_setup_hpo_hw_control(const struct dce_hwseq *hws, bool enable);

316
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c
View File

@ -401,40 +401,33 @@ void dcn42_program_cm_hist(
} }
static void dc_get_lut_xbar( static void dc_get_lut_xbar(
enum dc_cm2_gpu_mem_pixel_component_order order,
enum hubp_3dlut_fl_crossbar_bit_slice *cr_r, enum hubp_3dlut_fl_crossbar_bit_slice *cr_r,
enum hubp_3dlut_fl_crossbar_bit_slice *y_g, enum hubp_3dlut_fl_crossbar_bit_slice *y_g,
enum hubp_3dlut_fl_crossbar_bit_slice *cb_b) enum hubp_3dlut_fl_crossbar_bit_slice *cb_b)
{ {
switch (order) { /* component_order was previously hard-coded to RGBA in local_mcm,
case DC_CM2_GPU_MEM_PIXEL_COMPONENT_ORDER_RGBA: * preserve identical behavior.
*cr_r = hubp_3dlut_fl_crossbar_bit_slice_32_47; */
*y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31; *cr_r = hubp_3dlut_fl_crossbar_bit_slice_32_47;
*cb_b = hubp_3dlut_fl_crossbar_bit_slice_0_15; *y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31;
break; *cb_b = hubp_3dlut_fl_crossbar_bit_slice_0_15;
case DC_CM2_GPU_MEM_PIXEL_COMPONENT_ORDER_BGRA:
*cr_r = hubp_3dlut_fl_crossbar_bit_slice_0_15;
*y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31;
*cb_b = hubp_3dlut_fl_crossbar_bit_slice_32_47;
break;
}
} }
static void dc_get_lut_mode( static void dc_get_lut_mode(
enum dc_cm2_gpu_mem_layout layout, enum dc_cm_lut_swizzle swizzle,
enum hubp_3dlut_fl_mode *mode, enum hubp_3dlut_fl_mode *mode,
enum hubp_3dlut_fl_addressing_mode *addr_mode) enum hubp_3dlut_fl_addressing_mode *addr_mode)
{ {
switch (layout) { switch (swizzle) {
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_RGB: case CM_LUT_3D_SWIZZLE_LINEAR_RGB:
*mode = hubp_3dlut_fl_mode_native_1; *mode = hubp_3dlut_fl_mode_native_1;
*addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_BGR: case CM_LUT_3D_SWIZZLE_LINEAR_BGR:
*mode = hubp_3dlut_fl_mode_native_2; *mode = hubp_3dlut_fl_mode_native_2;
*addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_1D_PACKED_LINEAR: case CM_LUT_1D_PACKED_LINEAR:
*mode = hubp_3dlut_fl_mode_transform; *mode = hubp_3dlut_fl_mode_transform;
*addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear;
break; break;
@ -446,19 +439,22 @@ static void dc_get_lut_mode(
} }
static void dc_get_lut_format( static void dc_get_lut_format(
enum dc_cm2_gpu_mem_format dc_format, enum dc_cm_lut_pixel_format dc_format,
enum hubp_3dlut_fl_format *format) enum hubp_3dlut_fl_format *format)
{ {
switch (dc_format) { switch (dc_format) {
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12MSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB:
*format = hubp_3dlut_fl_format_unorm_12msb_bitslice; *format = hubp_3dlut_fl_format_unorm_12msb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12LSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB:
*format = hubp_3dlut_fl_format_unorm_12lsb_bitslice; *format = hubp_3dlut_fl_format_unorm_12lsb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10: case CM_LUT_PIXEL_FORMAT_RGBA16161616_FLOAT_FP1_5_10:
*format = hubp_3dlut_fl_format_float_fp1_5_10; *format = hubp_3dlut_fl_format_float_fp1_5_10;
break; break;
default:
*format = hubp_3dlut_fl_format_unorm_12msb_bitslice;
break;
} }
} }
@ -472,16 +468,17 @@ static bool dc_is_rmcm_3dlut_supported(struct hubp *hubp, struct mpc *mpc)
return false; return false;
} }
static bool is_rmcm_3dlut_fl_supported(struct dc *dc, enum dc_cm2_gpu_mem_size size) #if defined(CONFIG_DRM_AMD_DC_DCN4_2)
static bool is_rmcm_3dlut_fl_supported(struct dc *dc)
{ {
/* size was previously hard-coded to TRANSFORMED in local_mcm,
* which mapped to dim_17. Preserve identical behavior.
*/
if (!dc->caps.color.mpc.rmcm_3d_lut_caps.dma_3d_lut) if (!dc->caps.color.mpc.rmcm_3d_lut_caps.dma_3d_lut)
return false; return false;
if (size == DC_CM2_GPU_MEM_SIZE_171717) return dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_17 != 0u;
return dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_17 != 0u;
else if (size == DC_CM2_GPU_MEM_SIZE_333333)
return dc->caps.color.mpc.rmcm_3d_lut_caps.lut_dim_caps.dim_33 != 0u;
return false;
} }
#endif
static void dcn42_set_mcm_location_post_blend(struct dc *dc, struct pipe_ctx *pipe_ctx, bool bPostBlend) static void dcn42_set_mcm_location_post_blend(struct dc *dc, struct pipe_ctx *pipe_ctx, bool bPostBlend)
{ {
@ -502,56 +499,45 @@ static void dcn42_get_mcm_lut_xable_from_pipe_ctx(struct dc *dc, struct pipe_ctx
enum MCM_LUT_XABLE *lut3d_xable, enum MCM_LUT_XABLE *lut3d_xable,
enum MCM_LUT_XABLE *lut1d_xable) enum MCM_LUT_XABLE *lut1d_xable)
{ {
enum dc_cm2_shaper_3dlut_setting shaper_3dlut_setting = DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL;
bool lut1d_enable = false;
struct mpc *mpc = dc->res_pool->mpc; struct mpc *mpc = dc->res_pool->mpc;
int mpcc_id = pipe_ctx->plane_res.hubp->inst; int mpcc_id = pipe_ctx->plane_res.hubp->inst;
if (!pipe_ctx->plane_state) if (!pipe_ctx->plane_state)
return; return;
shaper_3dlut_setting = pipe_ctx->plane_state->mcm_shaper_3dlut_setting;
lut1d_enable = pipe_ctx->plane_state->mcm_lut1d_enable;
mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id); mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id);
pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE; pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE;
*lut1d_xable = lut1d_enable ? MCM_LUT_ENABLE : MCM_LUT_DISABLE; *lut1d_xable = pipe_ctx->plane_state->cm.flags.bits.blend_enable ?
MCM_LUT_ENABLE : MCM_LUT_DISABLE;
switch (shaper_3dlut_setting) { *shaper_xable = pipe_ctx->plane_state->cm.flags.bits.shaper_enable ?
case DC_CM2_SHAPER_3DLUT_SETTING_BYPASS_ALL: MCM_LUT_ENABLE : MCM_LUT_DISABLE;
*lut3d_xable = *shaper_xable = MCM_LUT_DISABLE; *lut3d_xable = (pipe_ctx->plane_state->cm.flags.bits.shaper_enable &&
break; pipe_ctx->plane_state->cm.flags.bits.lut3d_enable) ?
case DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER: MCM_LUT_ENABLE : MCM_LUT_DISABLE;
*lut3d_xable = MCM_LUT_DISABLE;
*shaper_xable = MCM_LUT_ENABLE;
break;
case DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT:
*lut3d_xable = *shaper_xable = MCM_LUT_ENABLE;
break;
}
} }
static void fl_get_lut_mode( static void fl_get_lut_mode(
enum dc_cm2_gpu_mem_layout layout, enum dc_cm_lut_swizzle swizzle,
enum dc_cm2_gpu_mem_size size,
enum hubp_3dlut_fl_mode *mode, enum hubp_3dlut_fl_mode *mode,
enum hubp_3dlut_fl_addressing_mode *addr_mode, enum hubp_3dlut_fl_addressing_mode *addr_mode,
enum hubp_3dlut_fl_width *width) enum hubp_3dlut_fl_width *width)
{ {
/* size was previously hard-coded to TRANSFORMED in local_mcm,
* preserve identical behavior (transformed width).
*/
*width = hubp_3dlut_fl_width_17; *width = hubp_3dlut_fl_width_17;
if (size == DC_CM2_GPU_MEM_SIZE_333333) switch (swizzle) {
*width = hubp_3dlut_fl_width_33; case CM_LUT_3D_SWIZZLE_LINEAR_RGB:
switch (layout) {
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_RGB:
*mode = hubp_3dlut_fl_mode_native_1; *mode = hubp_3dlut_fl_mode_native_1;
*addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_BGR: case CM_LUT_3D_SWIZZLE_LINEAR_BGR:
*mode = hubp_3dlut_fl_mode_native_2; *mode = hubp_3dlut_fl_mode_native_2;
*addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break; break;
case DC_CM2_GPU_MEM_LAYOUT_1D_PACKED_LINEAR: case CM_LUT_1D_PACKED_LINEAR:
*mode = hubp_3dlut_fl_mode_transform; *mode = hubp_3dlut_fl_mode_transform;
*addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear; *addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear;
break; break;
@ -565,8 +551,7 @@ static void fl_get_lut_mode(
bool dcn42_program_rmcm_luts( bool dcn42_program_rmcm_luts(
struct hubp *hubp, struct hubp *hubp,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
enum dc_cm2_transfer_func_source lut3d_src, const struct dc_plane_cm *cm,
struct dc_cm2_func_luts *mcm_luts,
struct mpc *mpc, struct mpc *mpc,
bool lut_bank_a, bool lut_bank_a,
int mpcc_id) int mpcc_id)
@ -596,21 +581,24 @@ bool dcn42_program_rmcm_luts(
if (!rmcm_3dlut) if (!rmcm_3dlut)
return false; return false;
rmcm_3dlut->protection_bits = mcm_luts->lut3d_data.rmcm_tmz; /* rmcm_tmz was previously zero-initialized in local_mcm,
* preserve identical behavior.
*/
rmcm_3dlut->protection_bits = 0;
dcn42_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable); dcn42_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable);
/* Shaper */ /* Shaper */
if (mcm_luts->shaper) { {
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (mcm_luts->shaper->type == TF_TYPE_HWPWL) { if (cm->shaper_func.type == TF_TYPE_HWPWL) {
m_lut_params.pwl = &mcm_luts->shaper->pwl; m_lut_params.pwl = &cm->shaper_func.pwl;
} else if (mcm_luts->shaper->type == TF_TYPE_DISTRIBUTED_POINTS) { } else if (cm->shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
ASSERT(false); ASSERT(false);
cm_helper_translate_curve_to_hw_format( cm_helper_translate_curve_to_hw_format(
dc->ctx, dc->ctx,
mcm_luts->shaper, &cm->shaper_func,
&dpp_base->shaper_params, true); &dpp_base->shaper_params, true);
m_lut_params.pwl = &dpp_base->shaper_params; m_lut_params.pwl = &dpp_base->shaper_params;
} }
@ -626,15 +614,16 @@ bool dcn42_program_rmcm_luts(
} }
/* 3DLUT */ /* 3DLUT */
switch (lut3d_src) { if (!cm->flags.bits.lut3d_dma_enable) {
case DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM: /* SYSMEM path — no DMA 3DLUT available.
* Previously this was treated as a no-op for the DMA/VIDMEM
* programming, preserve identical behavior.
*/
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
// Don't know what to do in this case. } else {
//case DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM: /* VIDMEM (3DLUT DMA Fast Load) */
break;
case DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM: fl_get_lut_mode(cm->lut3d_dma.swizzle,
fl_get_lut_mode(mcm_luts->lut3d_data.gpu_mem_params.layout,
mcm_luts->lut3d_data.gpu_mem_params.size,
&mode, &mode,
&addr_mode, &addr_mode,
&width); &width);
@ -646,20 +635,19 @@ bool dcn42_program_rmcm_luts(
return false; return false;
// setting native or transformed mode, // setting native or transformed mode,
dc_get_lut_mode(mcm_luts->lut3d_data.gpu_mem_params.layout, &mode, &addr_mode); dc_get_lut_mode(cm->lut3d_dma.swizzle, &mode, &addr_mode);
//seems to be only for the MCM //seems to be only for the MCM
dc_get_lut_format(mcm_luts->lut3d_data.gpu_mem_params.format_params.format, &format); dc_get_lut_format(cm->lut3d_dma.format, &format);
dc_get_lut_xbar( dc_get_lut_xbar(
mcm_luts->lut3d_data.gpu_mem_params.component_order,
&crossbar_bit_slice_cr_r, &crossbar_bit_slice_cr_r,
&crossbar_bit_slice_y_g, &crossbar_bit_slice_y_g,
&crossbar_bit_slice_cb_b); &crossbar_bit_slice_cb_b);
fl_config.mode = mode; fl_config.mode = mode;
fl_config.enabled = lut3d_xable != MCM_LUT_DISABLE; fl_config.enabled = lut3d_xable != MCM_LUT_DISABLE;
fl_config.address = mcm_luts->lut3d_data.gpu_mem_params.addr; fl_config.address = cm->lut3d_dma.addr;
fl_config.format = format; fl_config.format = format;
fl_config.crossbar_bit_slice_y_g = crossbar_bit_slice_y_g; fl_config.crossbar_bit_slice_y_g = crossbar_bit_slice_y_g;
fl_config.crossbar_bit_slice_cb_b = crossbar_bit_slice_cb_b; fl_config.crossbar_bit_slice_cb_b = crossbar_bit_slice_cb_b;
@ -667,17 +655,20 @@ bool dcn42_program_rmcm_luts(
fl_config.width = width; fl_config.width = width;
fl_config.protection_bits = rmcm_3dlut->protection_bits; fl_config.protection_bits = rmcm_3dlut->protection_bits;
fl_config.addr_mode = addr_mode; fl_config.addr_mode = addr_mode;
fl_config.layout = mcm_luts->lut3d_data.gpu_mem_params.layout; fl_config.layout = cm->lut3d_dma.swizzle;
fl_config.bias = mcm_luts->lut3d_data.gpu_mem_params.format_params.float_params.bias; fl_config.bias = cm->lut3d_dma.bias;
fl_config.scale = mcm_luts->lut3d_data.gpu_mem_params.format_params.float_params.scale; fl_config.scale = cm->lut3d_dma.scale;
mpc_fl_config.enabled = fl_config.enabled; mpc_fl_config.enabled = fl_config.enabled;
mpc_fl_config.width = width; mpc_fl_config.width = width;
mpc_fl_config.select_lut_bank_a = lut_bank_a; mpc_fl_config.select_lut_bank_a = lut_bank_a;
mpc_fl_config.bit_depth = mcm_luts->lut3d_data.gpu_mem_params.bit_depth; /* bit_depth was previously zero-initialized in local_mcm,
* preserve identical behavior.
*/
mpc_fl_config.bit_depth = 0;
mpc_fl_config.hubp_index = hubp->inst; mpc_fl_config.hubp_index = hubp->inst;
mpc_fl_config.bias = mcm_luts->lut3d_data.gpu_mem_params.format_params.float_params.bias; mpc_fl_config.bias = cm->lut3d_dma.bias;
mpc_fl_config.scale = mcm_luts->lut3d_data.gpu_mem_params.format_params.float_params.scale; mpc_fl_config.scale = cm->lut3d_dma.scale;
//1. power down the block //1. power down the block
mpc->funcs->rmcm.power_on_shaper_3dlut(mpc, mpcc_id, false); mpc->funcs->rmcm.power_on_shaper_3dlut(mpc, mpcc_id, false);
@ -689,10 +680,6 @@ bool dcn42_program_rmcm_luts(
//3. power on the block //3. power on the block
mpc->funcs->rmcm.power_on_shaper_3dlut(mpc, mpcc_id, true); mpc->funcs->rmcm.power_on_shaper_3dlut(mpc, mpcc_id, true);
break;
default:
return false;
} }
return true; return true;
@ -700,7 +687,7 @@ bool dcn42_program_rmcm_luts(
void dcn42_populate_mcm_luts(struct dc *dc, void dcn42_populate_mcm_luts(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
struct dc_cm2_func_luts mcm_luts, const struct dc_plane_cm *cm,
bool lut_bank_a) bool lut_bank_a)
{ {
struct dpp *dpp_base = pipe_ctx->plane_res.dpp; struct dpp *dpp_base = pipe_ctx->plane_res.dpp;
@ -708,14 +695,17 @@ void dcn42_populate_mcm_luts(struct dc *dc,
int mpcc_id = hubp->inst; int mpcc_id = hubp->inst;
struct mpc *mpc = dc->res_pool->mpc; struct mpc *mpc = dc->res_pool->mpc;
union mcm_lut_params m_lut_params; union mcm_lut_params m_lut_params;
enum dc_cm2_transfer_func_source lut3d_src = mcm_luts.lut3d_data.lut3d_src; const bool lut3d_dma = !!cm->flags.bits.lut3d_dma_enable;
enum hubp_3dlut_fl_format format = 0; enum hubp_3dlut_fl_format format = 0;
enum hubp_3dlut_fl_mode mode; enum hubp_3dlut_fl_mode mode;
enum hubp_3dlut_fl_width width = 0; /* Width was previously hard-coded to TRANSFORMED via local_mcm build,
* preserve identical behavior.
*/
enum hubp_3dlut_fl_width width = hubp_3dlut_fl_width_transformed;
enum hubp_3dlut_fl_addressing_mode addr_mode; enum hubp_3dlut_fl_addressing_mode addr_mode;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cr_r = 0; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cr_r;
enum MCM_LUT_XABLE shaper_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE shaper_xable = MCM_LUT_DISABLE;
enum MCM_LUT_XABLE lut3d_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE lut3d_xable = MCM_LUT_DISABLE;
enum MCM_LUT_XABLE lut1d_xable = MCM_LUT_DISABLE; enum MCM_LUT_XABLE lut1d_xable = MCM_LUT_DISABLE;
@ -724,33 +714,35 @@ void dcn42_populate_mcm_luts(struct dc *dc,
dcn42_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable); dcn42_get_mcm_lut_xable_from_pipe_ctx(dc, pipe_ctx, &shaper_xable, &lut3d_xable, &lut1d_xable);
//MCM - setting its location (Before/After) blender //MCM - setting its location (Before/After) blender
//set to post blend (true) //mpc_mcm_post_blend was previously zero-initialized in local_mcm,
//preserve identical behavior.
dcn42_set_mcm_location_post_blend( dcn42_set_mcm_location_post_blend(
dc, dc,
pipe_ctx, pipe_ctx,
mcm_luts.lut3d_data.mpc_mcm_post_blend); false);
//RMCM - 3dLUT+Shaper //RMCM - 3dLUT+Shaper
if (mcm_luts.lut3d_data.rmcm_3dlut_enable && #if defined(CONFIG_DRM_AMD_DC_DCN4_2)
is_rmcm_3dlut_fl_supported(dc, mcm_luts.lut3d_data.gpu_mem_params.size)) { if (cm->flags.bits.rmcm_enable &&
is_rmcm_3dlut_fl_supported(dc)) {
dcn42_program_rmcm_luts( dcn42_program_rmcm_luts(
hubp, hubp,
pipe_ctx, pipe_ctx,
lut3d_src, cm,
&mcm_luts,
mpc, mpc,
lut_bank_a, lut_bank_a,
mpcc_id); mpcc_id);
} }
#endif /* CONFIG_DRM_AMD_DC_DCN4_2 */
/* 1D LUT */ /* 1D LUT */
if (mcm_luts.lut1d_func) { {
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (mcm_luts.lut1d_func->type == TF_TYPE_HWPWL) if (cm->blend_func.type == TF_TYPE_HWPWL)
m_lut_params.pwl = &mcm_luts.lut1d_func->pwl; m_lut_params.pwl = &cm->blend_func.pwl;
else if (mcm_luts.lut1d_func->type == TF_TYPE_DISTRIBUTED_POINTS) { else if (cm->blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx, rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx,
mcm_luts.lut1d_func, &cm->blend_func,
&dpp_base->regamma_params, false); &dpp_base->regamma_params, false);
m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL; m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL;
} }
@ -763,14 +755,14 @@ void dcn42_populate_mcm_luts(struct dc *dc,
} }
/* Shaper */ /* Shaper */
if (mcm_luts.shaper && mcm_luts.lut3d_data.mpc_3dlut_enable) { if (cm->flags.bits.lut3d_enable) {
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (mcm_luts.shaper->type == TF_TYPE_HWPWL) if (cm->shaper_func.type == TF_TYPE_HWPWL)
m_lut_params.pwl = &mcm_luts.shaper->pwl; m_lut_params.pwl = &cm->shaper_func.pwl;
else if (mcm_luts.shaper->type == TF_TYPE_DISTRIBUTED_POINTS) { else if (cm->shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
ASSERT(false); ASSERT(false);
rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx, rval = cm3_helper_translate_curve_to_hw_format(mpc->ctx,
mcm_luts.shaper, &cm->shaper_func,
&dpp_base->regamma_params, true); &dpp_base->regamma_params, true);
m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL; m_lut_params.pwl = rval ? &dpp_base->regamma_params : NULL;
} }
@ -783,41 +775,27 @@ void dcn42_populate_mcm_luts(struct dc *dc,
} }
/* 3DLUT */ /* 3DLUT */
switch (lut3d_src) { if (!lut3d_dma) {
case DC_CM2_TRANSFER_FUNC_SOURCE_SYSMEM: /* SYSMEM (legacy lut3d_func) */
memset(&m_lut_params, 0, sizeof(m_lut_params)); memset(&m_lut_params, 0, sizeof(m_lut_params));
if (hubp->funcs->hubp_enable_3dlut_fl) if (hubp->funcs->hubp_enable_3dlut_fl)
hubp->funcs->hubp_enable_3dlut_fl(hubp, false); hubp->funcs->hubp_enable_3dlut_fl(hubp, false);
if (mcm_luts.lut3d_data.lut3d_func && mcm_luts.lut3d_data.lut3d_func->state.bits.initialized) { if (cm->lut3d_func.state.bits.initialized) {
m_lut_params.lut3d = &mcm_luts.lut3d_data.lut3d_func->lut_3d; m_lut_params.lut3d = &cm->lut3d_func.lut_3d;
if (mpc->funcs->populate_lut) if (mpc->funcs->populate_lut)
mpc->funcs->populate_lut(mpc, MCM_LUT_3DLUT, m_lut_params, lut_bank_a, mpcc_id); mpc->funcs->populate_lut(mpc, MCM_LUT_3DLUT, m_lut_params, lut_bank_a, mpcc_id);
if (mpc->funcs->program_lut_mode) if (mpc->funcs->program_lut_mode)
mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a,
mpcc_id); mpcc_id);
} }
break; } else {
case DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM: /* VIDMEM (3DLUT DMA Fast Load) */
switch (mcm_luts.lut3d_data.gpu_mem_params.size) {
case DC_CM2_GPU_MEM_SIZE_333333:
width = hubp_3dlut_fl_width_33;
break;
case DC_CM2_GPU_MEM_SIZE_171717:
width = hubp_3dlut_fl_width_17;
break;
case DC_CM2_GPU_MEM_SIZE_TRANSFORMED:
width = hubp_3dlut_fl_width_transformed;
break;
default:
//TODO: Handle default case
break;
}
//check for support //check for support
if (mpc->funcs->mcm.is_config_supported && if (mpc->funcs->mcm.is_config_supported &&
!mpc->funcs->mcm.is_config_supported(width)) !mpc->funcs->mcm.is_config_supported(width))
break; return;
if (mpc->funcs->program_lut_read_write_control) if (mpc->funcs->program_lut_read_write_control)
mpc->funcs->program_lut_read_write_control(mpc, MCM_LUT_3DLUT, lut_bank_a, mpcc_id); mpc->funcs->program_lut_read_write_control(mpc, MCM_LUT_3DLUT, lut_bank_a, mpcc_id);
@ -825,49 +803,70 @@ void dcn42_populate_mcm_luts(struct dc *dc,
mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpcc_id); mpc->funcs->program_lut_mode(mpc, MCM_LUT_3DLUT, lut3d_xable, lut_bank_a, mpcc_id);
if (hubp->funcs->hubp_program_3dlut_fl_addr) if (hubp->funcs->hubp_program_3dlut_fl_addr)
hubp->funcs->hubp_program_3dlut_fl_addr(hubp, mcm_luts.lut3d_data.gpu_mem_params.addr); hubp->funcs->hubp_program_3dlut_fl_addr(hubp, cm->lut3d_dma.addr);
/* bit_depth was previously zero-initialized in local_mcm,
* preserve identical behavior.
*/
if (mpc->funcs->mcm.program_bit_depth) if (mpc->funcs->mcm.program_bit_depth)
mpc->funcs->mcm.program_bit_depth(mpc, mcm_luts.lut3d_data.gpu_mem_params.bit_depth, mpcc_id); mpc->funcs->mcm.program_bit_depth(mpc, 0, mpcc_id);
dc_get_lut_mode(mcm_luts.lut3d_data.gpu_mem_params.layout, &mode, &addr_mode); switch (cm->lut3d_dma.swizzle) {
case CM_LUT_3D_SWIZZLE_LINEAR_RGB:
mode = hubp_3dlut_fl_mode_native_1;
addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break;
case CM_LUT_3D_SWIZZLE_LINEAR_BGR:
mode = hubp_3dlut_fl_mode_native_2;
addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break;
case CM_LUT_1D_PACKED_LINEAR:
mode = hubp_3dlut_fl_mode_transform;
addr_mode = hubp_3dlut_fl_addressing_mode_simple_linear;
break;
default:
mode = hubp_3dlut_fl_mode_disable;
addr_mode = hubp_3dlut_fl_addressing_mode_sw_linear;
break;
}
if (hubp->funcs->hubp_program_3dlut_fl_mode) if (hubp->funcs->hubp_program_3dlut_fl_mode)
hubp->funcs->hubp_program_3dlut_fl_mode(hubp, mode); hubp->funcs->hubp_program_3dlut_fl_mode(hubp, mode);
if (hubp->funcs->hubp_program_3dlut_fl_addressing_mode) if (hubp->funcs->hubp_program_3dlut_fl_addressing_mode)
hubp->funcs->hubp_program_3dlut_fl_addressing_mode(hubp, addr_mode); hubp->funcs->hubp_program_3dlut_fl_addressing_mode(hubp, addr_mode);
switch (mcm_luts.lut3d_data.gpu_mem_params.format_params.format) { switch (cm->lut3d_dma.format) {
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12MSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB:
format = hubp_3dlut_fl_format_unorm_12msb_bitslice; format = hubp_3dlut_fl_format_unorm_12msb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_UNORM_12LSB: case CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB:
format = hubp_3dlut_fl_format_unorm_12lsb_bitslice; format = hubp_3dlut_fl_format_unorm_12lsb_bitslice;
break; break;
case DC_CM2_GPU_MEM_FORMAT_16161616_FLOAT_FP1_5_10: case CM_LUT_PIXEL_FORMAT_RGBA16161616_FLOAT_FP1_5_10:
format = hubp_3dlut_fl_format_float_fp1_5_10; format = hubp_3dlut_fl_format_float_fp1_5_10;
break; break;
default:
break;
} }
if (hubp->funcs->hubp_program_3dlut_fl_format) if (hubp->funcs->hubp_program_3dlut_fl_format)
hubp->funcs->hubp_program_3dlut_fl_format(hubp, format); hubp->funcs->hubp_program_3dlut_fl_format(hubp, format);
if (hubp->funcs->hubp_update_3dlut_fl_bias_scale && if (hubp->funcs->hubp_update_3dlut_fl_bias_scale &&
mpc->funcs->mcm.program_bias_scale) { mpc->funcs->mcm.program_bias_scale) {
mpc->funcs->mcm.program_bias_scale(mpc, mpc->funcs->mcm.program_bias_scale(mpc,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.bias, cm->lut3d_dma.bias,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.scale, cm->lut3d_dma.scale,
mpcc_id); mpcc_id);
hubp->funcs->hubp_update_3dlut_fl_bias_scale(hubp, hubp->funcs->hubp_update_3dlut_fl_bias_scale(hubp,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.bias, cm->lut3d_dma.bias,
mcm_luts.lut3d_data.gpu_mem_params.format_params.float_params.scale); cm->lut3d_dma.scale);
} }
//navi 4x has a bug and r and blue are swapped and need to be worked around here in /* component_order was previously hard-coded to RGBA in local_mcm,
//TODO: need to make a method for get_xbar per asic OR do the workaround in program_crossbar for 4x * preserve identical behavior.
dc_get_lut_xbar( */
mcm_luts.lut3d_data.gpu_mem_params.component_order, crossbar_bit_slice_cr_r = hubp_3dlut_fl_crossbar_bit_slice_0_15;
&crossbar_bit_slice_cr_r, crossbar_bit_slice_y_g = hubp_3dlut_fl_crossbar_bit_slice_16_31;
&crossbar_bit_slice_y_g, crossbar_bit_slice_cb_b = hubp_3dlut_fl_crossbar_bit_slice_32_47;
&crossbar_bit_slice_cb_b);
if (hubp->funcs->hubp_program_3dlut_fl_crossbar) if (hubp->funcs->hubp_program_3dlut_fl_crossbar)
hubp->funcs->hubp_program_3dlut_fl_crossbar(hubp, hubp->funcs->hubp_program_3dlut_fl_crossbar(hubp,
@ -893,7 +892,6 @@ void dcn42_populate_mcm_luts(struct dc *dc,
mpc->funcs->program_lut_mode(mpc, MCM_LUT_1DLUT, MCM_LUT_DISABLE, lut_bank_a, mpcc_id); mpc->funcs->program_lut_mode(mpc, MCM_LUT_1DLUT, MCM_LUT_DISABLE, lut_bank_a, mpcc_id);
} }
} }
break;
} }
} }
@ -908,19 +906,19 @@ bool dcn42_set_mcm_luts(struct pipe_ctx *pipe_ctx,
const struct pwl_params *lut_params = NULL; const struct pwl_params *lut_params = NULL;
bool rval; bool rval;
if (plane_state->mcm_luts.lut3d_data.lut3d_src == DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM) { if (plane_state->cm.flags.bits.lut3d_dma_enable) {
dcn42_populate_mcm_luts(dc, pipe_ctx, plane_state->mcm_luts, plane_state->lut_bank_a); dcn42_populate_mcm_luts(dc, pipe_ctx, &plane_state->cm, plane_state->lut_bank_a);
return true; return true;
} }
mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id); mpc->funcs->set_movable_cm_location(mpc, MPCC_MOVABLE_CM_LOCATION_BEFORE, mpcc_id);
pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE; pipe_ctx->plane_state->mcm_location = MPCC_MOVABLE_CM_LOCATION_BEFORE;
// 1D LUT // 1D LUT
if (plane_state->blend_tf.type == TF_TYPE_HWPWL) if (plane_state->cm.blend_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->blend_tf.pwl; lut_params = &plane_state->cm.blend_func.pwl;
else if (plane_state->blend_tf.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.blend_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->blend_tf, &plane_state->cm.blend_func,
&dpp_base->regamma_params, false); &dpp_base->regamma_params, false);
lut_params = rval ? &dpp_base->regamma_params : NULL; lut_params = rval ? &dpp_base->regamma_params : NULL;
} }
@ -928,12 +926,12 @@ bool dcn42_set_mcm_luts(struct pipe_ctx *pipe_ctx,
lut_params = NULL; lut_params = NULL;
// Shaper // Shaper
if (plane_state->in_shaper_func.type == TF_TYPE_HWPWL) if (plane_state->cm.shaper_func.type == TF_TYPE_HWPWL)
lut_params = &plane_state->in_shaper_func.pwl; lut_params = &plane_state->cm.shaper_func.pwl;
else if (plane_state->in_shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) { else if (plane_state->cm.shaper_func.type == TF_TYPE_DISTRIBUTED_POINTS) {
// TODO: dpp_base replace // TODO: dpp_base replace
rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx, rval = cm3_helper_translate_curve_to_hw_format(plane_state->ctx,
&plane_state->in_shaper_func, &plane_state->cm.shaper_func,
&dpp_base->shaper_params, true); &dpp_base->shaper_params, true);
lut_params = rval ? &dpp_base->shaper_params : NULL; lut_params = rval ? &dpp_base->shaper_params : NULL;
} }
@ -941,8 +939,8 @@ bool dcn42_set_mcm_luts(struct pipe_ctx *pipe_ctx,
// 3D // 3D
if (mpc->funcs->program_3dlut) { if (mpc->funcs->program_3dlut) {
if (plane_state->lut3d_func.state.bits.initialized == 1) if (plane_state->cm.lut3d_func.state.bits.initialized == 1)
result &= mpc->funcs->program_3dlut(mpc, &plane_state->lut3d_func.lut_3d, mpcc_id); result &= mpc->funcs->program_3dlut(mpc, &plane_state->cm.lut3d_func.lut_3d, mpcc_id);
else else
result &= mpc->funcs->program_3dlut(mpc, NULL, mpcc_id); result &= mpc->funcs->program_3dlut(mpc, NULL, mpcc_id);
} }

5
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h
View File

@ -20,14 +20,13 @@ bool dcn42_set_mcm_luts(struct pipe_ctx *pipe_ctx,
void dcn42_populate_mcm_luts(struct dc *dc, void dcn42_populate_mcm_luts(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
struct dc_cm2_func_luts mcm_luts, const struct dc_plane_cm *cm,
bool lut_bank_a); bool lut_bank_a);
bool dcn42_program_rmcm_luts( bool dcn42_program_rmcm_luts(
struct hubp *hubp, struct hubp *hubp,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
enum dc_cm2_transfer_func_source lut3d_src, const struct dc_plane_cm *cm,
struct dc_cm2_func_luts *mcm_luts,
struct mpc *mpc, struct mpc *mpc,
bool lut_bank_a, bool lut_bank_a,
int mpcc_id); int mpcc_id);

3
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h
View File

@ -58,6 +58,7 @@ struct dc_state;
struct dc_stream_status; struct dc_stream_status;
struct dc_writeback_info; struct dc_writeback_info;
struct dchub_init_data; struct dchub_init_data;
struct dc_plane_cm;
struct dc_static_screen_params; struct dc_static_screen_params;
struct resource_pool; struct resource_pool;
struct resource_context; struct resource_context;
@ -219,7 +220,7 @@ struct hwseq_private_funcs {
struct dc_state *context); struct dc_state *context);
void (*populate_mcm_luts)(struct dc *dc, void (*populate_mcm_luts)(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
struct dc_cm2_func_luts mcm_luts, const struct dc_plane_cm *cm,
bool lut_bank_a); bool lut_bank_a);
void (*perform_3dlut_wa_unlock)(struct pipe_ctx *pipe_ctx); void (*perform_3dlut_wa_unlock)(struct pipe_ctx *pipe_ctx);
void (*wait_for_pipe_update_if_needed)(struct dc *dc, struct pipe_ctx *pipe_ctx, bool is_surface_update_only); void (*wait_for_pipe_update_if_needed)(struct dc *dc, struct pipe_ctx *pipe_ctx, bool is_surface_update_only);

2
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
View File

@ -108,7 +108,7 @@ struct hubp_fl_3dlut_config {
uint16_t scale; uint16_t scale;
struct dc_plane_address address; struct dc_plane_address address;
enum hubp_3dlut_fl_addressing_mode addr_mode; enum hubp_3dlut_fl_addressing_mode addr_mode;
enum dc_cm2_gpu_mem_layout layout; enum dc_cm_lut_swizzle layout;
uint8_t protection_bits; uint8_t protection_bits;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g;
enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b; enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b;