diff options
| author | Guoniu.Zhou <guoniu.zhou@nxp.com> | 2017-07-05 14:03:06 +0800 |
|---|---|---|
| committer | Guoniu.Zhou <guoniu.zhou@nxp.com> | 2017-07-12 09:43:55 +0800 |
| commit | eabcafbe1765c04211cf46a2395505af80a45519 (patch) | |
| tree | a85a0386279edbc64b31115734e6983f205a3835 /drivers | |
| parent | a9423b181466e7b0a09ae9b697ae9e140292af71 (diff) | |
MLK-15337: pxp-v3: add pxp v3 crop feature
Add pxp v3 crop feature support.
Update the pxp_dma.h file.
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit 23da5fe99a89adde6a8943517e0d7042dad50ea3)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/pxp/pxp_dma_v3.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/dma/pxp/pxp_dma_v3.c b/drivers/dma/pxp/pxp_dma_v3.c index 8d2e10edc14f..457e80d9a5c9 100644 --- a/drivers/dma/pxp/pxp_dma_v3.c +++ b/drivers/dma/pxp/pxp_dma_v3.c @@ -3220,10 +3220,10 @@ static int convert_param_to_pixmap(struct pxp_pixmap *pixmap, pixmap->bpp = get_bpp_from_fmt(pixmap->format); pixmap->pitch = param->width * pixmap->bpp >> 3; - pixmap->crop.x = param->left; - pixmap->crop.y = param->top; - pixmap->crop.width = param->width; - pixmap->crop.height = param->height; + pixmap->crop.x = param->crop.left; + pixmap->crop.y = param->crop.top; + pixmap->crop.width = param->crop.width; + pixmap->crop.height = param->crop.height; return 0; } @@ -3407,6 +3407,12 @@ static void __pxpdma_dostart(struct pxp_channel *pxp_chan) pxp->pxp_conf_state.s0_param.width, pxp->pxp_conf_state.s0_param.height, pxp->pxp_conf_state.s0_param.paddr); + pr_debug("%s:%d S0 crop (top, left)=(%d, %d), (width, height)=(%d, %d)\n", + __func__, __LINE__, + pxp->pxp_conf_state.s0_param.crop.top, + pxp->pxp_conf_state.s0_param.crop.left, + pxp->pxp_conf_state.s0_param.crop.width, + pxp->pxp_conf_state.s0_param.crop.height); pr_debug("%s:%d OUT w/h %d/%d paddr %08x\n", __func__, __LINE__, pxp->pxp_conf_state.out_param.width, pxp->pxp_conf_state.out_param.height, |