Commit 4a43586b authored by Yue Hin Lau's avatar Yue Hin Lau Committed by Alex Deucher

drm/amd/display: update output csc matrix values

Signed-off-by: default avatarYue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 675634c5
...@@ -123,29 +123,26 @@ struct output_csc_matrix { ...@@ -123,29 +123,26 @@ struct output_csc_matrix {
}; };
static const struct output_csc_matrix output_csc_matrix[] = { static const struct output_csc_matrix output_csc_matrix[] = {
{ COLOR_SPACE_SRGB, { COLOR_SPACE_SRGB,
{ 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} }, { 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} },
{ COLOR_SPACE_SRGB_LIMITED, { COLOR_SPACE_SRGB_LIMITED,
{ 0x1B60, 0, 0, 0x200, 0, 0x1B60, 0, 0x200, 0, 0, 0x1B60, 0x200} }, { 0x1B67, 0, 0, 0x201, 0, 0x1B67, 0, 0x201, 0, 0, 0x1B67, 0x201} },
{ COLOR_SPACE_YCBCR601, { COLOR_SPACE_YCBCR601,
{ 0xE00, 0xF447, 0xFDB9, 0x1000, 0x82F, 0x1012, 0x31F, 0x200, 0xFB47, { 0xE04, 0xF444, 0xFDB9, 0x1004, 0x831, 0x1016, 0x320, 0x201, 0xFB45,
0xF6B9, 0xE00, 0x1000} }, 0xF6B7, 0xE04, 0x1004} },
{ COLOR_SPACE_YCBCR709, { COLOR_SPACE_YCBCR709,
{ 0xE00, 0xF349, 0xFEB7, 0x1000, 0x5D2, 0x1394, 0x1FA, { 0xE04, 0xF345, 0xFEB7, 0x1004, 0x5D3, 0x1399, 0x1FA,
0x200, 0xFCCB, 0xF535, 0xE00, 0x1000} }, 0x201, 0xFCCA, 0xF533, 0xE04, 0x1004} },
/* TODO: correct values below */ /* TODO: correct values below */
{ COLOR_SPACE_YCBCR601_LIMITED, { COLOR_SPACE_YCBCR601_LIMITED,
{ 0xE00, 0xF447, 0xFDB9, 0x1000, 0x991, { 0xE00, 0xF447, 0xFDB9, 0x1000, 0x991,
0x12C9, 0x3A6, 0x200, 0xFB47, 0xF6B9, 0xE00, 0x1000} }, 0x12C9, 0x3A6, 0x200, 0xFB47, 0xF6B9, 0xE00, 0x1000} },
{ COLOR_SPACE_YCBCR709_LIMITED, { COLOR_SPACE_YCBCR709_LIMITED,
{ 0xE00, 0xF349, 0xFEB7, 0x1000, 0x6CE, 0x16E3, { 0xE00, 0xF349, 0xFEB7, 0x1000, 0x6CE, 0x16E3,
0x24F, 0x200, 0xFCCB, 0xF535, 0xE00, 0x1000} }, 0x24F, 0x200, 0xFCCB, 0xF535, 0xE00, 0x1000} },
{ COLOR_SPACE_UNKNOWN,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }
}; };
static void program_gamut_remap( static void program_gamut_remap(
struct dcn10_dpp *dpp, struct dcn10_dpp *dpp,
const uint16_t *regval, const uint16_t *regval,
......
...@@ -1686,7 +1686,6 @@ static void program_csc_matrix(struct pipe_ctx *pipe_ctx, ...@@ -1686,7 +1686,6 @@ static void program_csc_matrix(struct pipe_ctx *pipe_ctx,
} }
} }
//program ocsc matrix for dcn 2
static void set_mpc_output_csc(struct dc *dc, static void set_mpc_output_csc(struct dc *dc,
struct pipe_ctx *pipe_ctx, struct pipe_ctx *pipe_ctx,
enum dc_color_space colorspace, enum dc_color_space colorspace,
...@@ -1710,9 +1709,7 @@ static void set_mpc_output_csc(struct dc *dc, ...@@ -1710,9 +1709,7 @@ static void set_mpc_output_csc(struct dc *dc,
opp_id, opp_id,
&tbl_entry, &tbl_entry,
ocsc_mode); ocsc_mode);
} } else {
else {
if (mpc->funcs->set_ocsc_default != NULL) if (mpc->funcs->set_ocsc_default != NULL)
mpc->funcs->set_ocsc_default(mpc, mpc->funcs->set_ocsc_default(mpc,
opp_id, opp_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment