msm_fb: display: enable border color fill on external display
Enable border color fill feature on external display. This avoids usage
of RGB pipe for background border fill and can now be used as overlay
layer for UI display.
Change-Id: I652ab3ffe2c43260590e4e5a2ffc986340c4a8c0
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c
index 84beb6a..72a11a2 100644
--- a/drivers/video/msm/mdp4_overlay.c
+++ b/drivers/video/msm/mdp4_overlay.c
@@ -71,6 +71,18 @@
.pipe_num = OVERLAY_PIPE_VG2,
.pipe_ndx = 4,
},
+ {
+ .pipe_type = OVERLAY_TYPE_BF,
+ .pipe_num = OVERLAY_PIPE_RGB3,
+ .pipe_ndx = 5,
+ .mixer_num = MDP4_MIXER0,
+ },
+ {
+ .pipe_type = OVERLAY_TYPE_BF,
+ .pipe_num = OVERLAY_PIPE_VG3,
+ .pipe_ndx = 6,
+ .mixer_num = MDP4_MIXER1,
+ },
},
};
@@ -108,6 +120,11 @@
ctrl->panel_mode |= mode;
}
+void mdp4_overlay_panel_mode_unset(int mixer_num, uint32 mode)
+{
+ ctrl->panel_mode &= ~mode;
+}
+
uint32 mdp4_overlay_panel_list(void)
{
return ctrl->panel_mode;
@@ -339,11 +356,8 @@
static void mdp4_scale_setup(struct mdp4_overlay_pipe *pipe)
{
- int ptype;
-
pipe->phasex_step = MDP4_VG_PHASE_STEP_DEFAULT;
pipe->phasey_step = MDP4_VG_PHASE_STEP_DEFAULT;
- ptype = mdp4_overlay_format2type(pipe->src_format);
if (pipe->dst_h && pipe->src_h != pipe->dst_h) {
if (pipe->dst_h > pipe->src_h * 8) /* too much */
@@ -351,10 +365,15 @@
pipe->op_mode |= MDP4_OP_SCALEY_EN;
if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {
- if (pipe->dst_h <= (pipe->src_h / 4))
+ if (pipe->alpha_enable)
+ pipe->op_mode |= MDP4_OP_SCALEY_PIXEL_RPT;
+ else if (pipe->dst_h <= (pipe->src_h / 4))
pipe->op_mode |= MDP4_OP_SCALEY_MN_PHASE;
else
pipe->op_mode |= MDP4_OP_SCALEY_FIR;
+ } else { /* RGB pipe */
+ pipe->op_mode |= MDP4_OP_SCALE_RGB_BILINEAR;
+ pipe->op_mode |= MDP4_OP_SCALE_ALPHA_BILINEAR;
}
pipe->phasey_step = mdp4_scale_phase_step(29,
@@ -367,10 +386,15 @@
pipe->op_mode |= MDP4_OP_SCALEX_EN;
if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {
- if (pipe->dst_w <= (pipe->src_w / 4))
+ if (pipe->alpha_enable)
+ pipe->op_mode |= MDP4_OP_SCALEX_PIXEL_RPT;
+ else if (pipe->dst_w <= (pipe->src_w / 4))
pipe->op_mode |= MDP4_OP_SCALEX_MN_PHASE;
else
pipe->op_mode |= MDP4_OP_SCALEX_FIR;
+ } else { /* RGB pipe */
+ pipe->op_mode |= MDP4_OP_SCALE_RGB_BILINEAR;
+ pipe->op_mode |= MDP4_OP_SCALE_ALPHA_BILINEAR;
}
pipe->phasex_step = mdp4_scale_phase_step(29,
@@ -1212,7 +1236,9 @@
if (mixer == MDP4_MIXER1)
stage += 8;
- if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {/* VG1 and VG2 */
+ if (pipe->pipe_type == OVERLAY_TYPE_BF) {
+ snum = 16 + (4 * mixer);
+ } else if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {/* VG1 and VG2 */
pnum -= OVERLAY_PIPE_VG1; /* start from 0 */
snum = 0;
snum += (4 * pnum);
@@ -1256,7 +1282,9 @@
if (mixer == MDP4_MIXER1)
stage += 8;
- if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {/* VG1 and VG2 */
+ if (pipe->pipe_type == OVERLAY_TYPE_BF) {
+ snum = 16 + (4 * mixer);
+ } else if (pipe->pipe_num >= OVERLAY_PIPE_VG1) {
pnum -= OVERLAY_PIPE_VG1; /* start from 0 */
snum = 0;
snum += (4 * pnum);
@@ -1283,8 +1311,12 @@
struct mdp4_overlay_pipe *bg_pipe;
unsigned char *overlay_base, *rgb_base;
uint32 c0, c1, c2, blend_op, constant_color = 0, rgb_src_format;
+ uint32 fg_color3_out;
int off;
+ if (pipe->mixer_stage == MDP4_MIXER_STAGE_BASE)
+ return;
+
if (pipe->mixer_num) /* mixer number, /dev/fb0, /dev/fb1 */
overlay_base = MDP_BASE + MDP4_OVERLAYPROC1_BASE;/* 0x18000 */
else
@@ -1294,7 +1326,7 @@
off = 0x20 * (pipe->mixer_stage - MDP4_MIXER_STAGE0);
bg_pipe = mdp4_overlay_stage_pipe(pipe->mixer_num,
- MDP4_MIXER_STAGE_BASE);
+ MDP4_MIXER_STAGE_BASE);
if (bg_pipe == NULL) {
pr_err("%s: Error: no bg_pipe\n", __func__);
return;
@@ -1302,14 +1334,15 @@
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
- blend_op = 0;
+ blend_op = (MDP4_BLEND_FG_ALPHA_FG_CONST |
+ MDP4_BLEND_BG_ALPHA_BG_CONST);
+ outpdw(overlay_base + off + 0x108, pipe->alpha);
+ outpdw(overlay_base + off + 0x10c, 0xff - pipe->alpha);
+ fg_color3_out = 0; /* keep bg alpha by default */
if (pipe->is_fg) {
- blend_op |= (MDP4_BLEND_FG_ALPHA_FG_CONST |
- MDP4_BLEND_BG_ALPHA_BG_CONST);
- outpdw(overlay_base + off + 0x108, pipe->alpha);
- outpdw(overlay_base + off + 0x10c, 0xff - pipe->alpha);
- if (pipe->alpha == 0xff) {
+ if (pipe->alpha == 0xff &&
+ bg_pipe->pipe_num <= OVERLAY_PIPE_RGB2) {
rgb_base = MDP_BASE + MDP4_RGB_BASE;
rgb_base += MDP4_RGB_OFF * bg_pipe->pipe_num;
rgb_src_format = inpdw(rgb_base + 0x50);
@@ -1317,21 +1350,20 @@
outpdw(rgb_base + 0x50, rgb_src_format);
outpdw(rgb_base + 0x1008, constant_color);
}
- } else {
- if (bg_pipe->alpha_enable && pipe->alpha_enable) {
- /* both pipe have alpha */
- blend_op |= (MDP4_BLEND_FG_ALPHA_BG_PIXEL |
- MDP4_BLEND_FG_INV_ALPHA |
- MDP4_BLEND_BG_ALPHA_BG_PIXEL);
- } else if (bg_pipe->alpha_enable && pipe->alpha_enable == 0) {
- /* no alpha on both pipe */
- blend_op = (MDP4_BLEND_BG_ALPHA_BG_PIXEL |
- MDP4_BLEND_FG_ALPHA_BG_PIXEL |
- MDP4_BLEND_FG_INV_ALPHA);
- }
+ } else if (pipe->alpha_enable) {
+ /* pick fg alpha */
+ blend_op = (MDP4_BLEND_BG_ALPHA_FG_PIXEL |
+ MDP4_BLEND_FG_ALPHA_FG_PIXEL |
+ MDP4_BLEND_BG_INV_ALPHA);
+ fg_color3_out = 1; /* keep fg alpha */
+ } else if (bg_pipe->alpha_enable) {
+ /* pick bg alpha */
+ blend_op = (MDP4_BLEND_BG_ALPHA_BG_PIXEL |
+ MDP4_BLEND_FG_ALPHA_BG_PIXEL |
+ MDP4_BLEND_FG_INV_ALPHA);
+ fg_color3_out = 0; /* keep bg alpha */
}
-
if (pipe->transp != MDP_TRANSP_NOP) {
if (pipe->is_fg) {
transp_color_key(pipe->src_format, pipe->transp,
@@ -1363,6 +1395,7 @@
}
outpdw(overlay_base + off + 0x104, blend_op);
+ outpdw(overlay_base + (off << 5) + 0x1004, fg_color3_out);
mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
}
@@ -1377,7 +1410,7 @@
else
bits |= 0x01;
- if (all) {
+ if (all && pipe->pipe_type != OVERLAY_TYPE_BF) {
if (pipe->pipe_num <= OVERLAY_PIPE_RGB2) {
if (pipe->pipe_num == OVERLAY_PIPE_RGB2)
bits |= 0x20;
@@ -1438,6 +1471,9 @@
if ((pipe->pipe_used == 0) && ((pipe->pipe_type == ptype) ||
(ptype == OVERLAY_TYPE_RGB &&
pipe->pipe_type == OVERLAY_TYPE_VIDEO))) {
+ if (ptype == OVERLAY_TYPE_BF &&
+ mixer != pipe->mixer_num)
+ continue;
init_completion(&pipe->comp);
init_completion(&pipe->dmas_comp);
pr_info("%s: pipe=%x ndx=%d num=%d\n", __func__,
@@ -1454,19 +1490,21 @@
void mdp4_overlay_pipe_free(struct mdp4_overlay_pipe *pipe)
{
- uint32 ptype, num, ndx;
+ uint32 ptype, num, ndx, mixer;
pr_info("%s: pipe=%x ndx=%d\n", __func__, (int)pipe, pipe->pipe_ndx);
ptype = pipe->pipe_type;
num = pipe->pipe_num;
ndx = pipe->pipe_ndx;
+ mixer = pipe->mixer_num;
memset(pipe, 0, sizeof(*pipe));
pipe->pipe_type = ptype;
pipe->pipe_num = num;
pipe->pipe_ndx = ndx;
+ pipe->mixer_num = mixer;
}
int mdp4_overlay_req_check(uint32 id, uint32 z_order, uint32 mixer)
@@ -1681,17 +1719,9 @@
return -ENOMEM;
}
- /* no down scale at rgb pipe */
- if (pipe->pipe_num <= OVERLAY_PIPE_RGB2) {
- if ((req->src_rect.h > req->dst_rect.h) ||
- (req->src_rect.w > req->dst_rect.w)) {
- pr_err("%s: h>h || w>w!\n", __func__);
- return -ERANGE;
- }
- }
-
pipe->src_format = req->src.format;
ret = mdp4_overlay_format2pipe(pipe);
+
if (ret < 0) {
pr_err("%s: mdp4_overlay_format2pipe!\n", __func__);
return ret;
@@ -1886,6 +1916,9 @@
*req = pipe->req_data;
+ if (mdp4_overlay_borderfill_supported())
+ req->flags |= MDP_BORDERFILL_SUPPORTED;
+
return 0;
}
@@ -2088,6 +2121,10 @@
mdp4_overlay_status_write(MDP4_OVERLAY_TYPE_SET, true);
}
+ if (ctrl->panel_mode & MDP4_PANEL_DTV &&
+ pipe->mixer_num == MDP4_MIXER1)
+ mdp4_overlay_dtv_set(mfd, pipe);
+
if (new_perf_level != perf_level) {
mdp4_update_perf_level(perf_level);
@@ -2110,10 +2147,8 @@
mdp4_overlay_dtv_vsync_push(mfd, pipe);
}
}
-
mutex_unlock(&mfd->dma->ov_mutex);
-
#ifdef CONFIG_MSM_BUS_SCALING
if (pipe->mixer_num == MDP4_MIXER0) {
mdp_bus_scale_update_request(OVERLAY_BUS_SCALE_TABLE_BASE
@@ -2205,18 +2240,10 @@
mfd->ov0_blt_state = mfd->use_ov0_blt;
}
-#ifdef CONFIG_FB_MSM_DTV
else { /* mixer1, DTV, ATV */
- if (ctrl->panel_mode & MDP4_PANEL_DTV) {
- if (mfd->panel_power_on) {
- flags = pipe->flags;
- pipe->flags &= ~MDP_OV_PLAY_NOWAIT;
- mdp4_overlay_dtv_vsync_push(mfd, pipe);
- pipe->flags = flags;
- }
- }
+ if (ctrl->panel_mode & MDP4_PANEL_DTV)
+ mdp4_overlay_dtv_unset(mfd, pipe);
}
-#endif
/* Reset any HSIC settings to default */
if (pipe->flags & MDP_DPP_HSIC) {