From: Stephen Rothwell <sfr@canb.auug.org.au>
To: DRI <dri-devel@lists.freedesktop.org>, Dave Airlie <airlied@redhat.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>,
Jani Nikula <jani.nikula@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree
Date: Fri, 14 May 2021 11:53:07 +1000 [thread overview]
Message-ID: <20210514115307.4364aff9@canb.auug.org.au> (raw)
In-Reply-To: <20210430082321.3bd9c4a5@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 3099 bytes --]
Hi all,
On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the drm-intel tree got a conflict in:
> > >
> > > drivers/gpu/drm/i915/display/intel_sprite.c
> > >
> > > between commit:
> > >
> > > 92f1d09ca4ed ("drm: Switch to %p4cc format modifier")
> > >
> > > from the drm tree and commit:
> > >
> > > 46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")
> > >
> > > from the drm-intel tree.
> > >
> > > I fixed it up (I used the latter version of the file and applied the
> > > following patch) 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.
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 17 Mar 2021 14:05:42 +1100
> > > Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
> > > 1 file changed, 2 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > > index 1f335cb09149..45ceff436bf7 100644
> > > --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > > @@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
> > > struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
> > > const struct drm_framebuffer *fb = plane_state->hw.fb;
> > > unsigned int rotation = plane_state->hw.rotation;
> > > - struct drm_format_name_buf format_name;
> > >
> > > if (!fb)
> > > return 0;
> > > @@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
> > > case DRM_FORMAT_XVYU12_16161616:
> > > case DRM_FORMAT_XVYU16161616:
> > > drm_dbg_kms(&dev_priv->drm,
> > > - "Unsupported pixel format %s for 90/270!\n",
> > > - drm_get_format_name(fb->format->format,
> > > - &format_name));
> > > + "Unsupported pixel format %p4cc for 90/270!\n",
> > > + &fb->format->format);
> > > return -EINVAL;
> > > default:
> > > break;
> > > --
> > > 2.30.0
> >
> > The above fix up patch now needs to be applied to the drm tree.
>
> I am still applying the above patch, but it applies to Linus' tree now.
I am going to stop applying this. You guys can apply it if you want to
some time.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-05-14 1:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 3:08 [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2021-03-17 3:34 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-03-17 4:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-03-17 5:19 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-03-18 1:52 ` [Intel-gfx] " Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell [this message]
2021-05-14 12:14 ` Thomas Zimmermann
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 0:09 Stephen Rothwell
2023-05-30 1:59 Stephen Rothwell
2023-05-30 1:57 Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-09 0:55 Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2021-04-01 2:13 Stephen Rothwell
2021-01-25 0:46 Stephen Rothwell
2020-07-14 2:59 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=20210514115307.4364aff9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tzimmermann@suse.de \
/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).