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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 0C55AC433DB for ; Thu, 18 Mar 2021 01:52:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A7C2E64F41 for ; Thu, 18 Mar 2021 01:52:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7C2E64F41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D00276E03B; Thu, 18 Mar 2021 01:52:48 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id ACAD86E03B; Thu, 18 Mar 2021 01:52:47 +0000 (UTC) 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 4F195Q4f4Xz9sW5; Thu, 18 Mar 2021 12:52:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1616032365; bh=4vtpq80CBmDqW2sh2J2CRMVGkD6sU97trMEyod5tJA4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jGgtRVPNdd0DKGsIvquKCrN3Dbdk0DQc+PqankS3n/MerAu9HXY277PR6W6jVcnvR Vkum22u0yWpmLdcoQYk0v6igggjnsuwlNpvzpHf4g6SsNrb6g7M2p09Etx0hptJtdp mc2qwj12dgZ80td5IQ6LDSxUZR5i+ygUTSgA4Ak14QnCvabHa/2RdvkuM8vYIKGAFK I0Qv+TCTCXQ6pFjhel/53X/L1UC4cJaE5104jNSkGJU734oEVeQFlDxtLd0Pxh4br/ GHvkk2SnQ+ryBLkWH3LeO0WeTuqOOIw0mY0A82Rsm+N1Zni4iCoKj5RKQGcnZDaGGQ A1nlhlSCAenBQ== Date: Thu, 18 Mar 2021 12:52:41 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Dave Airlie Subject: Re: linux-next: manual merge of the drm-intel tree with the drm tree Message-ID: <20210318125241.5fdfeffd@canb.auug.org.au> In-Reply-To: <20210317140824.0a28ffec@canb.auug.org.au> References: <20210317140824.0a28ffec@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Thomas Zimmermann , Linux Next Mailing List , Linux Kernel Mailing List , Sakari Ailus Content-Type: multipart/mixed; boundary="===============1510805917==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --===============1510805917== Content-Type: multipart/signed; boundary="Sig_/BS././NG8qIOJgOu6hWnAIY"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/BS././NG8qIOJgOu6hWnAIY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, 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/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_cr= tc_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_cr= tc_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 The above fix up patch now needs to be applied to the drm tree. --=20 Cheers, Stephen Rothwell --Sig_/BS././NG8qIOJgOu6hWnAIY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBSsmkACgkQAVBC80lX 0Gzpsgf/YsqgwbYpm1vEujHLrODiCLuCVieqi0rDaDeJaxTN1d+PsRpVIvyqNL6B 2CbKvYakS3xKkD4f1YUlUFqA8uNHiVmepciYthnxoiTf+anY6yeJpxHVj/VmtHXR a7RrWCEUwk4G9azZIYMTSQpKlhNNwhCl/7rVOo24Ra3blq5KhlaJDtEE4vliJzj3 pe/oIgk5/CT+DWRl8FadFlro++c+Lg+91BG6m92LjMMaGbNB//AkVhwGNhEgw5XM CtUfydvQliOeeBWbROoovKVm95JMJXmCeqEsE2AxOgnIcN2PnboWhR5Sihw//Pwo KUzK9IQIetRafLGBcg2nbgMIP3sq2Q== =Wov6 -----END PGP SIGNATURE----- --Sig_/BS././NG8qIOJgOu6hWnAIY-- --===============1510805917== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============1510805917==--