Commit c0521598 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.0-2022-09-07' of... 

Merge tag 'amd-drm-fixes-6.0-2022-09-07' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.0-2022-09-07:

amdgpu:
- Firmware header fix
- SMU 13.x fix
- Debugfs memory leak fix
- NBIO 7.7 fix
- Firmware memory leak fix

amdkfd:
- Debug output fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908032332.5880-1-alexander.deucher@amd.com
parents 7e18e42e aac4cec1

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

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	add_kgd_mem_to_kfd_bo_list(*mem, avm->process_info, user_addr);



	if (user_addr) {

		pr_debug("creating userptr BO for user_addr = %llu\n", user_addr);

		pr_debug("creating userptr BO for user_addr = %llx\n", user_addr);

		ret = init_user_pages(*mem, user_addr, criu_resume);

		if (ret)

			goto allocate_init_user_pages_failed;

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

+5 −2
Original line number Diff line number Diff line
@@ -486,11 +486,14 @@ static int psp_sw_fini(void *handle) 
		release_firmware(psp->ta_fw);

		psp->ta_fw = NULL;

	}

	if (adev->psp.cap_fw) {

	if (psp->cap_fw) {

		release_firmware(psp->cap_fw);

		psp->cap_fw = NULL;

	}



	if (psp->toc_fw) {

		release_firmware(psp->toc_fw);

		psp->toc_fw = NULL;

	}

	if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) ||

	    adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7))

		psp_sysfs_fini(adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ union amdgpu_firmware_header { 
	struct rlc_firmware_header_v2_1 rlc_v2_1;

	struct rlc_firmware_header_v2_2 rlc_v2_2;

	struct rlc_firmware_header_v2_3 rlc_v2_3;

	struct rlc_firmware_header_v2_4 rlc_v2_4;

	struct sdma_firmware_header_v1_0 sdma;

	struct sdma_firmware_header_v1_1 sdma_v1_1;

	struct sdma_firmware_header_v2_0 sdma_v2_0;

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

+0 −6
Original line number Diff line number Diff line
@@ -68,12 +68,6 @@ static void nbio_v7_7_sdma_doorbell_range(struct amdgpu_device *adev, int instan 
		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_CSDMA_DOORBELL_RANGE,

					       SIZE, doorbell_size);

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

					       OFFSET, doorbell_index);

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

					       SIZE, doorbell_size);

	} else {

		doorbell_range = REG_SET_FIELD(doorbell_range,

					       GDC0_BIF_SDMA0_DOORBELL_RANGE,

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -3288,6 +3288,7 @@ void crtc_debugfs_init(struct drm_crtc *crtc) 
				   &crc_win_y_end_fops);

	debugfs_create_file_unsafe("crc_win_update", 0644, dir, crtc,

				   &crc_win_update_fops);

	dput(dir);

#endif

	debugfs_create_file("amdgpu_current_bpc", 0644, crtc->debugfs_entry,

			    crtc, &amdgpu_current_bpc_fops);