Commit 424a98a6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.11-2024-08-21' of... 

Merge tag 'amd-drm-fixes-6.11-2024-08-21' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.11-2024-08-21:

amdgpu:
- GFX10 firmware loading fix
- SDMA 5.2 fix
- Debugfs parameter validation fix
- eGPU hotplug fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240821172810.302416-1-alexander.deucher@amd.com
parents 5d34b050 9cead81e

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

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int amdgpu_discovery_read_binary_from_mem(struct amdgpu_device *adev, 
			msg = RREG32(mmMP0_SMN_C2PMSG_33);

			if (msg & 0x80000000)

				break;

			usleep_range(1000, 1100);

			msleep(1);

		}

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf, size_t 
	if (ret)

		return -EFAULT;



	if (ta_bin_len > PSP_1_MEG)

		return -EINVAL;



	copy_pos += sizeof(uint32_t);



	ta_bin = kzalloc(ta_bin_len, GFP_KERNEL);

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

+3 −2
Original line number Diff line number Diff line
@@ -4116,6 +4116,7 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev) 


static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)

{

	char fw_name[53];

	char ucode_prefix[30];

	const char *wks = "";

	int err;
@@ -4149,8 +4150,8 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) 
	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);



	if (!amdgpu_sriov_vf(adev)) {

		err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,

					   "amdgpu/%s_rlc.bin", ucode_prefix);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);

		err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);

		if (err)

			goto out;

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

+10 −8
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static void sdma_v5_2_ring_set_wptr(struct amdgpu_ring *ring) 
		DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",

				ring->doorbell_index, ring->wptr << 2);

		WDOORBELL64(ring->doorbell_index, ring->wptr << 2);

		if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) {

			/* SDMA seems to miss doorbells sometimes when powergating kicks in.

			 * Updating the wptr directly will wake it. This is only safe because

			 * we disallow gfxoff in begin_use() and then allow it again in end_use().
@@ -184,6 +185,7 @@ static void sdma_v5_2_ring_set_wptr(struct amdgpu_ring *ring) 
			       lower_32_bits(ring->wptr << 2));

			WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),

			       upper_32_bits(ring->wptr << 2));

		}

	} else {

		DRM_DEBUG("Not using doorbell -- "

				"mmSDMA%i_GFX_RB_WPTR == 0x%08x "