drm/amdgpu: sysfs node disable query error count during gpu reset

Sysfs node disable query error count during gpu reset.

Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: Stanley.Yang <Stanley.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
index d0a8da67dc2a1176a48711ccad73681f73976876..b0f95a7649bfed0dcd8e42266d9e6fcaea7da320 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
+++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
@@ -316,8 +316,6 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)
                adev->ip_blocks[i].status.late_initialized = true;
        }
 
-       amdgpu_ras_set_error_query_ready(adev, true);
-
        amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);
        amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b27336a05aaee6eee347225c3c8db09e47a639c6..bcacf2e35eba08e8829b2c7ceaf0bef39c6d06a8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3142,7 +3142,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev)
                return r;
        }
 
-       amdgpu_ras_set_error_query_ready(adev, true);
+       if (!amdgpu_in_reset(adev))
+               amdgpu_ras_set_error_query_ready(adev, true);
 
        amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);
        amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 6d1f974e2987a1494d8313d65e09ce0b23475c0b..53b5ac2d7bed207c76a2e78021df63214df838a1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1295,6 +1295,9 @@ ssize_t amdgpu_ras_aca_sysfs_read(struct device *dev, struct device_attribute *a
                .head = obj->head,
        };
 
+       if (!amdgpu_ras_get_error_query_ready(obj->adev))
+               return sysfs_emit(buf, "Query currently inaccessible\n");
+
        if (amdgpu_ras_query_error_status(obj->adev, &info))
                return -EINVAL;