summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-12-06 07:00:27 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-12-06 07:00:27 -0800
commit8bec3c2383e081da4c1cec6ce43e5a4cb75a6023 (patch)
tree28d729c0e5e77279b0946e730da47651554b5252 /drivers/gpu/drm
parente70f1f9a5c98de5f470aa1fc9be861acac97a1a7 (diff)
parent1ff6f9bca64917b406a7ea2b2dccfc3c1da430fb (diff)
Merge "drm/msm: Add API support for getting GPU hang timeout"
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/msm/adreno/adreno_gpu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index d397c44f1203..8986ba6c110b 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -61,6 +61,9 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
case MSM_PARAM_NR_RINGS:
*value = gpu->nr_rings;
return 0;
+ case MSM_PARAM_GPU_HANG_TIMEOUT:
+ *value = DRM_MSM_HANGCHECK_PERIOD;
+ return 0;
default:
DBG("%s: invalid param: %u", gpu->name, param);
return -EINVAL;