drm: Branch 'master'

[Michel Dänzer]

On 2018-03-30 04:51 AM, Chunming Zhou wrote:
>  include/drm/amdgpu_drm.h |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> New commits:
> commit 2fa58c77fb9e563219f8ec647b9ddf52f3390ed2
> Author: Rex Zhu <Rex.Zhu at amd.com>
> Date:   Tue Mar 20 14:08:09 2018 +0800
> 
>     headers: sync up amdgpu_drm.h with drm-next
>     
>     Add sensor_info type
>     AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_MCLK
>     AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_SCLK
>     
>     Reviewed-by: Evan Quan <evan.quan at amd.com>
>     Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
> 
> diff --git a/include/drm/amdgpu_drm.h b/include/drm/amdgpu_drm.h
> index a023b476..f784f248 100644
> --- a/include/drm/amdgpu_drm.h
> +++ b/include/drm/amdgpu_drm.h
> @@ -656,6 +656,10 @@ struct drm_amdgpu_cs_chunk_data {
>  	#define AMDGPU_INFO_SENSOR_VDDNB		0x6
>  	/* Subquery id: Query graphics voltage */
>  	#define AMDGPU_INFO_SENSOR_VDDGFX		0x7
> +	/* Subquery id: Query GPU stable pstate shader clock */
> +	#define AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_SCLK		0x8
> +	/* Subquery id: Query GPU stable pstate memory clock */
> +	#define AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_MCLK		0x9
>  /* Number of VRAM page faults on CPU access. */
>  #define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS	0x1E
>  #define AMDGPU_INFO_VRAM_LOST_COUNTER		0x1F

In the future, please follow the process described in include/drm/README
for syncing this header with the kernel.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer