From: jsg Date: Tue, 13 Jun 2023 03:17:09 +0000 (+0000) Subject: drm/amdgpu/jpeg: Remove harvest checking for JPEG3 X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1d897d338d1240a2bf03b002c89beb2664509c5f;p=openbsd drm/amdgpu/jpeg: Remove harvest checking for JPEG3 From Saleemkhan Jamadar 28c2e072fa1382e7e4da51ff7795fb5b5774f5a7 in linux-6.1.y/6.1.29 5b94db73e45e2e6c2840f39c022fd71dfa47fc58 in mainline linux --- diff --git a/sys/dev/pci/drm/amd/amdgpu/jpeg_v3_0.c b/sys/dev/pci/drm/amd/amdgpu/jpeg_v3_0.c index 8930169ec2d..fcd849b03ff 100644 --- a/sys/dev/pci/drm/amd/amdgpu/jpeg_v3_0.c +++ b/sys/dev/pci/drm/amd/amdgpu/jpeg_v3_0.c @@ -54,6 +54,7 @@ static int jpeg_v3_0_early_init(void *handle) switch (adev->ip_versions[UVD_HWIP][0]) { case IP_VERSION(3, 1, 1): + case IP_VERSION(3, 1, 2): break; default: harvest = RREG32_SOC15(JPEG, 0, mmCC_UVD_HARVESTING);