From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E3C9C433B4 for ; Thu, 29 Apr 2021 22:23:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0394E61461 for ; Thu, 29 Apr 2021 22:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229609AbhD2WY0 (ORCPT ); Thu, 29 Apr 2021 18:24:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbhD2WYZ (ORCPT ); Thu, 29 Apr 2021 18:24:25 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F02FC06138B; Thu, 29 Apr 2021 15:23:38 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FWVQD6QWDz9sVv; Fri, 30 Apr 2021 08:23:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1619735015; bh=oVYsnHHSjeLFJK4aqp+l/3D9t0MToGTq9ET4RhlCdug=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Edy1xN/6FEmkai3FVJFoyC1XoDQr8L0lehd3jyv588ccl3Nko1z5a5+sI+hR5dWr/ Ryzhm9KVr5XFyA7NN1ozBfDUuiisfeDDmiOdGDDJQwPcBWkTjJQqkj4fJ22xkuiENs 827voTQt8qACPNRnDxlaOd9w5ut8fNRDJfLa/lZw+qLN8F8TyUGnC1FwnL/6rhDdna tuv3LaeC04W/awQ4Rr/bx+JjKfCCSxD1Nl0IcX7WzJs9wtteWfmb7Dm4viWtwv7jMV mc1/12TX2i2KhwhWi8eYL29kaZWzKT0Nn1azOGw1UPFe889ojpjPcQNIkRd4akJXhb pPEEFHzTxEKzg== Date: Fri, 30 Apr 2021 08:23:21 +1000 From: Stephen Rothwell To: DRI , Dave Airlie Cc: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , Jani Nikula , Linux Kernel Mailing List , Linux Next Mailing List , Sakari Ailus , Thomas Zimmermann Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20210430082321.3bd9c4a5@canb.auug.org.au> In-Reply-To: <20210318125241.5fdfeffd@canb.auug.org.au> References: <20210317140824.0a28ffec@canb.auug.org.au> <20210318125241.5fdfeffd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/U9G.1q+RgpaZBkQfi4BGkVF"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/U9G.1q+RgpaZBkQfi4BGkVF Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell = wrote: >=20 > On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell wrote: > > > > Today's linux-next merge of the drm-intel tree got a conflict in: > >=20 > > drivers/gpu/drm/i915/display/intel_sprite.c > >=20 > > between commit: > >=20 > > 92f1d09ca4ed ("drm: Switch to %p4cc format modifier") > >=20 > > from the drm tree and commit: > >=20 > > 46d12f911821 ("drm/i915: migrate skl planes code new file (v5)") > >=20 > > from the drm-intel tree. > >=20 > > 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. > >=20 > > From: Stephen Rothwell > > Date: Wed, 17 Mar 2021 14:05:42 +1100 > > Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier" > >=20 > > Signed-off-by: Stephen Rothwell > > --- > > drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drive= rs/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 =3D to_i915(plane->base.dev); > > const struct drm_framebuffer *fb =3D plane_state->hw.fb; > > unsigned int rotation =3D plane_state->hw.rotation; > > - struct drm_format_name_buf format_name; > > =20 > > 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; > > --=20 > > 2.30.0 =20 >=20 > 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. --=20 Cheers, Stephen Rothwell --Sig_/U9G.1q+RgpaZBkQfi4BGkVF Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCLMdkACgkQAVBC80lX 0GwLGQgApUtuvWzc9MWXmPyM5lIRZ5AqoaS5IAuWaHu6AdJVGm8nlxoG6VRLRg2V 0adtxkBFmCIMkAc3CMWkimWTOG4zqnJLZ2LZsTQvyF/0LXv1s4x8bkH+x/q1xusw xnyAEAVRubSFtmOREyYkukeThqINxe0t1dJqvW9ZGYQpbarUOEdxBbEg41eVX1Tm 0UoqC6eaFkgdc8942LjnvomsXx7JCsuRgxyyK6vXJVeZ1osEQ2roBegB82VQDYiq MXyMqwt4zOGpOzJjDfr6X47FNOR11kCE3EaJesSZ+otGTETrD0FCCQmqFXs+ONK9 W88hNJiK1n6tHW3Xy58EIC26+SLj5g== =xR97 -----END PGP SIGNATURE----- --Sig_/U9G.1q+RgpaZBkQfi4BGkVF--