Signed-off-by: Nicholas Mc Guire der.herr@hofr.at ---
As the if (CISLAND_MINIMUM_ENGINE_CLOCK != CISLAND_MINIMUM_ENGINE_CLOCK) is never satisfied - the entire else branch is never going to be executed and could be removed - provided this is not simply a bug and needs to be fixed...
Patch is against 3.19.0-rc5 -next-20150119
Patch was only compile tested with x86_64_defconfig + CONFIG_DRM=m, CONFIG_DRM_RADEON=m
drivers/gpu/drm/radeon/ci_dpm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index f373a81..28db529 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -3805,13 +3805,8 @@ static void ci_find_dpm_states_clocks_in_dpm_table(struct radeon_device *rdev, break; }
- if (i >= sclk_table->count) { + if (i >= sclk_table->count) pi->need_update_smu7_dpm_table |= DPMTABLE_OD_UPDATE_SCLK; - } else { - /* XXX check display min clock requirements */ - if (CISLAND_MINIMUM_ENGINE_CLOCK != CISLAND_MINIMUM_ENGINE_CLOCK) - pi->need_update_smu7_dpm_table |= DPMTABLE_UPDATE_SCLK; - }
for (i = 0; i < mclk_table->count; i++) { if (mclk == mclk_table->dpm_levels[i].value)