From nobody Sat Feb 7 06:13:47 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 166E5320A24; Fri, 30 Jan 2026 15:37:33 +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=1769787454; cv=none; b=RDkukS0Qmm4bEOgKvy4pimzdZSzf/i26tbaPsYlwoLcqwQbE6/HEosesMHfsRjW4arVrw8HM0DOaRExn/gYJJtw9mo0U73rWwecVKwllHLFOYOUKAYUFMXzZ0MsoteKXwYRRlM1EKb5kkWYQi5GI5nZ3US/ukLFLFQiB8q6S/Mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769787454; c=relaxed/simple; bh=FasJqHiOy0M0v15r/lxI+qGvnaL+Q2UI4XVHktLRoxg=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=WIRpi0AZ12aHsw4E1m0H42mIzmo5KaLffnd5STXZWtJApaWT5dy3uoMeBDGVULmA9DZbmIAKal93mTcLTOxG+NZvcMHPWgf6E15vTg0qauxNdNDmR0uOR5Ri25sEQTxEYt7hQFIY4xSAoAm6pmEQby2wbtsT5cL3TiGDlQpgg44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p2IfpDpD; 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="p2IfpDpD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32EA4C4CEF7; Fri, 30 Jan 2026 15:37:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769787453; bh=FasJqHiOy0M0v15r/lxI+qGvnaL+Q2UI4XVHktLRoxg=; h=Date:From:To:Cc:Subject:From; b=p2IfpDpD2GXGuAKV0nkiYeLEJCrFfHMj8EGFanHwILNCi1pUt51wQOJOMoYMZRayL kG5SRvmuudO8M8h0t3cgnchg6mBkThrPEIFxbjeny26+Sb1xduh9/TSP3OeW5S1jq5 Ci8ULsW754G0XpJmoitsz7GodyiSiU5vXBLXqupmxhCDYUQBCARm77qQen7y6lmctS CcXiBu/phZSaN5zKxc3fVIXx3CwZaHRf7YCIuje/WgN9cuxXJNG18B/MtzVec+4gSc ALpCTtCZYUzCcx+SSTUOboY6/V/agXhiYMmNmg0p/pPdhkh79JoKknk08MX/c92bry sDmNcEay13PMA== Date: Fri, 30 Jan 2026 15:37:28 +0000 From: Mark Brown To: Dave Airlie , DRI Cc: Brian Nguyen , Linux Kernel Mailing List , Linux Next Mailing List , Lukasz Laguna , Matthew Brost , Matt Roper , Michal Wajdeczko , Nitin Gote , Oak Zeng , Tejas Upadhyay , Thomas =?iso-8859-1?Q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm 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="GNAsuMu+HLqy/fS0" Content-Disposition: inline --GNAsuMu+HLqy/fS0 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 conflicts in: drivers/gpu/drm/xe/xe_pci.c drivers/gpu/drm/xe/xe_pci_types.h between commit: ca8dcfedac480 ("drm/xe: derive mem copy capability from graphics version") from the drm-fixes tree and commits: 83f4151787c5d ("drm/xe/lnl: Drop pre-production workaround support") 7ef2d25e47736 ("drm/xe: Track pre-production workaround support") 9b1a0e0a15c97 ("drm/xe: Add page reclamation info to device info") 79cb005c71343 ("drm/xe: Add device flag to indicate standalone MERT") 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_pci.c index 2aa883f5ef797,09189ff3da441..0000000000000 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@@ -358,10 -365,15 +364,14 @@@ static const struct xe_device_desc bmg_ .has_fan_control =3D true, .has_flat_ccs =3D 1, .has_mbx_power_limits =3D true, + .has_mbx_thermal_info =3D true, .has_gsc_nvm =3D 1, .has_heci_cscfi =3D 1, + .has_i2c =3D true, .has_late_bind =3D true, + .has_pre_prod_wa =3D 1, + .has_soc_remapper_telem =3D true, .has_sriov =3D true, - .has_mem_copy_instr =3D true, .max_gt_per_tile =3D 2, .needs_scratch =3D true, .subplatforms =3D (const struct xe_subplatform_desc[]) { @@@ -378,6 -390,9 +388,8 @@@ static const struct xe_device_desc ptl_ .has_display =3D true, .has_flat_ccs =3D 1, .has_sriov =3D true, - .has_mem_copy_instr =3D true, + .has_pre_prod_wa =3D 1, + .has_pxp =3D true, .max_gt_per_tile =3D 2, .needs_scratch =3D true, .needs_shared_vf_gt_wq =3D true, @@@ -390,6 -405,8 +402,7 @@@ static const struct xe_device_desc nvls .dma_mask_size =3D 46, .has_display =3D true, .has_flat_ccs =3D 1, - .has_mem_copy_instr =3D true, + .has_pre_prod_wa =3D 1, .max_gt_per_tile =3D 2, .require_force_probe =3D true, .va_bits =3D 48, @@@ -666,11 -692,18 +688,17 @@@ static int xe_info_init_early(struct xe xe->info.has_gsc_nvm =3D desc->has_gsc_nvm; xe->info.has_heci_gscfi =3D desc->has_heci_gscfi; xe->info.has_heci_cscfi =3D desc->has_heci_cscfi; + xe->info.has_i2c =3D desc->has_i2c; xe->info.has_late_bind =3D desc->has_late_bind; xe->info.has_llc =3D desc->has_llc; + xe->info.has_mert =3D desc->has_mert; + xe->info.has_page_reclaim_hw_assist =3D desc->has_page_reclaim_hw_assist; + xe->info.has_pre_prod_wa =3D desc->has_pre_prod_wa; xe->info.has_pxp =3D desc->has_pxp; + xe->info.has_soc_remapper_sysctrl =3D desc->has_soc_remapper_sysctrl; + xe->info.has_soc_remapper_telem =3D desc->has_soc_remapper_telem; xe->info.has_sriov =3D xe_configfs_primary_gt_allowed(to_pci_dev(xe->drm= .dev)) && desc->has_sriov; - xe->info.has_mem_copy_instr =3D desc->has_mem_copy_instr; xe->info.skip_guc_pc =3D desc->skip_guc_pc; xe->info.skip_mtcfg =3D desc->skip_mtcfg; xe->info.skip_pcode =3D desc->skip_pcode; diff --cc drivers/gpu/drm/xe/xe_pci_types.h index a4451bdc79fb3,20acc5349ee6d..0000000000000 --- a/drivers/gpu/drm/xe/xe_pci_types.h +++ b/drivers/gpu/drm/xe/xe_pci_types.h @@@ -46,7 -48,14 +48,13 @@@ struct xe_device_desc=20 u8 has_late_bind:1; u8 has_llc:1; u8 has_mbx_power_limits:1; + u8 has_mbx_thermal_info:1; - u8 has_mem_copy_instr:1; + u8 has_mert:1; + u8 has_pre_prod_wa:1; + u8 has_page_reclaim_hw_assist:1; u8 has_pxp:1; + u8 has_soc_remapper_sysctrl:1; + u8 has_soc_remapper_telem:1; u8 has_sriov:1; u8 needs_scratch:1; u8 skip_guc_pc:1; --GNAsuMu+HLqy/fS0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAml80DcACgkQJNaLcl1U h9AYQgf/bmqOOOJNHFc6u5QWVeLLby3oq3FfaMiQGnfgONWF8IYwks+TO2IukY5M UI7J8KGcDEuRJ96MqBxfFSxCT+dywErDeIMaKSX5O8nqXiQr4mVla1PqodYRAwPx EyucNUVUaovzM3jO6PPvf29mhq7yijXOoS28j36eBHY6dH0KW7smq9/mxXLmnbtv Mutd0SxyRN2hiNmpsXQE2sFDZ2VptQWR5V1gEMiYdXjO7/IqTW/KgDjrX5LzVuAL qSZv0Sad/mlRkaWt/bevBAgYTpocUUXmzpREW6fDIxhnMZ2tqTwVm1Y/nM6UvrXu 2NWgt7TIwawpS+MvXUEX97ASAwjsHw== =0l0I -----END PGP SIGNATURE----- --GNAsuMu+HLqy/fS0--