From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 36D0C2C11FE; Fri, 3 Jul 2026 16:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783095627; cv=none; b=FYbIQmaIYB+NVyt962CfKCT7cxKE3ZTqlQNcPV2ETHRW0YitTEmlStJ89y90sirvCxlD2R7kj/SYO0navsFwSUc4qLseRgpzt/vyQRzSsGeJwwzOE/+pp3lhmY7w1KkhYGc8Fr3XXZUSHVcyU796LR+2BlWNcvU+blKlpkGY9mo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783095627; c=relaxed/simple; bh=L4B7vg/V7cyDRETxYXMM3cb9gxhmp9XpFIAb0xk8ME4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Camp1c8R7tUHZgFGeHxOARDKNtiSoYsgdIqQHKAWy7PO2DLi00XuTX1dqIJgQZYpxyVnB2JsN7JnB2fh4qS+DrVgN/UK974UBNp+R4pHfBG6/lQD8AHe5oVjYnFXIHzV2qVMRjuBMqRIBElyzOhMNC6Uk7ZUV4kJ0p50EekItko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TuyFT1vC; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TuyFT1vC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 517EC1F000E9; Fri, 3 Jul 2026 16:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783095625; bh=tYe2vcNc9zjCVZORiBcZ/Xy0DnzmgnoWMrPruVXwotk=; h=Date:From:To:Cc:Subject; b=TuyFT1vCyWKfONVc6oYQlpQjP3s3vpCcT8Qbfaa7xCWnS3ln3juKFoxyFWr/c3j/8 c/W2dEg/IosB7I2ItH4FhthIWoQ8bT3kWwRpE5VKQ12biWDP37w547SZjv5F5Yl9aA /R+gq4Iu/BNKtbyoLpl+oum2l0wgdUuI1nN9uBB1Uz+/0KMDPwzCAYR4aTmVuGoVY7 e1dVIsHgierQTSKCzv+uyXvmexIRZ1FHO+mjcJhoycHAohymrK2IrsEy/rg5QN+o2k JojS6GbvlB4FIEeI8JS/ZYSFrblKn/cApIIGTMmi2LmH7OKe8oxe0aLnr6t0BDbQes i0pFcEJVvNZnQ== Date: Fri, 3 Jul 2026 17:20:21 +0100 From: Mark Brown To: Thomas =?iso-8859-1?Q?Hellstr=F6m?= , DRM XE List Cc: Gustavo Sousa , Linux Kernel Mailing List , Linux Next Mailing List , Matt Roper , Violet Monti Subject: linux-next: manual merge of the drm-xe tree with the drm-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="tYyKyYj4ZgZXN21v" Content-Disposition: inline --tYyKyYj4ZgZXN21v Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-xe tree got a conflict in: drivers/gpu/drm/xe/xe_wa.c between commit: e23fafb8594ea ("drm/xe/rtp: Add struct types for RTP tables") =66rom the drm-fixes tree and commits: 5ff004fdc7377 ("drm/xe/rtp: Add struct types for RTP tables") e9845449e37f5 ("drm/xe/rtp: Ensure gt_was doesn't evaluate rules with eng= ine types") e2cfc5bc0c3ff ("drm/xe/rtp: Ensure oob_was does not evaluate engine type = rules") 94e15e89f491e ("drm/xe/rtp: Ensure device_oob_was only evaluates correct = rules") 02b41333f4874 ("drm/xe/xe3p_lpg: Add missing references to workarounds") =66rom the drm-xe 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/xe/xe_wa.c index b9d9fe0801aad,139434946f8f8..0000000000000 --- a/drivers/gpu/drm/xe/xe_wa.c +++ b/drivers/gpu/drm/xe/xe_wa.c @@@ -130,7 -130,7 +130,7 @@@ __diag_push(); __diag_ignore_all("-Woverride-init", "Allow field overrides in table"); =20 - static const struct xe_rtp_table_sr gt_was =3D XE_RTP_TABLE_SR( + VISIBLE_IF_KUNIT const struct xe_rtp_table_sr gt_was =3D XE_RTP_TABLE_SR( /* Workarounds applying over a range of IPs */ =20 { XE_RTP_NAME("14011060649"), @@@ -293,7 -293,7 +293,7 @@@ XE_RTP_ACTIONS(SET(MMIOATSREQLIMIT_GAM_WALK_3D, DIS_ATS_WRONLY_PG)) }, - { XE_RTP_NAME("14026144927, 16029437861"), + { XE_RTP_NAME("14026144927, 16029437861, 14026127056"), XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0)), XE_RTP_ACTIONS(SET(L3SQCREG2, L3_SQ_DISABLE_COAMA_2WAY_COH | L3_SQ_DISABLE_COAMA)) @@@ -307,6 -307,7 +307,7 @@@ XE_RTP_ACTIONS(SET(GUC_INTR_CHICKEN, DISABLE_SIGNALING_ENGINES)) }, ); + EXPORT_SYMBOL_IF_KUNIT(gt_was); =20 static const struct xe_rtp_table_sr engine_was =3D XE_RTP_TABLE_SR( /* Workarounds applying over a range of IPs */ @@@ -586,12 -587,12 +587,12 @@@ =20 /* Xe3p_LPG*/ =20 - { XE_RTP_NAME("22021149932"), + { XE_RTP_NAME("22021149932, 14026290593"), XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0), FUNC(xe_rtp_match_first_render_or_compute)), XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, SAMPLER_LD_LSC_DISABLE)) }, - { XE_RTP_NAME("14025676848"), + { XE_RTP_NAME("14025676848, 14026270459"), XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0), FUNC(xe_rtp_match_first_render_or_compute)), XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, LSCFE_SAME_ADDRESS_ATOMICS_C= OALESCING_DISABLE)) @@@ -802,10 -803,11 +803,11 @@@ static const struct xe_rtp_entry oob_wa =20 static_assert(ARRAY_SIZE(oob_was_entries) =3D=3D _XE_WA_OOB_COUNT); =20 - static __maybe_unused const struct xe_rtp_table oob_was =3D { + VISIBLE_IF_KUNIT __maybe_unused const struct xe_rtp_table oob_was =3D { .entries =3D oob_was_entries, .n_entries =3D ARRAY_SIZE(oob_was_entries), }; + EXPORT_SYMBOL_IF_KUNIT(oob_was); =20 static const struct xe_rtp_entry device_oob_was_entries[] =3D { #include @@@ -813,10 -815,11 +815,11 @@@ =20 static_assert(ARRAY_SIZE(device_oob_was_entries) =3D=3D _XE_DEVICE_WA_OOB= _COUNT); =20 - static __maybe_unused const struct xe_rtp_table device_oob_was =3D { + VISIBLE_IF_KUNIT __maybe_unused const struct xe_rtp_table device_oob_was = =3D { .entries =3D device_oob_was_entries, .n_entries =3D ARRAY_SIZE(device_oob_was_entries), }; + EXPORT_SYMBOL_IF_KUNIT(device_oob_was); =20 __diag_pop(); =20 --tYyKyYj4ZgZXN21v Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpH4UQACgkQJNaLcl1U h9DiGgf+MnGs4imANWfQxL5Uh352QrVy+Z1xlylAQ193+fjHgs3iUkwxpgaooWhc 1ayxH437REu3CAIxhj7lhOACxzs7ldpEWeay8NNwrTKAi+BccAlzmeVg06i7r/FJ E6iV8yOqYgo1wij0OiboYPEeCkmqBkvBWC1riZDysazXADTTKakNZ3grLPgYxspl hBbmyslbkAm7KPP+vAidPQoA0cnmXGJHJlw0Q2bLmO0QmiOy17NGiwkAk0vkH0mn efIFDtsezBhgTnpEdSJHi53O5hfVmkzjDDG23eoNZkhVBvE5q6ilJec9aTbOwQCw N8R5t0Ift4wpAXlHXHK+Zc9rgkn3fQ== =48tb -----END PGP SIGNATURE----- --tYyKyYj4ZgZXN21v--