Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index a4faea4fa0b592aed2a252f5521af514d34104e3..a53f436fa9f1ae7c0129f8e58dd212ad70dfd0aa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -748,6 +748,9 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf,
        ssize_t result = 0;
        int r;
 
+       if (!adev->smc_rreg)
+               return -EPERM;
+
        if (size & 0x3 || *pos & 0x3)
                return -EINVAL;
 
@@ -804,6 +807,9 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *
        ssize_t result = 0;
        int r;
 
+       if (!adev->smc_wreg)
+               return -EPERM;
+
        if (size & 0x3 || *pos & 0x3)
                return -EINVAL;
 
@@ -2016,8 +2022,8 @@ static ssize_t amdgpu_reset_dump_register_list_read(struct file *f,
        if (ret)
                return ret;
 
-       for (i = 0; i < adev->num_regs; i++) {
-               sprintf(reg_offset, "0x%x\n", adev->reset_dump_reg_list[i]);
+       for (i = 0; i < adev->reset_info.num_regs; i++) {
+               sprintf(reg_offset, "0x%x\n", adev->reset_info.reset_dump_reg_list[i]);
                up_read(&adev->reset_domain->sem);
                if (copy_to_user(buf + len, reg_offset, strlen(reg_offset)))
                        return -EFAULT;
@@ -2074,9 +2080,9 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f,
        if (ret)
                goto error_free;
 
-       swap(adev->reset_dump_reg_list, tmp);
-       swap(adev->reset_dump_reg_value, new);
-       adev->num_regs = i;
+       swap(adev->reset_info.reset_dump_reg_list, tmp);
+       swap(adev->reset_info.reset_dump_reg_value, new);
+       adev->reset_info.num_regs = i;
        up_write(&adev->reset_domain->sem);
        ret = size;