[PATCH Review V2 1/2] drm/amdgpu: Enable aqua vanjaram RAS

[PATCH Review V2 1/2] drm/amdgpu: Enable aqua vanjaram RAS

[Stanley.Yang]

Enable RAS for aqua vanjaram.

Changed from V1:
	Split the change in amdgpu_ras_asic_supported into a
	separated patch.

Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 5371fbd3fe17..8673d9790bb0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2422,6 +2422,7 @@ static bool amdgpu_ras_asic_supported(struct amdgpu_device *adev)
 	if (adev->asic_type == CHIP_IP_DISCOVERY) {
 		switch (adev->ip_versions[MP0_HWIP][0]) {
 		case IP_VERSION(13, 0, 0):
+		case IP_VERSION(13, 0, 6):
 		case IP_VERSION(13, 0, 10):
 			return true;
 		default:
-- 
2.25.1

[PATCH Review V2 2/2] drm/amdgpu: Disable RAS by default on APU flatform

[Stanley.Yang]

Disable RAS feature by default for aqua vanjaram on APU platform.

Changed from V1:
	Splite Disable RAS by default on APU platform into a
	separated patch.

Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 8673d9790bb0..ec5f60b64346 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2517,6 +2517,15 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev)
 		adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__GFX |
 					   1 << AMDGPU_RAS_BLOCK__SDMA |
 					   1 << AMDGPU_RAS_BLOCK__MMHUB);
+
+		if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(13, 0, 6)) {
+			/*
+			 * Disable ras feature for aqua vanjaram
+			 * by default on apu platform.
+			 */
+			if (-1 == amdgpu_ras_enable)
+				amdgpu_ras_enable = 0;
+		}
 	}
 
 	amdgpu_ras_get_quirks(adev);
-- 
2.25.1

Re: [PATCH Review V2 2/2] drm/amdgpu: Disable RAS by default on APU flatform

[Felix Kuehling]

On 2023-07-13 10:50, Stanley.Yang wrote:
> Disable RAS feature by default for aqua vanjaram on APU platform.
>
> Changed from V1:
> 	Splite Disable RAS by default on APU platform into a
> 	separated patch.
>
> Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 +++++++++
>   1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 8673d9790bb0..ec5f60b64346 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -2517,6 +2517,15 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev)
>   		adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__GFX |
>   					   1 << AMDGPU_RAS_BLOCK__SDMA |
>   					   1 << AMDGPU_RAS_BLOCK__MMHUB);
> +
> +		if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(13, 0, 6)) {
> +			/*
> +			 * Disable ras feature for aqua vanjaram
> +			 * by default on apu platform.
> +			 */
> +			if (-1 == amdgpu_ras_enable)
> +				amdgpu_ras_enable = 0;
Changing a global variable here is probably not appropriate. The 
condition above looks like this should affect a device-specific variable 
only.

Regards,
   Felix


> +		}
>   	}
>   
>   	amdgpu_ras_get_quirks(adev);