> -----Original Message-----
> From: Intel-gfx <[email protected]> On Behalf Of
> Chaitanya
> Kumar Borah
> Sent: Wednesday, June 17, 2026 2:38 PM
> To: [email protected]; [email protected]; intel-
> [email protected]
> Cc: Borah, Chaitanya Kumar <[email protected]>
> Subject: [v3 04/14] drm/i915/display: simplify glk_plane_color_ctl_input_csc
>
> Add early return for non-YUV formats and hoist the duplicated color_range
> check
> out of the if/else branches. No functional change.
>
Changes Look Good to me.
Reviewed-by: Uma Shankar <[email protected]>
> Signed-off-by: Chaitanya Kumar Borah <[email protected]>
> ---
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 50c6ceef9b9a..da2df5be9848 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -1247,7 +1247,10 @@ static u32 glk_plane_color_ctl_input_csc(const struct
> intel_plane_state *plane_s
> struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
> u32 ctl = 0;
>
> - if (fb->format->is_yuv && !icl_is_hdr_plane(display, plane->id)) {
> + if (!fb->format->is_yuv)
> + return 0;
> +
> + if (!icl_is_hdr_plane(display, plane->id)) {
> switch (plane_state->hw.color_encoding) {
> case DRM_COLOR_YCBCR_BT709:
> ctl |=
> PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
> @@ -1258,14 +1261,13 @@ static u32 glk_plane_color_ctl_input_csc(const
> struct intel_plane_state *plane_s
> default:
> ctl |=
> PLANE_COLOR_CSC_MODE_YUV601_TO_RGB601;
> }
> - if (plane_state->hw.color_range ==
> DRM_COLOR_YCBCR_FULL_RANGE)
> - ctl |=
> PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
> - } else if (fb->format->is_yuv) {
> + } else {
> ctl |= PLANE_COLOR_INPUT_CSC_ENABLE;
> - if (plane_state->hw.color_range ==
> DRM_COLOR_YCBCR_FULL_RANGE)
> - ctl |=
> PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
> }
>
> + if (plane_state->hw.color_range ==
> DRM_COLOR_YCBCR_FULL_RANGE)
> + ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
> +
> return ctl;
> }
>
> --
> 2.25.1
