diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:51:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 11:51:18 +1000 |
| commit | 762043aa77ad6de79236f3a9e6281f84e4fe9788 (patch) | |
| tree | 32644eb4feaf507900f56afebafa50edf95dca7d /include | |
| parent | f135b978c2dab3d439eacb8353d3c0aac6af072a (diff) | |
| parent | acc6a1a69b79fad70c4794a925dbfffa9fd6b21b (diff) | |
| download | linux-762043aa77ad6de79236f3a9e6281f84e4fe9788.tar.bz2 | |
Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Some amdgpu fixes.
* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu/cz/dpm: properly report UVD and VCE clock levels
drm/amdgpu/cz: implement voltage validation properly
drm/amdgpu: add VCE harvesting instance query
drm/amdgpu: implement VCE 3.0 harvesting support (v4)
drm/amdgpu/dce10: Re-set VBLANK interrupt state when enabling a CRTC
drm/amdgpu/dce11: Re-set VBLANK interrupt state when enabling a CRTC
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/drm/amdgpu_drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index b6fce900a833..d708a53b8fb1 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -614,6 +614,8 @@ struct drm_amdgpu_info_device { uint32_t vram_type; /** video memory bit width*/ uint32_t vram_bit_width; + /* vce harvesting instance */ + uint32_t vce_harvest_config; }; struct drm_amdgpu_info_hw_ip { |