diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-14 13:05:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-14 13:05:56 +1000 |
| commit | 25451c195a4e5097d4e74f2165e57f35a58197e4 (patch) | |
| tree | 3833123b5ffab17724819b9d8b04a700f1209b07 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
| parent | 928815245cbdaa611873424759d5e7a7293dd18b (diff) | |
| parent | 303f551c8e8dfca4df4e01612f0f393c2e5744e4 (diff) | |
| download | linux-25451c195a4e5097d4e74f2165e57f35a58197e4.tar.bz2 | |
Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
some misc radeon fixes.
* 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/amdgpu: fix irq domain remove for tonga ih
drm/radeon: use helper for mst connector dpms.
drm/radeon/mst: port some MST setup code from DAL.
drm/amdgpu: add invisible pin size statistic
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 598eb0cd5aab..aef70db16832 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -384,7 +384,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file vram_gtt.vram_size = adev->mc.real_vram_size; vram_gtt.vram_size -= adev->vram_pin_size; vram_gtt.vram_cpu_accessible_size = adev->mc.visible_vram_size; - vram_gtt.vram_cpu_accessible_size -= adev->vram_pin_size; + vram_gtt.vram_cpu_accessible_size -= (adev->vram_pin_size - adev->invisible_pin_size); vram_gtt.gtt_size = adev->mc.gtt_size; vram_gtt.gtt_size -= adev->gart_pin_size; return copy_to_user(out, &vram_gtt, |