Commit 0c61ac81 authored by Asher.Song's avatar Asher.Song Committed by Alex Deucher
Browse files

drm/amdgpu:disable VCN for Navi12 SKU 



Navi12 0x7360/C7 SKU has no video support, so remove it.

Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAsher.Song <Asher.Song@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 31ada99b

drivers/gpu/drm/amd/amdgpu/nv.c

+4 −2
Original line number Diff line number Diff line
@@ -558,7 +558,8 @@ static bool nv_is_headless_sku(struct pci_dev *pdev) 
{

	if ((pdev->device == 0x731E &&

	    (pdev->revision == 0xC6 || pdev->revision == 0xC7)) ||

	    (pdev->device == 0x7340 && pdev->revision == 0xC9))

	    (pdev->device == 0x7340 && pdev->revision == 0xC9)  ||

	    (pdev->device == 0x7360 && pdev->revision == 0xC7))

		return true;

	return false;

}
@@ -634,6 +635,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&

		    !amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);

		if (!nv_is_headless_sku(adev->pdev))

		        amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);

		if (!amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);