diff options
author | hersen wu <hersenxs.wu@amd.com> | 2019-06-02 01:23:38 +0300 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-22 17:34:07 +0300 |
commit | 284358f2acc189fa99088819cfdf93daf97a147d (patch) | |
tree | 994fdde3a2c5854a107d7a696a6aaf9854f4798e | |
parent | 3972c3508594310eb868f0e57c44cf0b6fccf7b2 (diff) | |
download | linux-284358f2acc189fa99088819cfdf93daf97a147d.tar.xz |
drm/amd/display/dc: fix azalia workaround sw implementation bug
caller of pp_nv_set_pme_wa_enable pass incorrect pp_smu:
dc->res_pool->pp_smu. it should be dc->res_pool->pp_smu->nv_funcs.pp_smu.
with incorrect input, pp->dm = NULL. This causes system crash.
Signed-off-by: hersen wu <hersenxs.wu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index e7cc58ef6a5e..edda426e32b4 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -969,10 +969,10 @@ static void set_pme_wa_enable_by_version(struct dc *dc) if (pp_smu) { if (pp_smu->ctx.ver == PP_SMU_VER_RV && pp_smu->rv_funcs.set_pme_wa_enable) - pp_smu->rv_funcs.set_pme_wa_enable(&(pp_smu->ctx)); + pp_smu->rv_funcs.set_pme_wa_enable(&(pp_smu->rv_funcs.pp_smu)); #ifdef CONFIG_DRM_AMD_DC_DCN2_0 else if (pp_smu->ctx.ver == PP_SMU_VER_NV && pp_smu->nv_funcs.set_pme_wa_enable) - pp_smu->nv_funcs.set_pme_wa_enable(&(pp_smu->ctx)); + pp_smu->nv_funcs.set_pme_wa_enable(&(pp_smu->nv_funcs.pp_smu)); #endif } } |