evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: fix solidfill config for multi-rect pipes

Browse source 
In multi-rect configuration both the pipes should fetch or should
be in solidfill configuration. The change ensures that when switching
between multi-rect to normal configuration with solid fill
enable/disable the multi-rect mode properly.

CRs-Fixed:1025380
Change-Id: I02fc72583fcd9bc27156ce717b52ef17e16313d5
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
This commit is contained in:
Abhijit Kulkarni 2016-06-06 11:41:42 -07:00 • committed by Kyle Yan
parent f3f6f5f3df
commit 292607a9e5
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/video/fbdev/msm/mdss_mdp_layer.c
View file

@ -1421,6 +1421,17 @@ static bool __multirect_validate_format(struct mdp_input_layer **layers,
if (count != 2)
return false;
if ((layers[0]->flags & MDP_LAYER_SOLID_FILL) !=
(layers[1]->flags & MDP_LAYER_SOLID_FILL)) {
pr_err("solid fill mismatch between multirect layers\n");
return false;
}
/* if both are solidfill, no need for format checks */
else if ((layers[0]->flags & MDP_LAYER_SOLID_FILL) &&
(layers[1]->flags & MDP_LAYER_SOLID_FILL)) {
return true;
}
/* format related validation */
rec0_fmt = mdss_mdp_get_format_params(layers[0]->buffer.format);
if (!rec0_fmt) {
@ -1458,12 +1469,6 @@ static bool __multirect_validate_format(struct mdp_input_layer **layers,
return false;
}
if ((layers[0]->flags & MDP_LAYER_SOLID_FILL) !=
(layers[1]->flags & MDP_LAYER_SOLID_FILL)) {
pr_err("solid fill mismatch between multirect layers\n");
return false;
}
return true;
}

35
drivers/video/fbdev/msm/mdss_mdp_pipe.c
View file

@ -2287,6 +2287,24 @@ static int mdss_mdp_src_addr_setup(struct mdss_mdp_pipe *pipe,
return 0;
}
static void __set_pipe_multirect_opmode(struct mdss_mdp_pipe *pipe)
{
u32 multirect_opmode = 0;
/*
* enable multirect only when both RECT0 and RECT1 are enabled,
* othwerise expect to work in non-multirect only in RECT0
*/
if (pipe->multirect.mode != MDSS_MDP_PIPE_MULTIRECT_NONE) {
multirect_opmode = BIT(0) | BIT(1);
if (pipe->multirect.mode == MDSS_MDP_PIPE_MULTIRECT_SERIAL)
multirect_opmode |= BIT(2);
}
mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_MULTI_REC_OP_MODE,
multirect_opmode);
}
static int mdss_mdp_pipe_solidfill_setup(struct mdss_mdp_pipe *pipe)
{
int ret;
@ -2336,6 +2354,8 @@ static int mdss_mdp_pipe_solidfill_setup(struct mdss_mdp_pipe *pipe)
MDSS_MDP_REG_SSPP_SRC_OP_MODE_REC1, opmode);
}
__set_pipe_multirect_opmode(pipe);
if (pipe->type != MDSS_MDP_PIPE_TYPE_DMA) {
mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SCALE_CONFIG, 0);
if (pipe->type == MDSS_MDP_PIPE_TYPE_VIG)
@ -2603,7 +2623,7 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe,
int ret = 0;
struct mdss_mdp_ctl *ctl;
u32 params_changed;
u32 opmode = 0, multirect_opmode = 0;
u32 opmode = 0;
struct mdss_data_type *mdata = mdss_mdp_get_mdata();
bool roi_changed = false;
bool delayed_programming;
@ -2729,19 +2749,8 @@ int mdss_mdp_pipe_queue_data(struct mdss_mdp_pipe *pipe,
}
}
/*
* enable multirect only when both RECT0 and RECT1 are enabled,
* othwerise expect to work in non-multirect only in RECT0
*/
if (pipe->multirect.mode != MDSS_MDP_PIPE_MULTIRECT_NONE) {
multirect_opmode = BIT(0) | BIT(1);
__set_pipe_multirect_opmode(pipe);
if (pipe->multirect.mode == MDSS_MDP_PIPE_MULTIRECT_SERIAL)
multirect_opmode |= BIT(2);
}
mdss_mdp_pipe_write(pipe, MDSS_MDP_REG_SSPP_MULTI_REC_OP_MODE,
multirect_opmode);
if (src_data == NULL) {
pr_debug("src_data=%p pipe num=%dx\n",
src_data, pipe->num);