1 files changed, 29 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 5cdf7aa75be5..0053258e03d3 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -64,7 +64,7 @@ struct drm_i915_gem_request;
  */
 struct i915_guc_client {
         struct i915_vma *vma;
-        void *client_base;              /* first page (only) of above   */
+        void *vaddr;
         struct i915_gem_context *owner;
         struct intel_guc *guc;
 
@@ -123,10 +123,28 @@ struct intel_guc_fw {
         uint32_t ucode_offset;
 };
 
+struct intel_guc_log {
+        uint32_t flags;
+        struct i915_vma *vma;
+        void *buf_addr;
+        struct workqueue_struct *flush_wq;
+        struct work_struct flush_work;
+        struct rchan *relay_chan;
+
+        /* logging related stats */
+        u32 capture_miss_count;
+        u32 flush_interrupt_count;
+        u32 prev_overflow_count[GUC_MAX_LOG_BUFFER];
+        u32 total_overflow_count[GUC_MAX_LOG_BUFFER];
+        u32 flush_count[GUC_MAX_LOG_BUFFER];
+};
+
 struct intel_guc {
         struct intel_guc_fw guc_fw;
-        uint32_t log_flags;
-        struct i915_vma *log_vma;
+        struct intel_guc_log log;
+
+        /* GuC2Host interrupt related state */
+        bool interrupts_enabled;
 
         struct i915_vma *ads_vma;
         struct i915_vma *ctx_pool_vma;
@@ -146,6 +164,9 @@ struct intel_guc {
 
         uint64_t submissions[I915_NUM_ENGINES];
         uint32_t last_seqno[I915_NUM_ENGINES];
+
+        /* To serialize the Host2GuC actions */
+        struct mutex action_lock;
 };
 
 /* intel_guc_loader.c */
@@ -163,5 +184,10 @@ int i915_guc_wq_reserve(struct drm_i915_gem_request *rq);
 void i915_guc_wq_unreserve(struct drm_i915_gem_request *request);
 void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
 void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
+void i915_guc_capture_logs(struct drm_i915_private *dev_priv);
+void i915_guc_flush_logs(struct drm_i915_private *dev_priv);
+void i915_guc_register(struct drm_i915_private *dev_priv);
+void i915_guc_unregister(struct drm_i915_private *dev_priv);
+int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);
 
 #endif