Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_hdp.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
index 43caf9f..7ec99d5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h
@@ -23,18 +23,29 @@
 #ifndef __AMDGPU_HDP_H__
 #define __AMDGPU_HDP_H__
 
+struct amdgpu_hdp_ras_funcs {
+       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 *ras_error_status);
+       void (*reset_ras_error_count)(struct amdgpu_device *adev);
+};
+
 struct amdgpu_hdp_funcs {
        void (*flush_hdp)(struct amdgpu_device *adev, struct amdgpu_ring *ring);
        void (*invalidate_hdp)(struct amdgpu_device *adev,
                               struct amdgpu_ring *ring);
-       void (*reset_ras_error_count)(struct amdgpu_device *adev);
        void (*update_clock_gating)(struct amdgpu_device *adev, bool enable);
        void (*get_clock_gating_state)(struct amdgpu_device *adev, u32 *flags);
        void (*init_registers)(struct amdgpu_device *adev);
 };
 
 struct amdgpu_hdp {
+       struct ras_common_if                    *ras_if;
        const struct amdgpu_hdp_funcs           *funcs;
+       const struct amdgpu_hdp_ras_funcs       *ras_funcs;
 };
 
+int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev);
+void amdgpu_hdp_ras_fini(struct amdgpu_device *adev);
 #endif /* __AMDGPU_HDP_H__ */