Commit 200ec44a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.1-2022-10-26-1' of... 

Merge tag 'amd-drm-fixes-6.1-2022-10-26-1' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-10-26-1:

amdgpu:
- Stable pstate fix
- SMU 13.x updates
- SR-IOV fixes
- PCI AER fix
- GC 11.x fixes
- Display fixes
- Expose IMU firmware version for debugging
- Plane modifier fix
- S0i3 fix

amdkfd:
- Fix possible memory leak
- Fix GC 10.x cache info reporting

UAPI:
- Expose IMU firmware version via existing INFO firmware query

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

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

+3 −3
Original line number Diff line number Diff line
@@ -510,13 +510,13 @@ kfd_mem_dmamap_userptr(struct kgd_mem *mem, 
	struct ttm_tt *ttm = bo->tbo.ttm;

	int ret;



	if (WARN_ON(ttm->num_pages != src_ttm->num_pages))

		return -EINVAL;



	ttm->sg = kmalloc(sizeof(*ttm->sg), GFP_KERNEL);

	if (unlikely(!ttm->sg))

		return -ENOMEM;



	if (WARN_ON(ttm->num_pages != src_ttm->num_pages))

		return -EINVAL;



	/* Same sequence as in amdgpu_ttm_tt_pin_userptr */

	ret = sg_alloc_table_from_pages(ttm->sg, src_ttm->pages,

					ttm->num_pages, 0,

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

+4 −1
Original line number Diff line number Diff line
@@ -326,6 +326,9 @@ static int amdgpu_ctx_init(struct amdgpu_ctx_mgr *mgr, int32_t priority, 
	if (r)

		return r;



	if (mgr->adev->pm.stable_pstate_ctx)

		ctx->stable_pstate = mgr->adev->pm.stable_pstate_ctx->stable_pstate;

	else

		ctx->stable_pstate = current_stable_pstate;



	return 0;

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

+17 −1
Original line number Diff line number Diff line
@@ -3210,6 +3210,15 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) 
			return r;

		}

		adev->ip_blocks[i].status.hw = true;



		if (adev->in_s0ix && adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {

			/* disable gfxoff for IP resume. The gfxoff will be re-enabled in

			 * amdgpu_device_resume() after IP resume.

			 */

			amdgpu_gfx_off_ctrl(adev, false);

			DRM_DEBUG("will disable gfxoff for re-initializing other blocks\n");

		}



	}



	return 0;
@@ -4185,6 +4194,13 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	/* Make sure IB tests flushed */

	flush_delayed_work(&adev->delayed_init_work);



	if (adev->in_s0ix) {

		/* re-enable gfxoff after IP resume. This re-enables gfxoff after

		 * it was disabled for IP resume in amdgpu_device_ip_resume_phase2().

		 */

		amdgpu_gfx_off_ctrl(adev, true);

		DRM_DEBUG("will enable gfxoff for the mission mode\n");

	}

	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);
@@ -5381,7 +5397,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
			drm_sched_start(&ring->sched, !tmp_adev->asic_reset_res);

		}



		if (adev->enable_mes)

		if (adev->enable_mes && adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3))

			amdgpu_mes_self_test(tmp_adev);



		if (!drm_drv_uses_atomic_modeset(adev_to_drm(tmp_adev)) && !job_signaled) {

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

+13 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, 
		fw_info->ver = adev->mes.ucode_fw_version[1];

		fw_info->feature = 0;

		break;

	case AMDGPU_INFO_FW_IMU:

		fw_info->ver = adev->gfx.imu_fw_version;

		fw_info->feature = 0;

		break;

	default:

		return -EINVAL;

	}
@@ -1520,6 +1524,15 @@ static int amdgpu_debugfs_firmware_info_show(struct seq_file *m, void *unused) 
			   fw_info.feature, fw_info.ver);

	}



	/* IMU */

	query_fw.fw_type = AMDGPU_INFO_FW_IMU;

	query_fw.index = 0;

	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);

	if (ret)

		return ret;

	seq_printf(m, "IMU feature version: %u, firmware version: 0x%08x\n",

		   fw_info.feature, fw_info.ver);



	/* PSP SOS */

	query_fw.fw_type = AMDGPU_INFO_FW_SOS;

	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);

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

+3 −1
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ FW_VERSION_ATTR(rlc_srlg_fw_version, 0444, gfx.rlc_srlg_fw_version); 
FW_VERSION_ATTR(rlc_srls_fw_version, 0444, gfx.rlc_srls_fw_version);

FW_VERSION_ATTR(mec_fw_version, 0444, gfx.mec_fw_version);

FW_VERSION_ATTR(mec2_fw_version, 0444, gfx.mec2_fw_version);

FW_VERSION_ATTR(imu_fw_version, 0444, gfx.imu_fw_version);

FW_VERSION_ATTR(sos_fw_version, 0444, psp.sos.fw_version);

FW_VERSION_ATTR(asd_fw_version, 0444, psp.asd_context.bin_desc.fw_version);

FW_VERSION_ATTR(ta_ras_fw_version, 0444, psp.ras_context.context.bin_desc.fw_version);
@@ -719,7 +720,8 @@ static struct attribute *fw_attrs[] = { 
	&dev_attr_ta_ras_fw_version.attr, &dev_attr_ta_xgmi_fw_version.attr,

	&dev_attr_smc_fw_version.attr, &dev_attr_sdma_fw_version.attr,

	&dev_attr_sdma2_fw_version.attr, &dev_attr_vcn_fw_version.attr,

	&dev_attr_dmcu_fw_version.attr, NULL

	&dev_attr_dmcu_fw_version.attr, &dev_attr_imu_fw_version.attr,

	NULL

};



static const struct attribute_group fw_attr_group = {