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 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
| parent | drm/ttm: recognize ARM64 arch in ioprot handler (diff) | |
| parent | drm/amdgpu/cz/dpm: properly report UVD and VCE clock levels (diff) | |
| download | linux-dev-762043aa77ad6de79236f3a9e6281f84e4fe9788.tar.xz linux-dev-762043aa77ad6de79236f3a9e6281f84e4fe9788.zip | |
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 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 5533434c7a8f..31ad444c6386 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -459,6 +459,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file memcpy(&dev_info.cu_bitmap[0], &cu_info.bitmap[0], sizeof(cu_info.bitmap)); dev_info.vram_type = adev->mc.vram_type; dev_info.vram_bit_width = adev->mc.vram_width; + dev_info.vce_harvest_config = adev->vce.harvest_config; return copy_to_user(out, &dev_info, min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0; |