From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: Remove bogus NV12 PLANE_COLOR_CTL setup
Date: Tue, 22 May 2018 13:16:59 +0300 [thread overview]
Message-ID: <874lj0ngf8.fsf@intel.com> (raw)
In-Reply-To: <20180521185613.5097-1-ville.syrjala@linux.intel.com>
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;
> }
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-05-22 10:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 18:56 [PATCH 1/2] drm/i915: Remove bogus NV12 PLANE_COLOR_CTL setup Ville Syrjala
2018-05-21 18:56 ` [PATCH 2/2] drm/i915: Configure SKL+ scaler initial phase correctly Ville Syrjala
2018-05-31 4:20 ` Srinivas, Vidya
2018-06-01 15:52 ` Ville Syrjälä
2018-05-21 19:41 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Remove bogus NV12 PLANE_COLOR_CTL setup Patchwork
2018-05-21 20:59 ` ✓ Fi.CI.IGT: " Patchwork
2018-05-22 10:16 ` Jani Nikula [this message]
2018-05-22 13:01 ` [PATCH 1/2] " Ville Syrjälä
2018-05-31 4:20 ` Srinivas, Vidya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874lj0ngf8.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox