Merge tag 'csky-for-linus-5.13-rc1' of git://github.com/c-sky/csky-linux

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
index 18381449365800c70ca8e5855c85af2da94f8454..bbcccf53080dd83c20ac8db513642403671e834b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
@@ -35,13 +35,17 @@
 #define LOOP_UMC_CH_INST(ch_inst) for ((ch_inst) = 0; (ch_inst) < adev->umc.channel_inst_num; (ch_inst)++)
 #define LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) LOOP_UMC_INST((umc_inst)) LOOP_UMC_CH_INST((ch_inst))
 
 #define LOOP_UMC_CH_INST(ch_inst) for ((ch_inst) = 0; (ch_inst) < adev->umc.channel_inst_num; (ch_inst)++)
 #define LOOP_UMC_INST_AND_CH(umc_inst, ch_inst) LOOP_UMC_INST((umc_inst)) LOOP_UMC_CH_INST((ch_inst))
 

-struct amdgpu_umc_funcs {
+struct amdgpu_umc_ras_funcs {

        void (*err_cnt_init)(struct amdgpu_device *adev);
        int (*ras_late_init)(struct amdgpu_device *adev);
        void (*err_cnt_init)(struct amdgpu_device *adev);
        int (*ras_late_init)(struct amdgpu_device *adev);

+       void (*ras_fini)(struct amdgpu_device *adev);

        void (*query_ras_error_count)(struct amdgpu_device *adev,
        void (*query_ras_error_count)(struct amdgpu_device *adev,

-                                       void *ras_error_status);
+                                     void *ras_error_status);

        void (*query_ras_error_address)(struct amdgpu_device *adev,
                                        void *ras_error_status);
        void (*query_ras_error_address)(struct amdgpu_device *adev,
                                        void *ras_error_status);

+};
+
+struct amdgpu_umc_funcs {

        void (*init_registers)(struct amdgpu_device *adev);
 };
 
        void (*init_registers)(struct amdgpu_device *adev);
 };
 


@@ -59,6 +63,7 @@ struct amdgpu_umc {
        struct ras_common_if *ras_if;
 
        const struct amdgpu_umc_funcs *funcs;
        struct ras_common_if *ras_if;
 
        const struct amdgpu_umc_funcs *funcs;

+       const struct amdgpu_umc_ras_funcs *ras_funcs;

 };
 
 int amdgpu_umc_ras_late_init(struct amdgpu_device *adev);
 };
 
 int amdgpu_umc_ras_late_init(struct amdgpu_device *adev);