Merge tag 'rpmsg-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_fence.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index fe2d495d08ab01d17bdb2503a2ab011d1818dfed..d56f4023ebb3142c256def1da84c75b1d0054cde 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -130,6 +130,7 @@ static u32 amdgpu_fence_read(struct amdgpu_ring *ring)
  *
  * @ring: ring the fence is associated with
  * @f: resulting fence object
  *
  * @ring: ring the fence is associated with
  * @f: resulting fence object

+ * @flags: flags to pass into the subordinate .emit_fence() call

  *
  * Emits a fence command on the requested ring (all asics).
  * Returns 0 on success, -ENOMEM on failure.
  *
  * Emits a fence command on the requested ring (all asics).
  * Returns 0 on success, -ENOMEM on failure.


@@ -187,6 +188,7 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f,
  *
  * @ring: ring the fence is associated with
  * @s: resulting sequence number
  *
  * @ring: ring the fence is associated with
  * @s: resulting sequence number

+ * @timeout: the timeout for waiting in usecs

  *
  * Emits a fence command on the requested ring (all asics).
  * Used For polling fence.
  *
  * Emits a fence command on the requested ring (all asics).
  * Used For polling fence.


@@ -294,7 +296,7 @@ bool amdgpu_fence_process(struct amdgpu_ring *ring)
 /**
  * amdgpu_fence_fallback - fallback for hardware interrupts
  *
 /**
  * amdgpu_fence_fallback - fallback for hardware interrupts
  *

- * @work: delayed work item
+ * @t: timer context used to obtain the pointer to ring structure

  *
  * Checks for fence activity.
  */
  *
  * Checks for fence activity.
  */


@@ -310,7 +312,6 @@ static void amdgpu_fence_fallback(struct timer_list *t)
 /**
  * amdgpu_fence_wait_empty - wait for all fences to signal
  *
 /**
  * amdgpu_fence_wait_empty - wait for all fences to signal
  *

- * @adev: amdgpu device pointer

  * @ring: ring index the fence is associated with
  *
  * Wait for all fences on the requested ring to signal (all asics).
  * @ring: ring index the fence is associated with
  *
  * Wait for all fences on the requested ring to signal (all asics).


@@ -639,7 +640,7 @@ static const char *amdgpu_fence_get_timeline_name(struct dma_fence *f)
 
 /**
  * amdgpu_fence_enable_signaling - enable signalling on fence
 
 /**
  * amdgpu_fence_enable_signaling - enable signalling on fence

- * @fence: fence
+ * @f: fence

  *
  * This function is called with fence_queue lock held, and adds a callback
  * to fence_queue that checks if this fence is signaled, and if so it
  *
  * This function is called with fence_queue lock held, and adds a callback
  * to fence_queue that checks if this fence is signaled, and if so it


@@ -675,7 +676,7 @@ static void amdgpu_fence_free(struct rcu_head *rcu)
 /**
  * amdgpu_fence_release - callback that fence can be freed
  *
 /**
  * amdgpu_fence_release - callback that fence can be freed
  *

- * @fence: fence
+ * @f: fence

  *
  * This function is called when the reference count becomes zero.
  * It just RCU schedules freeing up the fence.
  *
  * This function is called when the reference count becomes zero.
  * It just RCU schedules freeing up the fence.


@@ -740,7 +741,7 @@ static int amdgpu_debugfs_fence_info(struct seq_file *m, void *data)
        return 0;
 }
 
        return 0;
 }
 

-/**
+/*

  * amdgpu_debugfs_gpu_recover - manually trigger a gpu reset & recover
  *
  * Manually trigger a gpu reset at the next fence wait.
  * amdgpu_debugfs_gpu_recover - manually trigger a gpu reset & recover
  *
  * Manually trigger a gpu reset at the next fence wait.