FAILED: patch "[PATCH] drm/amd/display: hpd rx irq not working with eDP interface" failed to apply to 6.1-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x eeefe7c4820b6baa0462a8b723ea0a3b5846ccae
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023051356-helpful-blunt-f7fa@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
eeefe7c4820b ("drm/amd/display: hpd rx irq not working with eDP interface") 7ae1dbe6547c ("drm/amd/display: merge dc_link.h into dc.h and dc_types.h") 8e5cfe547bf3 ("drm/amd/display: upstream link_dp_dpia_bw.c")5ca38a18b5a4 ("drm/amd/display: move public dc link function implementation to dc_link_exports") 54618888d1ea ("drm/amd/display: break down dc_link.c")71d7e8904d54 ("drm/amd/display: Add HDMI manufacturer OUI and device id read") 65a4cfb45e0e ("drm/amdgpu/display: remove duplicate include header in files") e322843e5e33 ("drm/amd/display: fix linux dp link lost handled only one time") 0c2bfcc338eb ("drm/amd/display: Add Function declaration in dc_link")6ca7415f11af ("drm/amd/display: merge dc_link_dp into dc_link")de3fb390175b ("drm/amd/display: move dp cts functions from dc_link_dp to link_dp_cts") c5a31f178e35 ("drm/amd/display: move dp irq handler functions from dc_link_dp to link_dp_irq_handler") e95afc1cf7c6 ("drm/amd/display: Enable AdaptiveSync in DC interface")0078c924e733 ("drm/amd/display: move eDP panel control logic to link_edp_panel_control") bc33f5e5f05b ("drm/amd/display: create accessories, hwss and protocols sub folders in link") 2daeb74b7d66 ("drm/amdgpu/display/mst: update mst_mgr relevant variable when long HPD") 028c4ccfb812 ("drm/amd/display: force connector state when bpc changes during compliance") 603a521ec279 ("drm/amd/display: remove duplicate included header files")bd3149014dff ("drm/amd/display: Decrease messaging about DP alt mode state to debug") d5a43956b73b ("drm/amd/display: move dp capability related logic to link_dp_capability")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From eeefe7c4820b6baa0462a8b723ea0a3b5846ccae Mon Sep 17 00:00:00 2001
From: Robin Chen <[email protected]>
Date: Fri, 17 Feb 2023 20:47:57 +0800
Subject: [PATCH] drm/amd/display: hpd rx irq not working with eDP interface
[Why]
This is the fix for the defect of commit ab144f0b4ad6 ("drm/amd/display: Allow individual control of eDP hotplug support").
[How]
To revise the default eDP hotplug setting and use the enum to git rid of the magic number for different options.
drivers/gpu/drm/amd/display/dc/dc_types.h +7 -0
@@ -1080,4 +1080,11 @@ struct dc_dpia_bw_alloc { };#define MAX_SINKS_PER_LINK 4 + +enum dc_hpd_enable_select { +HPD_EN_FOR_ALL_EDP =0 , +HPD_EN_FOR_PRIMARY_EDP_ONLY , +HPD_EN_FOR_SECONDARY_EDP_ONLY , +}; +#endif /* DC_TYPES_H_ */
drivers/gpu/drm/amd/display/dc/link/link_factory.c +7 -2
@@ -528,14 +528,18 @@ static bool construct_phy(struct dc_link *link, link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ;switch (link->dc->config.allow_edp_hotplug_detection) { -case 1 :// only the 1st eDP handles hotplug +case HPD_EN_FOR_ALL_EDP : + link->irq_source_hpd_rx = +dal_irq_get_rx_source (link->hpd_gpio); +break ; +case HPD_EN_FOR_PRIMARY_EDP_ONLY :if (link->link_index ==0 ) link->irq_source_hpd_rx =dal_irq_get_rx_source (link->hpd_gpio);else link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ;break ; -case 2 :// only the 2nd eDP handles hotplug +case HPD_EN_FOR_SECONDARY_EDP_ONLY :if (link->link_index ==1 ) link->irq_source_hpd_rx =dal_irq_get_rx_source (link->hpd_gpio);
@@ -543,6 +547,7 @@ static bool construct_phy(struct dc_link *link, link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ;break ;default : + link->irq_source_hpd =DC_IRQ_SOURCE_INVALID ;break ; } }