Merge tag 'amd-drm-next-6.8-2024-01-05' of https://gitlab.freedesktop.org/agd5f/linux...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_cs.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index df3ecfa9e13f5d87d3e67397e22d0d339c62a809..6adeddfb3d5643bebe7366094ce8f4ba00dcdfb2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -66,7 +66,7 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p,
 
        amdgpu_sync_create(&p->sync);
        drm_exec_init(&p->exec, DRM_EXEC_INTERRUPTIBLE_WAIT |
-                     DRM_EXEC_IGNORE_DUPLICATES);
+                     DRM_EXEC_IGNORE_DUPLICATES, 0);
        return 0;
 }
 
@@ -207,7 +207,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
        }
 
        for (i = 0; i < p->nchunks; i++) {
-               struct drm_amdgpu_cs_chunk __user **chunk_ptr = NULL;
+               struct drm_amdgpu_cs_chunk __user *chunk_ptr = NULL;
                struct drm_amdgpu_cs_chunk user_chunk;
                uint32_t __user *cdata;
 
@@ -870,9 +870,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                struct amdgpu_bo *bo = e->bo;
                int i;
 
-               e->user_pages = kvmalloc_array(bo->tbo.ttm->num_pages,
-                                       sizeof(struct page *),
-                                       GFP_KERNEL | __GFP_ZERO);
+               e->user_pages = kvcalloc(bo->tbo.ttm->num_pages,
+                                        sizeof(struct page *),
+                                        GFP_KERNEL);
                if (!e->user_pages) {
                        DRM_ERROR("kvmalloc_array failure\n");
                        r = -ENOMEM;