Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bec3c23 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents e70f1f9a 1ff6f9bc

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

include/uapi/drm/msm_drm.h

+8 −7
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct drm_msm_ext_panel_hdr_properties { 
#define MSM_PARAM_TIMESTAMP          0x05

#define MSM_PARAM_GMEM_BASE          0x06

#define MSM_PARAM_NR_RINGS           0x07

#define MSM_PARAM_GPU_HANG_TIMEOUT   0xa0 /* timeout in ms */



struct drm_msm_param {

	__u32 pipe;           /* in, MSM_PIPE_x */