* [PATCH 0/4] treewide: Fix line continuation formats
@ 2017-11-16 15:27 Joe Perches
2017-11-16 15:27 ` [PATCH 2/4] drm: amd: " Joe Perches
2017-11-16 17:11 ` [PATCH 0/4] treewide: " Mimi Zohar
0 siblings, 2 replies; 8+ messages in thread
From: Joe Perches @ 2017-11-16 15:27 UTC (permalink / raw)
To: Chanwoo Choi, linux-pm, linux-integrity
Cc: linux-security-module, dri-devel, linux-kernel, amd-gfx, linux-media
Avoid using line continations in formats as that causes unexpected
output.
Joe Perches (4):
rk3399_dmc: Fix line continuation format
drm: amd: Fix line continuation formats
[media] dibx000_common: Fix line continuation format
ima: Fix line continuation format
drivers/devfreq/rk3399_dmc.c | 4 ++--
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++-----
.../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 ++---
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 6 ++---
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 9 +++-----
.../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++---
drivers/media/dvb-frontends/dibx000_common.c | 8 +++----
security/integrity/ima/ima_template.c | 11 ++++-----
9 files changed, 33 insertions(+), 55 deletions(-)
--
2.15.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/4] drm: amd: Fix line continuation formats
2017-11-16 15:27 [PATCH 0/4] treewide: Fix line continuation formats Joe Perches
@ 2017-11-16 15:27 ` Joe Perches
[not found] ` <eee8836696843f983a9533d6441fa9f2d8cbe92f.1510845910.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2017-11-16 17:11 ` [PATCH 0/4] treewide: " Mimi Zohar
1 sibling, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-11-16 15:27 UTC (permalink / raw)
To: linux-kernel
Cc: Alex Deucher, David Airlie, dri-devel, Christian König, amd-gfx
Line continuations with excess spacing causes unexpected output.
Miscellanea:
o Added missing '\n' to a few of the coalesced pr_<level> formats
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++-----
.../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 ++---
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 6 ++---
.../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 9 +++-----
.../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++---
6 files changed, 22 insertions(+), 43 deletions(-)
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 ced42484dcfc..6743786afcce 100644
--- 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 d1af1483c69b..813f827e4270 100644
--- 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 4f79c21f27ed..9599fe0ba779 100644
--- 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;
@@ -3415,8 +3410,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);
}
@@ -3425,8 +3419,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 {
@@ -3543,8 +3536,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);
}
@@ -3552,8 +3544,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 4d672cd15785..ed4b37e566a3 100644
--- 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 34128822b8fb..2ff682d44e8c 100644
--- 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 2f979fb86824..f6f39d01d227 100644
--- 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;
}
}
--
2.15.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] drm: amd: Fix line continuation formats
[not found] ` <eee8836696843f983a9533d6441fa9f2d8cbe92f.1510845910.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
@ 2017-11-16 15:38 ` Harry Wentland
2017-11-16 15:50 ` Joe Perches
0 siblings, 1 reply; 8+ messages in thread
From: Harry Wentland @ 2017-11-16 15:38 UTC (permalink / raw)
To: Joe Perches, linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: Alex Deucher, David Airlie,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Christian König,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 2017-11-16 10:27 AM, Joe Perches wrote:
> Line continuations with excess spacing causes unexpected output.
>
> Miscellanea:
>
> o Added missing '\n' to a few of the coalesced pr_<level> formats
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++-----
> .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 ++---
> drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 27 ++++++++--------------
> drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 6 ++---
> .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 9 +++-----
> .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 ++---
> 6 files changed, 22 insertions(+), 43 deletions(-)
>
> 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 ced42484dcfc..6743786afcce 100644
> --- 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",
Would probably be good to add a '\n' here as well but that's not the main intention of this patch.
Either way patch is
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Harry
> + __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 d1af1483c69b..813f827e4270 100644
> --- 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 4f79c21f27ed..9599fe0ba779 100644
> --- 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;
> @@ -3415,8 +3410,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);
> }
>
> @@ -3425,8 +3419,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 {
> @@ -3543,8 +3536,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);
> }
>
> @@ -3552,8 +3544,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 4d672cd15785..ed4b37e566a3 100644
> --- 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 34128822b8fb..2ff682d44e8c 100644
> --- 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 2f979fb86824..f6f39d01d227 100644
> --- 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;
> }
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] drm: amd: Fix line continuation formats
2017-11-16 15:38 ` Harry Wentland
@ 2017-11-16 15:50 ` Joe Perches
[not found] ` <1510847412.31559.25.camel-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-11-16 15:50 UTC (permalink / raw)
To: Harry Wentland, linux-kernel
Cc: Alex Deucher, David Airlie, amd-gfx, Christian König, dri-devel
On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
> On 2017-11-16 10:27 AM, Joe Perches wrote:
> > Line continuations with excess spacing causes unexpected output.
[]
> > @@ -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",
>
> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.
About 1/4 of the dm_logger_write calls are missing
newlines and I think it should be a separate patch.
I encourage you to fix them one day.
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
cheers, Joe
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] treewide: Fix line continuation formats
2017-11-16 15:27 [PATCH 0/4] treewide: Fix line continuation formats Joe Perches
2017-11-16 15:27 ` [PATCH 2/4] drm: amd: " Joe Perches
@ 2017-11-16 17:11 ` Mimi Zohar
2017-11-16 17:17 ` Joe Perches
1 sibling, 1 reply; 8+ messages in thread
From: Mimi Zohar @ 2017-11-16 17:11 UTC (permalink / raw)
To: Joe Perches, Chanwoo Choi, linux-pm, linux-integrity
Cc: linux-kernel, amd-gfx, dri-devel, linux-media, linux-security-module
On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> Avoid using line continations in formats as that causes unexpected
> output.
Is having lines greater than 80 characters the preferred method?
Could you add quotes before the backlash and before the first word on
the next line instead?
Mimi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] treewide: Fix line continuation formats
2017-11-16 17:11 ` [PATCH 0/4] treewide: " Mimi Zohar
@ 2017-11-16 17:17 ` Joe Perches
2017-11-16 19:35 ` Mimi Zohar
0 siblings, 1 reply; 8+ messages in thread
From: Joe Perches @ 2017-11-16 17:17 UTC (permalink / raw)
To: Mimi Zohar, Chanwoo Choi, linux-pm, linux-integrity
Cc: linux-kernel, amd-gfx, dri-devel, linux-media, linux-security-module
On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > Avoid using line continations in formats as that causes unexpected
> > output.
>
> Is having lines greater than 80 characters the preferred method?
yes.
> Could you add quotes before the backlash and before the first word on
> the next line instead?
coalesced formats are preferred.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] treewide: Fix line continuation formats
2017-11-16 17:17 ` Joe Perches
@ 2017-11-16 19:35 ` Mimi Zohar
0 siblings, 0 replies; 8+ messages in thread
From: Mimi Zohar @ 2017-11-16 19:35 UTC (permalink / raw)
To: Joe Perches, Chanwoo Choi, linux-pm, linux-integrity
Cc: linux-kernel, amd-gfx, dri-devel, linux-media, linux-security-module
On Thu, 2017-11-16 at 09:17 -0800, Joe Perches wrote:
> On Thu, 2017-11-16 at 12:11 -0500, Mimi Zohar wrote:
> > On Thu, 2017-11-16 at 07:27 -0800, Joe Perches wrote:
> > > Avoid using line continations in formats as that causes unexpected
> > > output.
> >
> > Is having lines greater than 80 characters the preferred method?
>
> yes.
>
> > Could you add quotes before the backlash and before the first word on
> > the next line instead?
>
> coalesced formats are preferred.
In the future, please reference the commit 6f76b6fcaa60 "CodingStyle:
Document the exception of not splitting user-visible strings, for
grepping"
thanks,
Mimi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] drm: amd: Fix line continuation formats
[not found] ` <1510847412.31559.25.camel-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
@ 2017-11-17 19:52 ` Alex Deucher
0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2017-11-17 19:52 UTC (permalink / raw)
To: Joe Perches
Cc: David Airlie, LKML, amd-gfx list, Maling list - DRI developers,
Alex Deucher, Harry Wentland, Christian König
On Thu, Nov 16, 2017 at 10:50 AM, Joe Perches <joe@perches.com> wrote:
> On Thu, 2017-11-16 at 10:38 -0500, Harry Wentland wrote:
>> On 2017-11-16 10:27 AM, Joe Perches wrote:
>> > Line continuations with excess spacing causes unexpected output.
> []
>> > @@ -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",
>>
>> Would probably be good to add a '\n' here as well but that's not the main intention of this patch.
>
> About 1/4 of the dm_logger_write calls are missing
> newlines and I think it should be a separate patch.
>
> I encourage you to fix them one day.
>
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> cheers, Joe
Applied. Thanks!
Alex
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-11-17 19:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-16 15:27 [PATCH 0/4] treewide: Fix line continuation formats Joe Perches
2017-11-16 15:27 ` [PATCH 2/4] drm: amd: " Joe Perches
[not found] ` <eee8836696843f983a9533d6441fa9f2d8cbe92f.1510845910.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2017-11-16 15:38 ` Harry Wentland
2017-11-16 15:50 ` Joe Perches
[not found] ` <1510847412.31559.25.camel-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2017-11-17 19:52 ` Alex Deucher
2017-11-16 17:11 ` [PATCH 0/4] treewide: " Mimi Zohar
2017-11-16 17:17 ` Joe Perches
2017-11-16 19:35 ` Mimi Zohar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).