From: Jani Nikula <jani.nikula@intel.com> To: Xi Ruoyao <xry111@outlook.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Mon, 16 Mar 2015 17:04:31 +0200 [thread overview] Message-ID: <873855ouf4.fsf@intel.com> (raw) In-Reply-To: <BLU437-SMTP229FA75B0BDC81D45AB16A9E020@phx.gbl> On Mon, 16 Mar 2015, Xi Ruoyao <xry111@outlook.com> wrote: > On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote: >> Hi Dave, >> >> Today's linux-next merge of the drm tree got a conflict in >> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45 >> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from >> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure >> plane->state->fb stays in sync with plane->fb"), f55548b5af87 >> ("drm/i915: Don't try to reference the fb in >> get_initial_plane_config()") and presumably others from the drm tree. >> >> Same patch summary, different authors, committers and added function. >> >> I fixed it up (I effectively used the drm tree version) and can carry >> the fix as necessary (no action is required). >> > My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no > relationship > with linux-next since Matt Roper's afd65eb4cc05 has solved this long > long ago. The relationship is that -next will eventually merge to Linus' master, so Matt's commit will conflict with yours. Your commit is taking the fast path to the kernel. But you don't have to worry about it, it's all taken care of. And per what Stephen says, he has done the right thing. > BTW, there is still one thing should be done in linux-next. We should > change > Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of > Matt's code is duplicated with drm_atomic_set_fb_for_plane. Patches welcome in intel-gfx list; the audience here is too wide. ;) BR, Jani. -- Jani Nikula, Intel Open Source Technology Center
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com> To: Xi Ruoyao <xry111@outlook.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Mon, 16 Mar 2015 17:04:31 +0200 [thread overview] Message-ID: <873855ouf4.fsf@intel.com> (raw) In-Reply-To: <BLU437-SMTP229FA75B0BDC81D45AB16A9E020@phx.gbl> On Mon, 16 Mar 2015, Xi Ruoyao <xry111@outlook.com> wrote: > On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote: >> Hi Dave, >> >> Today's linux-next merge of the drm tree got a conflict in >> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45 >> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from >> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure >> plane->state->fb stays in sync with plane->fb"), f55548b5af87 >> ("drm/i915: Don't try to reference the fb in >> get_initial_plane_config()") and presumably others from the drm tree. >> >> Same patch summary, different authors, committers and added function. >> >> I fixed it up (I effectively used the drm tree version) and can carry >> the fix as necessary (no action is required). >> > My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no > relationship > with linux-next since Matt Roper's afd65eb4cc05 has solved this long > long ago. The relationship is that -next will eventually merge to Linus' master, so Matt's commit will conflict with yours. Your commit is taking the fast path to the kernel. But you don't have to worry about it, it's all taken care of. And per what Stephen says, he has done the right thing. > BTW, there is still one thing should be done in linux-next. We should > change > Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of > Matt's code is duplicated with drm_atomic_set_fb_for_plane. Patches welcome in intel-gfx list; the audience here is too wide. ;) BR, Jani. -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-03-16 15:06 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-16 2:30 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell 2015-03-16 2:30 ` Stephen Rothwell 2015-03-16 13:43 ` Xi Ruoyao 2015-03-16 15:04 ` Jani Nikula [this message] 2015-03-16 15:04 ` Jani Nikula 2019-10-31 0:33 [Intel-gfx] " Stephen Rothwell 2019-10-31 0:33 ` Stephen Rothwell 2019-11-08 0:42 ` Stephen Rothwell 2019-11-08 0:42 ` Stephen Rothwell 2020-01-08 1:04 Stephen Rothwell 2020-01-08 2:28 ` Stephen Rothwell 2020-01-08 1:10 Stephen Rothwell 2020-01-08 1:15 Stephen Rothwell 2020-01-22 0:37 Stephen Rothwell 2020-05-07 2:43 Stephen Rothwell 2020-05-08 3:50 Stephen Rothwell 2022-05-17 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=873855ouf4.fsf@intel.com \ --to=jani.nikula@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 \ --cc=xry111@outlook.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.