From: Mario Limonciello <[email protected]>
The indentation for some lines in DML2 code is off and checkpatch
reported it while fixing another issue.
```
WARNING: suspect code indent for conditional statements (24, 40)
46: FILE: drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c:6416:
+ for (k = 0; k <= mode_lib->ms.num_active_planes; k++) {
CalculateUrgentBurstFactor(
WARNING: suspect code indent for conditional statements (8, 24)
118: FILE: drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c:6784:
+ for (k = 0; k <= mode_lib->ms.num_active_planes; k++) {
if
(mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear &&
(!(!dml_is_vertical_rotation(mode_lib->ms.cache_display_cfg.plane.SourceScan[k]))
|| mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) {
```
Correct indentation for those two cases.
Fixes: 7966f319c66d9 ("drm/amd/display: Introduce DML2")
Signed-off-by: Mario Limonciello <[email protected]>
---
.../amd/display/dc/dml2/display_mode_core.c | 55 +++++++++----------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
index 45147b812d7d9..e2c7afa958456 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
@@ -6414,32 +6414,32 @@ static void dml_prefetch_check(struct
display_mode_lib_st *mode_lib)
}
for (k = 0; k <= mode_lib->ms.num_active_planes - 1;
k++) {
- CalculateUrgentBurstFactor(
-
mode_lib->ms.cache_display_cfg.plane.UseMALLForPStateChange[k],
-
mode_lib->ms.swath_width_luma_ub_this_state[k],
-
mode_lib->ms.swath_width_chroma_ub_this_state[k],
-
mode_lib->ms.SwathHeightYThisState[k],
-
mode_lib->ms.SwathHeightCThisState[k],
-
mode_lib->ms.cache_display_cfg.timing.HTotal[k] /
mode_lib->ms.cache_display_cfg.timing.PixelClock[k],
- mode_lib->ms.UrgLatency,
-
mode_lib->ms.ip.cursor_buffer_size,
-
mode_lib->ms.cache_display_cfg.plane.CursorWidth[k],
-
mode_lib->ms.cache_display_cfg.plane.CursorBPP[k],
-
mode_lib->ms.VRatioPreY[j][k],
-
mode_lib->ms.VRatioPreC[j][k],
-
mode_lib->ms.BytePerPixelInDETY[k],
-
mode_lib->ms.BytePerPixelInDETC[k],
-
mode_lib->ms.DETBufferSizeYThisState[k],
-
mode_lib->ms.DETBufferSizeCThisState[k],
- /* Output */
-
&mode_lib->ms.UrgentBurstFactorCursorPre[k],
-
&mode_lib->ms.UrgentBurstFactorLumaPre[k],
-
&mode_lib->ms.UrgentBurstFactorChroma[k],
-
&mode_lib->ms.NotUrgentLatencyHidingPre[k]);
-
- mode_lib->ms.cursor_bw_pre[k] =
mode_lib->ms.cache_display_cfg.plane.NumberOfCursors[k] *
mode_lib->ms.cache_display_cfg.plane.CursorWidth[k] *
-
mode_lib->ms.cache_display_cfg.plane.CursorBPP[k] / 8.0
/ (mode_lib->ms.cache_display_cfg.timing.HTotal[k] /
-
mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) *
mode_lib->ms.VRatioPreY[j][k];
+ CalculateUrgentBurstFactor(
+
mode_lib->ms.cache_display_cfg.plane.UseMALLForPStateChange[k],
+
mode_lib->ms.swath_width_luma_ub_this_state[k],
+
mode_lib->ms.swath_width_chroma_ub_this_state[k],
+
mode_lib->ms.SwathHeightYThisState[k],
+
mode_lib->ms.SwathHeightCThisState[k],
+
mode_lib->ms.cache_display_cfg.timing.HTotal[k] /
mode_lib->ms.cache_display_cfg.timing.PixelClock[k],
+ mode_lib->ms.UrgLatency,
+
mode_lib->ms.ip.cursor_buffer_size,
+
mode_lib->ms.cache_display_cfg.plane.CursorWidth[k],
+
mode_lib->ms.cache_display_cfg.plane.CursorBPP[k],
+ mode_lib->ms.VRatioPreY[j][k],
+ mode_lib->ms.VRatioPreC[j][k],
+
mode_lib->ms.BytePerPixelInDETY[k],
+
mode_lib->ms.BytePerPixelInDETC[k],
+
mode_lib->ms.DETBufferSizeYThisState[k],
+
mode_lib->ms.DETBufferSizeCThisState[k],
+ /* Output */
+
&mode_lib->ms.UrgentBurstFactorCursorPre[k],
+
&mode_lib->ms.UrgentBurstFactorLumaPre[k],
+
&mode_lib->ms.UrgentBurstFactorChroma[k],
+
&mode_lib->ms.NotUrgentLatencyHidingPre[k]);
+
+ mode_lib->ms.cursor_bw_pre[k] =
mode_lib->ms.cache_display_cfg.plane.NumberOfCursors[k] *
mode_lib->ms.cache_display_cfg.plane.CursorWidth[k] *
+
mode_lib->ms.cache_display_cfg.plane.CursorBPP[k] / 8.0 /
(mode_lib->ms.cache_display_cfg.timing.HTotal[k] /
+
mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) *
mode_lib->ms.VRatioPreY[j][k];
}
{
@@ -6782,9 +6782,8 @@ dml_bool_t dml_core_mode_support(struct
display_mode_lib_st *mode_lib)
/*Source Format, Pixel Format and Scan Support Check*/
mode_lib->ms.support.SourceFormatPixelAndScanSupport = true;
for (k = 0; k <= mode_lib->ms.num_active_planes - 1; k++) {
- if
(mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear &&
(!(!dml_is_vertical_rotation(mode_lib->ms.cache_display_cfg.plane.SourceScan[k]))
|| mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) {
+ if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] ==
dml_sw_linear &&
(!(!dml_is_vertical_rotation(mode_lib->ms.cache_display_cfg.plane.SourceScan[k]))
|| mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true))
mode_lib->ms.support.SourceFormatPixelAndScanSupport =
false;
- }
}
for (k = 0; k <= mode_lib->ms.num_active_planes; k++) {
--
2.43.0
