From: hersen wu Date: Sat, 1 Jun 2019 22:23:38 +0000 (-0400) Subject: drm/amd/display/dc: fix azalia workaround sw implementation bug X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=284358f2acc189fa99088819cfdf93daf97a147d;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Alex Deucher --- 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 } }