Skip to content

Commit 9745a32

Browse files
Guchun Chengregkh
authored andcommitted
drm/amdgpu: restore ras flags when user resets eeprom(v2)
[ Upstream commit bf0b91b ] RAS flags needs to be cleaned as well when user requires one clean eeprom. v2: RAS flags shall be restored after eeprom reset succeeds. Signed-off-by: Guchun Chen <guchun.chen@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent f12784e commit 9745a32

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,19 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, const char __user *
367367
static ssize_t amdgpu_ras_debugfs_eeprom_write(struct file *f, const char __user *buf,
368368
size_t size, loff_t *pos)
369369
{
370-
struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private;
370+
struct amdgpu_device *adev =
371+
(struct amdgpu_device *)file_inode(f)->i_private;
371372
int ret;
372373

373-
ret = amdgpu_ras_eeprom_reset_table(&adev->psp.ras.ras->eeprom_control);
374+
ret = amdgpu_ras_eeprom_reset_table(
375+
&(amdgpu_ras_get_context(adev)->eeprom_control));
374376

375-
return ret == 1 ? size : -EIO;
377+
if (ret == 1) {
378+
amdgpu_ras_get_context(adev)->flags = RAS_DEFAULT_FLAGS;
379+
return size;
380+
} else {
381+
return -EIO;
382+
}
376383
}
377384

378385
static const struct file_operations amdgpu_ras_debugfs_ctrl_ops = {

0 commit comments

Comments
 (0)