From: Daniel Vetter <daniel@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date: Tue, 3 May 2016 09:54:55 +0200 [thread overview]
Message-ID: <20160503075455.GZ14148@phenom.ffwll.local> (raw)
In-Reply-To: <20160503132412.30a61b5c@canb.auug.org.au>
On Tue, May 03, 2016 at 01:24:12PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_display.c
>
> between commits:
>
> f7e5838bb37d ("drm/i915: Simplify reset_counter handling during atomic modesetting")
>
> from the drm-intel tree and commit:
>
> 81072bfd13f2 ("drm/i915: Rename async to nonblock.")
>
> 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.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
I kinda wonder whether there's some way we could share these conflict
resolutions among various trees. At least one really valuable part of
doing my own drm-intel-nightly integration tree is that I can soak merges
for a few days before I bake them in for eternity ...
Topic for KS I guess?
Cheers, Daniel
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/intel_display.c
> index ff60241b1f76,5d29b838d8d7..000000000000
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@@ -13462,9 -13414,12 +13462,9 @@@ static int intel_atomic_prepare_commit(
> return ret;
>
> ret = drm_atomic_helper_prepare_planes(dev, state);
> - if (!ret && !nonblock && !i915_reset_in_progress(&dev_priv->gpu_error)) {
> - u32 reset_counter;
> -
> - reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
> - mutex_unlock(&dev->struct_mutex);
> + mutex_unlock(&dev->struct_mutex);
>
> - if (!ret && !async) {
> ++ if (!ret && !nonblock) {
> for_each_plane_in_state(state, plane, plane_state, i) {
> struct intel_plane_state *intel_plane_state =
> to_intel_plane_state(plane_state);
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-05-03 7:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 3:24 linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell
2016-05-03 7:54 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 3:34 Stephen Rothwell
2020-04-15 1:52 Stephen Rothwell
2019-08-20 2:19 Stephen Rothwell
2019-05-22 23:58 Stephen Rothwell
2019-05-22 23:53 Stephen Rothwell
2019-03-19 0:51 Stephen Rothwell
2019-01-16 1:27 Stephen Rothwell
2017-07-20 1:23 Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2017-05-23 2:00 Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-03-06 23:48 Stephen Rothwell
2017-01-03 2:14 Stephen Rothwell
2017-01-03 2:08 Stephen Rothwell
2017-01-03 1:59 Stephen Rothwell
2017-01-03 1:50 Stephen Rothwell
2016-10-23 23:59 Stephen Rothwell
2016-04-27 2:32 Stephen Rothwell
2015-12-14 1:06 Stephen Rothwell
2015-10-15 2:04 Stephen Rothwell
2015-09-29 1:26 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=20160503075455.GZ14148@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--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).