[PATCH] drm/radeon: remove unreachable code

Deucher, Alexander Alexander.Deucher at amd.com
Mon Jan 19 10:27:23 PST 2015


> -----Original Message-----
> From: Nicholas Mc Guire [mailto:der.herr at hofr.at]
> Sent: Monday, January 19, 2015 8:11 AM
> To: Deucher, Alexander
> Cc: Koenig, Christian; David Airlie; dri-devel at lists.freedesktop.org; linux-
> kernel at vger.kernel.org; Nicholas Mc Guire
> Subject: [PATCH] drm/radeon: remove unreachable code
> 
> Signed-off-by: Nicholas Mc Guire <der.herr at hofr.at>

NACK.  I want to leave this in place for the future.  When we support dynamically adjusting the disp clock we'll need to update the sclk for ds mode.

Alex

> ---
> 
> 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)
> --
> 1.7.10.4



More information about the dri-devel mailing list