Skip to contentSkip to conversation

drm/amd/pp: Cleaning up vega10_enable_dpm_tasks function

PATCH In review Rex Zhu 2 participants 3 messages Feb 23, 2018 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/1 drm/amd/pp: Cleaning up vega10_enable_dpm_tasks function

move out functions that unrelated to enable dpm task.

Change-Id I93416e0eea82325040557a64af2b82a38d8c32ce
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 14 +++++---------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +5 -9
index b13f55d..c6cc6b2 100644
@@ -811,7 +811,8 @@ static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
 			data->vddci_control = VEGA10_VOLTAGE_CONTROL_BY_GPIO;
 	}
 
-	data->config_telemetry = config_telemetry;
+	smum_send_msg_to_smc_with_parameter(hwmgr,
+		PPSMC_MSG_ConfigureTelemetry, config_telemetry);
 
 	vega10_set_features_platform_caps(hwmgr);
 
@@ -928,6 +929,9 @@ static int vega10_setup_asic_task(struct pp_hwmgr *hwmgr)
 			"Failed to set up led dpm config!",
 			return -EINVAL);
 
+	smum_send_msg_to_smc_with_parameter(hwmgr,
+			PPSMC_MSG_NumOfDisplays, 0);
+
 	return 0;
 }
 
@@ -2853,16 +2857,8 @@ static int vega10_start_dpm(struct pp_hwmgr *hwmgr, uint32_t bitmap)
 
 static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
-	struct vega10_hwmgr *data =
-			(struct vega10_hwmgr *)(hwmgr->backend);
 	int tmp_result, result = 0;
 
-	smum_send_msg_to_smc_with_parameter(hwmgr,
-		PPSMC_MSG_ConfigureTelemetry, data->config_telemetry);
-
-	smum_send_msg_to_smc_with_parameter(hwmgr,
-			PPSMC_MSG_NumOfDisplays, 0);
-
 	tmp_result = (!smum_is_dpm_running(hwmgr)) ? 0 : -1;
 	PP_ASSERT_WITH_CODE(!tmp_result,
 			"DPM is already running right , skipping re-enablement!",
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +0 -1
index ab3e879..df7999d 100644
@@ -380,7 +380,6 @@ struct vega10_hwmgr {
 	struct smu_features            smu_features[GNLD_FEATURES_MAX];
 	struct vega10_smc_state_table  smc_state_table;
 
-	uint32_t                       config_telemetry;
 	uint32_t                       acg_loop_state;
 	uint32_t                       mem_channels;
 	uint8_t                       custom_profile_mode[4];
Signature · 6 lines
1.9.1

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

A message that is not in the archive (sent off-list or not yet received): 1519359682-28335-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 14 lines · Rex Zhu

move out functions that unrelated to enable dpm task.

Change-Id I93416e0eea82325040557a64af2b82a38d8c32ce
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 14 +++++---------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -0
index b13f55d..c6cc6b2 100644

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr) · line 815

Quoted 6 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -1
@@ -811,7 +811,8 @@ static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
                        data->vddci_control = VEGA10_VOLTAGE_CONTROL_BY_GPIO;
        }
 
-       data->config_telemetry = config_telemetry;
+       smum_send_msg_to_smc_with_parameter(hwmgr,
+               PPSMC_MSG_ConfigureTelemetry, config_telemetry);

I don't think backend_init actually touches the hw anywhere else. Seems like it might be better to move this to setup_asic_task for consistency.

Alex

Quoted 45 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +3 -8
        vega10_set_features_platform_caps(hwmgr);
 
@@ -928,6 +929,9 @@ static int vega10_setup_asic_task(struct pp_hwmgr *hwmgr)
                        "Failed to set up led dpm config!",
                        return -EINVAL);
 
+       smum_send_msg_to_smc_with_parameter(hwmgr,
+                       PPSMC_MSG_NumOfDisplays, 0);
+
        return 0;
 }
 
@@ -2853,16 +2857,8 @@ static int vega10_start_dpm(struct pp_hwmgr *hwmgr, uint32_t bitmap)
 
 static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
-       struct vega10_hwmgr *data =
-                       (struct vega10_hwmgr *)(hwmgr->backend);
        int tmp_result, result = 0;
 
