summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandy.hu <andy.hu@starfivetech.com>2024-02-02 14:45:11 +0300
committerandy.hu <andy.hu@starfivetech.com>2024-02-02 14:45:11 +0300
commit726aa953f50ad46ef112c661444fd0feb50d4ad5 (patch)
treeb27faade984a309547ac85d4b9dd1a00814f62dd
parentaadcc16cddfa5e097639ed54aa0573a1d4683c11 (diff)
parent84739e07324494d97af7f4395e770d01ddd81118 (diff)
downloadlinux-726aa953f50ad46ef112c661444fd0feb50d4ad5.tar.xz
Merge branch 'CR_7926_gpu_6.1_sdk_shanlong.li' into 'jh7110-6.1.y-devel'
CR_7926:driver:gpu: memset pagearray before use it by cacheable addr See merge request sdk/linux!1021
-rw-r--r--drivers/gpu/drm/img/img-rogue/services/server/env/linux/physmem_osmem_linux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/physmem_osmem_linux.c b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/physmem_osmem_linux.c
index e6bef8d19c54..320f855cdbdb 100644
--- a/drivers/gpu/drm/img/img-rogue/services/server/env/linux/physmem_osmem_linux.c
+++ b/drivers/gpu/drm/img/img-rogue/services/server/env/linux/physmem_osmem_linux.c
@@ -1958,7 +1958,7 @@ _AllocOSPages_Fast(PMR_OSPAGEARRAY_DATA *psPageArrayData)
{
eError = _MemsetPageArray(uiOSPagesToAlloc - uiDevPagesFromPool,
ppsPageAttributeArray, PAGE_KERNEL,
- PVRSRV_ZERO_VALUE, 0);
+ PVRSRV_ZERO_VALUE, 1);
if (eError != PVRSRV_OK)
{
PVR_DPF((PVR_DBG_ERROR, "Failed to zero pages (fast)"));
@@ -1971,14 +1971,14 @@ _AllocOSPages_Fast(PMR_OSPAGEARRAY_DATA *psPageArrayData)
* can point to different allocations: first for pages obtained from
* the pool and then the remaining pages */
eError = _MemsetPageArray(uiDevPagesFromPool, ppsPageArray, PAGE_KERNEL,
- PVRSRV_POISON_ON_ALLOC_VALUE, 0);
+ PVRSRV_POISON_ON_ALLOC_VALUE, 1);
if (eError != PVRSRV_OK)
{
PVR_DPF((PVR_DBG_ERROR, "Failed to poison pages (fast)"));
}
eError = _MemsetPageArray(uiOSPagesToAlloc - uiDevPagesFromPool,
ppsPageAttributeArray, PAGE_KERNEL,
- PVRSRV_POISON_ON_ALLOC_VALUE, 0);
+ PVRSRV_POISON_ON_ALLOC_VALUE, 1);
if (eError != PVRSRV_OK)
{
PVR_DPF((PVR_DBG_ERROR, "Failed to poison pages (fast)"));