Commit f76f795a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move headless sku check into harvest function 



Consolidate harvesting information.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent eb601e61

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

+7 −0
Original line number Diff line number Diff line
@@ -434,6 +434,13 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) 
		adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;

		adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;

	}

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

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

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

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

		adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;

		adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;

	}

}



int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev)

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

+0 −14
Original line number Diff line number Diff line
@@ -608,16 +608,6 @@ static const struct amdgpu_ip_block_version nv_common_ip_block = 
	.funcs = &nv_common_ip_funcs,

};



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 == 0x7360 && pdev->revision == 0xC7))

		return true;

	return false;

}



static int nv_reg_base_init(struct amdgpu_device *adev)

{

	int r;
@@ -631,10 +621,6 @@ static int nv_reg_base_init(struct amdgpu_device *adev) 
		}



		amdgpu_discovery_harvest_ip(adev);

		if (nv_is_headless_sku(adev->pdev)) {

			adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;

			adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;

		}



		return 0;

	}