Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a9f4d8 authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: add additional info for cursor position programming 



Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 793d4d08

drivers/gpu/drm/amd/display/dc/dc_hw_types.h

+3 −2
Original line number Diff line number Diff line
@@ -404,9 +404,10 @@ struct dc_cursor_position { 
struct dc_cursor_mi_param {

	unsigned int pixel_clk_khz;

	unsigned int ref_clk_khz;

	unsigned int viewport_x_start;

	unsigned int viewport_width;

	struct rect viewport;

	struct fixed31_32 h_scale_ratio;

	struct fixed31_32 v_scale_ratio;

	enum dc_rotation_angle rotation;

};



/* IPP related types */

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+4 −3
Original line number Diff line number Diff line
@@ -2801,9 +2801,10 @@ void dce110_set_cursor_position(struct pipe_ctx *pipe_ctx) 
	struct dc_cursor_mi_param param = {

		.pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz,

		.ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz,

		.viewport_x_start = pipe_ctx->plane_res.scl_data.viewport.x,

		.viewport_width = pipe_ctx->plane_res.scl_data.viewport.width,

		.h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz

		.viewport = pipe_ctx->plane_res.scl_data.viewport,

		.h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,

		.v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,

		.rotation = pipe_ctx->plane_state->rotation

	};



	if (pipe_ctx->plane_state->address.type

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c

+2 −2
Original line number Diff line number Diff line
@@ -445,10 +445,10 @@ void dpp1_set_cursor_position( 
		uint32_t width)

{

	struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);

	int src_x_offset = pos->x - pos->x_hotspot - param->viewport_x_start;

	int src_x_offset = pos->x - pos->x_hotspot - param->viewport.x;

	uint32_t cur_en = pos->enable ? 1 : 0;



	if (src_x_offset >= (int)param->viewport_width)

	if (src_x_offset >= (int)param->viewport.width)

		cur_en = 0;  /* not visible beyond right edge*/



	if (src_x_offset + (int)width <= 0)

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c

+2 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ void hubp1_cursor_set_position( 
		const struct dc_cursor_mi_param *param)

{

	struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp);

	int src_x_offset = pos->x - pos->x_hotspot - param->viewport_x_start;

	int src_x_offset = pos->x - pos->x_hotspot - param->viewport.x;

	uint32_t cur_en = pos->enable ? 1 : 0;

	uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0;
@@ -1107,7 +1107,7 @@ void hubp1_cursor_set_position( 
				dc_fixpt_from_int(dst_x_offset),

				param->h_scale_ratio));



	if (src_x_offset >= (int)param->viewport_width)

	if (src_x_offset >= (int)param->viewport.width)

		cur_en = 0;  /* not visible beyond right edge*/



	if (src_x_offset + (int)hubp->curs_attr.width <= 0)

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+4 −3
Original line number Diff line number Diff line
@@ -2520,9 +2520,10 @@ static void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) 
	struct dc_cursor_mi_param param = {

		.pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz,

		.ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz,

		.viewport_x_start = pipe_ctx->plane_res.scl_data.viewport.x,

		.viewport_width = pipe_ctx->plane_res.scl_data.viewport.width,

		.h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz

		.viewport = pipe_ctx->plane_res.scl_data.viewport,

		.h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,

		.v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,

		.rotation = pipe_ctx->plane_state->rotation

	};



	if (pipe_ctx->plane_state->address.type