Commit 19d0dfda authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amdgpu: optimize gfx ras features flag clean 



Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ef9bcfde

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

+5 −5
Original line number Diff line number Diff line
@@ -658,10 +658,6 @@ static int __amdgpu_ras_feature_enable(struct amdgpu_device *adev, 
		con->features |= BIT(head->block);

	} else {

		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);

			put_obj(obj);

		}
@@ -770,6 +766,10 @@ int amdgpu_ras_feature_enable_on_boot(struct amdgpu_device *adev, 
				con->features |= BIT(head->block);



			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

		ret = amdgpu_ras_feature_enable(adev, head, enable);