aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch')
-rw-r--r--common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch b/common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch
deleted file mode 100644
index 46d114a1..00000000
--- a/common/recipes-kernel/linux/files/1056-drm-amd-dal-On-resume-rewrite-the-MSTM-control-bits-.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 525a61bf411ffb31d73165b2bb81e7775294e287 Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Date: Fri, 8 Apr 2016 11:36:15 -0400
-Subject: [PATCH 1056/1110] drm/amd/dal: On resume rewrite the MSTM control
- bits to enamble MST
-
-Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Acked-by: Harry Wentland <harry.wentland@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 28 +++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-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 a989fc2..71b2808 100644
---- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
-@@ -410,6 +410,28 @@ static void detect_link_for_all_connectors(struct drm_device *dev)
- drm_modeset_unlock(&dev->mode_config.connection_mutex);
- }
-
-+static void s3_handle_mst(struct drm_device *dev, bool suspend)
-+{
-+ struct amdgpu_connector *aconnector;
-+ struct drm_connector *connector;
-+
-+ drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
-+
-+ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-+ aconnector = to_amdgpu_connector(connector);
-+ if (aconnector->dc_link->type == dc_connection_mst_branch &&
-+ !aconnector->mst_port) {
-+
-+ if (suspend)
-+ drm_dp_mst_topology_mgr_suspend(&aconnector->mst_mgr);
-+ else
-+ drm_dp_mst_topology_mgr_resume(&aconnector->mst_mgr);
-+ }
-+ }
-+
-+ drm_modeset_unlock(&dev->mode_config.connection_mutex);
-+}
-+
- static int dm_hw_init(void *handle)
- {
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-@@ -440,6 +462,8 @@ static int dm_suspend(void *handle)
- struct amdgpu_display_manager *dm = &adev->dm;
- int ret = 0;
-
-+ s3_handle_mst(adev->ddev, true);
-+
- dc_set_power_state(
- dm->dc,
- DC_ACPI_CM_POWER_STATE_D3,
-@@ -527,6 +551,7 @@ static int dm_display_resume(struct drm_device *ddev)
- crtc_state->mode_changed = true;
- }
-
-+
- /* Attach planes to drm_atomic_state */
- list_for_each_entry(plane, &ddev->mode_config.plane_list, head) {
-
-@@ -615,6 +640,9 @@ int amdgpu_dm_display_resume(struct amdgpu_device *adev )
- /* program HPD filter */
- dc_resume(dm->dc);
-
-+ /* On resume we need to rewrite the MSTM control bits to enamble MST*/
-+ s3_handle_mst(ddev, false);
-+
- /*
- * early enable HPD Rx IRQ, should be done before set mode as short
- * pulse interrupts are used for MST
---
-2.7.4
-