Skip to contentSkip to conversation

drm/amd/amdgpu: Add write() method to VRAM debugfs entry

PATCH In review Tom St Denis 2 participants 3 messages Aug 29, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/amdgpu: Add write() method to VRAM debugfs entry

Allows writing data to vram via debugfs.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 41 ++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +40 -1
index c97a99427eea..cdc96d027707 100644
@@ -1671,10 +1671,49 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf,
 	return result;
 }
 
+static ssize_t amdgpu_ttm_vram_write(struct file *f, const char __user *buf,
+				    size_t size, loff_t *pos)
+{
+	struct amdgpu_device *adev = file_inode(f)->i_private;
+	ssize_t result = 0;
+	int r;
+
+	if (size & 0x3 || *pos & 0x3)
+		return -EINVAL;
+
+	if (*pos >= adev->mc.mc_vram_size)
+		return -ENXIO;
+
+	while (size) {
+		unsigned long flags;
+		uint32_t value;
+
+		if (*pos >= adev->mc.mc_vram_size)
+			return result;
+
+		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
+		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
+		WREG32(mmMM_INDEX_HI, *pos >> 31);
+		r = get_user(value, (uint32_t *)buf);
+		if (r)
+			return r;
+		WREG32(mmMM_DATA, value);
+		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
+
+		result += 4;
+		buf += 4;
+		*pos += 4;
+		size -= 4;
+	}
+
+	return result;
+}
+
 static const struct file_operations amdgpu_ttm_vram_fops = {
 	.owner = THIS_MODULE,
 	.read = amdgpu_ttm_vram_read,
-	.llseek = default_llseek
+	.write = amdgpu_ttm_vram_write,
+	.llseek = default_llseek,
 };
 
 #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Am 29.08.2017 um 14:43 schrieb Tom St Denis:

Quoted 29 lines

Allows writing data to vram via debugfs.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 41 ++++++++++++++++++++++++++++++++-
  1 file changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +14 -0
index c97a99427eea..cdc96d027707 100644
@@ -1671,10 +1671,49 @@ static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf,
  	return result;
  }
 
+static ssize_t amdgpu_ttm_vram_write(struct file *f, const char __user *buf,
+				    size_t size, loff_t *pos)
+{
+	struct amdgpu_device *adev = file_inode(f)->i_private;
+	ssize_t result = 0;
+	int r;
+
+	if (size & 0x3 || *pos & 0x3)
+		return -EINVAL;
+
+	if (*pos >= adev->mc.mc_vram_size)
+		return -ENXIO;
+
+	while (size) {

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, · line 1697

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +10 -0
+		unsigned long flags;
+		uint32_t value;
+
+		if (*pos >= adev->mc.mc_vram_size)
+			return result;
+
+		spin_lock_irqsave(&adev->mmio_idx_lock, flags);
+		WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
+		WREG32(mmMM_INDEX_HI, *pos >> 31);
+		r = get_user(value, (uint32_t *)buf);

Don't call get_user() while holding a spin.

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, · line 1699

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
+		if (r)
+			return r;

You forget to unlock the spin.

Regards,
Christian.

Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +11 -0
+		WREG32(mmMM_DATA, value);
+		spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
+
+		result += 4;
+		buf += 4;
+		*pos += 4;
+		size -= 4;
+	}
+
+	return result;
+}

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, · line 1719

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -1
+
  static const struct file_operations amdgpu_ttm_vram_fops = {
  	.owner = THIS_MODULE,
  	.read = amdgpu_ttm_vram_read,
-	.llseek = default_llseek
+	.write = amdgpu_ttm_vram_write,
+	.llseek = default_llseek,
  };
 
  #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): d5d44c0b-c4be-ab78-49cf-4af048a9b4a3-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org

#4 lore raw
Quoted 45 lines · Christian König

Am 29.08.2017 um 14:43 schrieb Tom St Denis:

Quoted 31 lines

Allows writing data to vram via debugfs.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 41 
++++++++++++++++++++++++++++++++-
  1 file changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +14 -0
index c97a99427eea..cdc96d027707 100644
@@ -1671,10 +1671,49 @@ static ssize_t amdgpu_ttm_vram_read(struct 
 file *f, char __user *buf,
      return result;
  }
+static ssize_t amdgpu_ttm_vram_write(struct file *f, const char 
 __user *buf,
+                    size_t size, loff_t *pos)
+{
+    struct amdgpu_device *adev = file_inode(f)->i_private;
+    ssize_t result = 0;
+    int r;
+
+    if (size & 0x3 || *pos & 0x3)
+        return -EINVAL;
+
+    if (*pos >= adev->mc.mc_vram_size)
+        return -ENXIO;
+
+    while (size) {

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static ssize_t amdgpu_ttm_vram_read(struct · line 1698

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +10 -0
+        unsigned long flags;
+        uint32_t value;
+
+        if (*pos >= adev->mc.mc_vram_size)
+            return result;
+
+        spin_lock_irqsave(&adev->mmio_idx_lock, flags);
+        WREG32(mmMM_INDEX, ((uint32_t)*pos) | 0x80000000);
+        WREG32(mmMM_INDEX_HI, *pos >> 31);
+        r = get_user(value, (uint32_t *)buf);

Don't call get_user() while holding a spin.

Quoted 4 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf, · line 1699

Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -0
+        if (r)
+            return r;

You forget to unlock the spin.

Yup, my bad. I'll fix that up.

Tom
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx