Allows for mdp_writel_dbg to be redefined as needed to debug blits. Authors: Dima Zavin <[email protected]> Rebecca Schultz Zavin <[email protected]> Colin Cross <[email protected]>
Signed-off-by: Carl Vanderlip <[email protected]> --- drivers/video/msm/mdp_hw.h | 2 +- drivers/video/msm/mdp_ppp.c | 61 ++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/drivers/video/msm/mdp_hw.h b/drivers/video/msm/mdp_hw.h index acb48f5..fdf9e5e 100644 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm/mdp_hw.h @@ -87,7 +87,7 @@ int mdp_ppp_blit(const struct mdp_info *mdp, struct mdp_blit_req *req, #define MDP_DISPLAY0_ADDR (0x00054) #define MDP_DISPLAY1_ADDR (0x00058) #define MDP_EBI2_PORTMAP_MODE (0x0005c) -#define MDP_MODE (0x00060) +#define MDP_PPP_CMD_MODE (0x00060) #define MDP_TV_OUT_STATUS (0x00064) #define MDP_HW_VERSION (0x00070) #define MDP_SW_RESET (0x00074) diff --git a/drivers/video/msm/mdp_ppp.c b/drivers/video/msm/mdp_ppp.c index 3d190b9..290c29a 100644 --- a/drivers/video/msm/mdp_ppp.c +++ b/drivers/video/msm/mdp_ppp.c @@ -331,45 +331,48 @@ static void get_chroma_addr(struct mdp_img *img, struct mdp_rect *rect, } } +#define mdp_writel_dbg(mdp, val, reg) mdp_writel((mdp), (val), (reg)) + static int send_blit(const struct mdp_info *mdp, struct mdp_blit_req *req, struct ppp_regs *regs, struct file *src_file, struct file *dst_file) { - mdp_writel(mdp, 1, 0x060); - mdp_writel(mdp, regs->src_rect, PPP_ADDR_SRC_ROI); - mdp_writel(mdp, regs->src0, PPP_ADDR_SRC0); - mdp_writel(mdp, regs->src1, PPP_ADDR_SRC1); - mdp_writel(mdp, regs->src_ystride, PPP_ADDR_SRC_YSTRIDE); - mdp_writel(mdp, regs->src_cfg, PPP_ADDR_SRC_CFG); - mdp_writel(mdp, regs->src_pack, PPP_ADDR_SRC_PACK_PATTERN); - - mdp_writel(mdp, regs->op, PPP_ADDR_OPERATION); - mdp_writel(mdp, regs->phasex_init, PPP_ADDR_PHASEX_INIT); - mdp_writel(mdp, regs->phasey_init, PPP_ADDR_PHASEY_INIT); - mdp_writel(mdp, regs->phasex_step, PPP_ADDR_PHASEX_STEP); - mdp_writel(mdp, regs->phasey_step, PPP_ADDR_PHASEY_STEP); - - mdp_writel(mdp, (req->alpha << 24) | (req->transp_mask & 0xffffff), +#if 0 + mdp_writel_dbg(mdp, 1, MDP_PPP_CMD_MODE); +#endif + mdp_writel_dbg(mdp, regs->src_rect, PPP_ADDR_SRC_ROI); + mdp_writel_dbg(mdp, regs->src0, PPP_ADDR_SRC0); + mdp_writel_dbg(mdp, regs->src1, PPP_ADDR_SRC1); + mdp_writel_dbg(mdp, regs->src_ystride, PPP_ADDR_SRC_YSTRIDE); + mdp_writel_dbg(mdp, regs->src_cfg, PPP_ADDR_SRC_CFG); + mdp_writel_dbg(mdp, regs->src_pack, PPP_ADDR_SRC_PACK_PATTERN); + + mdp_writel_dbg(mdp, regs->op, PPP_ADDR_OPERATION); + mdp_writel_dbg(mdp, regs->phasex_init, PPP_ADDR_PHASEX_INIT); + mdp_writel_dbg(mdp, regs->phasey_init, PPP_ADDR_PHASEY_INIT); + mdp_writel_dbg(mdp, regs->phasex_step, PPP_ADDR_PHASEX_STEP); + mdp_writel_dbg(mdp, regs->phasey_step, PPP_ADDR_PHASEY_STEP); + + mdp_writel_dbg(mdp, regs->edge, PPP_ADDR_EDGE); + mdp_writel_dbg(mdp, (req->alpha << 24) | (req->transp_mask & 0xffffff), PPP_ADDR_ALPHA_TRANSP); - mdp_writel(mdp, regs->dst_cfg, PPP_ADDR_DST_CFG); - mdp_writel(mdp, regs->dst_pack, PPP_ADDR_DST_PACK_PATTERN); - mdp_writel(mdp, regs->dst_rect, PPP_ADDR_DST_ROI); - mdp_writel(mdp, regs->dst0, PPP_ADDR_DST0); - mdp_writel(mdp, regs->dst1, PPP_ADDR_DST1); - mdp_writel(mdp, regs->dst_ystride, PPP_ADDR_DST_YSTRIDE); + mdp_writel_dbg(mdp, regs->dst_cfg, PPP_ADDR_DST_CFG); + mdp_writel_dbg(mdp, regs->dst_pack, PPP_ADDR_DST_PACK_PATTERN); + mdp_writel_dbg(mdp, regs->dst_rect, PPP_ADDR_DST_ROI); + mdp_writel_dbg(mdp, regs->dst0, PPP_ADDR_DST0); + mdp_writel_dbg(mdp, regs->dst1, PPP_ADDR_DST1); + mdp_writel_dbg(mdp, regs->dst_ystride, PPP_ADDR_DST_YSTRIDE); - mdp_writel(mdp, regs->edge, PPP_ADDR_EDGE); if (regs->op & PPP_OP_BLEND_ON) { - mdp_writel(mdp, regs->dst0, PPP_ADDR_BG0); - mdp_writel(mdp, regs->dst1, PPP_ADDR_BG1); - mdp_writel(mdp, regs->dst_ystride, PPP_ADDR_BG_YSTRIDE); - mdp_writel(mdp, src_img_cfg[req->dst.format], PPP_ADDR_BG_CFG); - mdp_writel(mdp, pack_pattern[req->dst.format], - PPP_ADDR_BG_PACK_PATTERN); + mdp_writel_dbg(mdp, regs->bg0, PPP_ADDR_BG0); + mdp_writel_dbg(mdp, regs->bg1, PPP_ADDR_BG1); + mdp_writel_dbg(mdp, regs->bg_ystride, PPP_ADDR_BG_YSTRIDE); + mdp_writel_dbg(mdp, regs->bg_cfg, PPP_ADDR_BG_CFG); + mdp_writel_dbg(mdp, regs->bg_pack, PPP_ADDR_BG_PACK_PATTERN); } flush_imgs(req, regs, src_file, dst_file); - mdp_writel(mdp, 0x1000, MDP_DISPLAY0_START); + mdp_writel_dbg(mdp, 0x1000, MDP_DISPLAY0_START); return 0; } -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
