]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/amd/amdgpu: Allow broadcast on debugfs read (v2)
authorTom St Denis <tom.stdenis@amd.com>
Sun, 9 Oct 2016 11:41:26 +0000 (07:41 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Oct 2016 18:38:47 +0000 (14:38 -0400)
Allow any of the se/sh/instance fields to be
specified as a broadcast by submitting 0x3FF.

(v2) Fix broadcast range checking

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 188b8e0d7bca13e2c46b11988e1651610d784112..822dfc205a2a0e90c2a582cd163db183aeb2949c 100644 (file)
@@ -2576,6 +2576,13 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
                se_bank = (*pos >> 24) & 0x3FF;
                sh_bank = (*pos >> 34) & 0x3FF;
                instance_bank = (*pos >> 44) & 0x3FF;
+
+               if (se_bank == 0x3FF)
+                       se_bank = 0xFFFFFFFF;
+               if (sh_bank == 0x3FF)
+                       sh_bank = 0xFFFFFFFF;
+               if (instance_bank == 0x3FF)
+                       instance_bank = 0xFFFFFFFF;
                use_bank = 1;
        } else {
                use_bank = 0;
@@ -2584,8 +2591,8 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
        *pos &= 0x3FFFF;
 
        if (use_bank) {
-               if (sh_bank >= adev->gfx.config.max_sh_per_se ||
-                   se_bank >= adev->gfx.config.max_shader_engines)
+               if ((sh_bank != 0xFFFFFFFF && sh_bank >= adev->gfx.config.max_sh_per_se) ||
+                   (se_bank != 0xFFFFFFFF && se_bank >= adev->gfx.config.max_shader_engines))
                        return -EINVAL;
                mutex_lock(&adev->grbm_idx_mutex);
                amdgpu_gfx_select_se_sh(adev, se_bank,