diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-05-26 16:34:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-05-26 16:36:57 +1000 |
| commit | e1409f730251bf9d7e70046f58392de6e4e98815 (patch) | |
| tree | 7f6cbb69e94ddbc2cddbc6e01c2d697722483323 /src/amd/common/ac_gpu_info.c | |
| parent | ae1f32915bf6bad8ba3de572d9ecc874fc7df6e5 (diff) | |
Revert "amd/common: add vcn dec ip info query"
This reverts commit 524d4fff9e0e58e812e71bc5ba2c92ffa73bee16.
This commit breaks amdgpu on kernels with no DEC IP support.
Caught by the airlied CI system.
Diffstat (limited to 'src/amd/common/ac_gpu_info.c')
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index a23b9bbd4c5..56645c48632 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -88,7 +88,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, { struct amdgpu_buffer_size_alignments alignment_info = {}; struct amdgpu_heap_info vram, vram_vis, gtt; - struct drm_amdgpu_info_hw_ip dma = {}, compute = {}, uvd = {}, vce = {}, vcn_dec = {}; + struct drm_amdgpu_info_hw_ip dma = {}, compute = {}, uvd = {}, vce = {}; uint32_t vce_version = 0, vce_feature = 0, uvd_version = 0, uvd_feature = 0; uint32_t unused_feature; int r, i, j; @@ -157,12 +157,6 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, return false; } - r = amdgpu_query_hw_ip_info(dev, AMDGPU_HW_IP_VCN_DEC, 0, &vcn_dec); - if (r) { - fprintf(stderr, "amdgpu: amdgpu_query_hw_ip_info(vcn_dec) failed.\n"); - return false; - } - r = amdgpu_query_firmware_version(dev, AMDGPU_INFO_FW_GFX_ME, 0, 0, &info->me_fw_version, &unused_feature); if (r) { |