| Message ID | 1463752436-28045-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Please ignore this one, I was on the wrong branch while sending mails. Christian. Am 20.05.2016 um 15:53 schrieb Christian König: > From: Eric Huang <JinHuiEric.Huang@amd.com> > > Fixes OD failures on Tonga. > > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > index cb28335..7c3f82b 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > @@ -5331,7 +5331,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & > (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { > PP_ASSERT_WITH_CODE( > - true == tonga_is_dpm_running(hwmgr), > + 0 == tonga_is_dpm_running(hwmgr), > "Trying to freeze SCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5344,7 +5344,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > if ((0 == data->mclk_dpm_key_disabled) && > (data->need_update_smu7_dpm_table & > DPMTABLE_OD_UPDATE_MCLK)) { > - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), > + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), > "Trying to freeze MCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5647,7 +5647,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & > (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { > > - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), > + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), > "Trying to Unfreeze SCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5661,7 +5661,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { > > PP_ASSERT_WITH_CODE( > - true == tonga_is_dpm_running(hwmgr), > + 0 == tonga_is_dpm_running(hwmgr), > "Trying to Unfreeze MCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE(
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c index cb28335..7c3f82b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c @@ -5331,7 +5331,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { PP_ASSERT_WITH_CODE( - true == tonga_is_dpm_running(hwmgr), + 0 == tonga_is_dpm_running(hwmgr), "Trying to freeze SCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5344,7 +5344,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) if ((0 == data->mclk_dpm_key_disabled) && (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), "Trying to freeze MCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5647,7 +5647,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), "Trying to Unfreeze SCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5661,7 +5661,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { PP_ASSERT_WITH_CODE( - true == tonga_is_dpm_running(hwmgr), + 0 == tonga_is_dpm_running(hwmgr), "Trying to Unfreeze MCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE(