leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: optimize gfx ras features flag clean

Browse Source 
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Stanley.Yang
2021-04-19 11:33:10 +08:00
committed by Alex Deucher
parent ef9bcfde9e
commit 19d0dfda4c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
View File

@@ -658,10 +658,6 @@ static int __amdgpu_ras_feature_enable(struct amdgpu_device *adev,
con->features |= BIT(head->block); con->features |= BIT(head->block);
} else { } else {
if (obj && amdgpu_ras_is_feature_enabled(adev, head)) { if (obj && amdgpu_ras_is_feature_enabled(adev, head)) {
/* skip clean gfx ras context feature for VEGA20 Gaming.
* will clean later
*/
if (!(!adev->ras_features && con->features & BIT(AMDGPU_RAS_BLOCK__GFX)))
con->features &= ~BIT(head->block); con->features &= ~BIT(head->block);
put_obj(obj); put_obj(obj);
} }
@@ -770,6 +766,10 @@ int amdgpu_ras_feature_enable_on_boot(struct amdgpu_device *adev,
con->features |= BIT(head->block); con->features |= BIT(head->block);
ret = amdgpu_ras_feature_enable(adev, head, 0); ret = amdgpu_ras_feature_enable(adev, head, 0);
/* clean gfx block ras features flag */
if (adev->ras_features && head->block == AMDGPU_RAS_BLOCK__GFX)
con->features &= ~BIT(head->block);
} }
} else } else
ret = amdgpu_ras_feature_enable(adev, head, enable); ret = amdgpu_ras_feature_enable(adev, head, enable);