Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gpu-viv: change _QuerySignal return from gctBOOL to gceSTATUS #634

Merged
merged 1 commit into from
Jun 21, 2023

Conversation

quaresmajose
Copy link
Member

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);
|       | ^~~~~~~~~~~~

Tested on imx8ulp-lpddr4-evk machine.

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 <[email protected]>
@otavio
Copy link
Member

otavio commented Jun 21, 2023

Please fix it here as well: https://github.com/Freescale/kernel-module-imx-gpu-viv

@quaresmajose
Copy link
Member Author

Please fix it here as well: https://github.com/Freescale/kernel-module-imx-gpu-viv

Look like this one is already fixed by @kraj Freescale/kernel-module-imx-gpu-viv@43f9d48

@otavio otavio merged commit 3260d1a into Freescale:6.1-1.0.x-imx Jun 21, 2023
@quaresmajose quaresmajose deleted the 6.1-1.0.x-imx branch June 21, 2023 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants