evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm: Add API support for getting GPU hang timeout"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-06 07:00:27 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8bec3c2383
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/msm/adreno/adreno_gpu.c
View file

@ -61,6 +61,9 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
case MSM_PARAM_NR_RINGS: case MSM_PARAM_NR_RINGS:
*value = gpu->nr_rings; *value = gpu->nr_rings;
return 0; return 0;
case MSM_PARAM_GPU_HANG_TIMEOUT:
*value = DRM_MSM_HANGCHECK_PERIOD;
return 0;
default: default:
DBG("%s: invalid param: %u", gpu->name, param); DBG("%s: invalid param: %u", gpu->name, param);
return -EINVAL; return -EINVAL;

15
include/uapi/drm/msm_drm.h
View file

@ -112,13 +112,14 @@ struct drm_msm_ext_panel_hdr_properties {
__u32 hdr_min_luminance; /* Min Luminance */ __u32 hdr_min_luminance; /* Min Luminance */
}; };
#define MSM_PARAM_GPU_ID 0x01 #define MSM_PARAM_GPU_ID 0x01
#define MSM_PARAM_GMEM_SIZE 0x02 #define MSM_PARAM_GMEM_SIZE 0x02
#define MSM_PARAM_CHIP_ID 0x03 #define MSM_PARAM_CHIP_ID 0x03
#define MSM_PARAM_MAX_FREQ 0x04 #define MSM_PARAM_MAX_FREQ 0x04
#define MSM_PARAM_TIMESTAMP 0x05 #define MSM_PARAM_TIMESTAMP 0x05
#define MSM_PARAM_GMEM_BASE 0x06 #define MSM_PARAM_GMEM_BASE 0x06
#define MSM_PARAM_NR_RINGS 0x07 #define MSM_PARAM_NR_RINGS 0x07
#define MSM_PARAM_GPU_HANG_TIMEOUT 0xa0 /* timeout in ms */
struct drm_msm_param { struct drm_msm_param {
__u32 pipe; /* in, MSM_PIPE_x */ __u32 pipe; /* in, MSM_PIPE_x */