diff options
author | Christian König <christian.koenig@amd.com> | 2022-04-16 15:25:36 +0200 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2023-07-12 14:14:50 +0200 |
commit | ca6c1e210aa7d7629900a62f28b5090724054854 (patch) | |
tree | 9066b68298c3585c5a2e32d3a8122af54ba414e2 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | |
parent | drm/amdgpu: use drm_exec for MES testing (diff) | |
download | linux-ca6c1e210aa7d7629900a62f28b5090724054854.tar.xz linux-ca6c1e210aa7d7629900a62f28b5090724054854.zip |
drm/amdgpu: use the new drm_exec object for CS v3
Use the new component here as well and remove the old handling.
v2: drop dupplicate handling
v3: fix memory leak pointed out by Tatsuyuki
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230711133122.3710-7-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h index fb3e3d56d427..39c33ad100cb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h @@ -24,6 +24,7 @@ #define __AMDGPU_CS_H__ #include <linux/ww_mutex.h> +#include <drm/drm_exec.h> #include "amdgpu_job.h" #include "amdgpu_bo_list.h" @@ -62,11 +63,9 @@ struct amdgpu_cs_parser { struct amdgpu_job *gang_leader; /* buffer objects */ - struct ww_acquire_ctx ticket; + struct drm_exec exec; struct amdgpu_bo_list *bo_list; struct amdgpu_mn *mn; - struct amdgpu_bo_list_entry vm_pd; - struct list_head validated; struct dma_fence *fence; uint64_t bytes_moved_threshold; uint64_t bytes_moved_vis_threshold; @@ -74,7 +73,7 @@ struct amdgpu_cs_parser { uint64_t bytes_moved_vis; /* user fence */ - struct amdgpu_bo_list_entry uf_entry; + struct amdgpu_bo *uf_bo; unsigned num_post_deps; struct amdgpu_cs_post_dep *post_deps; |