From a5f740a128e3fe4efed3c70724495a54fbefa830 Mon Sep 17 00:00:00 2001 From: Jacob Chen Date: Wed, 27 Jul 2016 11:02:32 +0800 Subject: [PATCH] MALI: utgard: rockchip: fix_mali_hang_on_windows Change-Id: I9a03f2427cbe0653821a1671c1f3758bc8e891fe Signed-off-by: Jacob Chen --- drivers/gpu/arm/mali400/mali/common/mali_executor.c | 2 ++ drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/arm/mali400/mali/common/mali_executor.c b/drivers/gpu/arm/mali400/mali/common/mali_executor.c index 2a6d2d5d8e63..d8281822b6a4 100755 --- a/drivers/gpu/arm/mali400/mali/common/mali_executor.c +++ b/drivers/gpu/arm/mali400/mali/common/mali_executor.c @@ -617,9 +617,11 @@ _mali_osk_errcode_t mali_executor_interrupt_gp(struct mali_group *group, struct mali_gp_job *job; mali_bool success; + /* if (MALI_TRUE == time_out) { mali_group_dump_status(group); } + */ success = (int_result != MALI_INTERRUPT_RESULT_ERROR) ? MALI_TRUE : MALI_FALSE; diff --git a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c index f5ab28f4d3af..e8c607e59af9 100644 --- a/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c +++ b/drivers/gpu/arm/mali400/mali/platform/rk30/rk3066.c @@ -193,7 +193,7 @@ static const struct mali_gpu_device_data mali_gpu_data = { .shared_mem_size = 1024 * 1024 * 1024, /* 1GB */ .fb_start = 0x40000000, .fb_size = 0xb1000000, - .max_job_runtime = 60000, /* 60 seconds */ + .max_job_runtime = 100, /* 100 ms */ /* .utilization_interval = 0, */ /* 0ms */ .utilization_callback = mali_gpu_utilization_handler, }; -- 2.34.1