drm/amd/display: fix the build when DRM_AMD_DC_DCN is not set
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 11 Aug 2023 21:07:07 +0000 (16:07 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Aug 2023 16:27:23 +0000 (18:27 +0200)
commit 5ca9b33ece9aa048b6ec9411f054e1b781662327 upstream

Move the new callback outside of the guard.

Fixes: dc55b106ad47 ("drm/amd/display: Disable phantom OTG after enable for plane disable")
CC: Alvin Lee <Alvin.Lee2@amd.com>
CC: Alan Liu <HaoPing.Liu@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h

index 974f2c1..789cf94 100644 (file)
@@ -184,8 +184,8 @@ struct timing_generator_funcs {
        bool (*disable_crtc)(struct timing_generator *tg);
 #ifdef CONFIG_DRM_AMD_DC_DCN
        void (*phantom_crtc_post_enable)(struct timing_generator *tg);
-       void (*disable_phantom_crtc)(struct timing_generator *tg);
 #endif
+       void (*disable_phantom_crtc)(struct timing_generator *tg);
        bool (*immediate_disable_crtc)(struct timing_generator *tg);
        bool (*is_counter_moving)(struct timing_generator *tg);
        void (*get_position)(struct timing_generator *tg,