summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-12-15 14:41:33 +0100
committerAlex Deucher <alexander.deucher@amd.com>2016-02-10 14:16:46 -0500
commitc3cca41e6249e9775adfc0ad8bc1af6fc434da9f (patch)
tree43f777647214c56987cdcf937325e527e6b62940 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent25cfc3c27e84dc7c83227bae05558b7d35991412 (diff)
downloadlwn-c3cca41e6249e9775adfc0ad8bc1af6fc434da9f.tar.gz
lwn-c3cca41e6249e9775adfc0ad8bc1af6fc434da9f.zip
drm/amdgpu: cleanup amdgpu_cs_parser structure
Remove unused user_ptr field, group fields by usage. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index af2981190ae0..9c1113a96ae0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1247,28 +1247,29 @@ struct amdgpu_cs_chunk {
uint32_t chunk_id;
uint32_t length_dw;
uint32_t *kdata;
- void __user *user_ptr;
};
struct amdgpu_cs_parser {
struct amdgpu_device *adev;
struct drm_file *filp;
struct amdgpu_ctx *ctx;
- struct amdgpu_bo_list *bo_list;
+
/* chunks */
unsigned nchunks;
struct amdgpu_cs_chunk *chunks;
- /* relocations */
- struct amdgpu_bo_list_entry vm_pd;
- struct list_head validated;
- struct fence *fence;
- uint64_t bytes_moved_threshold;
- uint64_t bytes_moved;
- struct amdgpu_ib *ibs;
+ /* indirect buffers */
uint32_t num_ibs;
+ struct amdgpu_ib *ibs;
- struct ww_acquire_ctx ticket;
+ /* buffer objects */
+ struct ww_acquire_ctx ticket;
+ struct amdgpu_bo_list *bo_list;
+ struct amdgpu_bo_list_entry vm_pd;
+ struct list_head validated;
+ struct fence *fence;
+ uint64_t bytes_moved_threshold;
+ uint64_t bytes_moved;
/* user fence */
struct amdgpu_user_fence uf;