Commit c0924ad7 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: skip vram reserve on firmware_v2_2 for bare-metal 



vram_usagebyfirmware v2_2 is only used in SRIOV case, skip the related
settings in bare-metal case currently.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f4b09c29

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

+6 −4
Original line number Diff line number Diff line
@@ -147,16 +147,18 @@ static int amdgpu_atomfirmware_allocate_fb_v2_2(struct amdgpu_device *adev, 
			  drv_start_addr,

			  drv_size);



	if ((fw_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<

		ATOM_VRAM_OPERATION_FLAGS_SHIFT)) == 0) {

	if (amdgpu_sriov_vf(adev) &&

	    ((fw_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<

		ATOM_VRAM_OPERATION_FLAGS_SHIFT)) == 0)) {

		/* Firmware request VRAM reservation for SR-IOV */

		adev->mman.fw_vram_usage_start_offset = (fw_start_addr &

			(~ATOM_VRAM_OPERATION_FLAGS_MASK)) << 10;

		adev->mman.fw_vram_usage_size = fw_size << 10;

	}



	if ((drv_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<

		ATOM_VRAM_OPERATION_FLAGS_SHIFT)) == 0) {

	if (amdgpu_sriov_vf(adev) &&

	    ((drv_start_addr & (ATOM_VRAM_BLOCK_NEEDS_NO_RESERVATION <<

		ATOM_VRAM_OPERATION_FLAGS_SHIFT)) == 0)) {

		/* driver request VRAM reservation for SR-IOV */

		adev->mman.drv_vram_usage_start_offset = (drv_start_addr &

			(~ATOM_VRAM_OPERATION_FLAGS_MASK)) << 10;