This is a note to let you know that I've just added the patch titled
drm/amd/display: fix the build when DRM_AMD_DC_DCN is not set
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-fix-the-build-when-drm_amd_dc_dcn-is-not-set.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Aug 11 23:09:25 2023
From: Mario Limonciello <mario.limonciello@xxxxxxx>
Date: Fri, 11 Aug 2023 16:07:07 -0500
Subject: drm/amd/display: fix the build when DRM_AMD_DC_DCN is not set
To: <stable@xxxxxxxxxxxxxxx>
Cc: <Tianci.Yin@xxxxxxx>, <Richard.Gong@xxxxxxx>, <Aurabindo.Pillai@xxxxxxx>, Mario Limonciello <mario.limonciello@xxxxxxx>
Message-ID: <20230811210708.14512-10-mario.limonciello@xxxxxxx>
From: Alex Deucher <alexander.deucher@xxxxxxx>
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@xxxxxxx>
CC: Alan Liu <HaoPing.Liu@xxxxxxx>
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h
@@ -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,
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.1/drm-amd-display-fix-the-build-when-drm_amd_dc_dcn-is-not-set.patch
queue-6.1/drm-amd-pm-fulfill-powerplay-peak-profiling-mode-shader-memory-clock-settings.patch
queue-6.1/drm-amd-display-handle-virtual-hardware-detect.patch
queue-6.1/drm-amd-display-use-update-plane-and-stream-routine-for-dcn32x.patch
queue-6.1/drm-amd-display-avoid-abm-when-odm-combine-is-enabled-for-edp.patch
queue-6.1/drm-amd-pm-fulfill-swsmu-peak-profiling-mode-shader-memory-clock-settings.patch
queue-6.1/drm-amd-pm-avoid-unintentional-shutdown-due-to-temperature-momentary-fluctuation.patch
queue-6.1/drm-amd-display-update-otg-instance-in-the-commit-stream.patch
queue-6.1/drm-amd-pm-expose-swctf-threshold-setting-for-legacy-powerplay.patch
queue-6.1/drm-amd-display-add-function-for-validate-and-update-new-stream.patch
queue-6.1/drm-amd-display-trigger-timing-sync-only-if-tg-is-running.patch
queue-6.1/drm-amd-display-handle-seamless-boot-stream.patch
queue-6.1/drm-amd-display-retain-phantom-plane-stream-if-validation-fails.patch
queue-6.1/drm-amd-display-disable-phantom-otg-after-enable-for-plane-disable.patch
