From nobody Mon Mar 23 19:50:51 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 DA0B43AF67D; Mon, 23 Mar 2026 15:55:39 +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=1774281339; cv=none; b=uw6gBcB8a2QMTp53B2LyXarrMiUP4NuxThatpnbChPhisXx6TE23IL0ibNXEy/AAVhtNKG0/pgM4AbK5HlBa1ydur09wmwLIxZzXVRdl8adl127OZq4xcO/GOQEY/zdtvdtw/RIirO+O//lkvBT4syNocB25HFv811PtjgnaLiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774281339; c=relaxed/simple; bh=wHzaRl+PH4iWK+jpXaqEHqAp1wRSlwfsE0mEj9+UiRs=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=RLvz0ziWlftGzgtFX64sEPBLv/3uD+4i9KhaAMQd7qYKoXqM5tjFpCEuX8ho8dMGoKYhsl4EL6dmb4cyGaDH+zCpxWwNqIR5bN4j12zac3MkQoB14fxNcBbpSYPK72+sXp6yoiChWGxyB3/nlYrz2+UHILM5l64+pcY829qizPA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=klu2AOTl; 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="klu2AOTl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1197C4CEF7; Mon, 23 Mar 2026 15:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774281339; bh=wHzaRl+PH4iWK+jpXaqEHqAp1wRSlwfsE0mEj9+UiRs=; h=Date:From:To:Cc:Subject:From; b=klu2AOTl43S6BkI2DPD7hK74g/CgvZrMBISIIvo/HV4VoUMrT12KexibKJzK2vNW6 3NnKfS1MTT0Z4iLlE256HYhSc8OGxzu+fn/AG0RShZ5jzD9ns/RtKCv9W4mzx8CDRz 93NpiThgZBeC22IaEofdspQaYfHGp3Ne3oNaUL5ssP2AgaQjzNvJNOQMUeuY6C9Ifh 81bnHATnJKCCdNnxeZC846z38rcDB6OQJsiiypAbDFsauhzs3vRGNEb6Mc5jD50E+u B8sjUajDrbI9TwdqybiJr/LhyFzsczGSk333QW2sZo+tbRdFEwumDzBkchp3BpR9jC spVtuHUPgJJzw== Date: Mon, 23 Mar 2026 15:55:35 +0000 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Matthew Auld , Michal Wajdeczko , Nareshkumar Gollakoti , Sanjay Yadav , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm tree with the origin 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="WhwODcKUFgG2HqjC" Content-Disposition: inline --WhwODcKUFgG2HqjC 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 tree got a conflict in: drivers/gpu/drm/xe/xe_gt_ccs_mode.c between commit: 65d046b2d8e0d ("drm/xe: Fix missing runtime PM reference in ccs_mode_stor= e") from the origin tree and commit: 9b5e995e61290 ("drm/xe: Mutual exclusivity between CCS-mode and PF") from the drm 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 --cc drivers/gpu/drm/xe/xe_gt_ccs_mode.c index 03c1862ba497a,b35be36b0eaa2..0000000000000 --- a/drivers/gpu/drm/xe/xe_gt_ccs_mode.c +++ b/drivers/gpu/drm/xe/xe_gt_ccs_mode.c @@@ -12,8 -12,8 +12,9 @@@ #include "xe_gt_printk.h" #include "xe_gt_sysfs.h" #include "xe_mmio.h" +#include "xe_pm.h" #include "xe_sriov.h" + #include "xe_sriov_pf.h" =20 static void __xe_gt_apply_ccs_mode(struct xe_gt *gt, u32 num_engines) { @@@ -147,15 -145,29 +146,30 @@@ ccs_mode_store(struct device *kdev, str return -EBUSY; } =20 - if (gt->ccs_mode !=3D num_engines) { - xe_gt_info(gt, "Setting compute mode to %d\n", num_engines); - gt->ccs_mode =3D num_engines; - xe_gt_record_user_engines(gt); - guard(xe_pm_runtime)(xe); - xe_gt_reset(gt); + if (gt->ccs_mode =3D=3D num_engines) + return count; +=20 + /* + * Changing default CCS mode is only allowed when there + * are no VFs. Try to lockdown PF to find out. + */ + if (gt_ccs_mode_default(gt) && IS_SRIOV_PF(xe)) { + ret =3D xe_sriov_pf_lockdown(xe); + if (ret) { + xe_gt_dbg(gt, "Can't change CCS Mode: VFs are enabled\n"); + return ret; + } } =20 - mutex_unlock(&xe->drm.filelist_mutex); + xe_gt_info(gt, "Setting compute mode to %d\n", num_engines); + gt->ccs_mode =3D num_engines; + xe_gt_record_user_engines(gt); ++ guard(xe_pm_runtime)(xe); + xe_gt_reset(gt); +=20 + /* We may end PF lockdown once CCS mode is default again */ + if (gt_ccs_mode_default(gt) && IS_SRIOV_PF(xe)) + xe_sriov_pf_end_lockdown(xe); =20 return count; } --WhwODcKUFgG2HqjC Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmnBYnYACgkQJNaLcl1U h9BruQf8C+ZOaWjO01sNrbKsaYQGkI8YKrGZvrBCpwExXo/1Rwsjwq1HjNT9iqHx m/jCTs7D80u+7GvD7NCYGsxDmChotzPbCisJofosybr6dwNMS3Uq1Q/f4L8ruqvn CAOkVQGSxw6EeqnI+x+rKsLZgrLWNj579b1RAFi3X/7hSvTEqRUeu4e9m0h5+Hkn pf+DxKKdvm0gKCjkZDRBG8aUvmgC5x6UJVNMDmHgZJQBTvJMp9EGgGyBuCP0idCE UeGD2/afZac3aCT/eYEMIFDw5BLdRoO4PVq36gUBT7liEo4VOtL0OIhlI3lBrTre m8uQvwtTCT9ayH1qRtPwyA0mbyrOOw== =/hto -----END PGP SIGNATURE----- --WhwODcKUFgG2HqjC--