Eric Lee / smarc-fsl-linux-kernel

22 Dec, 2020

1 commit

c51aa2337 MGS-6128 gpu-viv: sync 20201218 patch release ... Browse Code »

include more bug-fixings for vulkan and opencl3.0

Signed-off-by: Xianzhong

Xianzhong
2020-12-22 15:19:24 +0800

14 Dec, 2020

39 commits

574754505 MGS-6108-3 [#imx-2416] fix gcdENABLE_VG logic issue ... Browse Code »

enable asynchronous unlock even if define gcdENABLE_VG

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:32 +0800
5506f3ce8 MGS-6108-2 [#imx-2416] fix vg kernel panic for command unlock ... Browse Code »

vg kernel does not suppport asynchronous event, uses sync unlock

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:32 +0800
7d996d3b2 MGS-6108 [#imx-2416] fix GPU exception to access the freed MMU page ... Browse Code »

GPU hardware access cannot be guaranteed to complete after unlock memory,
Need perform asynchronous unlock to avoid GPU access the freed MMU page.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:31 +0800
25ae1c57c MGS-6060 gpu-viv: sync 20201116 patch release ... Browse Code »

include critical bug-fixings for 6.4.3.p1 driver

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:31 +0800
a74107af0 MGS-6058 [#imx-2391] fix vivante drm build break for L5.10 ... Browse Code »

fix drm header and function related changes for new kernel

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:31 +0800
3834f4bdb MGS-4929 [#imx-2382] enable vivante drm for linux build ... Browse Code »

weston-simple-dmabuf-egl has failure without drm render node,
need enable vivante drm to fix dmabuf failure issue.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:30 +0800
71f650445 LF-2473 [#ccc] Coverity Issue:10281263 ... Browse Code »

checked return value

Date:30th Oct,2020
Signed-off-by Ya Zhou

ya.zhou@nxp.com
2020-12-14 11:32:30 +0800
a37c367bd LF-2492 [#ccc] check sscanf return value ... Browse Code »

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:30 +0800
e9c8a4c32 LF-2480 [#ccc] rm DEBUG print as it print below like external mem ... Browse Code »

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:30 +0800
13e1f24ea LF-2478 [#ccc] fix the dereferencing null pointer ... Browse Code »

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:29 +0800
cd6eca7c9 LF-2457 [#ccc] fix the Dereferencing null pointer ... Browse Code »

this also fix LF-2472
Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:29 +0800
0fff37ae4 LF-2461 [#ccc] use inline to fix multi-defination ... Browse Code »

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:29 +0800
4b0d13cd0 LF-2466 [#ccc] fix the dereference issue ... Browse Code »

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:29 +0800
bfe7fc03f LF-2473 [#ccc] Coverity Issue:10281263 ... Browse Code »

checked return value

Date:30th Oct,2020
Signed-off-by Ya Zhou

ya.zhou@nxp.com
2020-12-14 11:32:28 +0800
3b02401d8 MGS-6026-2 sync gpu database with formal 6.4.3.p1 ... Browse Code »

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:28 +0800
4cff02fe7 MGS-5990-4 [#ccc] fix the uninitialized variable ... Browse Code »

shall use the Bytes variable instead of heapBytes,
also fix bankSize assignment from heapBytes.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:28 +0800
3912bfd33 MGS-5990-3 [#ccc] refine gpu memory bank configuration ... Browse Code »

default set two banks for large and small memory in 16:1,
there is no function impact for specified bank size.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:27 +0800
dff513bf1 LF-2118-2 [#ccc] fixed Coverity Issue:6124050 ... Browse Code »

[Solution] add Node null check
[Problem]CID 6124050 (#8 of 8): Dereference after null check (FORWARD_NULL)
14. var_deref_op: Dereferencing null pointer Node

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:27 +0800
d63b4ff6c LF-2118 [#ccc] fixed Coverity Issue:6124050 ... Browse Code »

[Solution]add U prefix to declare it is uint32_t type
[Problem]CID 6124050 (#8 of 8): Dereference after null check (FORWARD_NULL)
14. var_deref_op: Dereferencing null pointer Node

Signed-off-by: Jiyu Yang

Jiyu Yang
2020-12-14 11:32:27 +0800
fafda1a5d MGS-6026 mxc/gpu-viv: integrate 6.4.3.p1 kernel ... Browse Code »

add new feature for openvx 1.3 and vulkan 1.2.1,
include more bug-fixing for new kernel version.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:26 +0800
ac506d9c2 LF-2495 [#imx-2359] fix the unchecked return value ... Browse Code »

add register access check for gckHARDWARE_SetClock
fix below coverity issues:
11056121
11056122
11056123

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:26 +0800
54dfa775f MGS-6015 [#imx-2345] fix 6qp vg stuck in suspend/resume ... Browse Code »

gckOS_WaitSignal return timeout error in _CommandStall,
the problem is caused by memremap with MEMREMAP_WT.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:26 +0800
3af6fa472 LF-2351 mxc: gpu-viv: upgrade 6.4.3.p0 version ... Browse Code »

support new feature list for Vivante GPU
- OpenGL ES 3.2.6.1
- Vulkan 1.1.6.3/1.2.1.0
- OpenVX 1.2 NN extension

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:26 +0800
861a9fdaf LF-1762-8 mxc: gpu: replace '---help---' in Kconfig files with 'help' ... Browse Code »

Update Kconfig to cope with upstream change
commit 84af7a6194e4 ("checkpatch: kconfig: prefer 'help' over
'---help---'").

Signed-off-by: Dong Aisheng

Dong Aisheng
2020-12-14 11:32:25 +0800
865c3f95d gpu-viv: rename mmap_sem to mmap_lock ... Browse Code »

Update gpu-viv driver to comply with upstream API change:
da1c55f1b272 ("mmap locking API: rename mmap_sem to mmap_lock")

Signed-off-by: Li Yang

Li Yang
2020-12-14 11:32:25 +0800
605e937bf LF-1162-24 gpu: drm: gpu-viv: update the using of pud_offset ... Browse Code »

pud_offset() changed since:
5d4d4a4a2866 ("arm/arm64: add support for folded p4d page tables")

CC drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_user_memory.o
In file included from ../arch/arm64/include/asm/thread_info.h:17,
from ../include/linux/thread_info.h:38,
from ../arch/arm64/include/asm/preempt.h:5,
from ../include/linux/preempt.h:78,
from ../include/linux/spinlock.h:51,
from ../include/linux/seqlock.h:36,
from ../include/linux/time.h:6,
from ../arch/arm64/include/asm/stat.h:12,
from ../include/linux/stat.h:6,
from ../include/linux/module.h:13,
from ../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:61,
from ../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56:
../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c: In function ‘_QueryProcessPageTable’:
../include/linux/compiler.h:284:2: error: incompatible type for argument 1 of ‘p4d_page_paddr’
284 | ({ \
| ~^~~~~~~~~~~
| |
| pgd_t {aka struct }
285 | union { typeof(x) __val; char __c[1]; } __u; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
286 | if (check) \
| ~~~~~~~~~~~~~~~~~~
287 | __read_once_size(&(x), __u.__c, sizeof(x)); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
288 | else \
| ~~~~~~~~~~~~~
289 | __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
290 | smp_read_barrier_depends(); /* Enforce dependency ordering from x */ \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
291 | __u.__val; \
| ~~~~~~~~~~~~~~~~~~
292 | })
| ~~
../arch/arm64/include/asm/memory.h:270:45: note: in definition of macro ‘__phys_to_virt’
270 | #define __phys_to_virt(x) ((unsigned long)((x) - physvirt_offset))
| ^
../arch/arm64/include/asm/pgtable.h:634:42: note: in expansion of macro ‘__va’
634 | #define pud_offset(dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))
| ^~~~
../include/linux/compiler.h:293:22: note: in expansion of macro ‘__READ_ONCE’
293 | #define READ_ONCE(x) __READ_ONCE(x, 1)
| ^~~~~~~~~~~
../arch/arm64/include/asm/pgtable.h:633:52: note: in expansion of macro ‘READ_ONCE’
633 | #define pud_offset_phys(dir, addr) (p4d_page_paddr(READ_ONCE(*(dir))) + pud_index(addr) * sizeof(pud_t))
| ^~~~~~~~~
../arch/arm64/include/asm/pgtable.h:634:47: note: in expansion of macro ‘pud_offset_phys’
634 | #define pud_offset(dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))
| ^~~~~~~~~~~~~~~
../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:434:15: note: in expansion of macro ‘pud_offset’
434 | pud = pud_offset(pgd, logical);

Signed-off-by: Dong Aisheng

Dong Aisheng
2020-12-14 11:32:24 +0800
e2535407f MGS-5653 [#imx-2041] modify clock prepare/unprepare along with power on/off ... Browse Code »

put clk_prepare and clk_prepare into set_power function

Signed-off-by: minjie.zhuang@nxp.com

Minjie Zhuang
2020-12-14 11:32:24 +0800
34e4c7ccc MGS-5551 [#imx-1868] Update GPU database ... Browse Code »

Update GPU database. And fix VSI profiler GPU hang issue, also update power management
register for VIP.

Signed-off-by: Ella Feng

Ella Feng
2020-12-14 11:32:23 +0800
3e1b996c0 MGS-5616-2 [#ccc] Remove dma-buf map/unmap hooks for 5.5 kernel ... Browse Code »

Make this change only for 5.5 kernel

Revert "mxc: gpu-viv: Remove dma-buf map/unmap hooks"
This reverts commit 5c6c9d8bed6d0e6adc57de9f422fd19bf8a569cd.

Date: 21 Apr, 2020
Signed-off-by: Ella Feng

Ella Feng
2020-12-14 11:32:20 +0800
342be2051 MGS-5616-1 [#ccc] Update some Linux APIs for 5.5 kernel ... Browse Code »

Replace ioremap_nocache() with ioremap, and use updated timespec struct instead of 32bit one.

Date: 21 Apr, 2020
Signed-off-by: Ella Feng

Ella Feng
2020-12-14 11:32:19 +0800
74703b8fc MGS-5612 [#IMX-2018] fix weston build error ... Browse Code »

fix weston build error such as:

/opt/fsl-imx-internal-xwayland/5.4-zeus/sysroots/aarch64-poky-linux/usr/include/HAL/shared/gc_hal_types_shared.h:17:10:
fatal error: gc_hal_version.h: No such file or directory
17 | #include "gc_hal_version.h"
| ^~~~~~~~~~~~~~~~~~
compilation terminated.

Signed-off-by: Minjie Zhuang
Signed-off-by: Yong Gan

Minjie Zhuang
2020-12-14 11:32:19 +0800
10ac03241 MGS-5607 [#imx-1868] integrate vsi patch base on 6.4.0.p2 from 20200320 to 20200408 ... Browse Code »

integrate vsi patch base on 6.4.0.p2 from 20200320 to 20200408

Signed-off-by: Minjie Zhuang

Minjie Zhuang
2020-12-14 11:32:18 +0800
a8165fe5d MGS-5581 [#imx-1868] integrate vsi patch base on 6.4.0.p2 from 20200306 to 20200320 ... Browse Code »

integrate vsi patch base on 6.4.0.p2 from 20200306 to 20200320

Signed-off-by: Minjie Zhuang

Minjie Zhuang
2020-12-14 11:32:17 +0800
761da88f6 LF-1162-24 gpu: drm: gpu-viv: update the using of pud_offset ... Browse Code »

pud_offset() changed since:
5d4d4a4a2866 ("arm/arm64: add support for folded p4d page tables")

CC drivers/mxc/gpu-viv/hal/os/linux/kernel/allocator/default/gc_hal_kernel_allocator_user_memory.o
In file included from ../arch/arm64/include/asm/thread_info.h:17,
from ../include/linux/thread_info.h:38,
from ../arch/arm64/include/asm/preempt.h:5,
from ../include/linux/preempt.h:78,
from ../include/linux/spinlock.h:51,
from ../include/linux/seqlock.h:36,
from ../include/linux/time.h:6,
from ../arch/arm64/include/asm/stat.h:12,
from ../include/linux/stat.h:6,
from ../include/linux/module.h:13,
from ../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_linux.h:61,
from ../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:56:
../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c: In function ‘_QueryProcessPageTable’:
../include/linux/compiler.h:284:2: error: incompatible type for argument 1 of ‘p4d_page_paddr’
284 | ({ \
| ~^~~~~~~~~~~
| |
| pgd_t {aka struct }
285 | union { typeof(x) __val; char __c[1]; } __u; \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
286 | if (check) \
| ~~~~~~~~~~~~~~~~~~
287 | __read_once_size(&(x), __u.__c, sizeof(x)); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
288 | else \
| ~~~~~~~~~~~~~
289 | __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
290 | smp_read_barrier_depends(); /* Enforce dependency ordering from x */ \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
291 | __u.__val; \
| ~~~~~~~~~~~~~~~~~~
292 | })
| ~~
../arch/arm64/include/asm/memory.h:270:45: note: in definition of macro ‘__phys_to_virt’
270 | #define __phys_to_virt(x) ((unsigned long)((x) - physvirt_offset))
| ^
../arch/arm64/include/asm/pgtable.h:634:42: note: in expansion of macro ‘__va’
634 | #define pud_offset(dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))
| ^~~~
../include/linux/compiler.h:293:22: note: in expansion of macro ‘__READ_ONCE’
293 | #define READ_ONCE(x) __READ_ONCE(x, 1)
| ^~~~~~~~~~~
../arch/arm64/include/asm/pgtable.h:633:52: note: in expansion of macro ‘READ_ONCE’
633 | #define pud_offset_phys(dir, addr) (p4d_page_paddr(READ_ONCE(*(dir))) + pud_index(addr) * sizeof(pud_t))
| ^~~~~~~~~
../arch/arm64/include/asm/pgtable.h:634:47: note: in expansion of macro ‘pud_offset_phys’
634 | #define pud_offset(dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))
| ^~~~~~~~~~~~~~~
../drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:434:15: note: in expansion of macro ‘pud_offset’
434 | pud = pud_offset(pgd, logical);

Signed-off-by: Dong Aisheng

Dong Aisheng
2020-12-14 11:32:15 +0800
a0304e01a MGS-5554 [#imx-1868] update gc_feature_database.h and gc_hal_enum.h file ... Browse Code »

update gc_feature_database.h file for patch_base_on_6.4.0.p2_from_20200227_20200306
update gc_hal_enum.h for fixing R/B swap issue with 2D HWC composition on m865

Signed-off-by: Minjie Zhuang

Minjie Zhuang
2020-12-14 11:32:15 +0800
e4502f843 MGS-5536-1 [#imx-1962] add memory-region property support ... Browse Code »

support memory-region for gpu reserved memory from DTS,
keep contiguous_mem compatibility if no memory-region.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:13 +0800
e871fc751 MGS-5490 [#imx-1868] 0009-CL 247796 -Add-cores-in-order-3D-VIP-cores-2D-core-VG- ... Browse Code »

CL247796 Add cores in order, 3D/VIP cores, 2D core, VG
core.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:13 +0800
72dd4700b MA-16364 [#imx-1927] Set 4GB address limit flag on 8mm/8mn as 8mq ... Browse Code »

Need set 4GB address limit flag on 8mm/8mn as 8mq,
because these platform GPU can't handle physical
address large than 4GB due to hardware system
integration limitation.

Signed-off-by: Richard Liu

Richard Liu
2020-12-14 11:32:12 +0800
077baf86b MGS-5497-2 [#ccc] fix 6QP 2D MMU exception issue ... Browse Code »

CONFIG_ZONE_DMA32 is not enabled in ARM32 build,
need set contiguous flag for CMA_LIMIT request.

Signed-off-by: Xianzhong

Xianzhong
2020-12-14 11:32:12 +0800