On Mon, 21 May 2018, Ville Syrjala <ville.syrj...@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> We already handle the color encoding mode properly. Remove the broken
> NV12 special case.
>
> Cc: Vidya Srinivas <vidya.srini...@intel.com>
> Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrj...@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;
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
