diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h index 9ae522baad8e..de972f69d96e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h @@ -268,7 +268,8 @@ struct amdgpu_ring_funcs {  	void (*patch_cntl)(struct amdgpu_ring *ring, unsigned offset);  	void (*patch_ce)(struct amdgpu_ring *ring, unsigned offset);  	void (*patch_de)(struct amdgpu_ring *ring, unsigned offset); -	int (*reset)(struct amdgpu_ring *ring, unsigned int vmid); +	int (*reset)(struct amdgpu_ring *ring, unsigned int vmid, +		     struct amdgpu_fence *timedout_fence);  	void (*emit_cleaner_shader)(struct amdgpu_ring *ring);  	bool (*is_guilty)(struct amdgpu_ring *ring);  }; @@ -425,7 +426,7 @@ struct amdgpu_ring {  #define amdgpu_ring_patch_cntl(r, o) ((r)->funcs->patch_cntl((r), (o)))  #define amdgpu_ring_patch_ce(r, o) ((r)->funcs->patch_ce((r), (o)))  #define amdgpu_ring_patch_de(r, o) ((r)->funcs->patch_de((r), (o))) -#define amdgpu_ring_reset(r, v) (r)->funcs->reset((r), (v)) +#define amdgpu_ring_reset(r, v, f) (r)->funcs->reset((r), (v), (f))  unsigned int amdgpu_ring_max_ibs(enum amdgpu_ring_type type);  int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw); | 
