aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-10-22 08:08:07 -0700
committerGitHub <noreply@github.com>2019-10-22 08:08:07 -0700
commit8e0cf9ee43840bd7ee004412129ba4aa055f5fc8 (patch)
treeb13804093e413307097cd6788ccdc8b062084013 /common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch
parent9e1e1da00d8ef569d83a7a742a734dbbf5e0bd13 (diff)
parent3f8062a03dc1d1d5fa386e1f1ca59d56b86a85d1 (diff)
downloadmeta-amd-8e0cf9ee43840bd7ee004412129ba4aa055f5fc8.tar.gz
meta-amd-8e0cf9ee43840bd7ee004412129ba4aa055f5fc8.tar.bz2
meta-amd-8e0cf9ee43840bd7ee004412129ba4aa055f5fc8.zip
Merge pull request #661 from ArsalanHAwan/master-merge-warrior
master: merge warrior
Diffstat (limited to 'common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch')
-rw-r--r--common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch b/common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch
deleted file mode 100644
index f6d9f581..00000000
--- a/common/recipes-kernel/linux/files/0635-drm-amd-dal-Switch-from-MST-state-to-our-own-flag-si.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7166707dad450ace2190bb13f9faffa6a2be911a Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Date: Thu, 17 Dec 2015 16:01:54 -0500
-Subject: [PATCH 0635/1110] drm/amd/dal: Switch from MST state to our own flag
- since it set in same thread.
-
-Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
----
- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-index c69ae16..a62c7db 100644
---- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-@@ -734,7 +734,7 @@ void amdgpu_dm_update_connector_after_detect(
- const struct dc_sink *sink;
-
- /* MST handled by drm_mst framework */
-- if (aconnector->mst_mgr.mst_state)
-+ if (aconnector->is_mst_connector)
- return;
-
- if (!dm_get_sink_from_link(dc_link, aconnector, &sink)) {
---
-2.7.4
-