From 2c9beff6a3096670c2801b99416e1ba6dbfdae53 Mon Sep 17 00:00:00 2001 From: Shixiang Zheng Date: Mon, 26 Nov 2018 17:27:36 +0800 Subject: [PATCH] video/rockchip: rga2: fix stuck problem on rk3368 Change-Id: Ic7a3d693c526857959a96607a68b490e56897be5 Signed-off-by: Shixiang Zheng --- drivers/video/rockchip/rga2/rga2_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index 0b32f00bb961..d3af6a27db07 100644 --- a/drivers/video/rockchip/rga2/rga2_drv.c +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -1535,7 +1535,8 @@ static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg) if (first_RGA2_proc == 0 && req.bitblt_mode == bitblt_mode && rga2_service.dev_mode == 1) { memcpy(&req_first, &req, sizeof(struct rga2_req)); if ((req_first.src.act_w != req_first.dst.act_w) - || (req_first.src.act_h != req_first.dst.act_h)) { + || (req_first.src.act_h != req_first.dst.act_h) + || rk3368) { req_first.src.act_w = MIN(320, MIN(req_first.src.act_w, req_first.dst.act_w)); req_first.src.act_h = MIN(240, MIN(req_first.src.act_h, req_first.dst.act_h)); req_first.dst.act_w = req_first.src.act_w;