OSDN Git Service

drm/amdgpu/display: drop ifdefs around comments
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 24 Jun 2019 15:13:56 +0000 (10:13 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jun 2019 18:23:17 +0000 (13:23 -0500)
No need to protect the comments.  The DCN1_01 config
was dopped anyway.  Got accidently brought back with the
navi merge.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c

index 6392ec7..a780057 100644 (file)
@@ -147,7 +147,6 @@ bool hubbub1_verify_allow_pstate_change_high(
                forced_pstate_allow = false;
        }
 
-#ifdef CONFIG_DRM_AMD_DC_DCN1_01
        /* RV2:
         * dchubbubdebugind, at: 0xB
         * description
@@ -184,8 +183,6 @@ bool hubbub1_verify_allow_pstate_change_high(
         * 30:    Arbiter's allow_pstate_change
         * 31:    SOC pstate change request"
         */
-#else
-#ifdef CONFIG_DRM_AMD_DC_DCN2_0
        /*DCN2.x:
        HUBBUB:DCHUBBUB_TEST_ARB_DEBUG10 DCHUBBUBDEBUGIND:0xB
        0: Pipe0 Plane0 Allow P-state Change
@@ -221,7 +218,6 @@ bool hubbub1_verify_allow_pstate_change_high(
        30: Arbiter`s Allow P-state Change
        31: SOC P-state Change request
        */
-#else
        /* RV1:
         * dchubbubdebugind, at: 0x7
         * description "3-0:   Pipe0 cursor0 QOS
@@ -245,8 +241,6 @@ bool hubbub1_verify_allow_pstate_change_high(
         * 30:    Arbiter's allow_pstate_change
         * 31:    SOC pstate change request
         */
-#endif
-#endif
 
        REG_WRITE(DCHUBBUB_TEST_DEBUG_INDEX, hubbub1->debug_test_index_pstate);