-       smum_send_msg_to_smc_with_parameter(hwmgr,
-               PPSMC_MSG_ConfigureTelemetry, data->config_telemetry);
-
-       smum_send_msg_to_smc_with_parameter(hwmgr,
-                       PPSMC_MSG_NumOfDisplays, 0);
-
        tmp_result = (!smum_is_dpm_running(hwmgr)) ? 0 : -1;
        PP_ASSERT_WITH_CODE(!tmp_result,
                        "DPM is already running right , skipping re-enablement!",
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +0 -2
index ab3e879..df7999d 100644
@@ -380,7 +380,6 @@ struct vega10_hwmgr {
        struct smu_features            smu_features[GNLD_FEATURES_MAX];
        struct vega10_smc_state_table  smc_state_table;
 
-       uint32_t                       config_telemetry;
        uint32_t                       acg_loop_state;
        uint32_t                       mem_channels;
        uint8_t                       custom_profile_mode[4];
--

1.9.1

Quoted 4 lines

_______________________________________________
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

A message that is not in the archive (sent off-list or not yet received): CADnq5_PHqqQcjf+2qEiLUDVDU8s8GHW09q4YtP-Q3kpwM4mbgw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

author
#4 lore raw
Quoted 3 lines

I don't think backend_init actually touches the hw anywhere else. Seems like it might be better to move this to setup_asic_task for consistency.

Thanks Alex, you are right. the change for telemetry will cause telemetry setting not restore after s3/s4 resume back.

Best Regards

Rex

________________________________
From: Alex Deucher <[email protected]>
Sent: Friday, February 23, 2018 1:01 PM
To: Zhu, Rex
Cc: amd-gfx list
Subject: Re: [PATCH] drm/amd/pp: Cleaning up vega10_enable_dpm_tasks function

Quoted 14 lines · Rex Zhu

move out functions that unrelated to enable dpm task.

Change-Id I93416e0eea82325040557a64af2b82a38d8c32ce
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 14 +++++---------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -0
index b13f55d..c6cc6b2 100644

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr) · line 815

Quoted 6 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -1
@@ -811,7 +811,8 @@ static int vega10_hwmgr_backend_init(struct pp_hwmgr *hwmgr)
                        data->vddci_control = VEGA10_VOLTAGE_CONTROL_BY_GPIO;
        }
 
-       data->config_telemetry = config_telemetry;
+       smum_send_msg_to_smc_with_parameter(hwmgr,
+               PPSMC_MSG_ConfigureTelemetry, config_telemetry);

I don't think backend_init actually touches the hw anywhere else. Seems like it might be better to move this to setup_asic_task for consistency.

Alex

Quoted 45 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +3 -8
        vega10_set_features_platform_caps(hwmgr);
 
@@ -928,6 +929,9 @@ static int vega10_setup_asic_task(struct pp_hwmgr *hwmgr)
                        "Failed to set up led dpm config!",
                        return -EINVAL);
 
+       smum_send_msg_to_smc_with_parameter(hwmgr,
+                       PPSMC_MSG_NumOfDisplays, 0);
+
        return 0;
 }
 
@@ -2853,16 +2857,8 @@ static int vega10_start_dpm(struct pp_hwmgr *hwmgr, uint32_t bitmap)
 
 static int vega10_enable_dpm_tasks(struct pp_hwmgr *hwmgr)
 {
-       struct vega10_hwmgr *data =
-                       (struct vega10_hwmgr *)(hwmgr->backend);
        int tmp_result, result = 0;
 
-       smum_send_msg_to_smc_with_parameter(hwmgr,
-               PPSMC_MSG_ConfigureTelemetry, data->config_telemetry);
-
-       smum_send_msg_to_smc_with_parameter(hwmgr,
-                       PPSMC_MSG_NumOfDisplays, 0);
-
        tmp_result = (!smum_is_dpm_running(hwmgr)) ? 0 : -1;
        PP_ASSERT_WITH_CODE(!tmp_result,
                        "DPM is already running right , skipping re-enablement!",
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +0 -2
index ab3e879..df7999d 100644
@@ -380,7 +380,6 @@ struct vega10_hwmgr {
        struct smu_features            smu_features[GNLD_FEATURES_MAX];
        struct vega10_smc_state_table  smc_state_table;
 
-       uint32_t                       config_telemetry;
        uint32_t                       acg_loop_state;
        uint32_t                       mem_channels;
        uint8_t                       custom_profile_mode[4];
--

1.9.1

Quoted 4 lines

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

amd-gfx Info Page - freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx>
lists.freedesktop.org
Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the following form. Use of all freedesktop.org lists is subject to our Code of ...

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