summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-29 13:05:22 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-29 13:05:22 -0400
commit2b09aae539ff50b169f72c4315f67809b80cf641 (patch)
treefc336ec669e353da89c4efbb53253dab30db68d7
parent1f6651ce18634b39de758667c4be77227114fc74 (diff)
downloadlongterm-queue-5.2-2b09aae539ff50b169f72c4315f67809b80cf641.tar.gz
drm: amd: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch b/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch
index 7b1dbfa1..fa46a551 100644
--- a/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch
+++ b/queue/drm-amdgpu-display-bail-early-in-dm_pp_get_static_cl.patch
@@ -1,4 +1,4 @@
-From 376814f5fcf1aadda501d1413d56e8af85d19a97 Mon Sep 17 00:00:00 2001
+From b56f4620c654d919006efc2da25ca2131a5cb3b7 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 17 Jun 2020 16:33:47 -0400
Subject: [PATCH] drm/amdgpu/display bail early in dm_pp_get_static_clocks
@@ -13,12 +13,12 @@ Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
-index 484171241330..35a317b70719 100644
+index 37893145e712..b7ab878f3932 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c
-@@ -530,6 +530,8 @@ bool dm_pp_get_static_clocks(
+@@ -500,6 +500,8 @@ bool dm_pp_get_static_clocks(
&pp_clk_info);
- else if (adev->smu.ppt_funcs)
+ else if (adev->smu.funcs)
ret = smu_get_current_clocks(&adev->smu, &pp_clk_info);
+ else
+ return false;