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

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
...@@ -404,9 +404,10 @@ struct dc_cursor_position { ...@@ -404,9 +404,10 @@ struct dc_cursor_position {
struct dc_cursor_mi_param { struct dc_cursor_mi_param {
unsigned int pixel_clk_khz; unsigned int pixel_clk_khz;
unsigned int ref_clk_khz; unsigned int ref_clk_khz;
unsigned int viewport_x_start; struct rect viewport;
unsigned int viewport_width;
struct fixed31_32 h_scale_ratio; struct fixed31_32 h_scale_ratio;
struct fixed31_32 v_scale_ratio;
enum dc_rotation_angle rotation;
}; };
/* IPP related types */ /* IPP related types */
......
...@@ -2801,9 +2801,10 @@ void dce110_set_cursor_position(struct pipe_ctx *pipe_ctx) ...@@ -2801,9 +2801,10 @@ void dce110_set_cursor_position(struct pipe_ctx *pipe_ctx)
struct dc_cursor_mi_param param = { struct dc_cursor_mi_param param = {
.pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz, .pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz,
.ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz, .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 = pipe_ctx->plane_res.scl_data.viewport,
.viewport_width = pipe_ctx->plane_res.scl_data.viewport.width, .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,
.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 if (pipe_ctx->plane_state->address.type
......
...@@ -445,10 +445,10 @@ void dpp1_set_cursor_position( ...@@ -445,10 +445,10 @@ void dpp1_set_cursor_position(
uint32_t width) uint32_t width)
{ {
struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base); 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; 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*/ cur_en = 0; /* not visible beyond right edge*/
if (src_x_offset + (int)width <= 0) if (src_x_offset + (int)width <= 0)
......
...@@ -1083,7 +1083,7 @@ void hubp1_cursor_set_position( ...@@ -1083,7 +1083,7 @@ void hubp1_cursor_set_position(
const struct dc_cursor_mi_param *param) const struct dc_cursor_mi_param *param)
{ {
struct dcn10_hubp *hubp1 = TO_DCN10_HUBP(hubp); 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 cur_en = pos->enable ? 1 : 0;
uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0; uint32_t dst_x_offset = (src_x_offset >= 0) ? src_x_offset : 0;
...@@ -1107,7 +1107,7 @@ void hubp1_cursor_set_position( ...@@ -1107,7 +1107,7 @@ void hubp1_cursor_set_position(
dc_fixpt_from_int(dst_x_offset), dc_fixpt_from_int(dst_x_offset),
param->h_scale_ratio)); 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*/ cur_en = 0; /* not visible beyond right edge*/
if (src_x_offset + (int)hubp->curs_attr.width <= 0) if (src_x_offset + (int)hubp->curs_attr.width <= 0)
......
...@@ -2520,9 +2520,10 @@ static void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) ...@@ -2520,9 +2520,10 @@ static void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx)
struct dc_cursor_mi_param param = { struct dc_cursor_mi_param param = {
.pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz, .pixel_clk_khz = pipe_ctx->stream->timing.pix_clk_khz,
.ref_clk_khz = pipe_ctx->stream->ctx->dc->res_pool->ref_clock_inKhz, .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 = pipe_ctx->plane_res.scl_data.viewport,
.viewport_width = pipe_ctx->plane_res.scl_data.viewport.width, .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,
.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 if (pipe_ctx->plane_state->address.type
......
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