Merge tag 'amd-drm-next-6.5-2023-06-09' of https://gitlab.freedesktop.org/agd5f/linux...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index eaf0f82757ef10adb40c5914ddf82a61e79ca23d..da26c555af24b781339593dd19ea07ca9156f6fd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -78,7 +78,7 @@ unsigned int amdgpu_ring_max_ibs(enum amdgpu_ring_type type)
  * Allocate @ndw dwords in the ring buffer (all asics).
  * Returns 0 on success, error on failure.
  */
-int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned ndw)
+int amdgpu_ring_alloc(struct amdgpu_ring *ring, unsigned int ndw)
 {
        /* Align requested size with padding so unlock_commit can
         * pad safely */
@@ -315,9 +315,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
                     amdgpu_ring_max_ibs(ring->funcs->type) * ring->funcs->emit_ib_size;
        max_ibs_dw = (max_ibs_dw + ring->funcs->align_mask) & ~ring->funcs->align_mask;
 
-       if (WARN_ON(max_ibs_dw > max_dw)) {
+       if (WARN_ON(max_ibs_dw > max_dw))
                max_dw = max_ibs_dw;
-       }
 
        ring->ring_size = roundup_pow_of_two(max_dw * 4 * sched_hw_submission);
 
@@ -509,6 +508,59 @@ static const struct file_operations amdgpu_debugfs_ring_fops = {
        .llseek = default_llseek
 };
 
+static ssize_t amdgpu_debugfs_mqd_read(struct file *f, char __user *buf,
+                                      size_t size, loff_t *pos)
+{
+       struct amdgpu_ring *ring = file_inode(f)->i_private;
+       volatile u32 *mqd;
+       int r;
+       uint32_t value, result;
+
+       if (*pos & 3 || size & 3)
+               return -EINVAL;
+
+       result = 0;
+
+       r = amdgpu_bo_reserve(ring->mqd_obj, false);
+       if (unlikely(r != 0))
+               return r;
+
+       r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&mqd);
+       if (r) {
+               amdgpu_bo_unreserve(ring->mqd_obj);
+               return r;
+       }
+
+       while (size) {
+               if (*pos >= ring->mqd_size)
+                       goto done;
+
+               value = mqd[*pos/4];
+               r = put_user(value, (uint32_t *)buf);
+               if (r)
+                       goto done;
+               buf += 4;
+               result += 4;
+               size -= 4;
+               *pos += 4;
+       }
+
+done:
+       amdgpu_bo_kunmap(ring->mqd_obj);
+       mqd = NULL;
+       amdgpu_bo_unreserve(ring->mqd_obj);
+       if (r)
+               return r;
+
+       return result;
+}
+
+static const struct file_operations amdgpu_debugfs_mqd_fops = {
+       .owner = THIS_MODULE,
+       .read = amdgpu_debugfs_mqd_read,
+       .llseek = default_llseek
+};
+
 #endif
 
 void amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
@@ -520,10 +572,16 @@ void amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
        char name[32];
 
        sprintf(name, "amdgpu_ring_%s", ring->name);
-       debugfs_create_file_size(name, S_IFREG | S_IRUGO, root, ring,
+       debugfs_create_file_size(name, S_IFREG | 0444, root, ring,
                                 &amdgpu_debugfs_ring_fops,
                                 ring->ring_size + 12);
 
+       if (ring->mqd_obj) {
+               sprintf(name, "amdgpu_mqd_%s", ring->name);
+               debugfs_create_file_size(name, S_IFREG | 0444, root, ring,
+                                        &amdgpu_debugfs_mqd_fops,
+                                        ring->mqd_size);
+       }
 #endif
 }
 
@@ -612,3 +670,21 @@ void amdgpu_ring_ib_end(struct amdgpu_ring *ring)
        if (ring->is_sw_ring)
                amdgpu_sw_ring_ib_end(ring);
 }
+
+void amdgpu_ring_ib_on_emit_cntl(struct amdgpu_ring *ring)
+{
+       if (ring->is_sw_ring)
+               amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CONTROL);
+}
+
+void amdgpu_ring_ib_on_emit_ce(struct amdgpu_ring *ring)
+{
+       if (ring->is_sw_ring)
+               amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CE);
+}
+
+void amdgpu_ring_ib_on_emit_de(struct amdgpu_ring *ring)
+{
+       if (ring->is_sw_ring)
+               amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_DE);
+}