From patchwork Mon May 2 14:55:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 7502 X-Patchwork-Delegate: reatmon@ti.com 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 7B2F0C433FE for ; Mon, 2 May 2022 14:56:00 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.11625.1651503357201831955 for ; Mon, 02 May 2022 07:55:57 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id A07BA40C2A; Mon, 2 May 2022 14:55:56 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iXOuDpe9Rs3q; Mon, 2 May 2022 14:55:56 +0000 (UTC) Received: from mail.denix.org (pool-100-15-86-127.washdc.fios.verizon.net [100.15.86.127]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 839A040B86; Mon, 2 May 2022 14:55:54 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 47E01174914; Mon, 2 May 2022 10:55:54 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko , Darren Etheridge Subject: [master][PATCH] ti-img-rogue-driver: fix breakage with GCC 11 Date: Mon, 2 May 2022 14:55:53 +0000 Message-Id: <20220502145553.726889-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 ; Mon, 02 May 2022 14:56:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14669 From: Denys Dmytriyenko Explicitly cast the value into correct type to fix this error: | .../services/server/devices/rogue/rgxinit.c:1345:36: error: implicit conversion from 'enum ' to 'IMG_BOOL' {aka 'enum tag_img_bool'} [-Werror=enum-conversion] | 1345 | bEnableAPM = false; | | ^ Cc: Darren Etheridge Signed-off-by: Denys Dmytriyenko --- ...nit.c-cast-boolean-value-to-IMG_BOOL.patch | 34 +++++++++++++++++++ .../ti-img-rogue-driver_1.15.6133109.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch new file mode 100644 index 00000000..8d909279 --- /dev/null +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch @@ -0,0 +1,34 @@ +From cc95fb4b1635bd1018d74b668430cda67731148f Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Sat, 30 Apr 2022 18:37:46 +0000 +Subject: [PATCH] rgxinit.c: cast boolean value to IMG_BOOL + +Fixes this error with GCC 11: + +| .../services/server/devices/rogue/rgxinit.c:1345:36: error: implicit conversion from 'enum ' to 'IMG_BOOL' {aka 'enum tag_img_bool'} [-Werror=enum-conversion] +| 1345 | bEnableAPM = false; +| | ^ + +Upstream-Status: Pending + +Signed-off-by: Denys Dmytriyenko +--- + services/server/devices/rogue/rgxinit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/server/devices/rogue/rgxinit.c b/services/server/devices/rogue/rgxinit.c +index ca7a1b9..fc94b73 100644 +--- a/services/server/devices/rogue/rgxinit.c ++++ b/services/server/devices/rogue/rgxinit.c +@@ -1342,7 +1342,7 @@ PVRSRV_ERROR RGXInitDevPart2(PVRSRV_DEVICE_NODE *psDeviceNode, + if (bEnableAPM && (!PVRSRV_VZ_MODE_IS(NATIVE))) + { + PVR_DPF((PVR_DBG_WARNING, "%s: Active Power Management disabled in virtualization mode", __func__)); +- bEnableAPM = false; ++ bEnableAPM = (IMG_BOOL)false; + } + + #if defined(RGX_NUM_OS_SUPPORTED) && (RGX_NUM_OS_SUPPORTED > 1) && defined(SUPPORT_AUTOVZ) +-- +2.25.1 + diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 94b05436..2f4a7354 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -22,6 +22,7 @@ BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = " \ git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ + file://0001-rgxinit.c-cast-boolean-value-to-IMG_BOOL.patch \ " S = "${WORKDIR}/git"