RE: [PATCH] drm/radeon: remove code that can never get executed

[Deucher, Alexander]

> -----Original Message-----
> From: Henning Schild [mailto:henning@xxxxxxxxxx]
> Sent: Saturday, October 11, 2014 8:51 AM
> To: linux-kernel@xxxxxxxxxxxxxxx
> Cc: Henning Schild; Deucher, Alexander; Rafał Miłecki
> Subject: [PATCH] drm/radeon: remove code that can never get executed
> 
> Removing a code-path that can never be executed ... and its copies. If
> drm_edid_to_speaker_allocation returns 0 the callers return. There is no
> need to check that condition again.

I think we actually want to set the speaker allocation setup to stereo if the speaker allocation block is not present so I think the attached patch is probably the proper fix.

Alex

> 
> Signed-off-by: Henning Schild <henning@xxxxxxxxxx>
> ---
>  drivers/gpu/drm/radeon/dce3_1_afmt.c    | 5 +----
>  drivers/gpu/drm/radeon/dce6_afmt.c      | 5 +----
>  drivers/gpu/drm/radeon/evergreen_hdmi.c | 5 +----
>  3 files changed, 3 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/dce3_1_afmt.c
> b/drivers/gpu/drm/radeon/dce3_1_afmt.c
> index cb76074..6d31ed8 100644
> --- a/drivers/gpu/drm/radeon/dce3_1_afmt.c
> +++ b/drivers/gpu/drm/radeon/dce3_1_afmt.c
> @@ -58,10 +58,7 @@ static void
> dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)
>  	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);
>  	/* set HDMI mode */
>  	tmp |= HDMI_CONNECTION;
> -	if (sad_count)
> -		tmp |= SPEAKER_ALLOCATION(sadb[0]);
> -	else
> -		tmp |= SPEAKER_ALLOCATION(5); /* stereo */
> +	tmp |= SPEAKER_ALLOCATION(sadb[0]);
>  	WREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER, tmp);
> 
>  	kfree(sadb);
> diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c
> b/drivers/gpu/drm/radeon/dce6_afmt.c
> index ab29f95..e6b2750 100644
> --- a/drivers/gpu/drm/radeon/dce6_afmt.c
> +++ b/drivers/gpu/drm/radeon/dce6_afmt.c
> @@ -186,10 +186,7 @@ void dce6_afmt_write_speaker_allocation(struct
> drm_encoder *encoder)
>  	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);
>  	/* set HDMI mode */
>  	tmp |= HDMI_CONNECTION;
> -	if (sad_count)
> -		tmp |= SPEAKER_ALLOCATION(sadb[0]);
> -	else
> -		tmp |= SPEAKER_ALLOCATION(5); /* stereo */
> +	tmp |= SPEAKER_ALLOCATION(sadb[0]);
>  	WREG32_ENDPOINT(offset,
> AZ_F0_CODEC_PIN_CONTROL_CHANNEL_SPEAKER, tmp);
> 
>  	kfree(sadb);
> diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> index 278c7a1..11a6b65 100644
> --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
> +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
> @@ -128,10 +128,7 @@ static void
> dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder)
>  	tmp &= ~(DP_CONNECTION | SPEAKER_ALLOCATION_MASK);
>  	/* set HDMI mode */
>  	tmp |= HDMI_CONNECTION;
> -	if (sad_count)
> -		tmp |= SPEAKER_ALLOCATION(sadb[0]);
> -	else
> -		tmp |= SPEAKER_ALLOCATION(5); /* stereo */
> +	tmp |= SPEAKER_ALLOCATION(sadb[0]);
>  	WREG32(AZ_F0_CODEC_PIN0_CONTROL_CHANNEL_SPEAKER, tmp);
> 
>  	kfree(sadb);
> --
> 2.0.4

Attachment: 0001-drm-radeon-fix-speaker-allocation-setup.patch
Description: 0001-drm-radeon-fix-speaker-allocation-setup.patch