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

Merge tag 'amd-drm-next-5.7-2020-03-26' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.7-2020-03-26:

amdgpu:
- Remove a dpm quirk that is not necessary
- Fix handling of AC/DC mode in newer SMU firmwares on navi
- SR-IOV fixes
- RAS fixes

scheduler:
- Fix a race condition

radeon:
- Remove a dpm quirk that is not necessary

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200326155310.5486-1-alexander.deucher@amd.com
parents c2556238 e862b08b

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

+11 −1
Original line number Diff line number Diff line
@@ -2742,6 +2742,9 @@ static void amdgpu_device_xgmi_reset_func(struct work_struct *__work) 


		if (adev->asic_reset_res)

			goto fail;



		if (adev->mmhub.funcs && adev->mmhub.funcs->reset_ras_error_count)

			adev->mmhub.funcs->reset_ras_error_count(adev);

	} else {



		task_barrier_full(&hive->tb);
@@ -3910,8 +3913,15 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive, 
		}

	}



	if (!r && amdgpu_ras_intr_triggered())

	if (!r && amdgpu_ras_intr_triggered()) {

		list_for_each_entry(tmp_adev, device_list_handle, gmc.xgmi.head) {

			if (tmp_adev->mmhub.funcs &&

			    tmp_adev->mmhub.funcs->reset_ras_error_count)

				tmp_adev->mmhub.funcs->reset_ras_error_count(tmp_adev);

		}



		amdgpu_ras_intr_cleared();

	}



	list_for_each_entry(tmp_adev, device_list_handle, gmc.xgmi.head) {

		if (need_full_reset) {

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

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev) 
		if (adev->powerplay.pp_funcs->enable_bapm)

			amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power);

		mutex_unlock(&adev->pm.mutex);



		if (is_support_sw_smu(adev))

			smu_set_ac_dc(&adev->smu);

	}

}

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

+1 −8
Original line number Diff line number Diff line
@@ -159,10 +159,6 @@ static int psp_sw_fini(void *handle) 
	adev->psp.sos_fw = NULL;

	release_firmware(adev->psp.asd_fw);

	adev->psp.asd_fw = NULL;

	if (adev->psp.cap_fw) {

		release_firmware(adev->psp.cap_fw);

		adev->psp.cap_fw = NULL;

	}

	if (adev->psp.ta_fw) {

		release_firmware(adev->psp.ta_fw);

		adev->psp.ta_fw = NULL;
@@ -250,7 +246,7 @@ psp_cmd_submit_buf(struct psp_context *psp, 
		DRM_WARN("psp command (0x%X) failed and response status is (0x%X)\n",

			 psp->cmd_buf_mem->cmd_id,

			 psp->cmd_buf_mem->resp.status);

		if ((ucode->ucode_id == AMDGPU_UCODE_ID_CAP) || !timeout) {

		if (!timeout) {

			mutex_unlock(&psp->mutex);

			return -EINVAL;

		}
@@ -1192,9 +1188,6 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode, 
			   enum psp_gfx_fw_type *type)

{

	switch (ucode->ucode_id) {

	case AMDGPU_UCODE_ID_CAP:

		*type = GFX_FW_TYPE_CAP;

		break;

	case AMDGPU_UCODE_ID_SDMA0:

		*type = GFX_FW_TYPE_SDMA0;

		break;

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

+0 −3
Original line number Diff line number Diff line
@@ -252,9 +252,6 @@ struct psp_context 
	uint32_t			asd_ucode_size;

	uint8_t				*asd_start_addr;



	/* cap firmware */

	const struct firmware		*cap_fw;



	/* fence buffer */

	struct amdgpu_bo		*fence_buf_bo;

	uint64_t			fence_buf_mc_addr;

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

+9 −0
Original line number Diff line number Diff line
@@ -281,6 +281,11 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, const char __user * 
	struct ras_debug_if data;

	int ret = 0;



	if (amdgpu_ras_intr_triggered()) {

		DRM_WARN("RAS WARN: error injection currently inaccessible\n");

		return size;

	}



	ret = amdgpu_ras_debugfs_ctrl_parse_data(f, buf, size, pos, &data);

	if (ret)

		return -EINVAL;
@@ -394,6 +399,10 @@ static ssize_t amdgpu_ras_sysfs_read(struct device *dev, 
		.head = obj->head,

	};



	if (amdgpu_ras_intr_triggered())

		return snprintf(buf, PAGE_SIZE,

				"Query currently inaccessible\n");



	if (amdgpu_ras_error_query(obj->adev, &info))

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE