Skip to contentSkip to conversation

drm/amd/pm: drop dead code

PATCH In review Evan Quan 2 participants 7 messages Sep 7, 2020 – Sep 15, 2020

Subsystems (4)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/4 drm/amd/pm: drop dead code

Raven never goes to swsmu path. So "adev->smu.ppt_funcs" will be always false.

Change-Id Ia55ad97bcf9ecf135a9bd795f36a5b521d718b20
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0 -3
index c5f2216e59c4..99ccabcc135e 100644
@@ -592,9 +592,6 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp,
 	if (pp_funcs && pp_funcs->set_watermarks_for_clocks_ranges)
 		pp_funcs->set_watermarks_for_clocks_ranges(pp_handle,
 							   &wm_with_clock_ranges);
-	else if (adev->smu.ppt_funcs)
-		smu_set_watermarks_for_clock_ranges(&adev->smu,
-				&wm_with_clock_ranges);
 }
 
 void pp_rv_set_pme_wa_enable(struct pp_smu *pp)
Signature · 6 lines
2.28.0

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

PATCH 2/4 drm/amd/pm: drop unnecessary wrappers around watermark setting

The convertion to "struct dm_pp_clock_range_for_mcif_wm_set_soc15" is totally unnecessary and can be dropped.

Change-Id Ieaa1d1f1cc12b29a8ec26d330fd209662940417d
---
 .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c  | 97 +------------------
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h       |  4 +-
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c     |  2 +-
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 68 ++++++-------
 .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c   | 69 ++++++-------
 .../gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c   | 44 ++++-----
 6 files changed, 78 insertions(+), 206 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2 -95
index 99ccabcc135e..435e58d12d8e 100644
@@ -664,49 +664,8 @@ static enum pp_smu_status pp_nv_set_wm_ranges(struct pp_smu *pp,
 {
 	const struct dc_context *ctx = pp->dm;
 	struct amdgpu_device *adev = ctx->driver_context;
-	struct dm_pp_wm_sets_with_clock_ranges_soc15 wm_with_clock_ranges;
-	struct dm_pp_clock_range_for_dmif_wm_set_soc15 *wm_dce_clocks =
-			wm_with_clock_ranges.wm_dmif_clocks_ranges;
-	struct dm_pp_clock_range_for_mcif_wm_set_soc15 *wm_soc_clocks =
-			wm_with_clock_ranges.wm_mcif_clocks_ranges;
-	int32_t i;
-
-	wm_with_clock_ranges.num_wm_dmif_sets = ranges->num_reader_wm_sets;
-	wm_with_clock_ranges.num_wm_mcif_sets = ranges->num_writer_wm_sets;
 
-	for (i = 0; i < wm_with_clock_ranges.num_wm_dmif_sets; i++) {
-		if (ranges->reader_wm_sets[i].wm_inst > 3)
-			wm_dce_clocks[i].wm_set_id = WM_SET_A;
-		else
-			wm_dce_clocks[i].wm_set_id =
-					ranges->reader_wm_sets[i].wm_inst;
-		wm_dce_clocks[i].wm_max_dcfclk_clk_in_khz =
-			ranges->reader_wm_sets[i].max_drain_clk_mhz * 1000;
-		wm_dce_clocks[i].wm_min_dcfclk_clk_in_khz =
-			ranges->reader_wm_sets[i].min_drain_clk_mhz * 1000;
-		wm_dce_clocks[i].wm_max_mem_clk_in_khz =
-			ranges->reader_wm_sets[i].max_fill_clk_mhz * 1000;
-		wm_dce_clocks[i].wm_min_mem_clk_in_khz =
-			ranges->reader_wm_sets[i].min_fill_clk_mhz * 1000;
-	}
-
-	for (i = 0; i < wm_with_clock_ranges.num_wm_mcif_sets; i++) {
-		if (ranges->writer_wm_sets[i].wm_inst > 3)
-			wm_soc_clocks[i].wm_set_id = WM_SET_A;
-		else
-			wm_soc_clocks[i].wm_set_id =
-					ranges->writer_wm_sets[i].wm_inst;
-		wm_soc_clocks[i].wm_max_socclk_clk_in_khz =
-			ranges->writer_wm_sets[i].max_fill_clk_mhz * 1000;
-		wm_soc_clocks[i].wm_min_socclk_clk_in_khz =
-			ranges->writer_wm_sets[i].min_fill_clk_mhz * 1000;
-		wm_soc_clocks[i].wm_max_mem_clk_in_khz =
-			ranges->writer_wm_sets[i].max_drain_clk_mhz * 1000;
-		wm_soc_clocks[i].wm_min_mem_clk_in_khz =
-			ranges->writer_wm_sets[i].min_drain_clk_mhz * 1000;
-	}
-
-	smu_set_watermarks_for_clock_ranges(&adev->smu,	&wm_with_clock_ranges);
+	smu_set_watermarks_for_clock_ranges(&adev->smu, ranges);
 
 	return PP_SMU_RESULT_OK;
 }
@@ -917,60 +876,8 @@ static enum pp_smu_status pp_rn_set_wm_ranges(struct pp_smu *pp,
 {
 	const struct dc_context *ctx = pp->dm;
 	struct amdgpu_device *adev = ctx->driver_context;
-	struct smu_context *smu = &adev->smu;
-	struct dm_pp_wm_sets_with_clock_ranges_soc15 wm_with_clock_ranges;
-	struct dm_pp_clock_range_for_dmif_wm_set_soc15 *wm_dce_clocks =
-			wm_with_clock_ranges.wm_dmif_clocks_ranges;
-	struct dm_pp_clock_range_for_mcif_wm_set_soc15 *wm_soc_clocks =
-			wm_with_clock_ranges.wm_mcif_clocks_ranges;
-	int32_t i;
-
-	if (!smu->ppt_funcs)
-		return PP_SMU_RESULT_UNSUPPORTED;
-
-	wm_with_clock_ranges.num_wm_dmif_sets = ranges->num_reader_wm_sets;
-	wm_with_clock_ranges.num_wm_mcif_sets = ranges->num_writer_wm_sets;
-
-	for (i = 0; i < wm_with_clock_ranges.num_wm_dmif_sets; i++) {
-		if (ranges->reader_wm_sets[i].wm_inst > 3)
-			wm_dce_clocks[i].wm_set_id = WM_SET_A;
-		else
-			wm_dce_clocks[i].wm_set_id =
-					ranges->reader_wm_sets[i].wm_inst;
-
-		wm_dce_clocks[i].wm_min_dcfclk_clk_in_khz =
-			ranges->reader_wm_sets[i].min_drain_clk_mhz;
-
-		wm_dce_clocks[i].wm_max_dcfclk_clk_in_khz =
-			ranges->reader_wm_sets[i].max_drain_clk_mhz;
-
-		wm_dce_clocks[i].wm_min_mem_clk_in_khz =
-			ranges->reader_wm_sets[i].min_fill_clk_mhz;
-
-		wm_dce_clocks[i].wm_max_mem_clk_in_khz =
-			ranges->reader_wm_sets[i].max_fill_clk_mhz;
-	}
-
-	for (i = 0; i < wm_with_clock_ranges.num_wm_mcif_sets; i++) {
-		if (ranges->writer_wm_sets[i].wm_inst > 3)
-			wm_soc_clocks[i].wm_set_id = WM_SET_A;
-		else
-			wm_soc_clocks[i].wm_set_id =
-					ranges->writer_wm_sets[i].wm_inst;
-		wm_soc_clocks[i].wm_min_socclk_clk_in_khz =
-				ranges->writer_wm_sets[i].min_fill_clk_mhz;
-
-		wm_soc_clocks[i].wm_max_socclk_clk_in_khz =
-			ranges->writer_wm_sets[i].max_fill_clk_mhz;
-
-		wm_soc_clocks[i].wm_min_mem_clk_in_khz =
-			ranges->writer_wm_sets[i].min_drain_clk_mhz;
-
-		wm_soc_clocks[i].wm_max_mem_clk_in_khz =
-			ranges->writer_wm_sets[i].max_drain_clk_mhz;
-	}
 
-	smu_set_watermarks_for_clock_ranges(&adev->smu, &wm_with_clock_ranges);
+	smu_set_watermarks_for_clock_ranges(&adev->smu, ranges);
 
 	return PP_SMU_RESULT_OK;
 }
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +2 -2
index 3aefc5f9ba21..85c5e8627e3b 100644
@@ -501,7 +501,7 @@ struct pptable_funcs {
 	bool (*is_dpm_running)(struct smu_context *smu);
 	int (*get_fan_speed_rpm)(struct smu_context *smu, uint32_t *speed);
 	int (*set_watermarks_table)(struct smu_context *smu,
-				    struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);
+				    struct pp_smu_wm_range_sets *clock_ranges);
 	int (*get_thermal_temperature_range)(struct smu_context *smu, struct smu_temperature_range *range);
 	int (*get_uclk_dpm_states)(struct smu_context *smu, uint32_t *clocks_in_khz, uint32_t *num_states);
 	int (*set_default_od_settings)(struct smu_context *smu);
@@ -755,7 +755,7 @@ enum amd_pm_state_type smu_get_current_power_state(struct smu_context *smu);
 int smu_write_watermarks_table(struct smu_context *smu);
 int smu_set_watermarks_for_clock_ranges(
 		struct smu_context *smu,
-		struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);
+		struct pp_smu_wm_range_sets *clock_ranges);
 
 /* smu to display interface */
 extern int smu_display_configuration_change(struct smu_context *smu, const
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
index 77e3ffb72dc2..489a84792002 100644
@@ -1824,7 +1824,7 @@ int smu_write_watermarks_table(struct smu_context *smu)
 }
 
 int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,
-		struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges)
+		struct pp_smu_wm_range_sets *clock_ranges)
 {
 	int ret = 0;
 
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +27 -41

84 lines not on this page · raw message

drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +27 -42

85 lines not on this page · raw message

drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +19 -25

69 lines not on this page · raw message

Signature · 6 lines
2.28.0

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

PATCH 3/4 drm/amd/pm: add Renoir watermak WmType setting

In reply to Evan Quan

Which tells it's a nomral pstate change or memory retraining.

Change-Id I8619115486021537b52c067c4d0b9bfc1417fc35
---
 drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +4 -0
index 53d8beffc74e..63c72e33222e 100644
@@ -887,6 +887,8 @@ static int renoir_set_watermarks_table(
 
 			table->WatermarkRow[WM_DCFCLK][i].WmSetting =
 				clock_ranges->reader_wm_sets[i].wm_inst;
+			table->WatermarkRow[WM_DCFCLK][i].WmType =
+				clock_ranges->reader_wm_sets[i].wm_type;
 		}
 
 		for (i = 0; i < clock_ranges->num_writer_wm_sets; i++) {
@@ -901,6 +903,8 @@ static int renoir_set_watermarks_table(
 
 			table->WatermarkRow[WM_SOCCLK][i].WmSetting =
 				clock_ranges->writer_wm_sets[i].wm_inst;
+			table->WatermarkRow[WM_SOCCLK][i].WmType =
+				clock_ranges->writer_wm_sets[i].wm_type;
 		}
 
 		smu->watermarks_bitmap |= WATERMARKS_EXIST;
Signature · 6 lines
2.28.0

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

Re: [PATCH 3/4] drm/amd/pm: add Renoir watermak WmType setting

Quoted 1 line · Evan Quan

Typo in the subject: watermak -> watermark

Quoted 1 line

Which tells it's a nomral pstate change or memory retraining.

Typo: nomral -> normal

with those fixed:

Quoted 33 lines
Change-Id I8619115486021537b52c067c4d0b9bfc1417fc35
---
 drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +4 -1
index 53d8beffc74e..63c72e33222e 100644
@@ -887,6 +887,8 @@ static int renoir_set_watermarks_table(
 
                        table->WatermarkRow[WM_DCFCLK][i].WmSetting =
                                clock_ranges->reader_wm_sets[i].wm_inst;
+                       table->WatermarkRow[WM_DCFCLK][i].WmType =
+                               clock_ranges->reader_wm_sets[i].wm_type;
                }
 
                for (i = 0; i < clock_ranges->num_writer_wm_sets; i++) {
@@ -901,6 +903,8 @@ static int renoir_set_watermarks_table(
 
                        table->WatermarkRow[WM_SOCCLK][i].WmSetting =
                                clock_ranges->writer_wm_sets[i].wm_inst;
+                       table->WatermarkRow[WM_SOCCLK][i].WmType =
+                               clock_ranges->writer_wm_sets[i].wm_type;
                }
 
                smu->watermarks_bitmap |= WATERMARKS_EXIST;
--

2.28.0

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

author
#4 lore raw

PATCH 4/4 drm/amd/pm: add Raven2 watermak WmType setting

In reply to Evan Quan

Which tells it's a nomral pstate change or memory retraining.

Change-Id If55d6c3f1dfc28005c6d767154664feddcda6f5b
---
 drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h         |  3 ++-
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +2 -1
index dea8fe93da63..c498158771cc 100644
@@ -54,7 +54,8 @@ typedef struct {
 	uint16_t MaxMclk;
 
 	uint8_t  WmSetting;
-	uint8_t  Padding[3];
+	uint8_t  WmType;
+	uint8_t  Padding[2];
 } WatermarkRowGeneric_t;
 
 #define NUM_WM_RANGES 4
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +11 -0
index 9ee8cf8267c8..88792dba1759 100644
@@ -1181,8 +1181,19 @@ static int smu10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,
 	struct smu10_hwmgr *data = hwmgr->backend;
 	struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges;
 	Watermarks_t *table = &(data->water_marks_table);
+	struct amdgpu_device *adev = hwmgr->adev;
+	int i;
 
 	smu_set_watermarks_for_clocks_ranges(table,wm_with_clock_ranges);
+
+	if (adev->apu_flags & AMD_APU_IS_RAVEN2) {
+		for (i = 0; i < NUM_WM_RANGES; i++)
+			table->WatermarkRow[WM_DCFCLK][i].WmType = (uint8_t)0;
+
+		for (i = 0; i < NUM_WM_RANGES; i++)
+			table->WatermarkRow[WM_SOCCLK][i].WmType = (uint8_t)0;
+	}
+
 	smum_smc_table_manager(hwmgr, (uint8_t *)table, (uint16_t)SMU10_WMTABLE, false);
 	data->water_marks_exist = true;
 	return 0;
Signature · 6 lines
2.28.0

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

Re: [PATCH 4/4] drm/amd/pm: add Raven2 watermak WmType setting

Quoted 2 lines · Evan Quan

Which tells it's a nomral pstate change or memory retraining.

Same typos as patch 3. With those fixed:

Quoted 50 lines
Change-Id If55d6c3f1dfc28005c6d767154664feddcda6f5b
---
 drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h         |  3 ++-
 drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h +2 -1
index dea8fe93da63..c498158771cc 100644
@@ -54,7 +54,8 @@ typedef struct {
        uint16_t MaxMclk;
 
        uint8_t  WmSetting;
-       uint8_t  Padding[3];
+       uint8_t  WmType;
+       uint8_t  Padding[2];
 } WatermarkRowGeneric_t;
 
 #define NUM_WM_RANGES 4
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +11 -1
index 9ee8cf8267c8..88792dba1759 100644
@@ -1181,8 +1181,19 @@ static int smu10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,
        struct smu10_hwmgr *data = hwmgr->backend;
        struct dm_pp_wm_sets_with_clock_ranges_soc15 *wm_with_clock_ranges = clock_ranges;
        Watermarks_t *table = &(data->water_marks_table);
+       struct amdgpu_device *adev = hwmgr->adev;
+       int i;
 
        smu_set_watermarks_for_clocks_ranges(table,wm_with_clock_ranges);
+
+       if (adev->apu_flags & AMD_APU_IS_RAVEN2) {
+               for (i = 0; i < NUM_WM_RANGES; i++)
+                       table->WatermarkRow[WM_DCFCLK][i].WmType = (uint8_t)0;
+
+               for (i = 0; i < NUM_WM_RANGES; i++)
+                       table->WatermarkRow[WM_SOCCLK][i].WmType = (uint8_t)0;
+       }
+
        smum_smc_table_manager(hwmgr, (uint8_t *)table, (uint16_t)SMU10_WMTABLE, false);
        data->water_marks_exist = true;
        return 0;
--

2.28.0

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

Acked-by on v1 1/4
#6 lore raw
In reply to Evan Quan
Quoted 7 lines · Evan Quan

Raven never goes to swsmu path. So "adev->smu.ppt_funcs" will be always false.

Change-Id Ia55ad97bcf9ecf135a9bd795f36a5b521d718b20

Patches 1, 2:

Quoted 21 lines
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0 -4
index c5f2216e59c4..99ccabcc135e 100644
@@ -592,9 +592,6 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp,
        if (pp_funcs && pp_funcs->set_watermarks_for_clocks_ranges)
                pp_funcs->set_watermarks_for_clocks_ranges(pp_handle,
                                                           &wm_with_clock_ranges);
-       else if (adev->smu.ppt_funcs)
-               smu_set_watermarks_for_clock_ranges(&adev->smu,
-                               &wm_with_clock_ranges);
 }
 
 void pp_rv_set_pme_wa_enable(struct pp_smu *pp)
--

2.28.0

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