Mesa (master): Revert "amd/common: set vcn dec as hw decode as well"

Dave Airlie airlied at kemper.freedesktop.org
Fri May 26 06:37:10 UTC 2017


Module: Mesa
Branch: master
Commit: ae1f32915bf6bad8ba3de572d9ecc874fc7df6e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae1f32915bf6bad8ba3de572d9ecc874fc7df6e5

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 26 16:34:51 2017 +1000

Revert "amd/common: set vcn dec as hw decode as well"

This reverts commit 50d322be2f30bb935ee52b3b3649785975771110.

A previous patch breaks amdgpu on non-vcn decode systems,
but have to revert this first.

---

 src/amd/common/ac_gpu_info.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
index 7f2506066a..a23b9bbd4c 100644
--- a/src/amd/common/ac_gpu_info.c
+++ b/src/amd/common/ac_gpu_info.c
@@ -248,8 +248,6 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
 	info->max_se = amdinfo->num_shader_engines;
 	info->max_sh_per_se = amdinfo->num_shader_arrays_per_engine;
 	info->has_hw_decode = uvd.available_rings != 0;
-	info->has_hw_decode =
-		(uvd.available_rings != 0) || (vcn_dec.available_rings != 0);
 	info->uvd_fw_version =
 		uvd.available_rings ? uvd_version : 0;
 	info->vce_fw_version =




More information about the mesa-commit mailing list