blob: e06f0d1a870a6f292411568a63a8117cb5b0cd9f (
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
47
|
From 2f14fb81cff2e912b0e3ea9f97a60dc320ab2fd0 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 0988/1050] 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.
Change-Id: I31e16aabd91db9ce1f2e5086eb3b17e91bbbc76c
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 b9dba39..404ce0c 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 6fd400d..00ac066 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
@@ -1240,9 +1240,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(
--
1.9.1
|
