diff mbox

[1/2] drm/i915: Remove bogus NV12 PLANE_COLOR_CTL setup

Message ID 20180521185613.5097-1-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjala May 21, 2018, 6:56 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

We already handle the color encoding mode properly. Remove the broken
NV12 special case.

Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Jani Nikula May 22, 2018, 10:16 a.m. UTC | #1 
On Mon, 21 May 2018, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We already handle the color encoding mode properly. Remove the broken
> NV12 special case.
>
> Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

For both patches, Fixes: ?

The deadline for v4.18 just passed, so this won't follow the nv12
enabling without it.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f5c078c9d0d2..42c1f4a56556 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3643,11 +3643,6 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
>  	plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format);
>  
>  	if (intel_format_is_yuv(fb->format->format)) {
> -		if (fb->format->format == DRM_FORMAT_NV12) {
> -			plane_color_ctl |=
> -				PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
> -			goto out;
> -		}
>  		if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
>  			plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
>  		else
> @@ -3656,7 +3651,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
>  		if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
>  			plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
>  	}
> -out:
> +
>  	return plane_color_ctl;
>  }
Ville Syrjala May 22, 2018, 1:01 p.m. UTC | #2 
On Tue, May 22, 2018 at 01:16:59PM +0300, Jani Nikula wrote:
> On Mon, 21 May 2018, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > We already handle the color encoding mode properly. Remove the broken
> > NV12 special case.
> >
> > Cc: Vidya Srinivas <vidya.srinivas@intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> For both patches, Fixes: ?
> 
> The deadline for v4.18 just passed, so this won't follow the nv12
> enabling without it.

Yeah, I suppose we want the nv12 fix in asap. The initial phase thing
might event want cc:stable, although no one has actually complained
about the problem afaik.

> 
> BR,
> Jani.
> 
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 7 +------
> >  1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index f5c078c9d0d2..42c1f4a56556 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -3643,11 +3643,6 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
> >  	plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format);
> >  
> >  	if (intel_format_is_yuv(fb->format->format)) {
> > -		if (fb->format->format == DRM_FORMAT_NV12) {
> > -			plane_color_ctl |=
> > -				PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
> > -			goto out;
> > -		}
> >  		if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
> >  			plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
> >  		else
> > @@ -3656,7 +3651,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
> >  		if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
> >  			plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
> >  	}
> > -out:
> > +
> >  	return plane_color_ctl;
> >  }
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center
Vidya Srinivas May 31, 2018, 4:20 a.m. UTC | #3 
Thank you.
Reviewed-By: Vidya Srinivas <vidya.srinivas@intel.com>


> -----Original Message-----

> From: Ville Syrjala [mailto:ville.syrjala@linux.intel.com]

> Sent: Tuesday, May 22, 2018 12:26 AM

> To: intel-gfx@lists.freedesktop.org

> Cc: Srinivas, Vidya <vidya.srinivas@intel.com>; Maarten Lankhorst

> <maarten.lankhorst@linux.intel.com>

> Subject: [PATCH 1/2] drm/i915: Remove bogus NV12 PLANE_COLOR_CTL

> setup

> 

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 

> We already handle the color encoding mode properly. Remove the broken

> NV12 special case.

> 

> Cc: Vidya Srinivas <vidya.srinivas@intel.com>

> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---

>  drivers/gpu/drm/i915/intel_display.c | 7 +------

>  1 file changed, 1 insertion(+), 6 deletions(-)

> 

> diff --git a/drivers/gpu/drm/i915/intel_display.c

> b/drivers/gpu/drm/i915/intel_display.c

> index f5c078c9d0d2..42c1f4a56556 100644

> --- a/drivers/gpu/drm/i915/intel_display.c

> +++ b/drivers/gpu/drm/i915/intel_display.c

> @@ -3643,11 +3643,6 @@ u32 glk_plane_color_ctl(const struct

> intel_crtc_state *crtc_state,

>  	plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format);

> 

>  	if (intel_format_is_yuv(fb->format->format)) {

> -		if (fb->format->format == DRM_FORMAT_NV12) {

> -			plane_color_ctl |=

> -

> 	PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;

> -			goto out;

> -		}

>  		if (plane_state->base.color_encoding ==

> DRM_COLOR_YCBCR_BT709)

>  			plane_color_ctl |=

> PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;

>  		else

> @@ -3656,7 +3651,7 @@ u32 glk_plane_color_ctl(const struct

> intel_crtc_state *crtc_state,

>  		if (plane_state->base.color_range ==

> DRM_COLOR_YCBCR_FULL_RANGE)

>  			plane_color_ctl |=

> PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;

>  	}

> -out:

> +

>  	return plane_color_ctl;

>  }

> 

> --

> 2.16.1
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f5c078c9d0d2..42c1f4a56556 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3643,11 +3643,6 @@  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
 	plane_color_ctl |= glk_plane_color_ctl_alpha(fb->format->format);
 
 	if (intel_format_is_yuv(fb->format->format)) {
-		if (fb->format->format == DRM_FORMAT_NV12) {
-			plane_color_ctl |=
-				PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
-			goto out;
-		}
 		if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709)
 			plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709;
 		else
@@ -3656,7 +3651,7 @@  u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state,
 		if (plane_state->base.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
 			plane_color_ctl |= PLANE_COLOR_YUV_RANGE_CORRECTION_DISABLE;
 	}
-out:
+
 	return plane_color_ctl;
 }