From patchwork Wed Sep 21 05:31:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kai X-Patchwork-Id: 13073 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 2558BC32771 for ; Wed, 21 Sep 2022 05:31:20 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.3106.1663738277958991215 for ; Tue, 20 Sep 2022 22:31:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@windriver.com header.s=pps06212021 header.b=Xv+/B3WN; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=62635da6bb=kai.kang@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28L5GHJX017170; Wed, 21 Sep 2022 05:31:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : mime-version : content-type : content-transfer-encoding; s=PPS06212021; bh=0W5uEK7QuEZByKmanfQfvbh/4czHngn6T7rFpgfZWXA=; b=Xv+/B3WN+iL3ZT68Gww8bXyiJhqhRBNGiPDjCuhTJ094phYETKDgKokkncFCrBrQZRVX nR7UcJtP2SSKEanZOmtNBHZ7D8YCvu6fdA/NsIeK7zztQgn6xqGfbDTmF9yVw51+Z2wR szJf1j9084+h9VxRa/6G5uSLZlaa+Vppm8t34hw/uUVzIIfIA7Vabbw0lcZBOb4f1xpC Wk4Mt2y5dgiGkMiym7EWSEOAikpNg/p+CtvxzSEvmdO0VsbIIkpuLejlHD/NBz6RYP/u YR65LqnbAmFecSoFxHuPAc2FUJXYHKM6Q0dpfB0uBzdbfkwPdfZKbpkobbnEzgO+x8UI 7A== Received: from ala-exchng01.corp.ad.wrs.com (unknown-82-252.windriver.com [147.11.82.252]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3jn3f1b8ug-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 21 Sep 2022 05:31:15 +0000 Received: from ala-exchng01.corp.ad.wrs.com (147.11.82.252) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Tue, 20 Sep 2022 22:31:14 -0700 Received: from pek-lpg-core3.wrs.com (128.224.153.232) by ala-exchng01.corp.ad.wrs.com (147.11.82.252) with Microsoft SMTP Server id 15.1.2242.12 via Frontend Transport; Tue, 20 Sep 2022 22:31:13 -0700 From: To: CC: Subject: [PATCH] mesa: only apply patch to fix ALWAYS_INLINE for native Date: Wed, 21 Sep 2022 13:31:09 +0800 Message-ID: <20220921053109.10792-1-kai.kang@windriver.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: rZy7uuF4Zx3grvYRJUdDqMmDzZUXUU9Z X-Proofpoint-GUID: rZy7uuF4Zx3grvYRJUdDqMmDzZUXUU9Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-21_02,2022-09-20_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 clxscore=1011 priorityscore=1501 adultscore=0 lowpriorityscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2209210035 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 28L5GHJX017170 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 ; Wed, 21 Sep 2022 05:31:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/170930 From: Kai Kang 0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch is not required by target mesa any more. But it still fails to compile mesa-native with DEBUG_BUILD enabled on Ubuntu 18.04 with gcc 7.5.0 without this patch: | ../mesa-22.1.6/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’: | ../mesa-22.1.6/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee | src_is_ssa(nir_src *src, void *state) | ^~~~~~~~~~ So only apply it for mesa-native. Signed-off-by: Kai Kang --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index ea7ed4fd27..c306c6b726 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -22,8 +22,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \ file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \ - file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " +SRC_URI:append:class-native = " file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch" SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a"