shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

video/rockchip: rga2: Fixup rga2 flush timeout on rk3368.

Browse Source 
Change-Id: Ia3c1c83d51c70f9d981bb45dc5c6a8c5e8073995
Signed-off-by: Li Huang <putin.li@rock-chips.com>
This commit is contained in:
Lihuang
2018-06-04 10:11:35 +08:00
committed by Tao Huang
parent 188c59dc60
commit 327aa30609
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/video/rockchip/rga2/rga2_drv.c
View File

@@ -72,6 +72,7 @@ ktime_t rga2_start;
ktime_t rga2_end;
int rga2_flag;
int first_RGA2_proc;
static int rk3368;
rga2_session rga2_session_global;
long (*rga2_ioctl_kernel_p)(struct rga_req *);
@@ -906,7 +907,10 @@ retry:
if(ret < 0)
return ret;
ret_timeout = wait_event_timeout(session->wait, atomic_read(&session->done), RGA2_TIMEOUT_DELAY);
if (rk3368)
ret_timeout = wait_event_timeout(session->wait, atomic_read(&session->done), RGA2_TIMEOUT_DELAY/2);
else
ret_timeout = wait_event_timeout(session->wait, atomic_read(&session->done), RGA2_TIMEOUT_DELAY);
if (unlikely(ret_timeout< 0))
{
@@ -1031,12 +1035,39 @@ static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
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;
req_first.dst.act_h = req_first.src.act_h;
ret = rga2_blit_async(session, &req_first);
if (rk3368)
ret = rga2_blit_sync(session, &req_first);
else
ret = rga2_blit_async(session, &req_first);
}
ret = rga2_blit_async(session, &req);
first_RGA2_proc = 1;
}
else {
if (rk3368)
{
memcpy(&req_first, &req, sizeof(struct rga2_req));
/*
* workround for gts
* run gts --skip-all-system-status-check --ignore-business-logic-failure -m GtsMediaTestCases -t com.google.android.media.gts.WidevineYouTubePerformanceTests#testClear1080P30
*/
if ((req_first.src.act_w == 1920) && (req_first.src.act_h == 1008) && (req_first.src.act_h == req_first.dst.act_w)) {
printk("src : aw=%d ah=%d vw=%d vh=%d \n",
req_first.src.act_w, req_first.src.act_h, req_first.src.vir_w, req_first.src.vir_h);
printk("dst : aw=%d ah=%d vw=%d vh=%d \n",
req_first.dst.act_w, req_first.dst.act_h, req_first.dst.vir_w, req_first.dst.vir_h);
} else {
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_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;
req_first.dst.act_h = req_first.src.act_h;
ret = rga2_blit_sync(session, &req_first);
}
}
}
ret = rga2_blit_async(session, &req);
}
break;
@@ -1401,6 +1432,8 @@ static int rga2_drv_probe(struct platform_device *pdev)
data->dev = &pdev->dev;
rga2_drvdata = data;
of_property_read_u32(np, "dev_mode", &rga2_service.dev_mode);
if (of_machine_is_compatible("rockchip,rk3368"))
rk3368 = 1;
#if defined(CONFIG_ION_ROCKCHIP)
data->ion_client = rockchip_ion_client_create("rga");