aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch
new file mode 100644
index 00000000..69816abc
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/0636-drm-amd-display-Return-hpd_irq_dpcd-from-hpd_rx-hand.patch
@@ -0,0 +1,75 @@
+From 669f0672b4e60e2b40eb8dfd68be20c88370bff1 Mon Sep 17 00:00:00 2001
+From: Wenjing Liu <Wenjing.Liu@amd.com>
+Date: Wed, 19 Jul 2017 13:18:26 -0400
+Subject: [PATCH 0636/4131] drm/amd/display: Return hpd_irq_dpcd from hpd_rx
+ handler
+
+Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
+Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
+Acked-by: Harry Wentland <Harry.Wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 5 ++++-
+ drivers/gpu/drm/amd/display/dc/dc.h | 3 ++-
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+index 8377575..8f18058 100644
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -914,7 +914,7 @@ static void handle_hpd_rx_irq(void *param)
+ if (aconnector->dc_link->type != dc_connection_mst_branch)
+ mutex_lock(&aconnector->hpd_lock);
+
+- if (dc_link_handle_hpd_rx_irq(aconnector->dc_link) &&
++ if (dc_link_handle_hpd_rx_irq(aconnector->dc_link, NULL) &&
+ !is_mst_root_connector) {
+ /* Downstream Port status changed. */
+ if (dc_link_detect(aconnector->dc_link, false)) {
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+index dd3f57f..445cd22 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
+@@ -1924,7 +1924,7 @@ static void handle_automated_test(struct core_link *link)
+ sizeof(test_response));
+ }
+
+-bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link)
++bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link, union hpd_irq_data *out_hpd_irq_dpcd_data)
+ {
+ struct core_link *link = DC_LINK_TO_LINK(dc_link);
+ union hpd_irq_data hpd_irq_dpcd_data = {{{{0}}}};
+@@ -1939,12 +1939,15 @@ bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link)
+ "%s: Got short pulse HPD on link %d\n",
+ __func__, link->public.link_index);
+
++
+ /* All the "handle_hpd_irq_xxx()" methods
+ * should be called only after
+ * dal_dpsst_ls_read_hpd_irq_data
+ * Order of calls is important too
+ */
+ result = read_hpd_rx_irq_data(link, &hpd_irq_dpcd_data);
++ if (out_hpd_irq_dpcd_data)
++ *out_hpd_irq_dpcd_data = hpd_irq_dpcd_data;
+
+ if (result != DC_OK) {
+ dm_logger_write(link->ctx->logger, LOG_HW_HPD_IRQ,
+diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
+index 07f064f..7ecbff7 100644
+--- a/drivers/gpu/drm/amd/display/dc/dc.h
++++ b/drivers/gpu/drm/amd/display/dc/dc.h
+@@ -755,7 +755,8 @@ bool dc_link_detect(const struct dc_link *dc_link, bool boot);
+ * detection.
+ * false - no change in Downstream port status. No further action required
+ * from DM. */
+-bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link);
++bool dc_link_handle_hpd_rx_irq(const struct dc_link *dc_link,
++ union hpd_irq_data *hpd_irq_dpcd_data);
+
+ struct dc_sink_init_data;
+
+--
+2.7.4
+