drm/amd/display: remove unnecessary allocation for regamma_params inside opp (974db151) · Commits · 戴 / test

drivers/gpu/drm/amd/display/dc/dce/dce_opp.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -987,10 +987,6 @@ bool dce110_opp_construct(struct dce110_opp *opp110,

		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->opp_shift = opp_shift;
		opp110->opp_mask = opp_mask;
		@@ -1000,12 +996,8 @@ bool dce110_opp_construct(struct dce110_opp *opp110,

		void dce110_opp_destroy(struct output_pixel_processor **opp)
		{
		if (*opp) {
		if ((*opp)->regamma_params)
		dm_free((*opp)->regamma_params);
		(*opp)->regamma_params = NULL;
		if (*opp)
		dm_free(FROM_DCE11_OPP(*opp));
		}
		*opp = NULL;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -637,7 +637,7 @@ static bool dce110_set_output_transfer_func(
		struct output_pixel_processor *opp = pipe_ctx->opp;

		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 &&
		stream->public.out_transfer_func->type ==
		@@ -646,8 +646,8 @@ static bool dce110_set_output_transfer_func(
		TRANSFER_FUNCTION_SRGB) {
		opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_SRGB);
		} else if (dce110_translate_regamma_to_hw_format(
		stream->public.out_transfer_func, opp->regamma_params)) {
		opp->funcs->opp_program_regamma_pwl(opp, opp->regamma_params);
		stream->public.out_transfer_func, &opp->regamma_params)) {
		opp->funcs->opp_program_regamma_pwl(opp, &opp->regamma_params);
		opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_USER);
		} else {
		opp->funcs->opp_set_regamma_mode(opp, OPP_REGAMMA_BYPASS);

+0 −4

Original line number	Diff line number	Diff line
		@@ -56,10 +56,6 @@ bool dce110_opp_v_construct(struct dce110_opp *opp110,

		opp110->base.ctx = ctx;

		opp110->base.regamma_params = dm_alloc(sizeof(struct pwl_params));
		if (opp110->base.regamma_params == NULL)
		return false;

		return true;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ enum opp_regamma {
		struct output_pixel_processor {
		struct dc_context *ctx;
		uint32_t inst;
		struct pwl_params *regamma_params;
		struct pwl_params regamma_params;
		const struct opp_funcs *funcs;
		};