diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
| commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
| tree | f578e02ef1dc6e59630f09404bb2f58500876811 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
| parent | ALSA: hda - Clarify CONFIG_SND_HDA_RECONFIG usages (diff) | |
| parent | ALSA: hda - Fix subwoofer pin on ASUS N751 and N551 (diff) | |
| download | linux-dev-2e00fde5c6ed8535244332ebb55e881baa54ae46.tar.xz linux-dev-2e00fde5c6ed8535244332ebb55e881baa54ae46.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 7805a8706af7..b04337de65d1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -303,7 +303,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file fw_info.feature = adev->vce.fb_version; break; case AMDGPU_INFO_FW_UVD: - fw_info.ver = 0; + fw_info.ver = adev->uvd.fw_version; fw_info.feature = 0; break; case AMDGPU_INFO_FW_GMC: @@ -382,8 +382,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file struct drm_amdgpu_info_vram_gtt vram_gtt; 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, |