Skip to contentSkip to conversation

drm/amd/powerplay: fix ret checks in amd_powerplay.c

PATCH In review Rex Zhu 3 participants 4 messages Oct 6, 2017 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/2 drm/amd/powerplay: fix ret checks in amd_powerplay.c

Change-Id Ie745bc10d933462863b4295eb26cc2af08f06547
---
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1 -1
index f3f303e..463905b 100644
@@ -396,7 +396,7 @@ static int pp_dpm_force_performance_level(void *handle,
 	hwmgr->request_dpm_level = level;
 	hwmgr_handle_task(pp_handle, AMD_PP_TASK_READJUST_POWER_STATE, NULL, NULL);
 	ret = hwmgr->hwmgr_func->force_dpm_level(hwmgr, level);
-	if (ret)
+	if (!ret)
 		hwmgr->dpm_level = hwmgr->request_dpm_level;
 
 	mutex_unlock(&pp_handle->pp_lock);
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
author
#2 lore raw

PATCH 2/2 drm/amd/powerplay: fix mclk can't switch on Tonga

In reply to a message not in the archive

regresstion issue caused by
commit 47047263c52779f1f3393c32e3e53661b53a372e ("drm/amd/powerplay: delete eventmgr related files.")

Change-Id Ia2ddf83443a666fd1e97ddf4142acce147be00dc
---
 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c  | 1 -
 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0 -1
index 35e80c9..ce59e0e 100644
@@ -292,7 +292,6 @@ int hwmgr_hw_fini(struct pp_instance *handle)
 
 	phm_stop_thermal_controller(hwmgr);
 	psm_set_boot_states(hwmgr);
-	phm_display_configuration_changed(hwmgr);
 	psm_adjust_power_state_dynamic(hwmgr, false, NULL);
 	phm_disable_dynamic_state_management(hwmgr);
 	phm_disable_clock_power_gatings(hwmgr);
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +5 -1
index 167cdc3..ffa44bb 100644
@@ -224,6 +224,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
 	if (skip)
 		return 0;
 
+	phm_display_configuration_changed(hwmgr);
+
 	if (new_ps != NULL)
 		requested = new_ps;
 	else
@@ -232,7 +234,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
 	pcurrent = hwmgr->current_ps;
 
 	phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
-
 	if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,
 			&pcurrent->hardware, &requested->hardware, &equal)))
 		equal = false;
@@ -241,6 +242,9 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
 		phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
 		memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
 	}
+
+	phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
+
 	return 0;
 }
 
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#4 lore raw

Re: [PATCH 2/2] drm/amd/powerplay: fix mclk can't switch on Tonga

In reply to a message not in the archive

Hi Rex,

Thanks. Everything seems to be functional again on my Tonga.

Cheers,
Tom

Quoted 46 lines · Rex Zhu

regresstion issue caused by
commit 47047263c52779f1f3393c32e3e53661b53a372e ("drm/amd/powerplay: delete eventmgr related files.")

Change-Id Ia2ddf83443a666fd1e97ddf4142acce147be00dc
---
  drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c  | 1 -
  drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 6 +++++-
  2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0 -1
index 35e80c9..ce59e0e 100644
@@ -292,7 +292,6 @@ int hwmgr_hw_fini(struct pp_instance *handle)
 
  	phm_stop_thermal_controller(hwmgr);
  	psm_set_boot_states(hwmgr);
-	phm_display_configuration_changed(hwmgr);
  	psm_adjust_power_state_dynamic(hwmgr, false, NULL);
  	phm_disable_dynamic_state_management(hwmgr);
  	phm_disable_clock_power_gatings(hwmgr);
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +2 -1
index 167cdc3..ffa44bb 100644
@@ -224,6 +224,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
  	if (skip)
  		return 0;
 
+	phm_display_configuration_changed(hwmgr);
+
  	if (new_ps != NULL)
  		requested = new_ps;
  	else
@@ -232,7 +234,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
  	pcurrent = hwmgr->current_ps;
 
  	phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
-
  	if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,
  			&pcurrent->hardware, &requested->hardware, &equal)))
  		equal = false;

drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip, · line 250

Quoted 9 lines
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +3 -0
@@ -241,6 +242,9 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
  		phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
  		memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
  	}
+
+	phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
+
  	return 0;
  }
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw

Re: [PATCH 2/2] drm/amd/powerplay: fix mclk can't switch on Tonga

In reply to a message not in the archive

These also fix for me.
Testing with 4.15-wip I also need the partial revert patch.

Quoted 60 lines · Tom St Denis

Hi Rex,

Thanks. Everything seems to be functional again on my Tonga.

Cheers,
Tom

Quoted 52 lines · Rex Zhu

regresstion issue caused by
commit 47047263c52779f1f3393c32e3e53661b53a372e ("drm/amd/powerplay: delete eventmgr related files.")

Change-Id Ia2ddf83443a666fd1e97ddf4142acce147be00dc
---
  drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c  | 1 -
  drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 6 +++++-
  2 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0 -1
index 35e80c9..ce59e0e 100644
@@ -292,7 +292,6 @@ int hwmgr_hw_fini(struct pp_instance *handle)
      phm_stop_thermal_controller(hwmgr);
      psm_set_boot_states(hwmgr);
-    phm_display_configuration_changed(hwmgr);
      psm_adjust_power_state_dynamic(hwmgr, false, NULL);
      phm_disable_dynamic_state_management(hwmgr);
      phm_disable_clock_power_gatings(hwmgr);
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +5 -1
index 167cdc3..ffa44bb 100644
@@ -224,6 +224,8 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr 
 *hwmgr, bool skip,
      if (skip)
          return 0;
+    phm_display_configuration_changed(hwmgr);
+
      if (new_ps != NULL)
          requested = new_ps;
      else
@@ -232,7 +234,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr 
 *hwmgr, bool skip,
      pcurrent = hwmgr->current_ps;
      phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
-
      if (pcurrent == NULL || (0 != phm_check_states_equal(hwmgr,
              &pcurrent->hardware, &requested->hardware, &equal)))
          equal = false;
@@ -241,6 +242,9 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr 
 *hwmgr, bool skip,
          phm_set_power_state(hwmgr, &pcurrent->hardware, 
 &requested->hardware);
          memcpy(hwmgr->current_ps, hwmgr->request_ps, hwmgr->ps_size);
      }
+
+    phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
+
Quoted 8 lines
Quoted 3 lines
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +0 -0
      return 0;
  }

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx