Commit 2c270d3e authored by Dan Carpenter's avatar Dan Carpenter Committed by Alex Deucher

drm/amdgpu/pm: smu_v13_0_4: delete duplicate condition

There is no need to check if "clock_ranges' is non-NULL.  It is checked
already on the line before.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3670c46f
...@@ -644,42 +644,40 @@ static int smu_v13_0_4_set_watermarks_table(struct smu_context *smu, ...@@ -644,42 +644,40 @@ static int smu_v13_0_4_set_watermarks_table(struct smu_context *smu,
if (!table || !clock_ranges) if (!table || !clock_ranges)
return -EINVAL; return -EINVAL;
if (clock_ranges) { if (clock_ranges->num_reader_wm_sets > NUM_WM_RANGES ||
if (clock_ranges->num_reader_wm_sets > NUM_WM_RANGES || clock_ranges->num_writer_wm_sets > NUM_WM_RANGES)
clock_ranges->num_writer_wm_sets > NUM_WM_RANGES) return -EINVAL;
return -EINVAL;
for (i = 0; i < clock_ranges->num_reader_wm_sets; i++) {
table->WatermarkRow[WM_DCFCLK][i].MinClock =
clock_ranges->reader_wm_sets[i].min_drain_clk_mhz;
table->WatermarkRow[WM_DCFCLK][i].MaxClock =
clock_ranges->reader_wm_sets[i].max_drain_clk_mhz;
table->WatermarkRow[WM_DCFCLK][i].MinMclk =
clock_ranges->reader_wm_sets[i].min_fill_clk_mhz;
table->WatermarkRow[WM_DCFCLK][i].MaxMclk =
clock_ranges->reader_wm_sets[i].max_fill_clk_mhz;
table->WatermarkRow[WM_DCFCLK][i].WmSetting =
clock_ranges->reader_wm_sets[i].wm_inst;
}
for (i = 0; i < clock_ranges->num_writer_wm_sets; i++) { for (i = 0; i < clock_ranges->num_reader_wm_sets; i++) {
table->WatermarkRow[WM_SOCCLK][i].MinClock = table->WatermarkRow[WM_DCFCLK][i].MinClock =
clock_ranges->writer_wm_sets[i].min_fill_clk_mhz; clock_ranges->reader_wm_sets[i].min_drain_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MaxClock = table->WatermarkRow[WM_DCFCLK][i].MaxClock =
clock_ranges->writer_wm_sets[i].max_fill_clk_mhz; clock_ranges->reader_wm_sets[i].max_drain_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MinMclk = table->WatermarkRow[WM_DCFCLK][i].MinMclk =
clock_ranges->writer_wm_sets[i].min_drain_clk_mhz; clock_ranges->reader_wm_sets[i].min_fill_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MaxMclk = table->WatermarkRow[WM_DCFCLK][i].MaxMclk =
clock_ranges->writer_wm_sets[i].max_drain_clk_mhz; clock_ranges->reader_wm_sets[i].max_fill_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].WmSetting = table->WatermarkRow[WM_DCFCLK][i].WmSetting =
clock_ranges->writer_wm_sets[i].wm_inst; clock_ranges->reader_wm_sets[i].wm_inst;
} }
smu->watermarks_bitmap |= WATERMARKS_EXIST; for (i = 0; i < clock_ranges->num_writer_wm_sets; i++) {
table->WatermarkRow[WM_SOCCLK][i].MinClock =
clock_ranges->writer_wm_sets[i].min_fill_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MaxClock =
clock_ranges->writer_wm_sets[i].max_fill_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MinMclk =
clock_ranges->writer_wm_sets[i].min_drain_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].MaxMclk =
clock_ranges->writer_wm_sets[i].max_drain_clk_mhz;
table->WatermarkRow[WM_SOCCLK][i].WmSetting =
clock_ranges->writer_wm_sets[i].wm_inst;
} }
smu->watermarks_bitmap |= WATERMARKS_EXIST;
/* pass data to smu controller */ /* pass data to smu controller */
if ((smu->watermarks_bitmap & WATERMARKS_EXIST) && if ((smu->watermarks_bitmap & WATERMARKS_EXIST) &&
!(smu->watermarks_bitmap & WATERMARKS_LOADED)) { !(smu->watermarks_bitmap & WATERMARKS_LOADED)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment