summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuoniu.Zhou <guoniu.zhou@nxp.com>2017-08-25 18:57:08 +0800
committerGuoniu.Zhou <guoniu.zhou@nxp.com>2017-08-30 12:11:25 +0800
commit53c8ffffec181a765f4487a9d1bf2eb05b1b78f7 (patch)
tree06712b4348c0411707755d091fe17b7e07abbd8e
parent14c988f1eb7e9471b0875016df29708865727fbb (diff)
MLK-16276: PxP: Improve code compatibility
g2d code has different parameter setting about stride parameter. For compatibility with all cases of using PxP, we need add this improved feature. Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com> Reviewed-by: Robby Cai <robby.cai@nxp.com> Reviewed-by: Fancy Fang <chen.fang@nxp.com>
-rw-r--r--drivers/dma/pxp/pxp_dma_v3.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dma/pxp/pxp_dma_v3.c b/drivers/dma/pxp/pxp_dma_v3.c
index 50e1d79c81ce..775900b1a188 100644
--- a/drivers/dma/pxp/pxp_dma_v3.c
+++ b/drivers/dma/pxp/pxp_dma_v3.c
@@ -3526,7 +3526,11 @@ static int convert_param_to_pixmap(struct pxp_pixmap *pixmap,
pixmap->format = param->pixel_fmt;
pixmap->paddr = param->paddr;
pixmap->bpp = get_bpp_from_fmt(pixmap->format);
- pixmap->pitch = param->width * pixmap->bpp >> 3;
+
+ if (!param->stride || (param->stride == param->width))
+ pixmap->pitch = param->width * pixmap->bpp >> 3;
+ else
+ pixmap->pitch = param->stride;
pixmap->crop.x = param->crop.left;
pixmap->crop.y = param->crop.top;