Commit 80e89901 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.8-2020-07-01' of... 

Merge tag 'amd-drm-fixes-5.8-2020-07-01' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.8-2020-07-01:

amdgpu:
- Fix for vega20 boards without RAS support
- DC bandwidth revalidation fix
- Fix Renoir vram info fetching
- Fix hwmon freq printing

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

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

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
				(mode_info->atom_context->bios + data_offset);

			switch (crev) {

			case 11:

			case 12:

				mem_channel_number = igp_info->v11.umachannelnumber;

				/* channel width is 64 */

				if (vram_width)

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

+2 −2
Original line number Diff line number Diff line
@@ -2784,7 +2784,7 @@ static ssize_t amdgpu_hwmon_show_sclk(struct device *dev, 
	if (r)

		return r;



	return snprintf(buf, PAGE_SIZE, "%d\n", sclk * 10 * 1000);

	return snprintf(buf, PAGE_SIZE, "%u\n", sclk * 10 * 1000);

}



static ssize_t amdgpu_hwmon_show_sclk_label(struct device *dev,
@@ -2819,7 +2819,7 @@ static ssize_t amdgpu_hwmon_show_mclk(struct device *dev, 
	if (r)

		return r;



	return snprintf(buf, PAGE_SIZE, "%d\n", mclk * 10 * 1000);

	return snprintf(buf, PAGE_SIZE, "%u\n", mclk * 10 * 1000);

}



static ssize_t amdgpu_hwmon_show_mclk_label(struct device *dev,

drivers/gpu/drm/amd/display/dc/core/dc.c

+6 −4
Original line number Diff line number Diff line
@@ -2538,11 +2538,13 @@ void dc_commit_updates_for_stream(struct dc *dc, 


	copy_stream_update_to_stream(dc, context, stream, stream_update);



	if (update_type > UPDATE_TYPE_FAST) {

		if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {

			DC_ERROR("Mode validation failed for stream update!\n");

			dc_release_state(context);

			return;

		}

	}



	commit_planes_for_stream(

				dc,

drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c

+7 −4
Original line number Diff line number Diff line
@@ -522,9 +522,11 @@ static int vega20_smu_init(struct pp_hwmgr *hwmgr) 
	priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].version = 0x01;

	priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF].size = sizeof(DpmActivityMonitorCoeffInt_t);



	if (adev->psp.ras.ras) {

		ret = smu_v11_0_i2c_eeprom_control_init(&adev->pm.smu_i2c);

		if (ret)

			goto err4;

	}



	return 0;
@@ -560,6 +562,7 @@ static int vega20_smu_fini(struct pp_hwmgr *hwmgr) 
			(struct vega20_smumgr *)(hwmgr->smu_backend);

	struct amdgpu_device *adev = hwmgr->adev;



	if (adev->psp.ras.ras)

		smu_v11_0_i2c_eeprom_control_fini(&adev->pm.smu_i2c);



	if (priv) {