Commit f8220070 authored by Samson Tam's avatar Samson Tam Committed by Alex Deucher
Browse files

drm/amd/display: remove dc dependencies from SPL library 



[Why]
Make SPL library dc-independent so it can be reused by other
 components

[How]
Create separate set of fixed31_32 calls in SPL
Make all inputs and outputs to SPL use primitive types
For ratios and inits, return as uint32 from SPL.  So
 add conversion from uint32 back to fixed point in
 SPL-to-dc translate function

Reviewed-by: default avatarRelja Vojvodic <relja.vojvodic@amd.com>
Signed-off-by: default avatarJerry Zuo <jerry.zuo@amd.com>
Signed-off-by: default avatarSamson Tam <samson.tam@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a41d58fb

drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c

+27 −0
Original line number Diff line number Diff line
@@ -486,3 +486,30 @@ int dc_fixpt_s4d19(struct fixed31_32 arg) 
	else

		return ux_dy(arg.value, 4, 19);

}



struct fixed31_32 dc_fixpt_from_ux_dy(unsigned int value,

	unsigned int integer_bits,

	unsigned int fractional_bits)

{

	struct fixed31_32 fixpt_value = dc_fixpt_zero;

	struct fixed31_32 fixpt_int_value = dc_fixpt_zero;

	long long frac_mask = ((long long)1 << (long long)integer_bits) - 1;



	fixpt_value.value = (long long)value << (FIXED31_32_BITS_PER_FRACTIONAL_PART - fractional_bits);

	frac_mask = frac_mask << fractional_bits;

	fixpt_int_value.value = value & frac_mask;

	fixpt_int_value.value <<= (FIXED31_32_BITS_PER_FRACTIONAL_PART - fractional_bits);

	fixpt_value.value |= fixpt_int_value.value;

	return fixpt_value;

}



struct fixed31_32 dc_fixpt_from_int_dy(unsigned int int_value,

	unsigned int frac_value,

	unsigned int integer_bits,

	unsigned int fractional_bits)

{

	struct fixed31_32 fixpt_value = dc_fixpt_from_int(int_value);



	fixpt_value.value |= (long long)frac_value << (FIXED31_32_BITS_PER_FRACTIONAL_PART - fractional_bits);

	return fixpt_value;

}

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+0 −2
Original line number Diff line number Diff line
@@ -1511,8 +1511,6 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
			pipe_ctx->plane_res.scl_data.lb_params.depth = LB_PIXEL_DEPTH_30BPP;



		pipe_ctx->plane_res.scl_data.lb_params.alpha_en = plane_state->per_pixel_alpha;

		spl_out->scl_data.h_active = pipe_ctx->plane_res.scl_data.h_active;

		spl_out->scl_data.v_active = pipe_ctx->plane_res.scl_data.v_active;



		// Convert pipe_ctx to respective input params for SPL

		translate_SPL_in_params_from_pipe_ctx(pipe_ctx, spl_in);

drivers/gpu/drm/amd/display/dc/dc_spl_translate.c

+23 −20
Original line number Diff line number Diff line
@@ -42,26 +42,26 @@ static void populate_spltaps_from_taps(struct spl_taps *spl_scaling_quality, 
static void populate_taps_from_spltaps(struct scaling_taps *scaling_quality,

		const struct spl_taps *spl_scaling_quality)

{

	scaling_quality->h_taps_c = spl_scaling_quality->h_taps_c;

	scaling_quality->h_taps = spl_scaling_quality->h_taps;

	scaling_quality->v_taps_c = spl_scaling_quality->v_taps_c;

	scaling_quality->v_taps = spl_scaling_quality->v_taps;

	scaling_quality->h_taps_c = spl_scaling_quality->h_taps_c + 1;

	scaling_quality->h_taps = spl_scaling_quality->h_taps + 1;

	scaling_quality->v_taps_c = spl_scaling_quality->v_taps_c + 1;

	scaling_quality->v_taps = spl_scaling_quality->v_taps + 1;

}

static void populate_ratios_from_splratios(struct scaling_ratios *ratios,

		const struct spl_ratios *spl_ratios)

		const struct ratio *spl_ratios)

{

	ratios->horz = spl_ratios->horz;

	ratios->vert = spl_ratios->vert;

	ratios->horz_c = spl_ratios->horz_c;

	ratios->vert_c = spl_ratios->vert_c;

	ratios->horz = dc_fixpt_from_ux_dy(spl_ratios->h_scale_ratio >> 5, 3, 19);

	ratios->vert = dc_fixpt_from_ux_dy(spl_ratios->v_scale_ratio >> 5, 3, 19);

	ratios->horz_c = dc_fixpt_from_ux_dy(spl_ratios->h_scale_ratio_c >> 5, 3, 19);

	ratios->vert_c = dc_fixpt_from_ux_dy(spl_ratios->v_scale_ratio_c >> 5, 3, 19);

}

