aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch
blob: 55a7d3e465e80702555ccf3b5101c4553d2abda8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
From 790ec28579208fa4331b7cffc0c0b76135145c8e Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
Date: Wed, 16 Dec 2015 17:02:52 -0500
Subject: [PATCH 0639/1110] drm/amd/dal: get modes in get_modes, instead of
 caching

The old way of populating modes no longer works in the drm-next
kernel tree.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
---
 drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c       | 1 -
 drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

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 a62c7db..b2b7820 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c
@@ -775,7 +775,6 @@ void amdgpu_dm_update_connector_after_detect(
 				(struct edid *) sink->dc_edid.raw_edid;
 			drm_mode_connector_update_edid_property(connector,
 					aconnector->edid);
-			amdgpu_dm_connector_get_modes(&aconnector->base);
 		}
 	} else {
 		drm_mode_connector_update_edid_property(connector, NULL);
diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
index bbadc59..a4ec911 100644
--- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_types.c
@@ -1237,9 +1237,7 @@ static struct drm_encoder *best_encoder(struct drm_connector *connector)
 
 static int get_modes(struct drm_connector *connector)
 {
-	struct amdgpu_connector *amdgpu_connector =
-			to_amdgpu_connector(connector);
-	return amdgpu_connector->num_modes;
+	return amdgpu_dm_connector_get_modes(connector);
 }
 
 int amdgpu_dm_connector_mode_valid(
-- 
2.7.4