diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 19 | 
1 files changed, 9 insertions, 10 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index e713d31619fe..4d380e79752c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h @@ -36,8 +36,13 @@  #define AMDGPU_MAX_VCE_RINGS		3  #define AMDGPU_MAX_UVD_ENC_RINGS	2 -#define AMDGPU_RING_PRIO_DEFAULT	1 -#define AMDGPU_RING_PRIO_MAX		AMDGPU_GFX_PIPE_PRIO_MAX +enum amdgpu_ring_priority_level { +	AMDGPU_RING_PRIO_0, +	AMDGPU_RING_PRIO_1, +	AMDGPU_RING_PRIO_DEFAULT = 1, +	AMDGPU_RING_PRIO_2, +	AMDGPU_RING_PRIO_MAX +};  /* some special values for the owner field */  #define AMDGPU_FENCE_OWNER_UNDEFINED	((void *)0ul) @@ -248,10 +253,6 @@ struct amdgpu_ring {  	bool			has_compute_vm_bug;  	bool			no_scheduler;  	int			hw_prio; - -#if defined(CONFIG_DEBUG_FS) -	struct dentry *ent; -#endif  };  #define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib))) @@ -351,8 +352,6 @@ static inline void amdgpu_ring_write_multiple(struct amdgpu_ring *ring,  int amdgpu_ring_test_helper(struct amdgpu_ring *ring); -int amdgpu_debugfs_ring_init(struct amdgpu_device *adev, -			     struct amdgpu_ring *ring); -void amdgpu_debugfs_ring_fini(struct amdgpu_ring *ring); - +void amdgpu_debugfs_ring_init(struct amdgpu_device *adev, +			      struct amdgpu_ring *ring);  #endif |