Commit bd12267d authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher

drm/amd/amdgpu: add pm lock to debugfs mmio entry

Adds support for PM locks around access to registers that might
have race conditions on PG transistions.
Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e95a14a9
...@@ -2282,22 +2282,26 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, ...@@ -2282,22 +2282,26 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
struct amdgpu_device *adev = f->f_inode->i_private; struct amdgpu_device *adev = f->f_inode->i_private;
ssize_t result = 0; ssize_t result = 0;
int r; int r;
bool use_bank; bool pm_pg_lock, use_bank;
unsigned instance_bank, sh_bank, se_bank; unsigned instance_bank, sh_bank, se_bank;
if (size & 0x3 || *pos & 0x3) if (size & 0x3 || *pos & 0x3)
return -EINVAL; return -EINVAL;
/* are we reading registers for which a PG lock is necessary? */
pm_pg_lock = (*pos >> 23) & 1;
if (*pos & (1ULL << 62)) { if (*pos & (1ULL << 62)) {
se_bank = (*pos >> 24) & 0x3FF; se_bank = (*pos >> 24) & 0x3FF;
sh_bank = (*pos >> 34) & 0x3FF; sh_bank = (*pos >> 34) & 0x3FF;
instance_bank = (*pos >> 44) & 0x3FF; instance_bank = (*pos >> 44) & 0x3FF;
use_bank = 1; use_bank = 1;
*pos &= 0xFFFFFF;
} else { } else {
use_bank = 0; use_bank = 0;
} }
*pos &= 0x3FFFF;
if (use_bank) { if (use_bank) {
if (sh_bank >= adev->gfx.config.max_sh_per_se || if (sh_bank >= adev->gfx.config.max_sh_per_se ||
se_bank >= adev->gfx.config.max_shader_engines) se_bank >= adev->gfx.config.max_shader_engines)
...@@ -2307,6 +2311,9 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, ...@@ -2307,6 +2311,9 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
sh_bank, instance_bank); sh_bank, instance_bank);
} }
if (pm_pg_lock)
mutex_lock(&adev->pm.mutex);
while (size) { while (size) {
uint32_t value; uint32_t value;
...@@ -2332,6 +2339,9 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, ...@@ -2332,6 +2339,9 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf,
mutex_unlock(&adev->grbm_idx_mutex); mutex_unlock(&adev->grbm_idx_mutex);
} }
if (pm_pg_lock)
mutex_unlock(&adev->pm.mutex);
return result; return result;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment