github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rockchip:midgard:1,keep processing if fence NULL 2,version to 0x05

Browse Source
This commit is contained in:
xxm 2014-07-08 10:54:48 +08:00
parent 68bef378c7
commit a972d04f65
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/arm/midgard/mali_kbase_core_linux.c
View File

@ -85,7 +85,7 @@ EXPORT_SYMBOL(shared_kernel_test_data);
#endif /* MALI_UNIT_TEST */
#define KBASE_DRV_NAME "mali"
#define ROCKCHIP_VERSION 4
#define ROCKCHIP_VERSION 5
static const char kbase_drv_name[] = KBASE_DRV_NAME;
static int kbase_dev_nr;

19
drivers/gpu/arm/midgard/mali_kbase_softjobs.c
View File

@ -256,24 +256,37 @@ static int kbase_fence_wait(kbase_jd_atom *katom)
static void kbase_fence_cancel_wait(kbase_jd_atom *katom)
{
if(!katom || !katom->fence)
if(!katom)
{
pr_info("%s,katom or katom->fence NULL\n",__func__);
pr_err("katom null.forbiden return\n");
return;
}
if(!katom->fence)
{
pr_info("katom->fence null.may release out of order.so continue unfinished step\n");
/*
if return here,may result in infinite loop?
we need to delete dep_item[0] from kctx->waiting_soft_jobs?
jd_done_nolock function move the dep_item[0] to complete job list and then delete?
*/
goto finish_softjob;
}
if (sync_fence_cancel_async(katom->fence, &katom->sync_waiter) != 0)
{
/* The wait wasn't cancelled - leave the cleanup for kbase_fence_wait_callback */
return;
}
/* Wait was cancelled - zap the atoms */
finish_softjob:
katom->event_code = BASE_JD_EVENT_JOB_CANCELLED;
kbase_finish_soft_job(katom);
if (jd_done_nolock(katom))
kbasep_js_try_schedule_head_ctx(katom->kctx->kbdev);
return;
}
#endif /* CONFIG_SYNC */