aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch')
-rw-r--r--common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch b/common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch
new file mode 100644
index 00000000..55a7d3e4
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0639-drm-amd-dal-get-modes-in-get_modes-instead-of-cachin.patch
@@ -0,0 +1,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
+