From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Dave Airlie <airlied@linux.ie>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm tree
Date: Mon, 19 Mar 2018 16:14:07 +0200 [thread overview]
Message-ID: <20180319141407.GM5453@intel.com> (raw)
In-Reply-To: <20180319122929.2ac3dfd8@canb.auug.org.au>
On Mon, Mar 19, 2018 at 12:29:29PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_color.c
>
> between commit:
>
> db61d160b3ed ("drm/i915: Remove the pointless 1:1 matrix copy")
>
> from the drm tree and commit:
>
> d5517a39dce4 ("drm/i915: Remove the blob->data casts")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/intel_color.c
> index 89ab0f70aa22,768f1c26080e..000000000000
> --- a/drivers/gpu/drm/i915/intel_color.c
> +++ b/drivers/gpu/drm/i915/intel_color.c
> @@@ -140,28 -140,20 +140,27 @@@ static void ilk_load_csc_matrix(struct
> int i, pipe = intel_crtc->pipe;
> uint16_t coeffs[9] = { 0, };
> struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state);
> + bool limited_color_range = false;
> +
> + /*
> + * FIXME if there's a gamma LUT after the CSC, we should
> + * do the range compression using the gamma LUT instead.
> + */
> + if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))
> + limited_color_range = intel_crtc_state->limited_color_range;
>
> if (intel_crtc_state->ycbcr420) {
> - i9xx_load_ycbcr_conversion_matrix(intel_crtc);
> + ilk_load_ycbcr_conversion_matrix(intel_crtc);
> return;
> } else if (crtc_state->ctm) {
> - struct drm_color_ctm *ctm =
> - (struct drm_color_ctm *)crtc_state->ctm->data;
> + struct drm_color_ctm *ctm = crtc_state->ctm->data;
> - uint64_t input[9] = { 0, };
> + const u64 *input;
> + u64 temp[9];
Yep. Looks correct.
>
> - if (intel_crtc_state->limited_color_range) {
> - ctm_mult_by_limited(input, ctm->matrix);
> - } else {
> - for (i = 0; i < ARRAY_SIZE(input); i++)
> - input[i] = ctm->matrix[i];
> - }
> + if (limited_color_range)
> + input = ctm_mult_by_limited(temp, ctm->matrix);
> + else
> + input = ctm->matrix;
>
> /*
> * Convert fixed point S31.32 input to format supported by the
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2018-03-19 14:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 1:29 linux-next: manual merge of the drm-misc tree with the drm tree Stephen Rothwell
2018-03-19 14:14 ` Ville Syrjälä [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-09 23:54 Stephen Rothwell
2019-10-09 0:12 Stephen Rothwell
2019-10-09 0:10 Stephen Rothwell
2019-10-08 23:46 Stephen Rothwell
2019-10-08 23:38 Stephen Rothwell
2019-10-08 23:33 Stephen Rothwell
2019-08-19 3:18 Stephen Rothwell
2019-06-11 3:52 Stephen Rothwell
2019-06-11 3:38 Stephen Rothwell
2019-04-09 1:34 Stephen Rothwell
2019-04-09 7:23 ` Gerd Hoffmann
2019-02-08 1:27 Stephen Rothwell
2019-02-08 8:53 ` Daniel Vetter
2019-02-08 9:25 ` Stephen Rothwell
2019-02-08 9:34 ` Daniel Vetter
2018-11-23 0:13 Stephen Rothwell
2018-09-18 1:31 Stephen Rothwell
2018-09-12 0:39 Stephen Rothwell
2017-11-01 3:36 Stephen Rothwell
2017-04-03 3:18 Stephen Rothwell
2016-09-28 2:11 Stephen Rothwell
2014-12-10 1:49 Stephen Rothwell
2014-12-03 2:43 Stephen Rothwell
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=20180319141407.GM5453@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).