Commit 57cda5e9 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'amd-drm-fixes-5.11-2021-01-06' of... 

Merge tag 'amd-drm-fixes-5.11-2021-01-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.11-2021-01-06:

amdgpu:
- Telemetry fix for VGH
- Powerplay fixes for RV
- Powerplay fixes for RN
- RAS fixes for Sienna Cichlid
- Blank screen regression fix
- Drop DCN support for aarch64
- Misc other fixes

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210106222721.3934-1-alexander.deucher@amd.com
parents e71ba945 5efc1f4b

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

+2 −2
Original line number Diff line number Diff line
@@ -2548,11 +2548,11 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
	if (adev->gmc.xgmi.num_physical_nodes > 1)

		amdgpu_xgmi_remove_device(adev);



	amdgpu_amdkfd_device_fini(adev);



	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_amdkfd_device_fini(adev);



	/* need to disable SMC first */

	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.hw)

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

+17 −8
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int psp_asd_load(struct psp_context *psp) 
	 * add workaround to bypass it for sriov now.

	 * TODO: add version check to make it common

	 */

	if (amdgpu_sriov_vf(psp->adev) || !psp->asd_fw)

	if (amdgpu_sriov_vf(psp->adev) || !psp->asd_ucode_size)

		return 0;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
@@ -1315,8 +1315,12 @@ static int psp_hdcp_terminate(struct psp_context *psp) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if (!psp->hdcp_context.hdcp_initialized)

	if (!psp->hdcp_context.hdcp_initialized) {

		if (psp->hdcp_context.hdcp_shared_buf)

			goto out;

		else

			return 0;

	}



	ret = psp_hdcp_unload(psp);

	if (ret)
@@ -1324,6 +1328,7 @@ static int psp_hdcp_terminate(struct psp_context *psp) 


	psp->hdcp_context.hdcp_initialized = false;



out:

	/* free hdcp shared memory */

	amdgpu_bo_free_kernel(&psp->hdcp_context.hdcp_shared_bo,

			      &psp->hdcp_context.hdcp_shared_mc_addr,
@@ -1462,8 +1467,12 @@ static int psp_dtm_terminate(struct psp_context *psp) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if (!psp->dtm_context.dtm_initialized)

	if (!psp->dtm_context.dtm_initialized) {

		if (psp->dtm_context.dtm_shared_buf)

			goto out;

		else

			return 0;

	}



	ret = psp_dtm_unload(psp);

	if (ret)
@@ -1471,6 +1480,7 @@ static int psp_dtm_terminate(struct psp_context *psp) 


	psp->dtm_context.dtm_initialized = false;



out:

	/* free hdcp shared memory */

	amdgpu_bo_free_kernel(&psp->dtm_context.dtm_shared_bo,

			      &psp->dtm_context.dtm_shared_mc_addr,
@@ -2593,7 +2603,6 @@ static int parse_ta_bin_descriptor(struct psp_context *psp, 
		psp->asd_feature_version   = le32_to_cpu(desc->fw_version);

		psp->asd_ucode_size        = le32_to_cpu(desc->size_bytes);

		psp->asd_start_addr 	   = ucode_start_addr;

		psp->asd_fw                = psp->ta_fw;

		break;

	case TA_FW_TYPE_PSP_XGMI:

		psp->ta_xgmi_ucode_version = le32_to_cpu(desc->fw_version);

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

+4 −4
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, 
	struct amdgpu_ras *con = amdgpu_ras_get_context(adev);

	struct ras_err_handler_data *data;

	int i = 0;

	int ret = 0;

	int ret = 0, status;



	if (!con || !con->eh_data || !bps || !count)

		return -EINVAL;
@@ -1543,12 +1543,12 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, 
			.size = AMDGPU_GPU_PAGE_SIZE,

			.flags = AMDGPU_RAS_RETIRE_PAGE_RESERVED,

		};

		ret = amdgpu_vram_mgr_query_page_status(

		status = amdgpu_vram_mgr_query_page_status(

				ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM),

				data->bps[i].retired_page);

		if (ret == -EBUSY)

		if (status == -EBUSY)

			(*bps)[i].flags = AMDGPU_RAS_RETIRE_PAGE_PENDING;

		else if (ret == -ENOENT)

		else if (status == -ENOENT)

			(*bps)[i].flags = AMDGPU_RAS_RETIRE_PAGE_FAULT;

	}

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

+7 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define EEPROM_I2C_TARGET_ADDR_VEGA20		0xA0

#define EEPROM_I2C_TARGET_ADDR_ARCTURUS		0xA8

#define EEPROM_I2C_TARGET_ADDR_ARCTURUS_D342	0xA0

#define EEPROM_I2C_TARGET_ADDR_SIENNA_CICHLID   0xA0



/*

 * The 2 macros bellow represent the actual size in bytes that
@@ -62,7 +63,8 @@ 
static bool __is_ras_eeprom_supported(struct amdgpu_device *adev)

{

	if ((adev->asic_type == CHIP_VEGA20) ||

	    (adev->asic_type == CHIP_ARCTURUS))

	    (adev->asic_type == CHIP_ARCTURUS) ||

	    (adev->asic_type == CHIP_SIENNA_CICHLID))

		return true;



	return false;
@@ -100,6 +102,10 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, 
	case CHIP_ARCTURUS:

		return __get_eeprom_i2c_addr_arct(adev, i2c_addr);



	case CHIP_SIENNA_CICHLID:

		*i2c_addr = EEPROM_I2C_TARGET_ADDR_SIENNA_CICHLID;

		break;



	default:

		return false;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static void mmhub_v2_3_setup_vmid_config(struct amdgpu_device *adev) 
		/* Send no-retry XNACK on fault to suppress VM fault storm. */

		tmp = REG_SET_FIELD(tmp, MMVM_CONTEXT1_CNTL,

				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,

				    !amdgpu_noretry);

				    !adev->gmc.noretry);

		WREG32_SOC15_OFFSET(MMHUB, 0, mmMMVM_CONTEXT1_CNTL,

				    i * hub->ctx_distance, tmp);

		WREG32_SOC15_OFFSET(MMHUB, 0, mmMMVM_CONTEXT1_PAGE_TABLE_START_ADDR_LO32,