Merge tag 'core-rcu-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ras.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index 762f5e46c007cf184ee39cae3cfa4fa114798942..60df268a0c66d25f4e6a159e5186d0e639b81821 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -318,8 +318,6 @@ struct amdgpu_ras {
        uint32_t supported;
        uint32_t features;
        struct list_head head;
        uint32_t supported;
        uint32_t features;
        struct list_head head;

-       /* debugfs */
-       struct dentry *dir;

        /* sysfs */
        struct device_attribute features_attr;
        struct bin_attribute badpages_attr;
        /* sysfs */
        struct device_attribute features_attr;
        struct bin_attribute badpages_attr;


@@ -395,8 +393,6 @@ struct ras_manager {
        struct list_head node;
        /* the device */
        struct amdgpu_device *adev;
        struct list_head node;
        /* the device */
        struct amdgpu_device *adev;

-       /* debugfs */
-       struct dentry *ent;

        /* sysfs */
        struct device_attribute sysfs_attr;
        int attr_inuse;
        /* sysfs */
        struct device_attribute sysfs_attr;
        int attr_inuse;


@@ -495,8 +491,6 @@ void amdgpu_ras_suspend(struct amdgpu_device *adev);
 unsigned long amdgpu_ras_query_error_count(struct amdgpu_device *adev,
                bool is_ce);
 
 unsigned long amdgpu_ras_query_error_count(struct amdgpu_device *adev,
                bool is_ce);
 

-bool amdgpu_ras_check_err_threshold(struct amdgpu_device *adev);
-

 /* error handling functions */
 int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
                struct eeprom_table_record *bps, int pages);
 /* error handling functions */
 int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
                struct eeprom_table_record *bps, int pages);


@@ -594,9 +588,12 @@ int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev,
 
 void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev);
 
 
 void amdgpu_ras_debugfs_create_all(struct amdgpu_device *adev);
 

-int amdgpu_ras_error_query(struct amdgpu_device *adev,
+int amdgpu_ras_query_error_status(struct amdgpu_device *adev,

                struct ras_query_if *info);
 
                struct ras_query_if *info);
 

+int amdgpu_ras_reset_error_status(struct amdgpu_device *adev,
+               enum amdgpu_ras_block block);
+

 int amdgpu_ras_error_inject(struct amdgpu_device *adev,
                struct ras_inject_if *info);
 
 int amdgpu_ras_error_inject(struct amdgpu_device *adev,
                struct ras_inject_if *info);
 


@@ -629,4 +626,6 @@ void amdgpu_ras_global_ras_isr(struct amdgpu_device *adev);
 void amdgpu_ras_set_error_query_ready(struct amdgpu_device *adev, bool ready);
 
 bool amdgpu_ras_need_emergency_restart(struct amdgpu_device *adev);
 void amdgpu_ras_set_error_query_ready(struct amdgpu_device *adev, bool ready);
 
 bool amdgpu_ras_need_emergency_restart(struct amdgpu_device *adev);

+
+void amdgpu_release_ras_context(struct amdgpu_device *adev);

 #endif
 #endif