mirror of https://gitee.com/openkylin/linux.git
drm/amd/display: redesign mpc
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
4c6e75989e
commit
f0558542a7
|
@ -517,6 +517,7 @@ static void split_stream_across_pipes(
|
||||||
secondary_pipe->stream = primary_pipe->stream;
|
secondary_pipe->stream = primary_pipe->stream;
|
||||||
secondary_pipe->tg = primary_pipe->tg;
|
secondary_pipe->tg = primary_pipe->tg;
|
||||||
|
|
||||||
|
secondary_pipe->mpcc = pool->mpcc[secondary_pipe->pipe_idx];
|
||||||
secondary_pipe->mi = pool->mis[secondary_pipe->pipe_idx];
|
secondary_pipe->mi = pool->mis[secondary_pipe->pipe_idx];
|
||||||
secondary_pipe->ipp = pool->ipps[secondary_pipe->pipe_idx];
|
secondary_pipe->ipp = pool->ipps[secondary_pipe->pipe_idx];
|
||||||
secondary_pipe->xfm = pool->transforms[secondary_pipe->pipe_idx];
|
secondary_pipe->xfm = pool->transforms[secondary_pipe->pipe_idx];
|
||||||
|
|
|
@ -1008,8 +1008,6 @@ static int acquire_first_split_pipe(
|
||||||
|
|
||||||
if (pipe_ctx->top_pipe &&
|
if (pipe_ctx->top_pipe &&
|
||||||
pipe_ctx->top_pipe->surface == pipe_ctx->surface) {
|
pipe_ctx->top_pipe->surface == pipe_ctx->surface) {
|
||||||
int mpc_idx = pipe_ctx->mpc_idx;
|
|
||||||
|
|
||||||
pipe_ctx->top_pipe->bottom_pipe = pipe_ctx->bottom_pipe;
|
pipe_ctx->top_pipe->bottom_pipe = pipe_ctx->bottom_pipe;
|
||||||
if (pipe_ctx->bottom_pipe)
|
if (pipe_ctx->bottom_pipe)
|
||||||
pipe_ctx->bottom_pipe->top_pipe = pipe_ctx->top_pipe;
|
pipe_ctx->bottom_pipe->top_pipe = pipe_ctx->top_pipe;
|
||||||
|
@ -1021,8 +1019,8 @@ static int acquire_first_split_pipe(
|
||||||
pipe_ctx->xfm = pool->transforms[i];
|
pipe_ctx->xfm = pool->transforms[i];
|
||||||
pipe_ctx->opp = pool->opps[i];
|
pipe_ctx->opp = pool->opps[i];
|
||||||
pipe_ctx->dis_clk = pool->display_clock;
|
pipe_ctx->dis_clk = pool->display_clock;
|
||||||
|
pipe_ctx->mpcc = pool->mpcc[i];
|
||||||
pipe_ctx->pipe_idx = i;
|
pipe_ctx->pipe_idx = i;
|
||||||
pipe_ctx->mpc_idx = mpc_idx;
|
|
||||||
|
|
||||||
pipe_ctx->stream = stream;
|
pipe_ctx->stream = stream;
|
||||||
return i;
|
return i;
|
||||||
|
@ -1243,6 +1241,9 @@ static int acquire_first_free_pipe(
|
||||||
if (!res_ctx->pipe_ctx[i].stream) {
|
if (!res_ctx->pipe_ctx[i].stream) {
|
||||||
struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
|
struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
|
||||||
|
|
||||||
|
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
|
||||||
|
pipe_ctx->mpcc = pool->mpcc[i];
|
||||||
|
#endif
|
||||||
pipe_ctx->tg = pool->timing_generators[i];
|
pipe_ctx->tg = pool->timing_generators[i];
|
||||||
pipe_ctx->mi = pool->mis[i];
|
pipe_ctx->mi = pool->mis[i];
|
||||||
pipe_ctx->ipp = pool->ipps[i];
|
pipe_ctx->ipp = pool->ipps[i];
|
||||||
|
@ -1251,9 +1252,6 @@ static int acquire_first_free_pipe(
|
||||||
pipe_ctx->dis_clk = pool->display_clock;
|
pipe_ctx->dis_clk = pool->display_clock;
|
||||||
pipe_ctx->pipe_idx = i;
|
pipe_ctx->pipe_idx = i;
|
||||||
|
|
||||||
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
|
|
||||||
pipe_ctx->mpc_idx = -1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
pipe_ctx->stream = stream;
|
pipe_ctx->stream = stream;
|
||||||
return i;
|
return i;
|
||||||
|
|
|
@ -135,8 +135,11 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
|
||||||
uint32_t reg_val;
|
uint32_t reg_val;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (ctx->dce_environment == DCE_ENV_FPGA_MAXIMUS)
|
if (IS_FPGA_MAXIMUS_DC(ctx->dce_environment)) {
|
||||||
time_out_num_tries *= 20;
|
/* 35 seconds */
|
||||||
|
delay_between_poll_us = 35000;
|
||||||
|
time_out_num_tries = 1000;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i <= time_out_num_tries; i++) {
|
for (i = 0; i <= time_out_num_tries; i++) {
|
||||||
if (i) {
|
if (i) {
|
||||||
|
@ -157,7 +160,8 @@ uint32_t generic_reg_wait(const struct dc_context *ctx,
|
||||||
|
|
||||||
dm_error("REG_WAIT timeout %dus * %d tries - %s\n",
|
dm_error("REG_WAIT timeout %dus * %d tries - %s\n",
|
||||||
delay_between_poll_us, time_out_num_tries, func_name);
|
delay_between_poll_us, time_out_num_tries, func_name);
|
||||||
if (ctx->dce_environment != DCE_ENV_FPGA_MAXIMUS)
|
|
||||||
|
if (!IS_FPGA_MAXIMUS_DC(ctx->dce_environment))
|
||||||
BREAK_TO_DEBUGGER();
|
BREAK_TO_DEBUGGER();
|
||||||
|
|
||||||
return reg_val;
|
return reg_val;
|
||||||
|
|
|
@ -592,9 +592,19 @@ static void init_hw(struct core_dc *dc)
|
||||||
for (i = 0; i < dc->res_pool->pipe_count; i++) {
|
for (i = 0; i < dc->res_pool->pipe_count; i++) {
|
||||||
struct timing_generator *tg =
|
struct timing_generator *tg =
|
||||||
dc->res_pool->timing_generators[i];
|
dc->res_pool->timing_generators[i];
|
||||||
|
struct mpcc *mpcc =
|
||||||
|
dc->res_pool->mpcc[i];
|
||||||
|
struct mpcc_cfg mpcc_cfg;
|
||||||
|
|
||||||
|
lock_otg_master_update(dc->ctx, tg->inst);
|
||||||
|
mpcc_cfg.opp_id = 0xf;
|
||||||
|
mpcc_cfg.top_dpp_id = 0xf;
|
||||||
|
mpcc_cfg.bot_mpcc_id = 0xf;
|
||||||
|
mpcc_cfg.top_of_tree = true;
|
||||||
|
mpcc->funcs->set(mpcc, &mpcc_cfg);
|
||||||
|
unlock_otg_master(dc->ctx, tg->inst);
|
||||||
|
|
||||||
tg->funcs->disable_vga(tg);
|
tg->funcs->disable_vga(tg);
|
||||||
|
|
||||||
/* Blank controller using driver code instead of
|
/* Blank controller using driver code instead of
|
||||||
* command table.
|
* command table.
|
||||||
*/
|
*/
|
||||||
|
@ -819,8 +829,7 @@ static void reset_front_end_for_pipe(
|
||||||
struct pipe_ctx *pipe_ctx,
|
struct pipe_ctx *pipe_ctx,
|
||||||
struct validate_context *context)
|
struct validate_context *context)
|
||||||
{
|
{
|
||||||
struct dcn10_mpc *mpc = TO_DCN10_MPC(dc->res_pool->mpc);
|
struct mpcc_cfg mpcc_cfg;
|
||||||
struct mpc_tree_cfg *tree_cfg = NULL;
|
|
||||||
|
|
||||||
if (!pipe_ctx->surface)
|
if (!pipe_ctx->surface)
|
||||||
return;
|
return;
|
||||||
|
@ -829,20 +838,14 @@ static void reset_front_end_for_pipe(
|
||||||
|
|
||||||
lock_otg_master_update(dc->ctx, pipe_ctx->tg->inst);
|
lock_otg_master_update(dc->ctx, pipe_ctx->tg->inst);
|
||||||
|
|
||||||
/* TODO: build stream pipes group id. For now, use stream otg
|
mpcc_cfg.opp_id = 0xf;
|
||||||
* id as pipe group id
|
mpcc_cfg.top_dpp_id = 0xf;
|
||||||
*/
|
mpcc_cfg.bot_mpcc_id = 0xf;
|
||||||
tree_cfg = &dc->current_context->res_ctx.mpc_tree[pipe_ctx->mpc_idx];
|
mpcc_cfg.top_of_tree = !pipe_ctx->top_pipe;
|
||||||
|
pipe_ctx->mpcc->funcs->set(pipe_ctx->mpcc, &mpcc_cfg);
|
||||||
if (!dcn10_remove_dpp(mpc, tree_cfg, pipe_ctx->pipe_idx)) {
|
|
||||||
dm_logger_write(dc->ctx->logger, LOG_RESOURCE,
|
|
||||||
"%s: failed to find dpp to be removed!\n",
|
|
||||||
__func__);
|
|
||||||
}
|
|
||||||
|
|
||||||
pipe_ctx->top_pipe = NULL;
|
pipe_ctx->top_pipe = NULL;
|
||||||
pipe_ctx->bottom_pipe = NULL;
|
pipe_ctx->bottom_pipe = NULL;
|
||||||
pipe_ctx->mpc_idx = -1;
|
|
||||||
|
|
||||||
unlock_master_tg_and_wait(dc->ctx, pipe_ctx->tg->inst);
|
unlock_master_tg_and_wait(dc->ctx, pipe_ctx->tg->inst);
|
||||||
|
|
||||||
|
@ -850,8 +853,6 @@ static void reset_front_end_for_pipe(
|
||||||
|
|
||||||
wait_no_outstanding_request(dc->ctx, pipe_ctx->pipe_idx);
|
wait_no_outstanding_request(dc->ctx, pipe_ctx->pipe_idx);
|
||||||
|
|
||||||
wait_mpcc_idle(mpc, pipe_ctx->pipe_idx);
|
|
||||||
|
|
||||||
disable_clocks(dc->ctx, pipe_ctx->pipe_idx);
|
disable_clocks(dc->ctx, pipe_ctx->pipe_idx);
|
||||||
|
|
||||||
pipe_ctx->xfm->funcs->transform_reset(pipe_ctx->xfm);
|
pipe_ctx->xfm->funcs->transform_reset(pipe_ctx->xfm);
|
||||||
|
@ -893,14 +894,10 @@ static void reset_hw_ctx_wrap(
|
||||||
reset_hw_ctx(dc, context, reset_front_end_for_pipe);
|
reset_hw_ctx(dc, context, reset_front_end_for_pipe);
|
||||||
/* Reset Back End*/
|
/* Reset Back End*/
|
||||||
reset_hw_ctx(dc, context, reset_back_end_for_pipe);
|
reset_hw_ctx(dc, context, reset_back_end_for_pipe);
|
||||||
|
|
||||||
memcpy(context->res_ctx.mpc_tree,
|
|
||||||
dc->current_context->res_ctx.mpc_tree,
|
|
||||||
sizeof(struct mpc_tree_cfg) * dc->res_pool->pipe_count);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool patch_address_for_sbs_tb_stereo(struct pipe_ctx *pipe_ctx,
|
static bool patch_address_for_sbs_tb_stereo(
|
||||||
PHYSICAL_ADDRESS_LOC *addr)
|
struct pipe_ctx *pipe_ctx, PHYSICAL_ADDRESS_LOC *addr)
|
||||||
{
|
{
|
||||||
struct core_surface *surface = pipe_ctx->surface;
|
struct core_surface *surface = pipe_ctx->surface;
|
||||||
bool sec_split = pipe_ctx->top_pipe &&
|
bool sec_split = pipe_ctx->top_pipe &&
|
||||||
|
@ -1670,14 +1667,10 @@ static void update_dchubp_dpp(
|
||||||
struct input_pixel_processor *ipp = pipe_ctx->ipp;
|
struct input_pixel_processor *ipp = pipe_ctx->ipp;
|
||||||
struct core_surface *surface = pipe_ctx->surface;
|
struct core_surface *surface = pipe_ctx->surface;
|
||||||
union plane_size size = surface->public.plane_size;
|
union plane_size size = surface->public.plane_size;
|
||||||
struct mpc_tree_cfg *tree_cfg = NULL;
|
|
||||||
struct default_adjustment ocsc = {0};
|
struct default_adjustment ocsc = {0};
|
||||||
enum dc_color_space color_space;
|
|
||||||
struct tg_color black_color = {0};
|
struct tg_color black_color = {0};
|
||||||
struct dcn10_mpc *mpc = TO_DCN10_MPC(dc->res_pool->mpc);
|
struct mpcc_cfg mpcc_cfg;
|
||||||
struct pipe_ctx *temp_pipe;
|
struct pipe_ctx *top_pipe;
|
||||||
int i;
|
|
||||||
int tree_pos = 0;
|
|
||||||
bool per_pixel_alpha = surface->public.per_pixel_alpha && pipe_ctx->bottom_pipe;
|
bool per_pixel_alpha = surface->public.per_pixel_alpha && pipe_ctx->bottom_pipe;
|
||||||
|
|
||||||
/* TODO: proper fix once fpga works */
|
/* TODO: proper fix once fpga works */
|
||||||
|
@ -1716,39 +1709,23 @@ static void update_dchubp_dpp(
|
||||||
1,
|
1,
|
||||||
IPP_OUTPUT_FORMAT_12_BIT_FIX);
|
IPP_OUTPUT_FORMAT_12_BIT_FIX);
|
||||||
|
|
||||||
/* mpc TODO un-hardcode object ids
|
|
||||||
* for pseudo code pipe_move.c :
|
|
||||||
* add_plane_mpcc(added_plane_inst, mpcc_inst, ...);
|
|
||||||
* Do we want to cache the tree_cfg?
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* TODO: build stream pipes group id. For now, use stream otg
|
|
||||||
* id as pipe group id
|
|
||||||
*/
|
|
||||||
pipe_ctx->scl_data.lb_params.alpha_en = per_pixel_alpha;
|
pipe_ctx->scl_data.lb_params.alpha_en = per_pixel_alpha;
|
||||||
pipe_ctx->mpc_idx = pipe_ctx->tg->inst;
|
for (top_pipe = pipe_ctx; top_pipe != NULL; top_pipe = top_pipe->top_pipe)
|
||||||
tree_cfg = &context->res_ctx.mpc_tree[pipe_ctx->mpc_idx];
|
mpcc_cfg.opp_id = top_pipe->opp->inst;
|
||||||
if (tree_cfg->num_pipes == 0) {
|
mpcc_cfg.top_dpp_id = pipe_ctx->pipe_idx;
|
||||||
tree_cfg->opp_id = pipe_ctx->tg->inst;
|
if (pipe_ctx->bottom_pipe)
|
||||||
for (i = 0; i < MAX_PIPES; i++) {
|
mpcc_cfg.bot_mpcc_id = pipe_ctx->bottom_pipe->mpcc->inst;
|
||||||
tree_cfg->dpp[i] = 0xf;
|
else
|
||||||
tree_cfg->mpcc[i] = 0xf;
|
mpcc_cfg.bot_mpcc_id = 0xf;
|
||||||
}
|
mpcc_cfg.top_of_tree = !pipe_ctx->top_pipe;
|
||||||
}
|
mpcc_cfg.per_pixel_alpha = per_pixel_alpha;
|
||||||
|
if (!dc->current_context->res_ctx.pipe_ctx[pipe_ctx->pipe_idx].surface)
|
||||||
|
pipe_ctx->mpcc->funcs->wait_for_idle(pipe_ctx->mpcc);
|
||||||
|
pipe_ctx->mpcc->funcs->set(pipe_ctx->mpcc, &mpcc_cfg);
|
||||||
|
|
||||||
for (temp_pipe = pipe_ctx->top_pipe;
|
color_space_to_black_color(
|
||||||
temp_pipe != NULL; temp_pipe = temp_pipe->top_pipe)
|
dc, pipe_ctx->stream->public.output_color_space, &black_color);
|
||||||
tree_pos++;
|
pipe_ctx->mpcc->funcs->set_bg_color(pipe_ctx->mpcc, &black_color);
|
||||||
|
|
||||||
tree_cfg->dpp[tree_pos] = pipe_ctx->pipe_idx;
|
|
||||||
tree_cfg->mpcc[tree_pos] = pipe_ctx->pipe_idx;
|
|
||||||
tree_cfg->per_pixel_alpha[tree_pos] = per_pixel_alpha;
|
|
||||||
tree_cfg->num_pipes = tree_pos + 1;
|
|
||||||
dcn10_set_mpc_tree(mpc, tree_cfg);
|
|
||||||
|
|
||||||
color_space = pipe_ctx->stream->public.output_color_space;
|
|
||||||
color_space_to_black_color(dc, color_space, &black_color);
|
|
||||||
dcn10_set_mpc_background_color(mpc, pipe_ctx->pipe_idx, &black_color);
|
|
||||||
|
|
||||||
pipe_ctx->scl_data.lb_params.depth = LB_PIXEL_DEPTH_30BPP;
|
pipe_ctx->scl_data.lb_params.depth = LB_PIXEL_DEPTH_30BPP;
|
||||||
/* scaler configuration */
|
/* scaler configuration */
|
||||||
|
@ -1853,13 +1830,8 @@ static void dcn10_apply_ctx_for_surface(
|
||||||
|
|
||||||
|
|
||||||
/* looking for top pipe to program */
|
/* looking for top pipe to program */
|
||||||
if (!pipe_ctx->top_pipe) {
|
if (!pipe_ctx->top_pipe)
|
||||||
memcpy(context->res_ctx.mpc_tree,
|
|
||||||
dc->current_context->res_ctx.mpc_tree,
|
|
||||||
sizeof(struct mpc_tree_cfg) * dc->res_pool->pipe_count);
|
|
||||||
|
|
||||||
program_all_pipe_in_tree(dc, pipe_ctx, context);
|
program_all_pipe_in_tree(dc, pipe_ctx, context);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS,
|
dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_CALCS,
|
||||||
|
@ -1927,8 +1899,7 @@ static void dcn10_apply_ctx_for_surface(
|
||||||
|
|
||||||
if ((!pipe_ctx->surface && old_pipe_ctx->surface)
|
if ((!pipe_ctx->surface && old_pipe_ctx->surface)
|
||||||
|| (!pipe_ctx->stream && old_pipe_ctx->stream))
|
|| (!pipe_ctx->stream && old_pipe_ctx->stream))
|
||||||
reset_front_end_for_pipe(dc,
|
reset_front_end_for_pipe(dc, old_pipe_ctx, dc->current_context);
|
||||||
old_pipe_ctx, dc->current_context);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,34 +27,26 @@
|
||||||
#include "dcn10_mpc.h"
|
#include "dcn10_mpc.h"
|
||||||
|
|
||||||
#define REG(reg)\
|
#define REG(reg)\
|
||||||
mpc->mpc_regs->reg
|
mpcc10->mpcc_regs->reg
|
||||||
|
|
||||||
#define CTX \
|
#define CTX \
|
||||||
mpc->base.ctx
|
mpcc10->base.ctx
|
||||||
|
|
||||||
#undef FN
|
#undef FN
|
||||||
#define FN(reg_name, field_name) \
|
#define FN(reg_name, field_name) \
|
||||||
mpc->mpc_shift->field_name, mpc->mpc_mask->field_name
|
mpcc10->mpcc_shift->field_name, mpcc10->mpcc_mask->field_name
|
||||||
|
|
||||||
#define MODE_TOP_ONLY 1
|
#define MODE_TOP_ONLY 1
|
||||||
#define MODE_BLEND 3
|
#define MODE_BLEND 3
|
||||||
|
#define BLND_PP_ALPHA 0
|
||||||
|
#define BLND_GLOBAL_ALPHA 2
|
||||||
|
|
||||||
/* Internal function to set mpc output mux */
|
|
||||||
static void set_output_mux(struct dcn10_mpc *mpc,
|
void dcn10_mpcc_set_bg_color(
|
||||||
uint8_t opp_id,
|
struct mpcc *mpcc,
|
||||||
uint8_t mpcc_id)
|
struct tg_color *bg_color)
|
||||||
{
|
|
||||||
if (mpcc_id != 0xf)
|
|
||||||
REG_UPDATE(OPP_PIPE_CONTROL[opp_id],
|
|
||||||
OPP_PIPE_CLOCK_EN, 1);
|
|
||||||
|
|
||||||
REG_SET(MUX[opp_id], 0, MPC_OUT_MUX, mpcc_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
void dcn10_set_mpc_background_color(struct dcn10_mpc *mpc,
|
|
||||||
unsigned int mpcc_inst,
|
|
||||||
struct tg_color *bg_color)
|
|
||||||
{
|
{
|
||||||
|
struct dcn10_mpcc *mpcc10 = TO_DCN10_MPCC(mpcc);
|
||||||
/* mpc color is 12 bit. tg_color is 10 bit */
|
/* mpc color is 12 bit. tg_color is 10 bit */
|
||||||
/* todo: might want to use 16 bit to represent color and have each
|
/* todo: might want to use 16 bit to represent color and have each
|
||||||
* hw block translate to correct color depth.
|
* hw block translate to correct color depth.
|
||||||
|
@ -63,277 +55,89 @@ void dcn10_set_mpc_background_color(struct dcn10_mpc *mpc,
|
||||||
uint32_t bg_g_y = bg_color->color_g_y << 2;
|
uint32_t bg_g_y = bg_color->color_g_y << 2;
|
||||||
uint32_t bg_b_cb = bg_color->color_b_cb << 2;
|
uint32_t bg_b_cb = bg_color->color_b_cb << 2;
|
||||||
|
|
||||||
REG_SET(MPCC_BG_R_CR[mpcc_inst], 0,
|
REG_SET(MPCC_BG_R_CR, 0,
|
||||||
MPCC_BG_R_CR, bg_r_cr);
|
MPCC_BG_R_CR, bg_r_cr);
|
||||||
REG_SET(MPCC_BG_G_Y[mpcc_inst], 0,
|
REG_SET(MPCC_BG_G_Y, 0,
|
||||||
MPCC_BG_G_Y, bg_g_y);
|
MPCC_BG_G_Y, bg_g_y);
|
||||||
REG_SET(MPCC_BG_B_CB[mpcc_inst], 0,
|
REG_SET(MPCC_BG_B_CB, 0,
|
||||||
MPCC_BG_B_CB, bg_b_cb);
|
MPCC_BG_B_CB, bg_b_cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This function programs MPC tree configuration
|
static void set_output_mux(struct dcn10_mpcc *mpcc10, int opp_id, int mpcc_id)
|
||||||
* Assume it is the initial time to setup MPC tree_configure, means
|
|
||||||
* the instance of dpp/mpcc/opp specified in structure tree_cfg are
|
|
||||||
* in idle status.
|
|
||||||
* Before invoke this function, ensure that master lock of OPTC specified
|
|
||||||
* by opp_id is set.
|
|
||||||
*
|
|
||||||
* tree_cfg[in] - new MPC_TREE_CFG
|
|
||||||
*/
|
|
||||||
|
|
||||||
void dcn10_set_mpc_tree(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg)
|
|
||||||
{
|
{
|
||||||
int i;
|
ASSERT(mpcc10->opp_id == 0xf || opp_id == mpcc10->opp_id);
|
||||||
|
mpcc10->opp_id = opp_id;
|
||||||
for (i = 0; i < tree_cfg->num_pipes; i++) {
|
REG_UPDATE(OPP_PIPE_CONTROL[opp_id], OPP_PIPE_CLOCK_EN, 1);
|
||||||
uint8_t mpcc_inst = tree_cfg->mpcc[i];
|
REG_SET(MUX[opp_id], 0, MPC_OUT_MUX, mpcc_id);
|
||||||
|
|
||||||
REG_SET(MPCC_OPP_ID[mpcc_inst], 0,
|
|
||||||
MPCC_OPP_ID, tree_cfg->opp_id);
|
|
||||||
|
|
||||||
REG_SET(MPCC_TOP_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_TOP_SEL, tree_cfg->dpp[i]);
|
|
||||||
|
|
||||||
if (i == tree_cfg->num_pipes-1) {
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_BOT_SEL, 0xF);
|
|
||||||
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_inst],
|
|
||||||
MPCC_MODE, MODE_TOP_ONLY);
|
|
||||||
} else {
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_BOT_SEL, tree_cfg->dpp[i+1]);
|
|
||||||
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_inst],
|
|
||||||
MPCC_MODE, MODE_BLEND);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i == 0)
|
|
||||||
set_output_mux(
|
|
||||||
mpc, tree_cfg->opp_id, mpcc_inst);
|
|
||||||
|
|
||||||
REG_UPDATE_2(MPCC_CONTROL[mpcc_inst],
|
|
||||||
MPCC_ALPHA_BLND_MODE,
|
|
||||||
tree_cfg->per_pixel_alpha[i] ? 0 : 2,
|
|
||||||
MPCC_ALPHA_MULTIPLIED_MODE, 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
static void reset_output_mux(struct dcn10_mpcc *mpcc10)
|
||||||
* This is the function to remove current MPC tree specified by tree_cfg
|
|
||||||
* Before invoke this function, ensure that master lock of OPTC specified
|
|
||||||
* by opp_id is set.
|
|
||||||
*
|
|
||||||
*tree_cfg[in/out] - current MPC_TREE_CFG
|
|
||||||
*/
|
|
||||||
void dcn10_delete_mpc_tree(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg)
|
|
||||||
{
|
{
|
||||||
int i;
|
REG_SET(MUX[mpcc10->opp_id], 0, MPC_OUT_MUX, 0xf);
|
||||||
|
REG_UPDATE(OPP_PIPE_CONTROL[mpcc10->opp_id], OPP_PIPE_CLOCK_EN, 0);
|
||||||
for (i = 0; i < tree_cfg->num_pipes; i++) {
|
mpcc10->opp_id = 0xf;
|
||||||
uint8_t mpcc_inst = tree_cfg->mpcc[i];
|
|
||||||
|
|
||||||
REG_SET(MPCC_OPP_ID[mpcc_inst], 0,
|
|
||||||
MPCC_OPP_ID, 0xf);
|
|
||||||
|
|
||||||
REG_SET(MPCC_TOP_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_TOP_SEL, 0xf);
|
|
||||||
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_BOT_SEL, 0xF);
|
|
||||||
|
|
||||||
/* add remove dpp/mpcc pair into pending list
|
|
||||||
* TODO FPGA AddToPendingList if empty from pseudo code
|
|
||||||
*/
|
|
||||||
tree_cfg->dpp[i] = 0xf;
|
|
||||||
tree_cfg->mpcc[i] = 0xf;
|
|
||||||
tree_cfg->per_pixel_alpha[i] = false;
|
|
||||||
}
|
|
||||||
set_output_mux(mpc, tree_cfg->opp_id, 0xf);
|
|
||||||
tree_cfg->opp_id = 0xf;
|
|
||||||
tree_cfg->num_pipes = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO FPGA: how to handle DPP?
|
static void dcn10_mpcc_set(struct mpcc *mpcc, struct mpcc_cfg *cfg)
|
||||||
* Function to remove one of pipe from MPC configure tree by dpp idx
|
|
||||||
* Before invoke this function, ensure that master lock of OPTC specified
|
|
||||||
* by opp_id is set
|
|
||||||
* This function can be invoke multiple times to remove more than 1 dpps.
|
|
||||||
*
|
|
||||||
* tree_cfg[in/out] - current MPC_TREE_CFG
|
|
||||||
* idx[in] - index of dpp from tree_cfg to be removed.
|
|
||||||
*/
|
|
||||||
bool dcn10_remove_dpp(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg,
|
|
||||||
uint8_t idx)
|
|
||||||
{
|
{
|
||||||
int i;
|
struct dcn10_mpcc *mpcc10 = TO_DCN10_MPCC(mpcc);
|
||||||
uint8_t mpcc_inst;
|
int alpha_blnd_mode = cfg->per_pixel_alpha ?
|
||||||
bool found = false;
|
BLND_PP_ALPHA : BLND_GLOBAL_ALPHA;
|
||||||
|
int mpcc_mode = cfg->bot_mpcc_id != 0xf ?
|
||||||
|
MODE_BLEND : MODE_TOP_ONLY;
|
||||||
|
|
||||||
/* find dpp_idx from dpp array of tree_cfg */
|
REG_SET(MPCC_OPP_ID, 0,
|
||||||
for (i = 0; i < tree_cfg->num_pipes; i++) {
|
MPCC_OPP_ID, cfg->opp_id);
|
||||||
if (tree_cfg->dpp[i] == idx) {
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!found) {
|
REG_SET(MPCC_TOP_SEL, 0,
|
||||||
BREAK_TO_DEBUGGER();
|
MPCC_TOP_SEL, cfg->top_dpp_id);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
mpcc_inst = tree_cfg->mpcc[i];
|
|
||||||
|
|
||||||
REG_SET(MPCC_OPP_ID[mpcc_inst], 0,
|
REG_SET(MPCC_BOT_SEL, 0,
|
||||||
MPCC_OPP_ID, 0xf);
|
MPCC_BOT_SEL, cfg->bot_mpcc_id);
|
||||||
|
|
||||||
REG_SET(MPCC_TOP_SEL[mpcc_inst], 0,
|
REG_SET_4(MPCC_CONTROL, 0xffffffff,
|
||||||
MPCC_TOP_SEL, 0xf);
|
MPCC_MODE, mpcc_mode,
|
||||||
|
MPCC_ALPHA_BLND_MODE, alpha_blnd_mode,
|
||||||
|
MPCC_ALPHA_MULTIPLIED_MODE, 0/*TODO: cfg->per_pixel_alpha*/,
|
||||||
|
MPCC_BLND_ACTIVE_OVERLAP_ONLY, cfg->top_of_tree);
|
||||||
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
if (cfg->top_of_tree) {
|
||||||
MPCC_BOT_SEL, 0xf);
|
if (cfg->opp_id != 0xf)
|
||||||
|
set_output_mux(mpcc10, cfg->opp_id, mpcc->inst);
|
||||||
if (i == 0) {
|
|
||||||
if (tree_cfg->num_pipes > 1)
|
|
||||||
set_output_mux(mpc,
|
|
||||||
tree_cfg->opp_id, tree_cfg->mpcc[i+1]);
|
|
||||||
else
|
else
|
||||||
set_output_mux(mpc, tree_cfg->opp_id, 0xf);
|
reset_output_mux(mpcc10);
|
||||||
} else if (i == tree_cfg->num_pipes-1) {
|
|
||||||
mpcc_inst = tree_cfg->mpcc[i - 1];
|
|
||||||
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_BOT_SEL, 0xF);
|
|
||||||
|
|
||||||
/* prev mpc is now last, set to top only*/
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_inst],
|
|
||||||
MPCC_MODE, MODE_TOP_ONLY);
|
|
||||||
} else {
|
|
||||||
mpcc_inst = tree_cfg->mpcc[i - 1];
|
|
||||||
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_inst], 0,
|
|
||||||
MPCC_BOT_SEL, tree_cfg->mpcc[i+1]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update tree_cfg structure */
|
|
||||||
while (i < tree_cfg->num_pipes - 1) {
|
|
||||||
tree_cfg->dpp[i] = tree_cfg->dpp[i+1];
|
|
||||||
tree_cfg->mpcc[i] = tree_cfg->mpcc[i+1];
|
|
||||||
tree_cfg->per_pixel_alpha[i] = tree_cfg->per_pixel_alpha[i+1];
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
tree_cfg->num_pipes--;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO FPGA: how to handle DPP?
|
static void dcn10_mpcc_wait_idle(struct mpcc *mpcc)
|
||||||
* Function to add DPP/MPCC pair into MPC configure tree by position.
|
|
||||||
* Before invoke this function, ensure that master lock of OPTC specified
|
|
||||||
* by opp_id is set
|
|
||||||
* This function can be invoke multiple times to add more than 1 pipes.
|
|
||||||
*
|
|
||||||
* tree_cfg[in/out] - current MPC_TREE_CFG
|
|
||||||
* dpp_idx[in] - index of an idle dpp insatnce to be added.
|
|
||||||
* mpcc_idx[in] - index of an idle mpcc instance to be added.
|
|
||||||
* poistion[in] - position of dpp/mpcc pair to be added into current tree_cfg
|
|
||||||
* 0 means insert to the most top layer of MPC tree
|
|
||||||
*/
|
|
||||||
void dcn10_add_dpp(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg,
|
|
||||||
uint8_t dpp_idx,
|
|
||||||
uint8_t mpcc_idx,
|
|
||||||
uint8_t per_pixel_alpha,
|
|
||||||
uint8_t position)
|
|
||||||
{
|
{
|
||||||
uint8_t prev;
|
struct dcn10_mpcc *mpcc10 = TO_DCN10_MPCC(mpcc);
|
||||||
uint8_t next;
|
|
||||||
|
|
||||||
REG_SET(MPCC_OPP_ID[mpcc_idx], 0,
|
REG_WAIT(MPCC_STATUS, MPCC_IDLE, 1, 1000, 1000);
|
||||||
MPCC_OPP_ID, tree_cfg->opp_id);
|
|
||||||
REG_SET(MPCC_TOP_SEL[mpcc_idx], 0,
|
|
||||||
MPCC_TOP_SEL, dpp_idx);
|
|
||||||
|
|
||||||
if (position == 0) {
|
|
||||||
/* idle dpp/mpcc is added to the top layer of tree */
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_idx], 0,
|
|
||||||
MPCC_BOT_SEL, tree_cfg->mpcc[0]);
|
|
||||||
|
|
||||||
/* bottom mpc is always top only */
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_idx],
|
|
||||||
MPCC_MODE, MODE_TOP_ONLY);
|
|
||||||
/* opp will get new output. from new added mpcc */
|
|
||||||
set_output_mux(mpc, tree_cfg->opp_id, mpcc_idx);
|
|
||||||
|
|
||||||
} else if (position == tree_cfg->num_pipes) {
|
|
||||||
/* idle dpp/mpcc is added to the bottom layer of tree */
|
|
||||||
|
|
||||||
/* get instance of previous bottom mpcc, set to middle layer */
|
|
||||||
prev = tree_cfg->mpcc[position - 1];
|
|
||||||
|
|
||||||
REG_SET(MPCC_BOT_SEL[prev], 0,
|
|
||||||
MPCC_BOT_SEL, mpcc_idx);
|
|
||||||
|
|
||||||
/* all mpcs other than bottom need to blend */
|
|
||||||
REG_UPDATE(MPCC_CONTROL[prev],
|
|
||||||
MPCC_MODE, MODE_BLEND);
|
|
||||||
|
|
||||||
/* mpcc_idx become new bottom mpcc*/
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_idx], 0,
|
|
||||||
MPCC_BOT_SEL, 0xf);
|
|
||||||
|
|
||||||
/* bottom mpc is always top only */
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_idx],
|
|
||||||
MPCC_MODE, MODE_TOP_ONLY);
|
|
||||||
} else {
|
|
||||||
/* idle dpp/mpcc is added to middle of tree */
|
|
||||||
prev = tree_cfg->mpcc[position - 1]; /* mpc a */
|
|
||||||
next = tree_cfg->mpcc[position]; /* mpc b */
|
|
||||||
|
|
||||||
/* connect mpc inserted below mpc a*/
|
|
||||||
REG_SET(MPCC_BOT_SEL[prev], 0,
|
|
||||||
MPCC_BOT_SEL, mpcc_idx);
|
|
||||||
|
|
||||||
/* blend on mpc being inserted */
|
|
||||||
REG_UPDATE(MPCC_CONTROL[mpcc_idx],
|
|
||||||
MPCC_MODE, MODE_BLEND);
|
|
||||||
|
|
||||||
/* Connect mpc b below one inserted */
|
|
||||||
REG_SET(MPCC_BOT_SEL[mpcc_idx], 0,
|
|
||||||
MPCC_BOT_SEL, next);
|
|
||||||
|
|
||||||
}
|
|
||||||
/* premultiplied mode only if alpha is on for the layer*/
|
|
||||||
REG_UPDATE_2(MPCC_CONTROL[mpcc_idx],
|
|
||||||
MPCC_ALPHA_BLND_MODE,
|
|
||||||
tree_cfg->per_pixel_alpha[position] ? 0 : 2,
|
|
||||||
MPCC_ALPHA_MULTIPLIED_MODE, 0);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* iterating from the last mpc/dpp pair to the one being added, shift
|
|
||||||
* them down one position
|
|
||||||
*/
|
|
||||||
for (next = tree_cfg->num_pipes; next > position; next--) {
|
|
||||||
tree_cfg->dpp[next] = tree_cfg->dpp[next - 1];
|
|
||||||
tree_cfg->mpcc[next] = tree_cfg->mpcc[next - 1];
|
|
||||||
tree_cfg->per_pixel_alpha[next] = tree_cfg->per_pixel_alpha[next - 1];
|
|
||||||
}
|
|
||||||
|
|
||||||
/* insert the new mpc/dpp pair into the tree_cfg*/
|
|
||||||
tree_cfg->dpp[position] = dpp_idx;
|
|
||||||
tree_cfg->mpcc[position] = mpcc_idx;
|
|
||||||
tree_cfg->per_pixel_alpha[position] = per_pixel_alpha;
|
|
||||||
tree_cfg->num_pipes++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wait_mpcc_idle(struct dcn10_mpc *mpc,
|
|
||||||
uint8_t mpcc_id)
|
const struct mpcc_funcs dcn10_mpcc_funcs = {
|
||||||
|
.set = dcn10_mpcc_set,
|
||||||
|
.wait_for_idle = dcn10_mpcc_wait_idle,
|
||||||
|
.set_bg_color = dcn10_mpcc_set_bg_color,
|
||||||
|
};
|
||||||
|
|
||||||
|
void dcn10_mpcc_construct(struct dcn10_mpcc *mpcc10,
|
||||||
|
struct dc_context *ctx,
|
||||||
|
const struct dcn_mpcc_registers *mpcc_regs,
|
||||||
|
const struct dcn_mpcc_shift *mpcc_shift,
|
||||||
|
const struct dcn_mpcc_mask *mpcc_mask,
|
||||||
|
int inst)
|
||||||
{
|
{
|
||||||
REG_WAIT(MPCC_STATUS[mpcc_id],
|
mpcc10->base.ctx = ctx;
|
||||||
MPCC_IDLE, 1,
|
|
||||||
1000, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
mpcc10->base.inst = inst;
|
||||||
|
mpcc10->base.funcs = &dcn10_mpcc_funcs;
|
||||||
|
|
||||||
|
mpcc10->mpcc_regs = mpcc_regs;
|
||||||
|
mpcc10->mpcc_shift = mpcc_shift;
|
||||||
|
mpcc10->mpcc_mask = mpcc_mask;
|
||||||
|
|
||||||
|
mpcc10->opp_id = inst;
|
||||||
|
}
|
||||||
|
|
|
@ -22,45 +22,45 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __DC_MPC_DCN10_H__
|
#ifndef __DC_MPCC_DCN10_H__
|
||||||
#define __DC_MPC_DCN10_H__
|
#define __DC_MPCC_DCN10_H__
|
||||||
|
|
||||||
#include "mpc.h"
|
#include "mpc.h"
|
||||||
|
|
||||||
#define TO_DCN10_MPC(mpc_base)\
|
#define TO_DCN10_MPCC(mpcc_base) \
|
||||||
container_of(mpc_base, struct dcn10_mpc, base)
|
container_of(mpcc_base, struct dcn10_mpcc, base)
|
||||||
|
|
||||||
#define MAX_MPCC 4
|
|
||||||
#define MAX_MPC_OUT 4
|
|
||||||
#define MAX_OPP 4
|
#define MAX_OPP 4
|
||||||
|
|
||||||
#define MPC_COMMON_REG_LIST_DCN1_0(inst) \
|
#define MPC_COMMON_REG_LIST_DCN1_0(inst) \
|
||||||
SRII(MPCC_TOP_SEL, MPCC, inst),\
|
|
||||||
SRII(MPCC_BOT_SEL, MPCC, inst),\
|
|
||||||
SRII(MPCC_CONTROL, MPCC, inst),\
|
|
||||||
SRII(MPCC_STATUS, MPCC, inst),\
|
|
||||||
SRII(MPCC_OPP_ID, MPCC, inst),\
|
|
||||||
SRII(MPCC_BG_G_Y, MPCC, inst),\
|
|
||||||
SRII(MPCC_BG_R_CR, MPCC, inst),\
|
|
||||||
SRII(MPCC_BG_B_CB, MPCC, inst),\
|
|
||||||
SRII(MPCC_BG_B_CB, MPCC, inst),\
|
|
||||||
SRII(MUX, MPC_OUT, inst),\
|
SRII(MUX, MPC_OUT, inst),\
|
||||||
SRII(OPP_PIPE_CONTROL, OPP_PIPE, inst)
|
SRII(OPP_PIPE_CONTROL, OPP_PIPE, inst)
|
||||||
|
|
||||||
struct dcn_mpc_registers {
|
#define MPCC_COMMON_REG_LIST_DCN1_0(inst) \
|
||||||
uint32_t MPCC_TOP_SEL[MAX_MPCC];
|
SRI(MPCC_TOP_SEL, MPCC, inst),\
|
||||||
uint32_t MPCC_BOT_SEL[MAX_MPCC];
|
SRI(MPCC_BOT_SEL, MPCC, inst),\
|
||||||
uint32_t MPCC_CONTROL[MAX_MPCC];
|
SRI(MPCC_CONTROL, MPCC, inst),\
|
||||||
uint32_t MPCC_STATUS[MAX_MPCC];
|
SRI(MPCC_STATUS, MPCC, inst),\
|
||||||
uint32_t MPCC_OPP_ID[MAX_MPCC];
|
SRI(MPCC_OPP_ID, MPCC, inst),\
|
||||||
uint32_t MPCC_BG_G_Y[MAX_MPCC];
|
SRI(MPCC_BG_G_Y, MPCC, inst),\
|
||||||
uint32_t MPCC_BG_R_CR[MAX_MPCC];
|
SRI(MPCC_BG_R_CR, MPCC, inst),\
|
||||||
uint32_t MPCC_BG_B_CB[MAX_MPCC];
|
SRI(MPCC_BG_B_CB, MPCC, inst),\
|
||||||
uint32_t MUX[MAX_MPC_OUT];
|
SRI(MPCC_BG_B_CB, MPCC, inst)
|
||||||
|
|
||||||
|
struct dcn_mpcc_registers {
|
||||||
|
uint32_t MPCC_TOP_SEL;
|
||||||
|
uint32_t MPCC_BOT_SEL;
|
||||||
|
uint32_t MPCC_CONTROL;
|
||||||
|
uint32_t MPCC_STATUS;
|
||||||
|
uint32_t MPCC_OPP_ID;
|
||||||
|
uint32_t MPCC_BG_G_Y;
|
||||||
|
uint32_t MPCC_BG_R_CR;
|
||||||
|
uint32_t MPCC_BG_B_CB;
|
||||||
uint32_t OPP_PIPE_CONTROL[MAX_OPP];
|
uint32_t OPP_PIPE_CONTROL[MAX_OPP];
|
||||||
|
uint32_t MUX[MAX_OPP];
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MPC_COMMON_MASK_SH_LIST_DCN1_0(mask_sh)\
|
#define MPCC_COMMON_MASK_SH_LIST_DCN1_0(mask_sh)\
|
||||||
SF(MPCC0_MPCC_TOP_SEL, MPCC_TOP_SEL, mask_sh),\
|
SF(MPCC0_MPCC_TOP_SEL, MPCC_TOP_SEL, mask_sh),\
|
||||||
SF(MPCC0_MPCC_BOT_SEL, MPCC_BOT_SEL, mask_sh),\
|
SF(MPCC0_MPCC_BOT_SEL, MPCC_BOT_SEL, mask_sh),\
|
||||||
SF(MPCC0_MPCC_CONTROL, MPCC_MODE, mask_sh),\
|
SF(MPCC0_MPCC_CONTROL, MPCC_MODE, mask_sh),\
|
||||||
|
@ -75,7 +75,7 @@ struct dcn_mpc_registers {
|
||||||
SF(MPC_OUT0_MUX, MPC_OUT_MUX, mask_sh),\
|
SF(MPC_OUT0_MUX, MPC_OUT_MUX, mask_sh),\
|
||||||
SF(OPP_PIPE0_OPP_PIPE_CONTROL, OPP_PIPE_CLOCK_EN, mask_sh)
|
SF(OPP_PIPE0_OPP_PIPE_CONTROL, OPP_PIPE_CLOCK_EN, mask_sh)
|
||||||
|
|
||||||
#define MPC_REG_FIELD_LIST(type) \
|
#define MPCC_REG_FIELD_LIST(type) \
|
||||||
type MPCC_TOP_SEL;\
|
type MPCC_TOP_SEL;\
|
||||||
type MPCC_BOT_SEL;\
|
type MPCC_BOT_SEL;\
|
||||||
type MPCC_MODE;\
|
type MPCC_MODE;\
|
||||||
|
@ -90,42 +90,28 @@ struct dcn_mpc_registers {
|
||||||
type MPC_OUT_MUX;\
|
type MPC_OUT_MUX;\
|
||||||
type OPP_PIPE_CLOCK_EN;\
|
type OPP_PIPE_CLOCK_EN;\
|
||||||
|
|
||||||
struct dcn_mpc_shift {
|
struct dcn_mpcc_shift {
|
||||||
MPC_REG_FIELD_LIST(uint8_t)
|
MPCC_REG_FIELD_LIST(uint8_t)
|
||||||
};
|
};
|
||||||
|
|
||||||
struct dcn_mpc_mask {
|
struct dcn_mpcc_mask {
|
||||||
MPC_REG_FIELD_LIST(uint32_t)
|
MPCC_REG_FIELD_LIST(uint32_t)
|
||||||
};
|
};
|
||||||
|
|
||||||
struct dcn10_mpc {
|
struct dcn10_mpcc {
|
||||||
struct mpc base;
|
struct mpcc base;
|
||||||
const struct dcn_mpc_registers *mpc_regs;
|
const struct dcn_mpcc_registers *mpcc_regs;
|
||||||
const struct dcn_mpc_shift *mpc_shift;
|
const struct dcn_mpcc_shift *mpcc_shift;
|
||||||
const struct dcn_mpc_mask *mpc_mask;
|
const struct dcn_mpcc_mask *mpcc_mask;
|
||||||
|
|
||||||
|
int opp_id;
|
||||||
};
|
};
|
||||||
|
|
||||||
void dcn10_delete_mpc_tree(struct dcn10_mpc *mpc,
|
void dcn10_mpcc_construct(struct dcn10_mpcc *mpcc10,
|
||||||
struct mpc_tree_cfg *tree_cfg);
|
struct dc_context *ctx,
|
||||||
|
const struct dcn_mpcc_registers *mpcc_regs,
|
||||||
|
const struct dcn_mpcc_shift *mpcc_shift,
|
||||||
|
const struct dcn_mpcc_mask *mpcc_mask,
|
||||||
|
int inst);
|
||||||
|
|
||||||
bool dcn10_remove_dpp(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg,
|
|
||||||
uint8_t idx);
|
|
||||||
|
|
||||||
void dcn10_add_dpp(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg,
|
|
||||||
uint8_t dpp_idx,
|
|
||||||
uint8_t mpcc_idx,
|
|
||||||
uint8_t per_pixel_alpha,
|
|
||||||
uint8_t position);
|
|
||||||
|
|
||||||
void wait_mpcc_idle(struct dcn10_mpc *mpc,
|
|
||||||
uint8_t mpcc_id);
|
|
||||||
|
|
||||||
void dcn10_set_mpc_tree(struct dcn10_mpc *mpc,
|
|
||||||
struct mpc_tree_cfg *tree_cfg);
|
|
||||||
|
|
||||||
void dcn10_set_mpc_background_color(struct dcn10_mpc *mpc,
|
|
||||||
unsigned int mpcc_inst,
|
|
||||||
struct tg_color *bg_color);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -336,19 +336,28 @@ static const struct dcn_transform_mask tf_mask = {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const struct dcn_mpc_registers mpc_regs = {
|
#define mpcc_regs(id)\
|
||||||
MPC_COMMON_REG_LIST_DCN1_0(0),
|
[id] = {\
|
||||||
MPC_COMMON_REG_LIST_DCN1_0(1),
|
MPCC_COMMON_REG_LIST_DCN1_0(id),\
|
||||||
MPC_COMMON_REG_LIST_DCN1_0(2),
|
MPC_COMMON_REG_LIST_DCN1_0(0),\
|
||||||
MPC_COMMON_REG_LIST_DCN1_0(3),
|
MPC_COMMON_REG_LIST_DCN1_0(1),\
|
||||||
|
MPC_COMMON_REG_LIST_DCN1_0(2),\
|
||||||
|
MPC_COMMON_REG_LIST_DCN1_0(3),\
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct dcn_mpcc_registers mpcc_regs[] = {
|
||||||
|
mpcc_regs(0),
|
||||||
|
mpcc_regs(1),
|
||||||
|
mpcc_regs(2),
|
||||||
|
mpcc_regs(3),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct dcn_mpc_shift mpc_shift = {
|
static const struct dcn_mpcc_shift mpcc_shift = {
|
||||||
MPC_COMMON_MASK_SH_LIST_DCN1_0(__SHIFT)
|
MPCC_COMMON_MASK_SH_LIST_DCN1_0(__SHIFT)
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct dcn_mpc_mask mpc_mask = {
|
static const struct dcn_mpcc_mask mpcc_mask = {
|
||||||
MPC_COMMON_MASK_SH_LIST_DCN1_0(_MASK),
|
MPCC_COMMON_MASK_SH_LIST_DCN1_0(_MASK),
|
||||||
};
|
};
|
||||||
|
|
||||||
#define tg_regs(id)\
|
#define tg_regs(id)\
|
||||||
|
@ -509,28 +518,22 @@ static struct output_pixel_processor *dcn10_opp_create(
|
||||||
return &opp->base;
|
return &opp->base;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct mpc *dcn10_mpc_create(
|
static struct mpcc *dcn10_mpcc_create(
|
||||||
struct dc_context *ctx)
|
struct dc_context *ctx,
|
||||||
|
int inst)
|
||||||
{
|
{
|
||||||
struct dcn10_mpc *mpc = dm_alloc(sizeof(struct dcn10_mpc));
|
struct dcn10_mpcc *mpcc10 = dm_alloc(sizeof(struct dcn10_mpcc));
|
||||||
|
|
||||||
if (!mpc)
|
if (!mpcc10)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
mpc->base.ctx = ctx;
|
dcn10_mpcc_construct(mpcc10, ctx,
|
||||||
mpc->mpc_regs = &mpc_regs;
|
&mpcc_regs[inst],
|
||||||
mpc->mpc_shift = &mpc_shift;
|
&mpcc_shift,
|
||||||
mpc->mpc_mask = &mpc_mask;
|
&mpcc_mask,
|
||||||
|
inst);
|
||||||
|
|
||||||
return &mpc->base;
|
return &mpcc10->base;
|
||||||
}
|
|
||||||
|
|
||||||
static void dcn10_mpc_destroy(struct mpc **mpc_base)
|
|
||||||
{
|
|
||||||
if (*mpc_base)
|
|
||||||
dm_free(TO_DCN10_MPC(*mpc_base));
|
|
||||||
|
|
||||||
*mpc_base = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct timing_generator *dcn10_timing_generator_create(
|
static struct timing_generator *dcn10_timing_generator_create(
|
||||||
|
@ -736,6 +739,11 @@ static void destruct(struct dcn10_resource_pool *pool)
|
||||||
dm_free(DCN10TG_FROM_TG(pool->base.timing_generators[i]));
|
dm_free(DCN10TG_FROM_TG(pool->base.timing_generators[i]));
|
||||||
pool->base.timing_generators[i] = NULL;
|
pool->base.timing_generators[i] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pool->base.mpcc[i] != NULL) {
|
||||||
|
dm_free(TO_DCN10_MPCC(pool->base.mpcc[i]));
|
||||||
|
pool->base.mpcc[i] = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < pool->base.stream_enc_count; i++) {
|
for (i = 0; i < pool->base.stream_enc_count; i++) {
|
||||||
|
@ -760,9 +768,6 @@ static void destruct(struct dcn10_resource_pool *pool)
|
||||||
pool->base.dp_clock_source = NULL;
|
pool->base.dp_clock_source = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pool->base.mpc != NULL)
|
|
||||||
dcn10_mpc_destroy(&pool->base.mpc);
|
|
||||||
|
|
||||||
if (pool->base.abm != NULL)
|
if (pool->base.abm != NULL)
|
||||||
dce_abm_destroy(&pool->base.abm);
|
dce_abm_destroy(&pool->base.abm);
|
||||||
|
|
||||||
|
@ -1007,6 +1012,7 @@ static struct pipe_ctx *dcn10_acquire_idle_pipe_for_layer(
|
||||||
idle_pipe->stream = head_pipe->stream;
|
idle_pipe->stream = head_pipe->stream;
|
||||||
idle_pipe->tg = head_pipe->tg;
|
idle_pipe->tg = head_pipe->tg;
|
||||||
|
|
||||||
|
idle_pipe->mpcc = pool->mpcc[idle_pipe->pipe_idx];
|
||||||
idle_pipe->mi = pool->mis[idle_pipe->pipe_idx];
|
idle_pipe->mi = pool->mis[idle_pipe->pipe_idx];
|
||||||
idle_pipe->ipp = pool->ipps[idle_pipe->pipe_idx];
|
idle_pipe->ipp = pool->ipps[idle_pipe->pipe_idx];
|
||||||
idle_pipe->xfm = pool->transforms[idle_pipe->pipe_idx];
|
idle_pipe->xfm = pool->transforms[idle_pipe->pipe_idx];
|
||||||
|
@ -1427,10 +1433,14 @@ static bool construct(
|
||||||
dm_error("DC: failed to create tg!\n");
|
dm_error("DC: failed to create tg!\n");
|
||||||
goto otg_create_fail;
|
goto otg_create_fail;
|
||||||
}
|
}
|
||||||
|
pool->base.mpcc[i] = dcn10_mpcc_create(ctx, i);
|
||||||
|
if (pool->base.mpcc[i] == NULL) {
|
||||||
|
BREAK_TO_DEBUGGER();
|
||||||
|
dm_error("DC: failed to create mpcc!\n");
|
||||||
|
goto mpcc_create_fail;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pool->base.mpc = dcn10_mpc_create(ctx);
|
|
||||||
|
|
||||||
if (!resource_construct(num_virtual_links, dc, &pool->base,
|
if (!resource_construct(num_virtual_links, dc, &pool->base,
|
||||||
(!IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment) ?
|
(!IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment) ?
|
||||||
&res_create_funcs : &res_create_maximus_funcs)))
|
&res_create_funcs : &res_create_maximus_funcs)))
|
||||||
|
@ -1444,6 +1454,7 @@ static bool construct(
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
disp_clk_create_fail:
|
disp_clk_create_fail:
|
||||||
|
mpcc_create_fail:
|
||||||
otg_create_fail:
|
otg_create_fail:
|
||||||
opp_create_fail:
|
opp_create_fail:
|
||||||
transform_create_fail:
|
transform_create_fail:
|
||||||
|
|
|
@ -236,6 +236,9 @@ struct resource_pool {
|
||||||
struct output_pixel_processor *opps[MAX_PIPES];
|
struct output_pixel_processor *opps[MAX_PIPES];
|
||||||
struct timing_generator *timing_generators[MAX_PIPES];
|
struct timing_generator *timing_generators[MAX_PIPES];
|
||||||
struct stream_encoder *stream_enc[MAX_PIPES * 2];
|
struct stream_encoder *stream_enc[MAX_PIPES * 2];
|
||||||
|
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
|
||||||
|
struct mpcc *mpcc[MAX_PIPES];
|
||||||
|
#endif
|
||||||
|
|
||||||
unsigned int pipe_count;
|
unsigned int pipe_count;
|
||||||
unsigned int underlay_pipe_index;
|
unsigned int underlay_pipe_index;
|
||||||
|
@ -259,9 +262,6 @@ struct resource_pool {
|
||||||
|
|
||||||
struct abm *abm;
|
struct abm *abm;
|
||||||
struct dmcu *dmcu;
|
struct dmcu *dmcu;
|
||||||
#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
|
|
||||||
struct mpc *mpc;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const struct resource_funcs *funcs;
|
const struct resource_funcs *funcs;
|
||||||
const struct resource_caps *res_cap;
|
const struct resource_caps *res_cap;
|
||||||
|
@ -295,8 +295,9 @@ struct pipe_ctx {
|
||||||
|
|
||||||
struct pipe_ctx *top_pipe;
|
struct pipe_ctx *top_pipe;
|
||||||
struct pipe_ctx *bottom_pipe;
|
struct pipe_ctx *bottom_pipe;
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
|
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
|
||||||
uint8_t mpc_idx;
|
struct mpcc *mpcc;
|
||||||
struct _vcs_dpi_display_dlg_regs_st dlg_regs;
|
struct _vcs_dpi_display_dlg_regs_st dlg_regs;
|
||||||
struct _vcs_dpi_display_ttu_regs_st ttu_regs;
|
struct _vcs_dpi_display_ttu_regs_st ttu_regs;
|
||||||
struct _vcs_dpi_display_rq_regs_st rq_regs;
|
struct _vcs_dpi_display_rq_regs_st rq_regs;
|
||||||
|
@ -306,9 +307,6 @@ struct pipe_ctx {
|
||||||
|
|
||||||
struct resource_context {
|
struct resource_context {
|
||||||
struct pipe_ctx pipe_ctx[MAX_PIPES];
|
struct pipe_ctx pipe_ctx[MAX_PIPES];
|
||||||
#ifdef CONFIG_DRM_AMD_DC_DCN1_0
|
|
||||||
struct mpc_tree_cfg mpc_tree[MAX_PIPES];
|
|
||||||
#endif
|
|
||||||
bool is_stream_enc_acquired[MAX_PIPES * 2];
|
bool is_stream_enc_acquired[MAX_PIPES * 2];
|
||||||
bool is_audio_acquired[MAX_PIPES];
|
bool is_audio_acquired[MAX_PIPES];
|
||||||
uint8_t clock_source_ref_count[MAX_CLOCK_SOURCES];
|
uint8_t clock_source_ref_count[MAX_CLOCK_SOURCES];
|
||||||
|
|
|
@ -22,76 +22,29 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __DC_MPC_H__
|
#ifndef __DC_MPCC_H__
|
||||||
#define __DC_MPC_H__
|
#define __DC_MPCC_H__
|
||||||
|
|
||||||
/* This structure define the mpc tree configuration
|
#include "dc_hw_types.h"
|
||||||
* num_pipes - number of pipes of the tree
|
|
||||||
* opp_id - instance id of OPP to drive MPC
|
|
||||||
* dpp- array of DPP index
|
|
||||||
* mpcc - array of MPCC index
|
|
||||||
* mode - the most bottom layer MPCC mode control.
|
|
||||||
* All other layers need to be program to 3
|
|
||||||
*
|
|
||||||
* The connection will be:
|
|
||||||
* mpcc[num_pipes-1]->mpcc[num_pipes-2]->...->mpcc[1]->mpcc[0]->OPP[opp_id]
|
|
||||||
* dpp[0]->mpcc[0]
|
|
||||||
* dpp[1]->mpcc[1]
|
|
||||||
* ...
|
|
||||||
* dpp[num_pipes-1]->mpcc[num_pipes-1]
|
|
||||||
* mpcc[0] is the most top layer of MPC tree,
|
|
||||||
* mpcc[num_pipes-1] is the most bottom layer.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct mpc_tree_cfg {
|
struct mpcc_cfg {
|
||||||
uint8_t num_pipes;
|
int top_dpp_id;
|
||||||
uint8_t opp_id;
|
int bot_mpcc_id;
|
||||||
/* dpp pipes for blend */
|
int opp_id;
|
||||||
uint8_t dpp[6];
|
bool per_pixel_alpha;
|
||||||
/* mpcc insatnces for blend */
|
bool top_of_tree;
|
||||||
uint8_t mpcc[6];
|
|
||||||
bool per_pixel_alpha[6];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct mpcc_blnd_cfg {
|
struct mpcc {
|
||||||
/* 0- perpixel alpha, 1- perpixel alpha combined with global gain,
|
const struct mpcc_funcs *funcs;
|
||||||
* 2- global alpha
|
|
||||||
*/
|
|
||||||
uint8_t alpha_mode;
|
|
||||||
uint8_t global_gain;
|
|
||||||
uint8_t global_alpha;
|
|
||||||
bool overlap_only;
|
|
||||||
bool pre_multiplied_alpha;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct mpcc_sm_cfg {
|
|
||||||
bool enable;
|
|
||||||
/* 0-single plane, 2-row subsampling, 4-column subsampling,
|
|
||||||
* 6-checkboard subsampling
|
|
||||||
*/
|
|
||||||
uint8_t sm_mode;
|
|
||||||
bool frame_alt; /* 0- disable, 1- enable */
|
|
||||||
bool field_alt; /* 0- disable, 1- enable */
|
|
||||||
/* 0-no force, 2-force frame polarity from top,
|
|
||||||
* 3-force frame polarity from bottom
|
|
||||||
*/
|
|
||||||
uint8_t force_next_frame_porlarity;
|
|
||||||
/* 0-no force, 2-force field polarity from top,
|
|
||||||
* 3-force field polarity from bottom
|
|
||||||
*/
|
|
||||||
uint8_t force_next_field_polarity;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct mpcc_vupdate_lock_cfg {
|
|
||||||
bool cfg_lock;
|
|
||||||
bool adr_lock;
|
|
||||||
bool adr_cfg_lock;
|
|
||||||
bool cur0_lock;
|
|
||||||
bool cur1_lock;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct mpc {
|
|
||||||
struct dc_context *ctx;
|
struct dc_context *ctx;
|
||||||
|
int inst;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct mpcc_funcs {
|
||||||
|
void (*set)(struct mpcc *mpcc, struct mpcc_cfg *cfg);
|
||||||
|
void (*wait_for_idle)(struct mpcc *mpcc);
|
||||||
|
void (*set_bg_color)( struct mpcc *mpcc, struct tg_color *bg_color);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue