drm/amd/powerplay: helper interfaces for MGPU fan boost feature (b55c9e7a) · Commits · 戴 / test

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

+41 −0

Original line number	Diff line number	Diff line
		@@ -1833,6 +1833,43 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev)
		return 0;
		}

		static int amdgpu_device_enable_mgpu_fan_boost(void)
		{
		struct amdgpu_gpu_instance *gpu_ins;
		struct amdgpu_device *adev;
		int i, ret = 0;

		mutex_lock(&mgpu_info.mutex);

		/*
		* MGPU fan boost feature should be enabled
		* only when there are two or more dGPUs in
		* the system
		*/
		if (mgpu_info.num_dgpu < 2)
		goto out;

		for (i = 0; i < mgpu_info.num_dgpu; i++) {
		gpu_ins = &(mgpu_info.gpu_ins[i]);
		adev = gpu_ins->adev;
		if (!(adev->flags & AMD_IS_APU) &&
		!gpu_ins->mgpu_fan_enabled &&
		adev->powerplay.pp_funcs &&
		adev->powerplay.pp_funcs->enable_mgpu_fan_boost) {
		ret = amdgpu_dpm_enable_mgpu_fan_boost(adev);
		if (ret)
		break;

		gpu_ins->mgpu_fan_enabled = 1;
		}
		}

		out:
		mutex_unlock(&mgpu_info.mutex);

		return ret;
		}

		/**
		* amdgpu_device_ip_late_init_func_handler - work handler for ib test
		*
		@@ -1847,6 +1884,10 @@ static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)
		r = amdgpu_ib_ring_tests(adev);
		if (r)
		DRM_ERROR("ib ring test failed (%d).\n", r);

		r = amdgpu_device_enable_mgpu_fan_boost();
		if (r)
		DRM_ERROR("enable mgpu fan boost failed (%d).\n", r);
		}

		static void amdgpu_device_delay_enable_gfx_off(struct work_struct *work)

+4 −0

Original line number	Diff line number	Diff line
		@@ -357,6 +357,10 @@ enum amdgpu_pcie_gen {
		((adev)->powerplay.pp_funcs->odn_edit_dpm_table(\
		(adev)->powerplay.pp_handle, type, parameter, size))

		#define amdgpu_dpm_enable_mgpu_fan_boost(adev) \
		((adev)->powerplay.pp_funcs->enable_mgpu_fan_boost(\
		(adev)->powerplay.pp_handle))

		struct amdgpu_dpm {
		struct amdgpu_ps *ps;
		/* number of valid power states */

+1 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ struct amd_pm_funcs {
		int (get_display_mode_validation_clocks)(void handle,
		struct amd_pp_simple_clock_info *clocks);
		int (notify_smu_enable_pwe)(void handle);
		int (enable_mgpu_fan_boost)(void handle);
		};

		#endif

+19 −0

Original line number	Diff line number	Diff line
		@@ -1243,6 +1243,24 @@ static int pp_notify_smu_enable_pwe(void *handle)
		return 0;
		}

		static int pp_enable_mgpu_fan_boost(void *handle)
		{
		struct pp_hwmgr *hwmgr = handle;

		if (!hwmgr \|\| !hwmgr->pm_en)
		return -EINVAL;

		if (hwmgr->hwmgr_func->enable_mgpu_fan_boost == NULL) {
		return 0;
		}

		mutex_lock(&hwmgr->smu_lock);
		hwmgr->hwmgr_func->enable_mgpu_fan_boost(hwmgr);
		mutex_unlock(&hwmgr->smu_lock);

		return 0;
		}

		static const struct amd_pm_funcs pp_dpm_funcs = {
		.load_firmware = pp_dpm_load_fw,
		.wait_for_fw_loading_complete = pp_dpm_fw_loading_complete,
		@@ -1287,4 +1305,5 @@ static const struct amd_pm_funcs pp_dpm_funcs = {
		.display_clock_voltage_request = pp_display_clock_voltage_request,
		.get_display_mode_validation_clocks = pp_get_display_mode_validation_clocks,
		.notify_smu_enable_pwe = pp_notify_smu_enable_pwe,
		.enable_mgpu_fan_boost = pp_enable_mgpu_fan_boost,
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ struct pp_hwmgr_func {
		int (set_power_limit)(struct pp_hwmgr hwmgr, uint32_t n);
		int (powergate_mmhub)(struct pp_hwmgr hwmgr);
		int (smus_notify_pwe)(struct pp_hwmgr hwmgr);
		int (enable_mgpu_fan_boost)(struct pp_hwmgr hwmgr);
		};

		struct pp_table_func {