diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-05 22:33:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-05 22:33:05 -0800 |
| commit | 513fd626d6dd6b56c78fa011ba8bbbad0ba5ee12 (patch) | |
| tree | 5a6dfcdd79f07467ea0443c1d2f5ce876debd9d6 | |
| parent | 551738a812012f899e409900ebddaa148602d1cc (diff) | |
| parent | a943eac9d4d2a1ee11544f57d5742bbcaff17dd9 (diff) | |
Merge "msm: kgsl: Add property to determine commands timeout"
| -rw-r--r-- | drivers/gpu/msm/adreno.c | 20 | ||||
| -rw-r--r-- | include/uapi/linux/msm_kgsl.h | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index c620c7ac1afa..9b171389d69d 100644 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -1922,6 +1922,26 @@ static int adreno_getproperty(struct kgsl_device *device, status = 0; } break; + case KGSL_PROP_IB_TIMEOUT: + { + unsigned int ib_timeout = adreno_drawobj_timeout; + + if (ib_timeout == 0) + return -EINVAL; + + if (sizebytes != sizeof(unsigned int)) { + status = -EINVAL; + break; + } + + if (copy_to_user(value, &ib_timeout, + sizeof(unsigned int))) { + status = -EFAULT; + break; + } + status = 0; + } + break; default: status = -EINVAL; diff --git a/include/uapi/linux/msm_kgsl.h b/include/uapi/linux/msm_kgsl.h index 5fd58dfb153e..13bb8b79359a 100644 --- a/include/uapi/linux/msm_kgsl.h +++ b/include/uapi/linux/msm_kgsl.h @@ -321,6 +321,7 @@ enum kgsl_timestamp_type { #define KGSL_PROP_DEVICE_BITNESS 0x18 #define KGSL_PROP_DEVICE_QDSS_STM 0x19 #define KGSL_PROP_DEVICE_QTIMER 0x20 +#define KGSL_PROP_IB_TIMEOUT 0x21 struct kgsl_shadowprop { unsigned long gpuaddr; |