drm: amd: Fix line continuation formats

Line continuations with excess spacing causes unexpected output.

Miscellanea:

o Added missing '\n' to a few of the coalesced pr_<level> formats

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
index b2dcc46..00528b2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
@@ -220,8 +220,7 @@ static void dpcd_set_lt_pattern_and_lane_settings(
                size_in_bytes);
 
        dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-               "%s:\n %x VS set = %x  PE set = %x \
-               max VS Reached = %x  max PE Reached = %x\n",
+               "%s:\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
                __func__,
                DP_TRAINING_LANE0_SET,
                dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -558,8 +557,7 @@ static void dpcd_set_lane_settings(
        */
 
        dm_logger_write(link->ctx->logger, LOG_HW_LINK_TRAINING,
-               "%s\n %x VS set = %x  PE set = %x \
-               max VS Reached = %x  max PE Reached = %x\n",
+               "%s\n %x VS set = %x  PE set = %x max VS Reached = %x  max PE Reached = %x\n",
                __func__,
                DP_TRAINING_LANE0_SET,
                dpcd_lane[0].bits.VOLTAGE_SWING_SET,
@@ -872,9 +870,8 @@ static bool perform_clock_recovery_sequence(
        if (retry_count >= LINK_TRAINING_MAX_CR_RETRY) {
                ASSERT(0);
                dm_logger_write(link->ctx->logger, LOG_ERROR,
-                       "%s: Link Training Error, could not \
-                        get CR after %d tries. \
-                       Possibly voltage swing issue", __func__,
+                       "%s: Link Training Error, could not get CR after %d tries. Possibly voltage swing issue",
+                       __func__,
                        LINK_TRAINING_MAX_CR_RETRY);
 
        }

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
index a651ebc..b49d65c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
@@ -523,8 +523,7 @@ static int get_pcie_table(
                if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
                        pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
                else
-                       pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-                       Disregarding the excess entries... \n");
+                       pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
                pcie_table->count = pcie_count;
                for (i = 0; i < pcie_count; i++) {
@@ -563,8 +562,7 @@ static int get_pcie_table(
                if ((uint32_t)atom_pcie_table->ucNumEntries <= pcie_count)
                        pcie_count = (uint32_t)atom_pcie_table->ucNumEntries;
                else
-                       pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! \
-                       Disregarding the excess entries... \n");
+                       pr_err("Number of Pcie Entries exceed the number of SCLK Dpm Levels! Disregarding the excess entries...\n");
 
                pcie_table->count = pcie_count;
 

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
index 9d4955e..07d256d 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
@@ -546,8 +546,7 @@ static void vega10_patch_with_vdd_leakage(struct pp_hwmgr *hwmgr,
        }
 
        if (*voltage > ATOM_VIRTUAL_VOLTAGE_ID0)
-               pr_info("Voltage value looks like a Leakage ID \
-                               but it's not patched\n");
+               pr_info("Voltage value looks like a Leakage ID but it's not patched\n");
 }
 
 /**
@@ -701,18 +700,14 @@ static int vega10_set_private_data_based_on_pptable(struct pp_hwmgr *hwmgr)
                        table_info->vdd_dep_on_mclk;
 
        PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table,
-               "VDD dependency on SCLK table is missing. \
-               This table is mandatory", return -EINVAL);
+               "VDD dependency on SCLK table is missing. This table is mandatory", return -EINVAL);
        PP_ASSERT_WITH_CODE(allowed_sclk_vdd_table->count >= 1,
-               "VDD dependency on SCLK table is empty. \
-               This table is mandatory", return -EINVAL);
+               "VDD dependency on SCLK table is empty. This table is mandatory", return -EINVAL);
 
        PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table,
-               "VDD dependency on MCLK table is missing. \
-               This table is mandatory", return -EINVAL);
+               "VDD dependency on MCLK table is missing.  This table is mandatory", return -EINVAL);
        PP_ASSERT_WITH_CODE(allowed_mclk_vdd_table->count >= 1,
-               "VDD dependency on MCLK table is empty. \
-               This table is mandatory", return -EINVAL);
+               "VDD dependency on MCLK table is empty.  This table is mandatory", return -EINVAL);
 
        table_info->max_clock_voltage_on_ac.sclk =
                allowed_sclk_vdd_table->entries[allowed_sclk_vdd_table->count - 1].clk;
@@ -3416,8 +3411,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
                                        DPMTABLE_OD_UPDATE_SCLK)) {
                        result = vega10_populate_all_graphic_levels(hwmgr);
                        PP_ASSERT_WITH_CODE(!result,
-                                       "Failed to populate SCLK during \
-                                       PopulateNewDPMClocksStates Function!",
+                                       "Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
                                        return result);
                }
 
@@ -3426,8 +3420,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
                                        DPMTABLE_OD_UPDATE_MCLK)){
                        result = vega10_populate_all_memory_levels(hwmgr);
                        PP_ASSERT_WITH_CODE(!result,
-                                       "Failed to populate MCLK during \
-                                       PopulateNewDPMClocksStates Function!",
+                                       "Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
                                        return result);
                }
        } else {
@@ -3544,8 +3537,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
                        data->apply_optimized_settings) {
                        result = vega10_populate_all_graphic_levels(hwmgr);
                        PP_ASSERT_WITH_CODE(!result,
-                                       "Failed to populate SCLK during \
-                                       PopulateNewDPMClocksStates Function!",
+                                       "Failed to populate SCLK during PopulateNewDPMClocksStates Function!",
                                        return result);
                }
 
@@ -3553,8 +3545,7 @@ static int vega10_populate_and_upload_sclk_mclk_dpm_levels(
                                (DPMTABLE_OD_UPDATE_MCLK + DPMTABLE_UPDATE_MCLK)) {
                        result = vega10_populate_all_memory_levels(hwmgr);
                        PP_ASSERT_WITH_CODE(!result,
-                                       "Failed to populate MCLK during \
-                                       PopulateNewDPMClocksStates Function!",
+                                       "Failed to populate MCLK during PopulateNewDPMClocksStates Function!",
                                        return result);
                }
        }

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
index 4d672cd..ed4b37e 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -1732,8 +1732,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
        if (0 != result) {
                smu_data->smc_state_table.GraphicsBootLevel = 0;
-               pr_err("VBIOS did not find boot engine clock value \
-                       in dependency table. Using Graphics DPM level 0!");
+               pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
                result = 0;
        }
 
@@ -1743,8 +1742,7 @@ static int ci_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
        if (0 != result) {
                smu_data->smc_state_table.MemoryBootLevel = 0;
-               pr_err("VBIOS did not find boot engine clock value \
-                       in dependency table. Using Memory DPM level 0!");
+               pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
                result = 0;
        }
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
index 3412882..2ff682d 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -911,8 +911,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
                hwmgr->dyn_state.vddc_dependency_on_sclk, engine_clock,
                &graphic_level->MinVddc);
        PP_ASSERT_WITH_CODE((0 == result),
-               "can not find VDDC voltage value for VDDC       \
-               engine clock dependency table", return result);
+               "can not find VDDC voltage value for VDDC engine clock dependency table", return result);
 
        /* SCLK frequency in units of 10KHz*/
        graphic_level->SclkFrequency = engine_clock;
@@ -1678,8 +1677,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
        if (0 != result) {
                smu_data->smc_state_table.GraphicsBootLevel = 0;
-               pr_err("VBIOS did not find boot engine clock value \
-                       in dependency table. Using Graphics DPM level 0!");
+               pr_err("VBIOS did not find boot engine clock value in dependency table. Using Graphics DPM level 0!\n");
                result = 0;
        }
 
@@ -1689,8 +1687,7 @@ static int iceland_populate_smc_boot_level(struct pp_hwmgr *hwmgr,
 
        if (0 != result) {
                smu_data->smc_state_table.MemoryBootLevel = 0;
-               pr_err("VBIOS did not find boot engine clock value \
-                       in dependency table. Using Memory DPM level 0!");
+               pr_err("VBIOS did not find boot engine clock value in dependency table. Using Memory DPM level 0!\n");
                result = 0;
        }
 

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
index 2f979fb..f6f39d0 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
@@ -381,10 +381,8 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)
                (rev_id == 0xc1) ||
                (rev_id == 0xc3)))) {
                if (smc_driver_if_version != SMU9_DRIVER_IF_VERSION) {
-                       pr_err("Your firmware(0x%x) doesn't match \
-                               SMU9_DRIVER_IF_VERSION(0x%x). \
-                               Please update your firmware!\n",
-                               smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
+                       pr_err("Your firmware(0x%x) doesn't match SMU9_DRIVER_IF_VERSION(0x%x). Please update your firmware!\n",
+                              smc_driver_if_version, SMU9_DRIVER_IF_VERSION);
                        return -EINVAL;
                }
        }