From patchwork Fri Apr 11 22:09:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14B11C369AE for ; Fri, 11 Apr 2025 22:09:24 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.38809.1744409360519932470 for ; Fri, 11 Apr 2025 15:09:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=Df6UcRIi; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BEgq59008198 for ; Fri, 11 Apr 2025 22:09:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= gYIZzZqqAhFTg8VPozFMl62snavhCT0kdbzDx0Q2nIU=; b=Df6UcRIidCdFxDEa GdOKYYjDrkhQ4IYjv7hnMV6vZ2VFOiSGnLH5ZI22QiaTCIX/ypxkTZXUdszkxD2a dwtSgZqWvtfk50A0rY5hpnHnwFQmgLbEdtwruxHzGWhHj77EKv2Fg4t8bZFGxwqP UPEWOdpXv+xABrcZ0TfZ3YGlAQcv7dtlcVCtLwib1tHiMFLROBesLavmNPF1Yuzv Y9XzYtawBebKmrD/y9liNcYgDg7Bbxw6iGf5O9RFwU9/hvk+Ngod7Vc+nga6l15B s1j8zCBCBra/3bIL8uAVIDa67j2qYDUNgklxfxhudNyJYjbyeoT6Bmy8ZvMbhhTN tAz91w== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twd0buu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:19 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c53e316734so424249385a.2 for ; Fri, 11 Apr 2025 15:09:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409358; x=1745014158; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gYIZzZqqAhFTg8VPozFMl62snavhCT0kdbzDx0Q2nIU=; b=TL0qFb793tF0u5TTGrhsKX+6u6YKJiOoOvvPXqfVEQb+59mtmR0j/DtxuyWjOMYuKr syJwl5FL2qErFotA0KnPuBQzwLPC1IxBgr1xc3cwgfiNNJn19c+nHp2A4AKkR1x0C4v9 /rkSRWuewMJH/2rbTF2uDO4myMksD/7XVjgmfBkXzGkPgs1lDnB62dJ9r8aldbxl1ObG 2CtEsVBNAAHgmlHIPv1z32Vd5HgG3Resj2yY9hsOVZJ52qn7rqAwaMfGGDBLArsDYqhC T9ocmi5BYLL16LRfoGMzqPxdup7n8fsv+LtXPbIcvS4ZG1KSYSWemjLCPgon+7wYtuww 5PvA== X-Gm-Message-State: AOJu0Yx0+XZnFiHDFPdCJcdO0Nze/UupRtV8l0gWa/hXm11fq9wR0NAE e5pIGFmC60TXQcNmJ41rgcFyWVNWxUoMqEWuqqYpNtERzhSRBiqJodPnyXAierYjBTX+EMr7l2g M889Lk32O75nwtLjPn/Lh8dXUE5fLSsOFxYJE8++JmapaiffKv0x4BB1YDSJG3d8HdosjILTqm2 JDlA9/dwaHa1s= X-Gm-Gg: ASbGnctmdubx0izdqNw8/a//CPhs1+LiKgyOtQv+lgjnbNB+fVmezTgByTYP+iQrV7M q2/i2fiGRUUCsSX1Xvk9uZ6wYUajpMVpzrORY0Za8SWjarBm9ALcRgtlG2eLSfMh7YXtUIx+U0o fqip3PCo3UXZEtGPvLvi9TdUzivXFi5o2fL/D7x6GITT2Z2TEU93mjs0A28uCzpBKmPbiYGij7d 1ye6pdFpr5g7lUwiHCTfkkt4F4LRCc16FYOS4zRX38yJMd5gpvCAjtGwiBFBwWnp+U1k491oSUj n3/3vxRMUg9gaJGwQrHxZRBEmJtiLwRlN75Fi4bO76XEDmk8QsZBVI7l7raUjVEkEV6/11ApSp/ xavREygg0m69v2BVlKwIZC4UZ X-Received: by 2002:a05:620a:4550:b0:7c5:5394:7e9c with SMTP id af79cd13be357-7c7af11ba43mr757572985a.32.1744409358230; Fri, 11 Apr 2025 15:09:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFq+8Bf1hQ0eaNfVcAUSVzCbF202s2iJBOTph7aDNKKEiKIy0y5G3xcTfKfodlpJWbQIHIdrg== X-Received: by 2002:a05:620a:4550:b0:7c5:5394:7e9c with SMTP id af79cd13be357-7c7af11ba43mr757569785a.32.1744409357896; Fri, 11 Apr 2025 15:09:17 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:15 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:10 +0300 Subject: [PATCH 1/7] mesa: drop kmsro PACKAGECONFIG MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-1-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org Cc: Martin Jansa X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1640; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=uTAHgVqHm23O3BUZbnofWu9NcwEFwCSsx9pfQUkRloM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMGrnetS/LnKslTiz7gRXeFuD0RERvJm6f6l iVojWvumTKJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBgAKCRCLPIo+Aiko 1b7ZCACqT4KuoqTOeM5L08T/pJhpF8LZbYb94pucWTpn6koejRyrQpKBQKeTV7MjLgqxbkdyGrn C7AKO+y/vj38Russ3hOH0z8357K/1/Z8Zw/fRRqyhkMo+EaHKc6tknHJGQJLRavRNPUqRVm3LH9 kel+FC5A4F3meEQU3BMpVak2R6H2PFFs9H/2Hg9FkoP3hWptf0B5S41rcP9pnDRUE6p2fC7JMAh MQOMFSHHc2tOqSbG8PxYWTwkzJzPTE39nZXl091qbdX4UxyA2/TIodIfG+uG6Re/R3duiz6NkMn TxwadFiym6QgM75iqyHdRfvfbE3y0yqEhTLE9ff0FsV651kL X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: vIcmbyG_JuG49341A7U4bO3FtVyTWIsK X-Authority-Analysis: v=2.4 cv=Q4vS452a c=1 sm=1 tr=0 ts=67f9930f cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=stO6C21a5PeFhlPs9Q0A:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: vIcmbyG_JuG49341A7U4bO3FtVyTWIsK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 phishscore=0 bulkscore=0 adultscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=770 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214763 Mesa has dropped support for separate kmsro option to gallium-drivers. Drop it from the recipe and drop the now-unused PACKAGECONFIG too. Reported-by: Martin Jansa Closes: https://lore.kernel.org/r/CA+chaQeWA01kB3q6=o4xcZwA1TMggHxYTZ0AZETY7he_yU3E1A@mail.gmail.com/ Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index aca34983e97ca684d662987d3a1d0b61ba44029a..a88cc8660e26bae43c713b2bfdbf396e804f6c09 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -162,7 +162,6 @@ PACKAGECONFIG[opencl] = " \ PACKAGECONFIG[broadcom] = "" PACKAGECONFIG[etnaviv] = ",,python3-pycparser-native" PACKAGECONFIG[freedreno] = "" -PACKAGECONFIG[kmsro] = "" PACKAGECONFIG[vc4] = "" PACKAGECONFIG[v3d] = "" PACKAGECONFIG[zink] = "" @@ -177,7 +176,6 @@ GALLIUMDRIVERS:append:i686 = ",i915,crocus" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', '', d)}" From patchwork Fri Apr 11 22:09:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61200 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19206C369B1 for ; Fri, 11 Apr 2025 22:09:24 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.38811.1744409362669767144 for ; Fri, 11 Apr 2025 15:09:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=Ori3lkUz; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BFiSiR019629 for ; Fri, 11 Apr 2025 22:09:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= u6UG6ZM5UrXTCK3/sjn3Hg7Znll8PCBtcru2pFnUQlA=; b=Ori3lkUzTuSRCCwU T3DcTeXsUkqjzI8lR5m6Af6C9bhaKtGUetHIZQAcddGK4SgJnk+0zUwnwMxBP41e Ps2YKTz98iTUvtETejkibYFB4sF0fNbuXi7YLnn6xMXCLEoQRqaJdRPY3RcDCcOf d1QIqxCR4ZRvFU5mvZfVNRtS/MEBPU8nLKnGhDysAdWa4ReDF/Q1FVSTg3B5nq9i SmSolWXfyn64Gv0+rh5Bwg2xXuhmjH6Wo3srTSxvNcbEuoFJnyBKkmdIO3RthbVm gXEUm/dLe0vdW3p4e42vW82MXsrLbWqZELtiCs/lz0yO0G/F5C7sX4bu+IBvCPV4 vDmqmA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcruvay-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:21 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c5e2a31f75so695808985a.1 for ; Fri, 11 Apr 2025 15:09:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409360; x=1745014160; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u6UG6ZM5UrXTCK3/sjn3Hg7Znll8PCBtcru2pFnUQlA=; b=FuaywPxrJWnM9DKjrGZRqv6XEizIK0DP7cJt36rZjLF5muCbkRBZPtZVM6JsoN4BGw uhXzeQW4dU1TMRj5Pp4XoY5Z92Vo1t2TLjpMdgFP8zfRNayBE/SN5gVOAcnTqOg2Qd1g PhHZ49Y5lcAl2gBmcbu9yOzeO8F5OPNf5te9FlqjWu9FsuX5zASvnBy5uflGqCD1luqy awjkzJeZK7peUy4H83ZmOHN8xzRjyoWx2GXvQsd31OLpjeoq3B19zUKngDzsejPq0cCW cj56+JYKiDhOcr2EXpxadzuxMyj3p/ifRYojJiobJYwl6IyVlY/86hotBC6qoTqPrVlj UDyQ== X-Gm-Message-State: AOJu0YwfoUv1SQAJ8dumcsW4YoZwWeOT47o9lmm6+l84vzvPIpnD7LSv /8zV/rKt9bR1Q4kKaQTRq7aDUaqRBu1BhNVe7R6CWHcXzLjT1/g8TnvXzbsh1G3OWODw7G5O9cA MWwx7r/4buRJo1gtdkgIOr/EXagZOe+7f5Px8Py2QRfjo2dDFcwx1difFoufTmICJZgXvEojjyJ BsqsdxulbiEbw= X-Gm-Gg: ASbGnctmA7TUb8t4K+o3WColE+K95FI53GCp8MnKAf+CRwC0iGYjlYTnU5ug/shzBA1 +GkQzhGlxUub8eE/UmgkLj6n7XGllhB62Nuc2rW7TnFIU4wfGuYo+IZDdj+3vi97CkTpUbzcg2l xD4sotI5Mc5p2ajMJ5+jkNiGk9aUXCYpqJ+kcn6o52Hy3aImJsD5G0tmfi6Fl5lpkwP1PAkpsdA PkAjwD8R8jQdZaSLF4V/t9P5CokgtOScvz4pv7nxRYWmlZ8c3P39nTw3r47Nab4dszo6TPgoEwP 8UQE2A3Ze/mgB560H3fZX7iO9ipGV+6Qi4N6YEqbrjNLNzWBp8XCDosfweWEzGRfeBo3dl92ibe oQVXMtW5Lg5PFyj346j8Hn5Iy X-Received: by 2002:a05:620a:3949:b0:7c5:994a:7f62 with SMTP id af79cd13be357-7c7af11f4cbmr699399685a.41.1744409360757; Fri, 11 Apr 2025 15:09:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8dGjM+3+/29IlETM3hfVhoZSBG3XvuTk1iZt7OjYxLXQuRSckcBHQC4ddelR46XeFQpPXbg== X-Received: by 2002:a05:620a:3949:b0:7c5:994a:7f62 with SMTP id af79cd13be357-7c7af11f4cbmr699396385a.41.1744409360365; Fri, 11 Apr 2025 15:09:20 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:18 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:11 +0300 Subject: [PATCH 2/7] meson: pass -target and -I to bindgen calls MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-2-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=994; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=IHpEZaEk5c5V//eNaDaKFBkCrlcHIGS7GMwYlkAQQZU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMGMj4VCIwrsf1bgH1gb28dRp93ZwSWpVniq XtAGIrT5y6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBgAKCRCLPIo+Aiko 1TXlB/9WeVW583HDpXwxmBU9MSbdZCyoBmtEZxTaHb/Tr3ym68yMKWm5SL1PYG4C0wF4L2il6y8 vU6G4+XjkDGyVojMIgEjYy4Hmm8YZbyPWhoeapRIosT0oeOwEQuUk1pgt3JDlWysCXaycz1Jebr XlholDO2xqDlnteJ96qHpPi1NjRi084e7sTL2AkgiE5DTRJ1oEyiJoxYL/G880Lu7ik8eOPk370 /P20cCpkE/uEpH2LmUXnpPfQwT25z0Aoqe84FJrqQSAqyXlz8Pybwfq96ifeMKdEyZ+Y/UiF7n/ Eb248GW5ZZtnJYK2UISLAFW3MLktl4G7A04LiATFQxhBivx4 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 2AgDV8t2_GiUCjNToQtLVO1Z6_6K6DR_ X-Authority-Analysis: v=2.4 cv=QuVe3Uyd c=1 sm=1 tr=0 ts=67f99311 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=E226iTZLpvBttkJnM84A:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: 2AgDV8t2_GiUCjNToQtLVO1Z6_6K6DR_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=671 bulkscore=0 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214764 In order to properly generate Rust bindings for the target systems, we need to pass '-taget foo-linux-gnueabi' flags and a correct include target include path (${STAGING_INCDIR}) to the bindgen. Add those flags to the generated meson target file. Signed-off-by: Dmitry Baryshkov --- meta/classes-recipe/meson.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index cbfc45b94bbd076735847134a0976b6b30784d50..ef45a034a767e979a45553ba08e46dc90e34f33f 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -93,6 +93,7 @@ cpp_link_args = ${@meson_array('LDFLAGS', d)} [properties] needs_exe_wrapper = true sys_root = '${STAGING_DIR_HOST}' +bindgen_clang_arguments = ['-target', '${@d.getVar('RUST_HOST_SYS')}', '-I${STAGING_INCDIR}'] [host_machine] system = '${@meson_operating_system('HOST_OS', d)}' From patchwork Fri Apr 11 22:09:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 114ECC369A2 for ; Fri, 11 Apr 2025 22:09:34 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.38814.1744409365675223430 for ; Fri, 11 Apr 2025 15:09:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=QgVmHO0k; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BFefAS019634 for ; Fri, 11 Apr 2025 22:09:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Y8W3iANCcowrr5NREKOQOmbPqQl9vZT60As30OigF3A=; b=QgVmHO0kQQv0/Zcg 5K/qVSYw28ZlyI04NksXoSCAbVXTbTJtn/9HtuJcKCJwIxzkJN3MO486DJfTevWY 0B32Tb0LAGA0L+HQVrHtJlpO3/9JR8vV5yKLRFFi0+qkSAW31lrAnCf/B5YKq0D5 Qw9FoSbM2BJwpq6BbHRmLWHypOWcRcyAsqI4XbloPnT6UBvpeXwxf7+VW0bm//FS CGHL20atE8RfUFmnMI+1gT2OkjjAnATO8+DNgG1A11DeogrR9gWBi+5czD76mgD1 f+oL37TeCE7f3GkakjAEPmcbZWMLpN+LSGUm12Um4i7h2B3Pg4MTEqdeqzZNWkYp Z9hiHg== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcruvb1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:24 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5b9333642so299981985a.3 for ; Fri, 11 Apr 2025 15:09:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409363; x=1745014163; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y8W3iANCcowrr5NREKOQOmbPqQl9vZT60As30OigF3A=; b=G+th+FWpx4dXdoOp+5EtOQ8xpsIcghF3LVpTQQ77hupZVircPxLWINsyVHU6AoKvNm MrFTyXL26f/jpXcFMYLcUK5yv6Nq9JMUGpBtR940ZhdeNicfe0cqBsAPpJrG3ncwt0Tw zThVZOMRZVBQts/Jx0c058P+Xj4gkXF24GSFUIp5WvEpZ8wWiGEWZw0l1Dxn3JOHResZ Mi0z4YGC2gXKfHa7ky//4Y/wSE77BJFefSS5bYtHC3xRdZ8bxfvmua4PD6VlFZnRL0r2 aYg/VpVbMFWj1kEPGqJT00ufGuY8GhP1uZElw4yoi8+awEhy8ygK4vso5Frq1bEprt9I orXA== X-Gm-Message-State: AOJu0YxMFWLhRzKpsWjPIgTozlRKGUvNU1e7TBjVGz9bMwcR44ttB/7b b7k7Ls91yGPsNmFZp6zG6PZQvFQCThwIxki2ob1rRr9BiNCLLaYFMCDhwP5UDNwRpisz6VQwrGb eyRA7WZU7E+SkhMp8A6YJQsOJi8mh7XRGR0+pakrLmFmZBY/biTdUiA7V0Xjzf7mD9fPZ9G4S6L NzgoFa5WbsOeg= X-Gm-Gg: ASbGncv/BMwIvZ9QInhwlgLGm1LB6wXoPCPdlC0OuIw2bXOcbj/rbdhh4nkhs7rTLHF TwYglUL79DtjadNdZmpj4ysk9+Hx+CVGVuSYK+FjlFmk3VB/dNGy2xpiWekqB8c8Smsjds8iwEu NNr3pclxYPw7hhLvHLXno87EeZQdxifb1Cmhuwlbif+Le4Q3iLrUFbtTCnpNGqsdv9tbiG2V83c thyVZtOC6IzCX82OM1fqAIrHHFINUdQs8O6tr4IDRmiO/V14WPnQoV8hRtgbunh3IlKEvRKbXFp m8o69HywSOD6W7brybvTTYLMRLlCB5YQsGw/dHT36/2l9BcfBMhgEHPeTm9RM2O0bBBbyT3szyR GPSranDlIW8aKLArLfdEP3QPv X-Received: by 2002:a05:620a:4610:b0:7c5:4463:29aa with SMTP id af79cd13be357-7c7af1127a6mr825984585a.40.1744409363312; Fri, 11 Apr 2025 15:09:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8hFFP598LKqlcdjDTXkKU/GYNLdiptYitz7GAvLV2E2bOcDZLa6+D0/3SExiPXJ1tswx8Tw== X-Received: by 2002:a05:620a:4610:b0:7c5:4463:29aa with SMTP id af79cd13be357-7c7af1127a6mr825981085a.40.1744409362897; Fri, 11 Apr 2025 15:09:22 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:20 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:12 +0300 Subject: [PATCH 3/7] mesa: drop the bindgen patch MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-3-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4797; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=1aaS43YmAfwycWvcgP8ngMXuQ4FRkuimUaW7KNv/A3w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMGcMts7y+ys0+iYsqaGbS9BjZYIoc1lwAN4 hPgSHDWhSuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBgAKCRCLPIo+Aiko 1Qb2B/0dTK7XFs8xiNWLrYARigQpByuyLM9NcShPj3T6YgoVQK9V6TF0J4hwvilFuO0SPKaYL6a xQjG8bcdAh+nEHVu2FVn6eqgiTp7AxWOjAt0+QkV9WDYHya4LU15ZmD9NFo6QSXYtRTroP6TXhI SEVzo3K35ir2l8CcmnPpPusRToqjVZqD1LqqAyj0BZEjNBMCRSl6PebOft0wTOgRg8nYAwG+sCR ZusoJbPmJdxnZVWVVRlD//OkIMtxZqkDQ64mxixoU6YuLPkgeMAlc356FWuWEeb0kZ8oa33BilJ lUfBMUDmABJsFljDhhWybTbQGx4YKk9ceiS9ckWtTu+tuoKq X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: sWOGFBgR1q74cs6_QTseyNmFV2jPBzqq X-Authority-Analysis: v=2.4 cv=QuVe3Uyd c=1 sm=1 tr=0 ts=67f99314 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=NEAV23lmAAAA:8 a=ZpVaWaFtAAAA:8 a=EUspDBNiAAAA:8 a=9tIwmJ9o9K6fykSinjgA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=5tn4MO8azEBWFjlAA-rn:22 X-Proofpoint-GUID: sWOGFBgR1q74cs6_QTseyNmFV2jPBzqq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214765 Drop the bingen-target and bindgen-includedir options in favour of the bindgen_clang_args being passed through the meson target file. Signed-off-by: Dmitry Baryshkov --- ...vide-cross-compilation-arguments-to-LLVM-.patch | 67 ---------------------- meta/recipes-graphics/mesa/mesa.inc | 6 +- 2 files changed, 1 insertion(+), 72 deletions(-) diff --git a/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch b/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch deleted file mode 100644 index d527b3408734dfa0aa756053c1b0f3ea3a59563b..0000000000000000000000000000000000000000 --- a/meta/recipes-graphics/mesa/files/0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch +++ /dev/null @@ -1,67 +0,0 @@ -From b9cf34f39ca7e7546508ce2ab1f053edef5fc201 Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Wed, 26 Mar 2025 17:47:09 +0200 -Subject: [PATCH] rusticl: provide cross-compilation arguments to LLVM bindgen - invocation - -Correctly generating LLVM bindings requires several croos-compilation -arguments. Provide them to rust.bindgen(). Karol Herbst on IRC suggested -that a proper fix should be to fix meson's rust.bindgen() to support -cross-compilation. Carry this patch until meson is fixed. - -Upstream-Status: Inappropriate [OE-Specific] -Link: https://github.com/mesonbuild/meson/issues/13591 -Signed-off-by: Dmitry Baryshkov ---- - meson_options.txt | 14 ++++++++++++++ - src/gallium/frontends/rusticl/meson.build | 8 ++++++++ - 2 files changed, 22 insertions(+) - -diff --git a/meson_options.txt b/meson_options.txt -index 0147cafcb146..f73e83fded18 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -796,3 +796,17 @@ option( - value : false, - description : 'Install the drivers internal shader compilers (if needed for cross builds).' - ) -+ -+option( -+ 'bindgen-includedir', -+ type : 'string', -+ value : '', -+ description : 'system-wide include directory for cross-generating LLVM bindings' -+ ) -+ -+option( -+ 'bindgen-target', -+ type : 'string', -+ value : '', -+ description : 'Clang target for cross-generating LLVM bindings' -+ ) -diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build -index a5d1dcf3abb9..480c220b7f5f 100644 ---- a/src/gallium/frontends/rusticl/meson.build -+++ b/src/gallium/frontends/rusticl/meson.build -@@ -115,6 +115,11 @@ rusticl_bindgen_c_args = [ - '-fno-builtin-malloc', - ] - -+bindgen_target = get_option('bindgen-target') -+if bindgen_target != '' -+ rusticl_bindgen_c_args += [ '-target', bindgen_target ] -+endif -+ - cl_c_args = [ - '-DCL_USE_DEPRECATED_OPENCL_1_0_APIS', - '-DCL_USE_DEPRECATED_OPENCL_1_1_APIS', -@@ -187,6 +192,9 @@ rusticl_llvm_bindings_rs = rust.bindgen( - rusticl_bindgen_c_args, - pre_args, - ], -+ include_directories : [ -+ get_option('bindgen-includedir'), -+ ], - dependencies : [ - dep_clang, - dep_llvm, diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a88cc8660e26bae43c713b2bfdbf396e804f6c09..d2de6a096a6343b6d1bf9e7a638abc0e3c7eb492 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -18,7 +18,6 @@ SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch \ file://0001-freedreno-don-t-encode-build-path-into-binaries.patch\ - file://0001-rusticl-provide-cross-compilation-arguments-to-LLVM-.patch \ " SRC_URI[sha256sum] = "adf904d083b308df95898600ffed435f4b5c600d95fb6ec6d4c45638627fdc97" @@ -148,13 +147,10 @@ PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2 # "egl" requires "opengl" PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" -BINDGEN_TARGET = "${TARGET_ARCH}-${TARGET_OS}${@['-gnu', ''][d.getVar('LIBCEXTENSION') != '']}" -BINDGEN_TARGET:class-native = "" - # "opencl" also requires libclc and gallium-llvm to be present in PKGCONFIG! # Be sure to enable them both for the target and for the native build. PACKAGECONFIG[opencl] = " \ - -Dgallium-opencl=icd -Dgallium-rusticl=true -Dbindgen-includedir=${STAGING_INCDIR} -Dbindgen-target=${BINDGEN_TARGET},\ + -Dgallium-opencl=icd -Dgallium-rusticl=true, \ -Dgallium-opencl=disabled -Dgallium-rusticl=false, \ bindgen-cli-native \ " From patchwork Fri Apr 11 22:09:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13BC0C369AE for ; Fri, 11 Apr 2025 22:09:34 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.38516.1744409367934779761 for ; Fri, 11 Apr 2025 15:09:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=eYPP3ueo; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BGKfD3032650 for ; Fri, 11 Apr 2025 22:09:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 76MdRSb+07Be4Vcy++jOlCWUNeA3y5UInl4V3IrBcgQ=; b=eYPP3ueoL4oz8v3t 6KFGFFXJ01yg2uI6cHnCJZsFt+bAGEf1eo3VnW/GGcSbAWX/JnlzuxSKfGbeg7+s zQCAGSiHRBqS28FE6/GhbaaRDxUWlK0RfQ+QwPgHHtnmu7QwTGSBFJSxenuxSD0B HtwYTcoLD5uTNTfSBiFyy2jLzn22QHvDwxTzD8I7wmP8Bpbjgq+E1UFTrFd1Pchx /fS9SQ6cQs07UZxThJLzduGxTBzWeiOjCaNQQYOPjzkMspI0w215vNkYLsO6Na5u V6wGoad4HzZXxS6Ayyzi8KCoqJ0oLwZeWZkV4/QqCuRtn94eR3vsHXCaUWXwoecE LtsuWQ== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twfkuhke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:27 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c572339444so336169285a.3 for ; Fri, 11 Apr 2025 15:09:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409366; x=1745014166; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=76MdRSb+07Be4Vcy++jOlCWUNeA3y5UInl4V3IrBcgQ=; b=sciP4J/rX8dBbm1sGsKe5r1uVhvu9hOcNz+S7wPzSgNDu5YJIsPFksmJj5FUpaMP3C CL0rrGa2L65naJEGPueKQHiB9D0ZAhlhthNhWnmtY2HYVboO0DxScepXCfNcg1oZpyvL 2KR2JWGhsS2HoRE0PdGNdm5W7aWu2cLdcB6iAvw/NRVjZv6QEARqqJ4zs1PVq0YfrhiD +aAsMA9ZwNGFiqvifNscqx/27ZFJM9DLUCkc2Mh0n+PPftQfXgkXZE/3jgfGGt+0DPco 99phPvP+nM5pfgucsnnTBosxuW7zwCL/YIPmRr4V9bW9lVUyYH2VhYvSGQL0fpL4q5Da MabA== X-Gm-Message-State: AOJu0YyY/16KfGc0G/XX3/LscU7jdCWCf0xH3jD9qwoqr2a7p0lXfDtz xbDrlb0FMRNDR0WS02zibCesta3lWmzVF2ipuauyXJEg1Pfqx99S5DwcGL7UiTKqp9f1aMMtSLh 2ySB3hAUypguRqnQeFJIPfZvzgLv3SvxIfR1uflSHxja/TdcigWqjXJxyIHjDvIS1bKjqBzMX1A g0B8f1UWYpMyo= X-Gm-Gg: ASbGncvaa7hnqLulis4EQk7odhS7Huxcg/Dz1oLb5awsjnkqZUmwy0PEcafCQwag7Ej 53xg9NIFA2vwMCHPsld1QbDW894/1uSQ1t//RAMYwmKDoU9ntXiLFy5I/VwqTjY2G7OF+L+Kopb v6mkPrBG5wk/IwHXDFe6fmALtjprA0YUvXmAEqUkTbAXVc1HHQoiIQ0Ik3gdCafFEcgjtDs3k8k b/WKacwaYOWPWZCxu/zRSuJ7fyhgIBYwKM4LycU5jwFcZ58v5+EzcYnQCSEcAqt6vaY8fc1hx2f GkLsKnzrv9Fv/rdYZo/3/lJb5jvVr7MQmOVBHfc2xUINO+lebpsXgmdiEtE3vXANGP123mf0GE5 my551Sp0JAku/adwx0KQFHlCx X-Received: by 2002:a05:620a:1a91:b0:7c7:a5e6:d287 with SMTP id af79cd13be357-7c7af12a31bmr623993485a.52.1744409365720; Fri, 11 Apr 2025 15:09:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWMmy5Xyjmt3dEqOC6bTJYq0F7iyMvRV6o5/bkrnNBQTZ6Nv9nVlK6hr7VId2CQOffsd9g9w== X-Received: by 2002:a05:620a:1a91:b0:7c7:a5e6:d287 with SMTP id af79cd13be357-7c7af12a31bmr623990685a.52.1744409365338; Fri, 11 Apr 2025 15:09:25 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:24 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:13 +0300 Subject: [PATCH 4/7] mesa: update patch status MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-4-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1316; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=GT8JDPv1xRVOMEObZ0wdppBBiUD0zMqQCDsgTGcw35k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMHnl2qHAaGW5hkt/jqngYxQzfHw2rCjo5+n m+vvKmnTg6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBwAKCRCLPIo+Aiko 1fDzCACUguhtB6M+qRDluH5fwFJOWS8bmDjguFgCYakrgyKJigAW6XMXMQC3UrdzgKEkWvQtJES yYFXjHr9NEJ0pvcCsSri3yoHrCPl7JyEtI9fvFgCiTdn5rsPn3qr/HEWO5UphdBN8/0XFut9u1u QLp9NMcoqhnQL75XS13FPKh89L4GS9PsSnTFFRh6ywmEsAL2+O9C2Oo1T26Tmf6Prd5NNnrWPvT eAyVc4yZ5NvKITlrwy+tYfoSs/e1HPmIawnlIzMzCoVFkRHG4BoIl+KyQi9nyuIA6UBMzTizWbP F77qdIVtTUzkcI0+IEa6vSZ4Gt2PLvSR4JK0NqPTPn9F61fN X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 4bmU4bwMlnGhUkPtTLdYww8JMDk6e9oI X-Proofpoint-ORIG-GUID: 4bmU4bwMlnGhUkPtTLdYww8JMDk6e9oI X-Authority-Analysis: v=2.4 cv=b7Oy4sGx c=1 sm=1 tr=0 ts=67f99317 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=e5mUnYsNAAAA:8 a=EUspDBNiAAAA:8 a=hjY-yhfJD7uvjjkrABIA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=Vxmtnl_E_bksehYqCbjh:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 priorityscore=1501 suspectscore=0 mlxscore=0 impostorscore=0 phishscore=0 clxscore=1015 spamscore=0 mlxlogscore=972 bulkscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214766 Update status of mesa build fix as the patch have been submitted to the project. Signed-off-by: Dmitry Baryshkov --- .../files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch b/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch index bebe30037abffab676bdd371116c1b9cbd9f9cef..f8af2bafb43333a2746b3bd25c794beec8db066e 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson-disable-SIMD-blake-optimisations-on-x32-host.patch @@ -8,7 +8,7 @@ blake3_hash_many_sse41(), most likely because of the different pointer size. Disable SIMD blake implementation if x32 is detected. Signed-off-by: Dmitry Baryshkov -Upstream-Status: Pending [will be submitted upstream after internal clearance] +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/b9c6afd3a7c7ac302b47e70b5c745b84cb35f188] --- src/util/blake3/meson.build | 2 ++ 1 file changed, 2 insertions(+) From patchwork Fri Apr 11 22:09:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61203 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A7BEC369B1 for ; Fri, 11 Apr 2025 22:09:34 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.38815.1744409369424922165 for ; Fri, 11 Apr 2025 15:09:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=cfyFErIo; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BEuQGU018718 for ; Fri, 11 Apr 2025 22:09:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= QVTQVHxao+HHtAzHRjZwG1A3WANxx5vtsPNlpU8jrro=; b=cfyFErIotSFedrk1 lf/GV5sbiS/jyc7uzleeIqH1e5iSpijc/fIkqcJlfryQWsXZo2t3IJYJFRexAhnW 5Jaq5rbLSV/gauE8HKGG/i1fTUEfw/DhapjT8C95ED2lQhaB7Fdni9TkLx3dJlfY dwRrDTLUo9N02rvU0kuy0JolTdCk7XEFvgcdyOioYCxJLlJ6Mmh2FPfWah5zOwqH g+pM+I0Dlgxy6YgpHDpyCh5r7YHMjYL08/eAvgj6gWas2MnfNYOcd40RAqI8MSdr BKA9qq6x8KCbXdCfVTC8W3SOmR2IMtpvIvQbhgHrYIi/iIm05A1zyTV5HYzxY6jY 6Akfig== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twdguvvu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:28 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c579d37eeeso389104485a.0 for ; Fri, 11 Apr 2025 15:09:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409367; x=1745014167; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QVTQVHxao+HHtAzHRjZwG1A3WANxx5vtsPNlpU8jrro=; b=SS+U4iCI+Vtr78rcBLyy54Cec6PoUwwtcPHnqEgvq5XplQInAxHyRJDNF/7v4z68BJ ndEAmwSUCP4KblZunctjlh+c5Sf2HTL7ozAwRYq+erTZuBpTTXlhOE7psOmdx9Pu/dor rwsQ88uXjYWsUg0h6BqPXw8TA4gLdxJANjOzTqfZ4pTweusG3zJIKGELjvbol2uWcsro qtfTLbq6qndWXcBmDImTXOnmKzLVqcTVshrjVHfTcENx4irKvxYxShVYHOSch/aEEymV DUUVaHpL2Zzah7opyMyQG8bp4JurfmKVGAfiK0p17LM0wVRDLYHWk/LPyCtvUVjPctnZ A8pg== X-Gm-Message-State: AOJu0YyIGzcEq/IP/DAn7+oMInQuAfuDazol9xg3QOmq8pULzRatmCwm vJfQyX2OrKV+ICc1aPrVu8UTfsWlM/7eFOkilTt+xuW7Ip0t+ZI8eU3XZBMjEOnRNVlhheFUb/b qQWTpunwfw0goDupu5GW3vAzHoY+U/kOZVWrZ8tg8/f/W/giFxxTWlaVZPV7N5duDey9EW8ImcO vz+jY05j+GDVI= X-Gm-Gg: ASbGnctpyicVxsIjqoZhwulK2Px4EqFy7FInSSON4O2p6unc80JcJHKieV9RHCu6GU2 R0Aq8IBDYuWc6XnWJaobb9wXrnuobnUYDQ93S9pjuYVpmE/s4rerfi9CeiI7IMwNPypk6wSo+T8 z77YF0oEpHh5BJ4FIfJ4maZWnv8pLP/CiDESc0QUvGuHSbcKBAnKaZSV/nStK7hcs64GJxgeeYY BmW7Zwm4TAm3npEIgZEgec4zxEJsLP9PvfcRRQ1+Apagm2pt2GwOqSpYnsMM68gIML2wDtdqYg+ uRuIYVf9WScjeqhnY/3w+tPDih/fsEhW0FirLLdpM1JnuQCC0PLq/4DIGMsIR3qBAoNU40EnI8y gO1C4ZA/ges8KRbH99E8FHaA5 X-Received: by 2002:a05:620a:4915:b0:7c7:b5e1:4e45 with SMTP id af79cd13be357-7c7b5e14ea8mr161632285a.9.1744409367295; Fri, 11 Apr 2025 15:09:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH66+dPKxmL6AAbK5KoFo/fbfOgdunMYiVubm/uZ10Ebtujo0lKaZ3Xd/CmdqDYsGSospRqzQ== X-Received: by 2002:a05:620a:4915:b0:7c7:b5e1:4e45 with SMTP id af79cd13be357-7c7b5e14ea8mr161630185a.9.1744409366934; Fri, 11 Apr 2025 15:09:26 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:25 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:14 +0300 Subject: [PATCH 5/7] mesa: don't buid Intel drivers outside of x86 world MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-5-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3298; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=fb/WV3aEc1HSGrpHmAgkF4nqjJxS0ORcv1IqVy6OXNc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMHh/773kWC8Yn10BrIERhAFgysxv/F4R6aH fULR7Vlc82JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBwAKCRCLPIo+Aiko 1ebPB/9rakN4KpDKQjr16MdweLFvVWmux0Jgtvz2469XpEj4mXlx9lSDzrEj6qlgkC2F9HIw/Sx XXEiGAufbDkpfylLt/o/+B0cQLkmj4mctNffy3g3TZcTjCiigwAzyQCeAHUwhZRA/plhc5cU1os TclfS/YKl9fc2pupbneZezCthfmvSPG4nNSEEa+M+HkHx5XL1wCsyp10DW22W7IoqHatRy9w/wJ ZHSS7crmm+NvvEzQibj76DcOLZcMEL3AyDWYIaJwWCkJOp7MJkPPqBC1p6l9ecuWD1iOiiklzsX cGJFaWnKSeatgDXnfUcbo5hfSpegr4IYjcVlaOg2NDyjXbje X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=PJgP+eqC c=1 sm=1 tr=0 ts=67f99318 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=9ulEF5QCDdM8efRlvGcA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: 4oJft0DBjAyYmtfAw-DSo1bUQgLmwAjx X-Proofpoint-GUID: 4oJft0DBjAyYmtfAw-DSo1bUQgLmwAjx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 malwarescore=0 spamscore=0 impostorscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214767 It mostly doesn't make sense to build i915 & Co drivers for non-x86 targets. Add separate 'intel' PACKAGECONFIG entry (enabled by default on x86) and use it to select Intel-related drivers. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index d2de6a096a6343b6d1bf9e7a638abc0e3c7eb492..1b758a28d38b4d2d02df501b8898fb7f2f5e88a4 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -88,9 +88,9 @@ PACKAGECONFIG = " \ # skip all Rust dependencies if we are not building OpenCL" INHIBIT_DEFAULT_RUST_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'opencl', '', '1', d)}" -PACKAGECONFIG:append:x86 = " libclc gallium-llvm" -PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm" -PACKAGECONFIG:append:i686 = " libclc gallium-llvm" +PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel" +PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel" +PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel" PACKAGECONFIG:append:class-native = " libclc gallium-llvm r600" # "gbm" requires "opengl" @@ -107,7 +107,7 @@ VULKAN_DRIVERS_AMD:x86-64 = ",amd" # i686 is a 32 bit override for mesa-native VULKAN_DRIVERS_AMD:i686 = ",amd" -VULKAN_DRIVERS_INTEL = "${@bb.utils.contains('PACKAGECONFIG', 'libclc', ',intel', '', d)}" +VULKAN_DRIVERS_INTEL = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',intel', '', d)}" VULKAN_DRIVERS_SWRAST = ",swrast" # Crashes on x32 VULKAN_DRIVERS_SWRAST:x86-x32 = "" @@ -165,10 +165,6 @@ PACKAGECONFIG[zink] = "" GALLIUMDRIVERS = "softpipe" # gallium swrast was found to crash Xorg on startup in x32 qemu GALLIUMDRIVERS:x86-x32 = "" -GALLIUMDRIVERS:append:x86 = ",i915,crocus" -GALLIUMDRIVERS:append:x86-64 = ",i915,crocus" -# i686 is a 32 bit override for mesa-native -GALLIUMDRIVERS:append:i686 = ",i915,crocus" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" @@ -177,7 +173,7 @@ GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '' GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', '', d)}" # radeonsi requires LLVM -GALLIUMDRIVERS_IRIS = "${@bb.utils.contains('PACKAGECONFIG', 'libclc', ',iris', '', d)}" +GALLIUMDRIVERS_IRIS = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',iris', '', d)}" GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe" # llvmpipe crashes on x32 @@ -211,6 +207,9 @@ PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpa PACKAGECONFIG[imagination] = "-Dimagination-srv=true,-Dimagination-srv=false" +PACKAGECONFIG[intel] = "" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'intel', ',i915,crocus', '', d)}" + PACKAGECONFIG[lima] = "" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" From patchwork Fri Apr 11 22:09:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26013C369AF for ; Fri, 11 Apr 2025 22:09:34 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.38817.1744409371935722318 for ; Fri, 11 Apr 2025 15:09:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=VtV2/oM5; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BEnxBb019655 for ; Fri, 11 Apr 2025 22:09:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 3OHh5UEUDLEG2JttfFRufY+/E1FFzxTGBOKl4vLF2DQ=; b=VtV2/oM5aACVPzv+ m32TYfYNj3ALN4Cf8uE5ulRiDK1aB2ruzGBNMsQqcbHoknT9JoDAcwYV+5uX5KD7 6dwCGqNIVJpoYSTTmZfl8LPX3BiMcw8snw1b66t7hjUsJv7s0cUf4yrfHuxkOe2F A4F0A8zsw6WzoRagsPdIKPfeLYteXJBeavfNpKaJUWKgFEjERrPnLyar5Nuw2I61 7w+kCNGsP+cKjS5iyrf7Mvu1hJrN3WVgW7hUEWb5ql6phSm/G9XeJmkwmyGl6PvG R/LmELugHvS/Jef4ZkoV+41yDPv1IYLi1M4PHJyVk5Ec1JhvuI1AzdaGP9Zd8KcQ UFt/zA== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twcruvb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:31 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5f7210995so443041285a.1 for ; Fri, 11 Apr 2025 15:09:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409370; x=1745014170; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3OHh5UEUDLEG2JttfFRufY+/E1FFzxTGBOKl4vLF2DQ=; b=wJ12u45ZFtrmCo0HutCd7BVYd3lS8RYxXKpWmL3L8GNVG0wo9oXBdCpIMh/z20/UZw OLlkLmAtjc/9pnR0qUScT72JbLR1LVyAezJLuxImHXM+Rl8G7ZoW96LytlhN0sEMd6ti ldVSrAevtmDErFL2hK5MoLSecwnBm2dGHAFR7qhf97KEroDxWDNYFF9dZkYJKhh4SQOr +WczxkslZepdnEVW1npOtgDM9MUAdsJDMfoCsjFjy94enNhhd/km7BrP5rJYNmV1GbvP 40I7XIlYfagv6Ios6XAI6f8dwYKSvqqMh1HEtiTmQtH+IJUHySh3gBfvCg3vWxMkW8r/ eTHA== X-Gm-Message-State: AOJu0YyGDlOOcYy2IKoHm8P17NMZZuqrh5MrrwA4tLLfQqWK0/tH3+Ob HiD+Ol9HyP8cWlqFftcCORj5tEdozwk0FefM3/ygXKNCkLCi2AgvBHAK+QC05Lw6Bva1UZFQyQv NP4jtctMFlcKWv8TykvtcJDqdd1zLRKdl/Ay0T9K7pa8dXJLkcPmzgnDQstfmMeUGAPxpv5DHc1 vD55XQxnD4iS8= X-Gm-Gg: ASbGnctO/d7KjOygWhJLLpBP2hCOkuh4WB9kkI4njCOhXDJwkEQ8dRpOP2BRsmaz3/C Dx1cyP3ivrnr4dJxcyPiKN0HWws2nzSPbfzhRDQIwvPoZ7w40YaS1qHjqcd3+3V9XUBsMOUF69X tMljiu5wMi02Z5LvgPhlILdgToiAJb1kwTQWK0hU6+Q9qHJbZ4E+fJ1gMGYnZnduWPcwX3s6CWF 5xzQP2LTGxHFxwuQEJti+RACHOglR6t6PyEUEcuNDElHaTDSn2/axo56fyaopGYxcr0v+iWK5RR M8AhqsZhH046ttGElK5YfphWBJ4n/ILQmikHY4wa/8wGMVvL1NXAqs/fNlbb6TZgZ82ycbyBAc1 xPn8JAA+fwRxfyTeQ/CzwFLQG X-Received: by 2002:a05:620a:448d:b0:7c5:93bd:fbf2 with SMTP id af79cd13be357-7c7a76b9727mr1150225285a.19.1744409369856; Fri, 11 Apr 2025 15:09:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPCN3Diwy9Fd+NMCR0+SR63Miav/vIbPU0upsojmlK2b9ZifXYfywjXSTstfZistfZ0YqCRQ== X-Received: by 2002:a05:620a:448d:b0:7c5:93bd:fbf2 with SMTP id af79cd13be357-7c7a76b9727mr1150222485a.19.1744409369461; Fri, 11 Apr 2025 15:09:29 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:27 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:15 +0300 Subject: [PATCH 6/7] mesa: introduce amd PACKAGECONFIG MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-6-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3266; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=vsyOLZOy4uVPnh8nGac255CSvcUXmOku9CDPcoILehc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMHE1gIWvlSD1ZzJ2X6N3henIB+mLs1GMwVp RajK08ELLaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBwAKCRCLPIo+Aiko 1W4UB/98N6cxnC3+VzO7SXLgJZdd5XLE/3N3DF4w+HvySOPzkWFOcM6UFWvS7uuDiDsUpLx/ZpG +NsFu5yNOx7N3hvliD2UBOuWLy8MOMTq2WaJMLJLlZcxrhmkpK382RZI1o9c2VlgStAy8OX8ZCn gzCTdRXrf3Xl0Qc+pM4gPLmMPAxVwQDLTF1u5quXhh581hQTD5jSA7oib9dE3ulJq0ZX6WwWelp k0/MNOr8exLSQglcRCG9mvLkg3HcrfFI+08UY0LzhZnYH5BOus+uJ/U/ceZKtHGPHT/GZWH9pof NtBW+5z8aG+WM7tBWQ9tOJmf23aODdckqHrSzLl6hUYPtRqa X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 2q7tDn1dZPI5OGFTlKkn91DDBo2-F4pM X-Authority-Analysis: v=2.4 cv=QuVe3Uyd c=1 sm=1 tr=0 ts=67f9931b cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=N-1FU7Ib_J0BpY9GTPwA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: 2q7tDn1dZPI5OGFTlKkn91DDBo2-F4pM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=939 bulkscore=0 priorityscore=1501 clxscore=1015 phishscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214768 Follow the example of other hardware platforms and introduce a separate PACKAGECONFIG knbob for all AMD/ATI cards. Enable it by default on x86 platforms. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1b758a28d38b4d2d02df501b8898fb7f2f5e88a4..8ab9af9887ef567925563247b88d96aca3fcfb1c 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -88,10 +88,10 @@ PACKAGECONFIG = " \ # skip all Rust dependencies if we are not building OpenCL" INHIBIT_DEFAULT_RUST_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'opencl', '', '1', d)}" -PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel" -PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel" -PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel" -PACKAGECONFIG:append:class-native = " libclc gallium-llvm r600" +PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd" +PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd" +PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd" +PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd" # "gbm" requires "opengl" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" @@ -101,12 +101,7 @@ X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xra PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -VULKAN_DRIVERS_AMD = "" -VULKAN_DRIVERS_AMD:x86 = ",amd" -VULKAN_DRIVERS_AMD:x86-64 = ",amd" -# i686 is a 32 bit override for mesa-native -VULKAN_DRIVERS_AMD:i686 = ",amd" - +VULKAN_DRIVERS_AMD = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',amd', '', d)}" VULKAN_DRIVERS_INTEL = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',intel', '', d)}" VULKAN_DRIVERS_SWRAST = ",swrast" # Crashes on x32 @@ -174,7 +169,7 @@ GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', # radeonsi requires LLVM GALLIUMDRIVERS_IRIS = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',iris', '', d)}" -GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" +GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',radeonsi', '', d)}" GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe" # llvmpipe crashes on x32 GALLIUMDRIVERS_LLVMPIPE:x86-x32 = "" @@ -184,11 +179,11 @@ GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" # i686 is a 32 bit override for mesa-native GALLIUMDRIVERS_LLVM:append:i686 = ",svga" -PACKAGECONFIG[r600] = "" +PACKAGECONFIG[amd] = "" PACKAGECONFIG[virgl] = "" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',r600', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" MESA_CLC = "system" From patchwork Fri Apr 11 22:09:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 61205 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12F4FC369A2 for ; Fri, 11 Apr 2025 22:09:44 +0000 (UTC) Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.38520.1744409375496295826 for ; Fri, 11 Apr 2025 15:09:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qualcomm.com header.s=qcppdkim1 header.b=XdoLNERL; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: oss.qualcomm.com, ip: 205.220.180.131, mailfrom: dmitry.baryshkov@oss.qualcomm.com) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53BCQP9Q006864 for ; Fri, 11 Apr 2025 22:09:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= X6baqfH4hB2fsqNWTiO7enFJKMWOlC3MHwOiGmQHdXg=; b=XdoLNERLsYtV8c3e bAfB9xN7AzjIDLy7tJ759kcV55ZGcLCqlI0gRKURVcpBAf7EmfEWAbXB76xvSkLG 75TRHxSHZ2MZ3lmkK2J3EUJ1tkoMZ6JawyR7JrZNNb1uiU3thH5frAMlnNmewEOB 10BtdTEoDI5YO1lk+HsFCg1FKhyqEykSQfofd7pP8UZlLvl+Rxci92GMPzGYLUmB PA30XKGjbe64hN2ry5QQqGSNkhWUPC+8rBuLNID2q8YvTAod87F9Q3ZHZjKGOaok C2WgqfJxONZXM/ROZGeuLbDRT3XQXfDZsCJz4R9mJ5OsthAkw/rn97Tnzy5i/pJo 4UU3tg== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45xeh3mqfd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 11 Apr 2025 22:09:34 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-7c790dc38b4so404079485a.0 for ; Fri, 11 Apr 2025 15:09:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409373; x=1745014173; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X6baqfH4hB2fsqNWTiO7enFJKMWOlC3MHwOiGmQHdXg=; b=gEBdJnh3ibCWrk26/7XvkhbX6LgEKHLRwArsacVVmAPSmniznW82cH9BOqEfGgv3F8 UwaWb1cApQ4U+StkvuGw8+cYjl+GkHzDWYfi2fRZIURsg35wd3REH2exVfKRtj6QY6Te faGgaE4oS7YtB77+KDIwelOwgoFoKu+cJ4hg2dgp2HyKeiUWGhfD9U+mC+hdmkCH7UvB 52OUsY8SKo7JDKMYD/GjtPLPS2IGmeHLt249crBvGvn1vcNqvvAgOw9wEXgyaC+EigGQ +Qur2k7OwOmtMfn2e5lSGy2PdHHUBkXqqqYGp80oGhvXOTAK48t/m03j1kIl/j1sOLm1 HYuQ== X-Gm-Message-State: AOJu0Yyjj5q5IlbUYG5Y/SFJWQ2XGXr6RU7Ap34YnBxb99iO/FsVCGLc Maq5O3NKMMvCab5nZzWGZlfB+YXkUqWqQst7jDnpvDgOTJhovI9qNsF//4IVgixZ66ZgEAC+VkA CYNm9mbWZvISMCo+VPpBu4kZX+an4ScbGjYC45Sepjm1fHlVE1JphDVrRl1lrXIhfbvMnKf8+AX /e74TR8pKfIx0= X-Gm-Gg: ASbGnct3r94JmunmSIkoemIWdmNQI/KQRDZmlYLU+pBRantbhBalB0oFyI1x73kgd8x +wF47crLdXpuaDGvoeD6idodvRu9c7jeEosCUpTw/QH6FYMaiz1qV2wuM2WRHw0f6qRfWO1+kGO Ug9nBUyDD8kzv5lX4cSOnSIkyYRWKA3qwYbTnMlnN0rI6cvQ8qTCs0Uwzn7ZAqHzjuQ8mdofjq/ mUi3k6/w+EGK+5216jcTo2rGlUxhk5XJmlN9Gg1sptBicFWkqvKWewSGOWLxTWF7xZheHp7QaWF v55LN4xxzYU1PF5G8GLuPWub0t3yMll/R+d/98qx28qZgZClI48azp3XVzs4s8npdIRSn+fEy/f GEiGBcwJCeuNXuo2sk4xerr8v X-Received: by 2002:a05:620a:414b:b0:7c3:c512:9b1a with SMTP id af79cd13be357-7c7a76b96dbmr1167922885a.22.1744409373477; Fri, 11 Apr 2025 15:09:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+BRpwOhFuw/D/is2x7lGbRZukL5EWLsDL4wUYArHnUBJwyX8WUsiDwe7/F+peebkvNe0+pA== X-Received: by 2002:a05:620a:414b:b0:7c3:c512:9b1a with SMTP id af79cd13be357-7c7a76b96dbmr1167920385a.22.1744409373112; Fri, 11 Apr 2025 15:09:33 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d3d510076sm518432e87.175.2025.04.11.15.09.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:09:31 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:16 +0300 Subject: [PATCH 7/7] mesa: hanlde svga Gallium driver through PACKAGECONFIG too MIME-Version: 1.0 Message-Id: <20250412-mesa-25-fixes-v1-7-791840391271@oss.qualcomm.com> References: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> In-Reply-To: <20250412-mesa-25-fixes-v1-0-791840391271@oss.qualcomm.com> To: openembedded-core@lists.openembedded.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2334; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=trwvbbQ/zgt3gjU1gEPIHD3rgn9NoNArbThYBv8PNoI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBn+ZMHsbhylXkTjEvELYfJRjVGCESPMY0q2G/Y/ 4vTbFlOex6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ/mTBwAKCRCLPIo+Aiko 1a8TB/9zF8LWO/MPF/etbdtm/q0HTKrW5twhkxhUeEkMZLunnvf4OZsC0rLYHrnX/fl6tX+JGgI 6mAT4HxxjtNYAZM8RRq2s3vzJgwHBO5mFhHc0urHfz1AD8StcLKus56jN8RzH9xX3tOdASO4qXq zizPTwNNuV0ySPrFC0DmrbTUj/fy+svbHHd9Ts5ZZ2fQ1KUhi7Mnr+DwLyiuRFN51iN6WyddfI4 I2/3yOvQXVrgoaFyGzyPlLH1FP59HIicSAhaHyJEjkER7kEjxqmULWaFNJoWuDhAmWa/3vEnqt4 FyiUrvGfi9lp9RjFNkSBXOsUgcbw8Wh/bhM9S29gxnINEvNQ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=VbH3PEp9 c=1 sm=1 tr=0 ts=67f9931e cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=OHXMhqJX0b9lEWDjoBoA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-GUID: wIEPuVnj5uUvqxU7ZG2bmKnyvPEdFQ2S X-Proofpoint-ORIG-GUID: wIEPuVnj5uUvqxU7ZG2bmKnyvPEdFQ2S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_09,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 bulkscore=0 mlxscore=0 mlxlogscore=769 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110143 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 11 Apr 2025 22:09:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214769 For the sake of uniformity add the svga PACKAGECONFIG and use it to guard inclusion of the svga Gallium driver. Signed-off-by: Dmitry Baryshkov --- meta/recipes-graphics/mesa/mesa.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 8ab9af9887ef567925563247b88d96aca3fcfb1c..c191e68b5841118d94574c243b74561484f39370 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -88,10 +88,10 @@ PACKAGECONFIG = " \ # skip all Rust dependencies if we are not building OpenCL" INHIBIT_DEFAULT_RUST_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'opencl', '', '1', d)}" -PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd" +PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd svga" # "gbm" requires "opengl" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" @@ -173,13 +173,11 @@ GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',radeon GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe" # llvmpipe crashes on x32 GALLIUMDRIVERS_LLVMPIPE:x86-x32 = "" -GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_LLVMPIPE}${GALLIUMDRIVERS_IRIS}${GALLIUMDRIVERS_RADEONSI}" -GALLIUMDRIVERS_LLVM:append:x86 = ",svga" -GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" -# i686 is a 32 bit override for mesa-native -GALLIUMDRIVERS_LLVM:append:i686 = ",svga" +GALLIUMDRIVERS_SVGA = "${@bb.utils.contains('PACKAGECONFIG', 'svga', ',svga', '', d)}" +GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_LLVMPIPE}${GALLIUMDRIVERS_IRIS}${GALLIUMDRIVERS_RADEONSI}${GALLIUMDRIVERS_SVGA}" PACKAGECONFIG[amd] = "" +PACKAGECONFIG[svga] = "" PACKAGECONFIG[virgl] = "" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}"