drm/amd/display: Whitespace cleanup
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 27 Mar 2023 16:07:54 +0000 (18:07 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 31 Mar 2023 15:18:55 +0000 (11:18 -0400)
Commit 075e2099c32c ("drm/amd/display: Fix race condition in DPIA AUX
transfer") was backported to stable, which I noticed because of git
saying

linux-6.1/.git/rebase-apply/patch:37154: space before tab in indent.

while applying patch-6.1.21. While fixing the code location that issued
that warning, improve in few more places.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 5d0069f383d424d1ae9d0eda0f8b42f9882ddc7c..e29655a26dd42ed853a63bf1e11fdcb6ab4504b6 100644 (file)
@@ -2299,9 +2299,9 @@ static int dm_late_init(void *handle)
         */
        params.min_abm_backlight = 0x28F;
        /* In the case where abm is implemented on dmcub,
-       * dmcu object will be null.
-       * ABM 2.4 and up are implemented on dmcub.
-       */
+        * dmcu object will be null.
+        * ABM 2.4 and up are implemented on dmcub.
+        */
        if (dmcu) {
                if (!dmcu_load_iram(dmcu, params))
                        return -EINVAL;
@@ -7091,13 +7091,13 @@ static uint add_fs_modes(struct amdgpu_dm_connector *aconnector)
        /* Standard FPS values
         *
         * 23.976       - TV/NTSC
-        * 24           - Cinema
-        * 25           - TV/PAL
+        * 24           - Cinema
+        * 25           - TV/PAL
         * 29.97        - TV/NTSC
-        * 30           - TV/NTSC
-        * 48           - Cinema HFR
-        * 50           - TV/PAL
-        * 60           - Commonly used
+        * 30           - TV/NTSC
+        * 48           - Cinema HFR
+        * 50           - TV/PAL
+        * 60           - Commonly used
         * 48,72,96,120 - Multiples of 24
         */
        static const u32 common_rates[] = {
@@ -7726,7 +7726,7 @@ static void update_freesync_state_on_stream(
                return;
 
        spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
-        vrr_params = acrtc->dm_irq_params.vrr_params;
+       vrr_params = acrtc->dm_irq_params.vrr_params;
 
        if (surface) {
                mod_freesync_handle_preflip(
@@ -8307,7 +8307,7 @@ static void amdgpu_dm_commit_audio(struct drm_device *dev,
                if (!drm_atomic_crtc_needs_modeset(new_crtc_state))
                        continue;
 
-       notify:
+notify:
                aconnector = to_amdgpu_dm_connector(connector);
 
                mutex_lock(&adev->dm.audio_lock);
@@ -9323,7 +9323,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
 skip_modeset:
        /* Release extra reference */
        if (new_stream)
-                dc_stream_release(new_stream);
+               dc_stream_release(new_stream);
 
        /*
         * We want to do dc stream updates that do not require a
@@ -10657,7 +10657,7 @@ int amdgpu_dm_process_dmub_aux_transfer_sync(
        if (!dc_process_dmub_aux_transfer_async(ctx->dc, link_index, payload)) {
                *operation_result = AUX_RET_ERROR_ENGINE_ACQUIRE;
                goto out;
-       }
+       }
 
        if (!wait_for_completion_timeout(&adev->dm.dmub_aux_transfer_done, 10 * HZ)) {
                DRM_ERROR("wait_for_completion_timeout timeout!");