From: Dave Airlie Date: Fri, 26 May 2017 06:34:51 +0000 (+1000) Subject: Revert "amd/common: set vcn dec as hw decode as well" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae1f32915bf6bad8ba3de572d9ecc874fc7df6e5;p=mesa.git 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. --- diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 7f2506066a8..a23b9bbd4c5 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 =