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

Merge tag 'amd-drm-fixes-5.7-2020-04-22' of... 

Merge tag 'amd-drm-fixes-5.7-2020-04-22' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.7-2020-04-22:

amdgpu:
- Fix resume issue on renoir
- Thermal fix for older CI dGPUs
- Fix some fallout from dropping drm load/unload callbacks

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

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+12 −2
Original line number Diff line number Diff line
@@ -4664,6 +4664,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) 
		i2c_del_adapter(&aconnector->i2c->base);

		kfree(aconnector->i2c);

	}

	kfree(aconnector->dm_dp_aux.aux.name);



	kfree(connector);

}
@@ -4723,10 +4724,19 @@ amdgpu_dm_connector_atomic_duplicate_state(struct drm_connector *connector) 
static int

amdgpu_dm_connector_late_register(struct drm_connector *connector)

{

#if defined(CONFIG_DEBUG_FS)

	struct amdgpu_dm_connector *amdgpu_dm_connector =

		to_amdgpu_dm_connector(connector);

	int r;



	if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) ||

	    (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) {

		amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;

		r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);

		if (r)

			return r;

	}



#if defined(CONFIG_DEBUG_FS)

	connector_debugfs_init(amdgpu_dm_connector);

#endif
@@ -6092,7 +6102,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm, 


	if (connector_type == DRM_MODE_CONNECTOR_DisplayPort

		|| connector_type == DRM_MODE_CONNECTOR_eDP)

		amdgpu_dm_initialize_dp_connector(dm, aconnector);

		amdgpu_dm_initialize_dp_connector(dm, aconnector, link->link_index);



out_free:

	if (res) {

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+9 −6
Original line number Diff line number Diff line
@@ -156,16 +156,16 @@ amdgpu_dm_mst_connector_late_register(struct drm_connector *connector) 
		to_amdgpu_dm_connector(connector);

	int r;



	amdgpu_dm_connector->dm_dp_aux.aux.dev = connector->kdev;

	r = drm_dp_aux_register(&amdgpu_dm_connector->dm_dp_aux.aux);

	if (r)

	r = drm_dp_mst_connector_late_register(connector,

					       amdgpu_dm_connector->port);

	if (r < 0)

		return r;



#if defined(CONFIG_DEBUG_FS)

	connector_debugfs_init(amdgpu_dm_connector);

#endif



	return r;

	return 0;

}



static void
@@ -472,9 +472,12 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = { 
};



void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

				       struct amdgpu_dm_connector *aconnector)

				       struct amdgpu_dm_connector *aconnector,

				       int link_index)

{

	aconnector->dm_dp_aux.aux.name = "dmdc";

	aconnector->dm_dp_aux.aux.name =

		kasprintf(GFP_KERNEL, "AMDGPU DM aux hw bus %d",

			  link_index);

	aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;

	aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ struct amdgpu_dm_connector; 
int dm_mst_get_pbn_divider(struct dc_link *link);



void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

				       struct amdgpu_dm_connector *aconnector);

				       struct amdgpu_dm_connector *aconnector,

				       int link_index);



#if defined(CONFIG_DRM_AMD_DC_DCN)

bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,

drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c

+26 −0
Original line number Diff line number Diff line
@@ -984,6 +984,32 @@ static int init_thermal_controller( 
			struct pp_hwmgr *hwmgr,

			const ATOM_PPLIB_POWERPLAYTABLE *powerplay_table)

{

	hwmgr->thermal_controller.ucType =

			powerplay_table->sThermalController.ucType;

	hwmgr->thermal_controller.ucI2cLine =

			powerplay_table->sThermalController.ucI2cLine;

	hwmgr->thermal_controller.ucI2cAddress =

			powerplay_table->sThermalController.ucI2cAddress;



	hwmgr->thermal_controller.fanInfo.bNoFan =

		(0 != (powerplay_table->sThermalController.ucFanParameters &

			ATOM_PP_FANPARAMETERS_NOFAN));



	hwmgr->thermal_controller.fanInfo.ucTachometerPulsesPerRevolution =

		powerplay_table->sThermalController.ucFanParameters &

		ATOM_PP_FANPARAMETERS_TACHOMETER_PULSES_PER_REVOLUTION_MASK;



	hwmgr->thermal_controller.fanInfo.ulMinRPM

		= powerplay_table->sThermalController.ucFanMinRPM * 100UL;

	hwmgr->thermal_controller.fanInfo.ulMaxRPM

		= powerplay_table->sThermalController.ucFanMaxRPM * 100UL;



	set_hw_cap(hwmgr,

		   ATOM_PP_THERMALCONTROLLER_NONE != hwmgr->thermal_controller.ucType,

		   PHM_PlatformCaps_ThermalController);



	hwmgr->thermal_controller.use_hw_fan_control = 1;



	return 0;

}

drivers/gpu/drm/amd/powerplay/renoir_ppt.c

+6 −1
Original line number Diff line number Diff line
@@ -895,11 +895,16 @@ static int renoir_read_sensor(struct smu_context *smu, 


static bool renoir_is_dpm_running(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;



	/*

	 * Util now, the pmfw hasn't exported the interface of SMU

	 * feature mask to APU SKU so just force on all the feature

	 * at early initial stage.

	 */

	if (adev->in_suspend)

		return false;

	else

		return true;



}

CRA Git | Maintained and supported by SUSTech CRA and CCSE