From 44d1888f691d649061499e64bee0b347edabc685 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 18 Jan 2024 06:24:03 +0000 Subject: [PATCH] remove duplicate steam deck block, merge error from local patches --- sys/dev/pci/drm/amd/amdgpu/amdgpu_vcn.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vcn.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vcn.c index 290d22869ee..4e8e3d3fa1c 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_vcn.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_vcn.c @@ -135,24 +135,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) } } - /* - * Some Steam Deck's BIOS versions are incompatible with the - * indirect SRAM mode, leading to amdgpu being unable to get - * properly probed (and even potentially crashing the kernel). - * Hence, check for these versions here - notice this is - * restricted to Vangogh (Deck's APU). - */ - if (adev->ip_versions[UVD_HWIP][0] == IP_VERSION(3, 0, 2)) { - const char *bios_ver = dmi_get_system_info(DMI_BIOS_VERSION); - - if (bios_ver && (!strncmp("F7A0113", bios_ver, 7) || - !strncmp("F7A0114", bios_ver, 7))) { - adev->vcn.indirect_sram = false; - dev_info(adev->dev, - "Steam Deck quirk: indirect SRAM disabled on BIOS %s\n", bios_ver); - } - } - hdr = (const struct common_firmware_header *)adev->vcn.fw->data; adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version); -- 2.20.1