diff options
| author |   Roman Li <Roman.Li@amd.com> | 2019-06-18 11:25:25 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2019-06-20 11:34:32 -0500 |
| commit | 496091fa041fe8e8a6b2da745ba4fbcb8caed2dd (patch) | |
| tree | 45e25aeb6b21fd235917a57caf52fb07b23193e5 /drivers/gpu/drm/amd/display/dc/inc | |
| parent | drm/amdkfd: Add procfs-style information for KFD processes (diff) | |
| download | linux-dev-496091fa041fe8e8a6b2da745ba4fbcb8caed2dd.tar.xz linux-dev-496091fa041fe8e8a6b2da745ba4fbcb8caed2dd.zip | |
drm/amd/display: Fix null-deref on vega20 with xgmi
[Why]
After clkmgr rework it gets initialized after resource pool.
The clkmgr is used in resource pool init for xgmi path.
That causes driver crash on Vega20 with xgmi due to NULL deref.
[How]
Move xgmi compensation code to dce121_clk_mgr_construct()
That also allows to make dce121_clock_patch_xgmi_ss_info()
internal static function.
Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/inc')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h index 721e13135e76..36ebd5bc7863 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h @@ -53,8 +53,6 @@ struct clk_mgr_funcs { void (*enable_pme_wa) (struct clk_mgr *clk_mgr); }; -void dce121_clock_patch_xgmi_ss_info(struct clk_mgr *clk_mgr_base); - struct clk_mgr { struct dc_context *ctx; struct clk_mgr_funcs *funcs; |