Commit 974db151 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher

drm/amd/display: remove unnecessary allocation for regamma_params inside opp

Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50f27269
...@@ -987,10 +987,6 @@ bool dce110_opp_construct(struct dce110_opp *opp110, ...@@ -987,10 +987,6 @@ bool dce110_opp_construct(struct dce110_opp *opp110,
opp110->base.inst = inst; opp110->base.inst = inst;
opp110->base.regamma_params = dm_alloc(sizeof(struct pwl_params));
if (opp110->base.regamma_params == NULL)
return false;
opp110->regs = regs; opp110->regs = regs;
opp110->opp_shift = opp_shift; opp110->opp_shift = opp_shift;
opp110->opp_mask = opp_mask; opp110->opp_mask = opp_mask;
...@@ -1000,12 +996,8 @@ bool dce110_opp_construct(struct dce110_opp *opp110, ...@@ -1000,12 +996,8 @@ bool dce110_opp_construct(struct dce110_opp *opp110,
void dce110_opp_destroy(struct output_pixel_processor **opp) void dce110_opp_destroy(struct output_pixel_processor **opp)
{ {
if (*opp) { if (*opp)
if ((*opp)->regamma_params)
dm_free((*opp)->regamma_params);
(*opp)->regamma_params = NULL;
dm_free(FROM_DCE11_OPP(*opp)); dm_free(FROM_DCE11_OPP(*opp));
}
*opp = NULL; *opp = NULL;
} }
...@@ -637,7 +637,7 @@ static bool dce110_set_output_transfer_func( ...@@ -637,7 +637,7 @@ static bool dce110_set_output_transfer_func(
struct output_pixel_processor *opp = pipe_ctx->opp; struct output_pixel_processor *opp = pipe_ctx->opp;
opp->funcs->opp_power_on_regamma_lut(opp, true); opp->funcs->opp_power_on_regamma_lut(opp, true);
opp->regamma_params->hw_points_num = GAMMA_HW_POINTS_NUM; opp->regamma_params.hw_points_num = GAMMA_HW_POINTS_NUM;
if (stream->public.out_transfer_func && if (stream->public.out_transfer_func &&
stream->public.out_transfer_func->type == stream->public.out_transfer_func->type ==
...@@ -646,8 +646,8 @@ static bool dce110_set_output_transfer_func( ...@@ -646,8 +646,8 @@ static bool dce110_set_output_transfer_func(
TRANSFER_FUNCTION_SRGB) { TRANSFER_FUNCTION_SRGB) {
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_SRGB); opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_SRGB);
} else if (dce110_translate_regamma_to_hw_format( } else if (dce110_translate_regamma_to_hw_format(
stream->public.out_transfer_func, opp->regamma_params)) { stream->public.out_transfer_func, &opp->regamma_params)) {
opp->funcs->opp_program_regamma_pwl(opp, opp->regamma_params); opp->funcs->opp_program_regamma_pwl(opp, &opp->regamma_params);
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_USER); opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_USER);
} else { } else {
opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_BYPASS); opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_BYPASS);
......
...@@ -56,10 +56,6 @@ bool dce110_opp_v_construct(struct dce110_opp *opp110, ...@@ -56,10 +56,6 @@ bool dce110_opp_v_construct(struct dce110_opp *opp110,
opp110->base.ctx = ctx; opp110->base.ctx = ctx;
opp110->base.regamma_params = dm_alloc(sizeof(struct pwl_params));
if (opp110->base.regamma_params == NULL)
return false;
return true; return true;
} }
...@@ -203,7 +203,7 @@ enum opp_regamma { ...@@ -203,7 +203,7 @@ enum opp_regamma {
struct output_pixel_processor { struct output_pixel_processor {
struct dc_context *ctx; struct dc_context *ctx;
uint32_t inst; uint32_t inst;
struct pwl_params *regamma_params; struct pwl_params regamma_params;
const struct opp_funcs *funcs; const struct opp_funcs *funcs;
}; };
......
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