[PATCH] drm/amdgpu: Quit RAS initialization earlier if RAS is disabled

[Zeng, Oak]

Thank you Hawking for reviewing this. I made a mistake when I pushed this in. I forgot to add " Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>". 

Regards,
Oak 

 

On 2021-05-07, 9:05 AM, "Zhang, Hawking" <Hawking.Zhang at amd.com> wrote:

    [AMD Public Use]

    Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>

    Regards,
    Hawking
    -----Original Message-----
    From: Zeng, Oak <Oak.Zeng at amd.com> 
    Sent: Friday, May 7, 2021 09:15
    To: amd-gfx at lists.freedesktop.org
    Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Lazar, Lijo <Lijo.Lazar at amd.com>; Clements, John <John.Clements at amd.com>; Joshi, Mukul <Mukul.Joshi at amd.com>; Zeng, Oak <Oak.Zeng at amd.com>
    Subject: [PATCH] drm/amdgpu: Quit RAS initialization earlier if RAS is disabled

    If RAS is disabled through amdgpu_ras_enable kernel parameter, we should quit the RAS initialization eariler to avoid initialization of some RAS data structure such as sysfs etc.

    Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>
    ---
     drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
    index ebbe2c5..7e65b35 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
    @@ -2155,7 +2155,7 @@ int amdgpu_ras_init(struct amdgpu_device *adev)

     	amdgpu_ras_check_supported(adev, &con->hw_supported,
     			&con->supported);
    -	if (!con->hw_supported || (adev->asic_type == CHIP_VEGA10)) {
    +	if (!adev->ras_features || (adev->asic_type == CHIP_VEGA10)) {
     		/* set gfx block ras context feature for VEGA20 Gaming
     		 * send ras disable cmd to ras ta during ras late init.
     		 */
    --
    2.7.4