From 386bab91e0ee054cb0fd7007a05f8ea3ed8c2c7d Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Wed, 21 Jun 2023 17:16:05 +0000 Subject: [PATCH] gpu-viv: change _QuerySignal return from gctBOOL to gceSTATUS Fixes gcc 13 build error: | /srv/oe/build/tmp-lmp/work-shared/imx8ulp-lpddr4-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5675:1: error: conflicting types for '_QuerySignal' 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 /srv/oe/build/tmp-lmp/work-shared/imx8ulp-lpddr4-evk/kernel-source/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56: | /srv/oe/build/tmp-lmp/work-shared/imx8ulp-lpddr4-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); | | ^~~~~~~~~~~~ Signed-off-by: Jose Quaresma --- 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 61edf03571443e..b4c1cbf4148469 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