drm/amd/display: Remove redundant AUTO color format handling in else

[PATCH] drm/amd/display: Remove redundant AUTO color format handling in else

Posted by Nicolas Frattaroli 4 days, 12 hours ago

The AUTO connector color format is handled in the earlier branches for
both RGB and YUV420. The repeated check in the else branch is therefore
redundant.

Remove it to make the code less confusing to read.

Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/alCcJmDeIYEE94Eh@stanley.mountain/
Fixes: 8a0343b03b98 ("drm/amdgpu: Implement "color format" DRM property")
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
index 88f938a8f24f..ea277c991234 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
@@ -854,12 +854,7 @@ static void fill_stream_properties_from_drm_display_mode(
 		 * error bubbles up to userspace. This way, userspace knows it
 		 * needs to make a better choice.
 		 */
-		if (connector_state->color_format != DRM_CONNECTOR_COLOR_FORMAT_AUTO)
-			timing_out->pixel_encoding = PIXEL_ENCODING_UNDEFINED;
-		else if (drm_mode_is_420_only(info, mode_in))
-			timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
-		else
-			timing_out->pixel_encoding = PIXEL_ENCODING_RGB;
+		timing_out->pixel_encoding = PIXEL_ENCODING_UNDEFINED;
 	}
 
 	timing_out->timing_3d_format = TIMING_3D_FORMAT_NONE;

---
base-commit: e6a72e9b927165081566252d972ea1cbbee5bf28
change-id: 20260720-color-format-amdgpu-fix-09a03106c9da

Best regards,
--  
Nicolas Frattaroli <nicolas.frattaroli@collabora.com>

Re: [PATCH] drm/amd/display: Remove redundant AUTO color format handling in else

Posted by Leo Li 4 days, 12 hours ago


On 2026-07-20 09:03, Nicolas Frattaroli wrote:
> The AUTO connector color format is handled in the earlier branches for
> both RGB and YUV420. The repeated check in the else branch is therefore
> redundant.
> 
> Remove it to make the code less confusing to read.
> 
> Reported-by: Dan Carpenter <error27@gmail.com>
> Closes: https://lore.kernel.org/r/alCcJmDeIYEE94Eh@stanley.mountain/
> Fixes: 8a0343b03b98 ("drm/amdgpu: Implement "color format" DRM property")
> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>

Reviewed-by: Leo Li <sunpeng.li@amd.com>

Thanks!

> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> index 88f938a8f24f..ea277c991234 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> @@ -854,12 +854,7 @@ static void fill_stream_properties_from_drm_display_mode(
>  		 * error bubbles up to userspace. This way, userspace knows it
>  		 * needs to make a better choice.
>  		 */
> -		if (connector_state->color_format != DRM_CONNECTOR_COLOR_FORMAT_AUTO)
> -			timing_out->pixel_encoding = PIXEL_ENCODING_UNDEFINED;
> -		else if (drm_mode_is_420_only(info, mode_in))
> -			timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420;
> -		else
> -			timing_out->pixel_encoding = PIXEL_ENCODING_RGB;
> +		timing_out->pixel_encoding = PIXEL_ENCODING_UNDEFINED;
>  	}
>  
>  	timing_out->timing_3d_format = TIMING_3D_FORMAT_NONE;
> 
> ---
> base-commit: e6a72e9b927165081566252d972ea1cbbee5bf28
> change-id: 20260720-color-format-amdgpu-fix-09a03106c9da
> 
> Best regards,
> --  
> Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
>