Skip to content

Commit

Permalink
Merge pull request #1621 from angolini/fix-enum-int
Browse files Browse the repository at this point in the history
linux-imx: Add patch to fix build issue
  • Loading branch information
otavio authored Jul 25, 2023
2 parents 4b8c461 + 28d8800 commit c64f9ac
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 168e36d8879e3f5c4cf57ed74c10f6c134e45638 Mon Sep 17 00:00:00 2001
From: Daiane Angolini <[email protected]>
Date: Tue, 25 Jul 2023 10:54:45 -0300
Subject: [PATCH] drivers:mxc-gpu-viv: Fix enum-int-mismatch warning

Fix the warning (treated as error):

ignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch]
| 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal)
| | ^~~~~~~~~~~~
| In file included from /(...)tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56:
| /(...)/buildw/tmp/work-shared/imx93-11x11-lpddr4x-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:341:1: note: previous declaration of '_QuerySignal' with type 'gctBOOL(struct _gckOS *, void *)' {aka 'int(struct _gckOS *, void *)'}
| 341 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal);
| | ^~~~~~~~~~~~
| cc1: all warnings being treated as errors

Signed-off-by: Daiane Angolini <[email protected]>
---
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
index 61edf03571443..b4c1cbf414846 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h
@@ -337,7 +337,7 @@ _ConvertLogical2Physical(IN gckOS Os,
IN PLINUX_MDL Mdl,
OUT gctPHYS_ADDR_T *Physical);

-gctBOOL
+gceSTATUS
_QuerySignal(IN gckOS Os, IN gctSIGNAL Signal);

static inline gctINT
--
2.34.1

4 changes: 3 additions & 1 deletion recipes-kernel/linux/linux-imx_6.1.bb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU

require recipes-kernel/linux/linux-imx.inc

SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch"
SRC_URI += "file://ARM-imx_v7_defconfig-Remove-KERNEL_LZO-config.patch \
file://drivers-mxc-gpu-viv-Fix-enum-int-mismatch-warning.patch \
"

SRCBRANCH = "lf-6.1.y"
LOCALVERSION = "-6.1.22-2.0.0"
Expand Down

0 comments on commit c64f9ac

Please sign in to comment.