Revert "amd/common: set vcn dec as hw decode as well"
authorDave Airlie <airlied@redhat.com>
Fri, 26 May 2017 06:34:51 +0000 (16:34 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 26 May 2017 06:36:38 +0000 (16:36 +1000)
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

index 7f2506066a8aacea3297ba44d1cba91228c30bc8..a23b9bbd4c54d6685ec5b8fa86cb2819a6c5be98 100644 (file)
@@ -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 =