From nobody Fri Apr 3 19:24:19 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1DA3257851; Mon, 23 Mar 2026 16:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282250; cv=none; b=scvFiiRJQKuFvoY+g9z9zH0F+FhXudgccCbrO07cWJ88UjJk0okwtREjIHk/31m/G9725y/AJlIyWRI2IaM6js4fIxYOBMQqVIPROUweVJ37iPGf1DqmtC3eUwvdv1apzVx6rDYQwfBxSaV2F/tziavwykLu5Jlra7Z7TtDtNL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774282250; c=relaxed/simple; bh=ZoF6xupyTlTv3+792NBhfg/e7BseX4uCTwsWp6/Ht5o=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=VJ0ooIdI1JKkKjqhh115GZmgLaf7BNCv8wUsMiJ3QGYzVlQ7hdUygyJ9RRhT7auOy+fNgx4U5enkKqxhgSK2zDDAI6dT3F42Pp+v7bF2sRazQojgkgQim4uS3bS6lZZJMXhYiCslDb2bBW78oPOtg/alNglEj5Tlj+qCrm/KuQg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ECcKQQMM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ECcKQQMM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83931C2BC9E; Mon, 23 Mar 2026 16:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774282250; bh=ZoF6xupyTlTv3+792NBhfg/e7BseX4uCTwsWp6/Ht5o=; h=Date:From:To:Cc:Subject:From; b=ECcKQQMMWU2dOCMAt5/a29k+/CM78UaRqJB2AIlhQmkr+pJbb9NNKHBe5fjIfSfby 5Q61bd8MSML5hT0XC1RFwswkg5SF3eThQg51onLwHHvckIm4/Y8u3DDGNCEdQ8fYkI /mEofa/HxUC9h5WmsrXgUt+cy20BPIo1BkwDofIdDL5XtM4IYwLWOgK651JMxoXmT9 WlpdgReSsRkgHpXM3NhYNhrzOf/6yQBARoBqNnBmYFQZI5HzWAi47dMxTKKtOFewzM Qd7TdU6mNW0uIX+OgNS/Lmn//JB+LuyQLr/LTCxzx3sjgAfxMchREDSJv0NLv8Ougm ndJ4bIQ9MntGA== Date: Mon, 23 Mar 2026 16:10:45 +0000 From: Mark Brown To: Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="aL9nb2R2bPSwnBDn" Content-Disposition: inline --aL9nb2R2bPSwnBDn Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_plane.c between commit: bfa71b7a9dc6b ("drm/i915: Unlink NV12 planes earlier") from the drm-intel-fixes tree and commits: 017ecd0498557 ("drm/i915: Unlink NV12 planes earlier") 7b3a14322d1a8 ("drm/i915: Relocate unlink_nv12_plane()") c5121204ad991 ("drm/i915: Skip redundant NV12 plane unlinking") from the drm-intel 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. diff --combined drivers/gpu/drm/i915/display/intel_plane.c index 076b9b3564816,5390ceb21ca42..0000000000000 --- a/drivers/gpu/drm/i915/display/intel_plane.c +++ b/drivers/gpu/drm/i915/display/intel_plane.c @@@ -437,7 -437,29 +437,29 @@@ void intel_plane_copy_hw_state(struct i } =20 static void unlink_nv12_plane(struct intel_crtc_state *crtc_state, - struct intel_plane_state *plane_state); + struct intel_plane_state *plane_state) + { + struct intel_display *display =3D to_intel_display(plane_state); + struct intel_plane *plane =3D to_intel_plane(plane_state->uapi.plane); +=20 + if (!plane_state->planar_linked_plane) + return; +=20 + plane_state->planar_linked_plane =3D NULL; +=20 + if (!plane_state->is_y_plane) + return; +=20 + drm_WARN_ON(display->drm, plane_state->uapi.visible); +=20 + plane_state->is_y_plane =3D false; +=20 + crtc_state->enabled_planes &=3D ~BIT(plane->id); + crtc_state->active_planes &=3D ~BIT(plane->id); + crtc_state->update_planes |=3D BIT(plane->id); + crtc_state->data_rate[plane->id] =3D 0; + crtc_state->rel_data_rate[plane->id] =3D 0; + } =20 void intel_plane_set_invisible(struct intel_crtc_state *crtc_state, struct intel_plane_state *plane_state) @@@ -1512,31 -1534,6 +1534,6 @@@ static void link_nv12_planes(struct int icl_link_nv12_planes(uv_plane_state, y_plane_state); } =20 - static void unlink_nv12_plane(struct intel_crtc_state *crtc_state, - struct intel_plane_state *plane_state) - { - struct intel_display *display =3D to_intel_display(plane_state); - struct intel_plane *plane =3D to_intel_plane(plane_state->uapi.plane); -=20 - if (!plane_state->planar_linked_plane) - return; -=20 - plane_state->planar_linked_plane =3D NULL; -=20 - if (!plane_state->is_y_plane) - return; -=20 - drm_WARN_ON(display->drm, plane_state->uapi.visible); -=20 - plane_state->is_y_plane =3D false; -=20 - crtc_state->enabled_planes &=3D ~BIT(plane->id); - crtc_state->active_planes &=3D ~BIT(plane->id); - crtc_state->update_planes |=3D BIT(plane->id); - crtc_state->data_rate[plane->id] =3D 0; - crtc_state->rel_data_rate[plane->id] =3D 0; - } -=20 static int icl_check_nv12_planes(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@@ -1550,17 -1547,6 +1547,6 @@@ if (DISPLAY_VER(display) < 11) return 0; =20 - /* - * Destroy all old plane links and make the Y plane invisible - * in the crtc_state->active_planes mask. - */ - for_each_new_intel_plane_in_state(state, plane, plane_state, i) { - if (plane->pipe !=3D crtc->pipe) - continue; -=20 - unlink_nv12_plane(crtc_state, plane_state); - } -=20 if (!crtc_state->nv12_planes) return 0; =20 --aL9nb2R2bPSwnBDn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmnBZgUACgkQJNaLcl1U h9AIzwf+ISvVVdgyEcks5gQhMPiY6ZQJnrEsybRPvGC+0xBAL01/09v/+3vLLkiw a8QzekfS2/ErTHjAC3s6h8Slx4Sr05mKcry69xQkl6sU4322W9pVHyMmvDgaGj/i w+KUHIUrryjwyPUE5OrPOaEgG63ls0pUtYSB9WyCpwFwJ9jmjcikIz7fYqXd6hpw 9zjXDc4K+EEuwRCCrB9AKbeRzW7SBKag2xQURd+6FUvDFvr4xA1Sll+IJ1jNvP6t oiDRfMYHl7Kv6W/h5OnP+lCdSm+YF/DHpDw71onMF6iI2NsrFeK0FAH7gFdSlSF7 uEnZhCLN38ZJfH8vbTP2LoNu054Skg== =YpWH -----END PGP SIGNATURE----- --aL9nb2R2bPSwnBDn--