static void populate_inits_from_splinits(struct scl_inits *inits,

		const struct spl_inits *spl_inits)

		const struct init *spl_inits)

{

	inits->h = spl_inits->h;

	inits->v = spl_inits->v;

	inits->h_c = spl_inits->h_c;

	inits->v_c = spl_inits->v_c;

	inits->h = dc_fixpt_from_int_dy(spl_inits->h_filter_init_int, spl_inits->h_filter_init_frac >> 5, 0, 19);

	inits->v = dc_fixpt_from_int_dy(spl_inits->v_filter_init_int, spl_inits->v_filter_init_frac >> 5, 0, 19);

	inits->h_c = dc_fixpt_from_int_dy(spl_inits->h_filter_init_int_c, spl_inits->h_filter_init_frac_c >> 5, 0, 19);

	inits->v_c = dc_fixpt_from_int_dy(spl_inits->v_filter_init_int_c, spl_inits->v_filter_init_frac_c >> 5, 0, 19);

}

/// @brief Translate SPL input parameters from pipe context

/// @param pipe_ctx
@@ -170,6 +170,9 @@ void translate_SPL_in_params_from_pipe_ctx(struct pipe_ctx *pipe_ctx, struct spl 
	/* Translate transfer function */

	spl_in->basic_in.tf_type = (enum spl_transfer_func_type) plane_state->in_transfer_func.type;

	spl_in->basic_in.tf_predefined_type = (enum spl_transfer_func_predefined) plane_state->in_transfer_func.tf;



	spl_in->h_active = pipe_ctx->plane_res.scl_data.h_active;

	spl_in->v_active = pipe_ctx->plane_res.scl_data.v_active;

	/* Check if it is stream is in fullscreen and if its HDR.

	 * Use this to determine sharpness levels

	 */
@@ -184,15 +187,15 @@ void translate_SPL_in_params_from_pipe_ctx(struct pipe_ctx *pipe_ctx, struct spl 
void translate_SPL_out_params_to_pipe_ctx(struct pipe_ctx *pipe_ctx, struct spl_out *spl_out)

{

	// Make scaler data recout point to spl output field recout

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.recout, &spl_out->scl_data.recout);

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.recout, &spl_out->dscl_prog_data->recout);

	// Make scaler data ratios point to spl output field ratios

	populate_ratios_from_splratios(&pipe_ctx->plane_res.scl_data.ratios, &spl_out->scl_data.ratios);

	populate_ratios_from_splratios(&pipe_ctx->plane_res.scl_data.ratios, &spl_out->dscl_prog_data->ratios);

	// Make scaler data viewport point to spl output field viewport

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.viewport, &spl_out->scl_data.viewport);

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.viewport, &spl_out->dscl_prog_data->viewport);

	// Make scaler data viewport_c point to spl output field viewport_c

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.viewport_c, &spl_out->scl_data.viewport_c);

	populate_rect_from_splrect(&pipe_ctx->plane_res.scl_data.viewport_c, &spl_out->dscl_prog_data->viewport_c);

	// Make scaler data taps point to spl output field scaling taps

	populate_taps_from_spltaps(&pipe_ctx->plane_res.scl_data.taps, &spl_out->scl_data.taps);

	populate_taps_from_spltaps(&pipe_ctx->plane_res.scl_data.taps, &spl_out->dscl_prog_data->taps);

	// Make scaler data init point to spl output field init

	populate_inits_from_splinits(&pipe_ctx->plane_res.scl_data.inits, &spl_out->scl_data.inits);

	populate_inits_from_splinits(&pipe_ctx->plane_res.scl_data.inits, &spl_out->dscl_prog_data->init);

}

drivers/gpu/drm/amd/display/dc/spl/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# Makefile for the 'spl' sub-component of DAL.

# It provides the scaling library interface.



SPL = dc_spl.o dc_spl_scl_filters.o dc_spl_scl_easf_filters.o dc_spl_isharp_filters.o dc_spl_filters.o

SPL = dc_spl.o dc_spl_scl_filters.o dc_spl_scl_easf_filters.o dc_spl_isharp_filters.o dc_spl_filters.o spl_fixpt31_32.o



AMD_DAL_SPL = $(addprefix $(AMDDALPATH)/dc/spl/,$(SPL))

drivers/gpu/drm/amd/display/dc/spl/dc_spl.c

+287 −279

File changed.

Preview size limit exceeded, changes collapsed.