summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorDmytro Laktyushkin2016-12-02 23:41:42 +0100
committerAlex Deucher2017-09-26 23:03:13 +0200
commit85944914f1de9b12fb2867f8dd835835f08861a2 (patch)
treef5479d761424cc44d651b8b280693a00e3918707 /drivers/gpu/drm/amd
parentdrm/amd/display: add newline to generic_reg_wait timeout message (diff)
downloadkernel-qcow2-linux-85944914f1de9b12fb2867f8dd835835f08861a2.tar.gz
kernel-qcow2-linux-85944914f1de9b12fb2867f8dd835835f08861a2.tar.xz
kernel-qcow2-linux-85944914f1de9b12fb2867f8dd835835f08861a2.zip
drm/amd/display: fix display clock integrated info read
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
index 77033fe8a8e5..846754c16831 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
@@ -342,7 +342,7 @@ static void dce_clock_read_integrated_info(struct dce_disp_clk *clk_dce)
info.disp_clk_voltage[i].max_supported_clk;
}
- if (!debug->disable_dfs_bypass)
+ if (!debug->disable_dfs_bypass && bp->integrated_info)
if (bp->integrated_info->gpu_cap_info & DFS_BYPASS_ENABLE)
clk_dce->dfs_bypass_enabled = true;