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

drm/amd/display: add back quality EASF and ISHARP and dc dependency changes 



[Why]
Addressed previous issues with quality changes and new issues due to
 rolling back quality changes.

[How]
This reverts commit f9e67598, fixes merge conflicts, and fixed some
 formatting errors.
Store current sharpness level for each pregen table to minimize
 calculating sharpness table every time.
Disable dynamic ODM when sharpness is enabled.

Reviewed-by: default avatarJun Lei <jun.lei@amd.com>
Signed-off-by: default avatarSamson Tam <Samson.Tam@amd.com>
Signed-off-by: default avatarZaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9793a4a6

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

+0 −2
Original line number Diff line number Diff line
@@ -1506,8 +1506,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

+28 −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
@@ -171,6 +171,14 @@ 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

	 */

	spl_in->is_fullscreen = dm_helpers_is_fullscreen(pipe_ctx->stream->ctx, pipe_ctx->stream);

	spl_in->is_hdr_on = dm_helpers_is_hdr_on(pipe_ctx->stream->ctx, pipe_ctx->stream);

}



/// @brief Translate SPL output parameters to pipe context
@@ -179,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/dc_spl_translate.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define __DC_SPL_TRANSLATE_H__

#include "dc.h"

#include "resource.h"

#include "dm_helpers.h"



/* Map SPL input parameters to pipe context

 * @pipe_ctx: pipe context

drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c

+10 −1
Original line number Diff line number Diff line
@@ -514,7 +514,8 @@ static void populate_dml21_stream_overrides_from_stream_state( 
		break;

	}

	if (!stream->ctx->dc->debug.enable_single_display_2to1_odm_policy ||

			stream->debug.force_odm_combine_segments > 0)

			stream->debug.force_odm_combine_segments > 0 ||

			stream->ctx->dc->debug.force_sharpness > 1)

		stream_desc->overrides.disable_dynamic_odm = true;

	stream_desc->overrides.disable_subvp = stream->ctx->dc->debug.force_disable_subvp || stream->hw_cursor_req;

}
@@ -777,6 +778,14 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dm 
		 * certain cases. Hence do corrective active and disable scaling.

		 */

		plane->composition.scaler_info.enabled = false;

	} else if ((plane_state->ctx->dc->config.use_spl == true) &&

		(plane->composition.scaler_info.enabled == false)) {

		/* To enable sharpener for 1:1, scaler must be enabled.  If use_spl is set, then

		 *  allow case where ratio is 1 but taps > 1

		 */

		if ((scaler_data->taps.h_taps > 1) || (scaler_data->taps.v_taps > 1) ||

			(scaler_data->taps.h_taps_c > 1) || (scaler_data->taps.v_taps_c > 1))

			plane->composition.scaler_info.enabled = true;

	}



	/* always_scale is only used for debug purposes not used in production but has to be

drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c

+262 −306

File changed.

Preview size limit exceeded, changes collapsed.