Commit 769bfbf9 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

drm/i915/guc: Make event handler a virtual function

On platforms with CTB based GuC communications, we will handle
GuC events in a different way. Let's make event handler a virtual
function to allow easy switch between those variants.

Credits-to: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180326194829.58836-6-michal.wajdeczko@intel.com
parent f6a70b59
...@@ -69,6 +69,7 @@ void intel_guc_init_early(struct intel_guc *guc) ...@@ -69,6 +69,7 @@ void intel_guc_init_early(struct intel_guc *guc)
mutex_init(&guc->send_mutex); mutex_init(&guc->send_mutex);
spin_lock_init(&guc->irq_lock); spin_lock_init(&guc->irq_lock);
guc->send = intel_guc_send_nop; guc->send = intel_guc_send_nop;
guc->handler = intel_guc_to_host_event_handler_nop;
guc->notify = gen8_guc_raise_irq; guc->notify = gen8_guc_raise_irq;
} }
...@@ -317,6 +318,11 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, ...@@ -317,6 +318,11 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len,
return -ENODEV; return -ENODEV;
} }
void intel_guc_to_host_event_handler_nop(struct intel_guc *guc)
{
WARN(1, "Unexpected event: no suitable handler\n");
}
/* /*
* This function implements the MMIO based host to GuC interface. * This function implements the MMIO based host to GuC interface.
*/ */
...@@ -388,7 +394,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, ...@@ -388,7 +394,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
return ret; return ret;
} }
void intel_guc_to_host_event_handler(struct intel_guc *guc) void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc)
{ {
struct drm_i915_private *dev_priv = guc_to_i915(guc); struct drm_i915_private *dev_priv = guc_to_i915(guc);
u32 msg, val; u32 msg, val;
......
...@@ -91,6 +91,9 @@ struct intel_guc { ...@@ -91,6 +91,9 @@ struct intel_guc {
int (*send)(struct intel_guc *guc, const u32 *data, u32 len, int (*send)(struct intel_guc *guc, const u32 *data, u32 len,
u32 *response_buf, u32 response_buf_size); u32 *response_buf, u32 response_buf_size);
/* GuC's FW specific event handler function */
void (*handler)(struct intel_guc *guc);
/* GuC's FW specific notify function */ /* GuC's FW specific notify function */
void (*notify)(struct intel_guc *guc); void (*notify)(struct intel_guc *guc);
}; };
...@@ -113,6 +116,11 @@ static inline void intel_guc_notify(struct intel_guc *guc) ...@@ -113,6 +116,11 @@ static inline void intel_guc_notify(struct intel_guc *guc)
guc->notify(guc); guc->notify(guc);
} }
static inline void intel_guc_to_host_event_handler(struct intel_guc *guc)
{
guc->handler(guc);
}
/* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */ /* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */
#define GUC_GGTT_TOP 0xFEE00000 #define GUC_GGTT_TOP 0xFEE00000
...@@ -153,6 +161,8 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len, ...@@ -153,6 +161,8 @@ int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len,
int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
u32 *response_buf, u32 response_buf_size); u32 *response_buf, u32 response_buf_size);
void intel_guc_to_host_event_handler(struct intel_guc *guc); void intel_guc_to_host_event_handler(struct intel_guc *guc);
void intel_guc_to_host_event_handler_nop(struct intel_guc *guc);
void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc);
int intel_guc_sample_forcewake(struct intel_guc *guc); int intel_guc_sample_forcewake(struct intel_guc *guc);
int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset); int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
int intel_guc_suspend(struct intel_guc *guc); int intel_guc_suspend(struct intel_guc *guc);
......
...@@ -233,6 +233,7 @@ static int guc_enable_communication(struct intel_guc *guc) ...@@ -233,6 +233,7 @@ static int guc_enable_communication(struct intel_guc *guc)
return intel_guc_ct_enable(&guc->ct); return intel_guc_ct_enable(&guc->ct);
guc->send = intel_guc_send_mmio; guc->send = intel_guc_send_mmio;
guc->handler = intel_guc_to_host_event_handler_mmio;
return 0; return 0;
} }
...@@ -246,6 +247,7 @@ static void guc_disable_communication(struct intel_guc *guc) ...@@ -246,6 +247,7 @@ static void guc_disable_communication(struct intel_guc *guc)
gen9_disable_guc_interrupts(dev_priv); gen9_disable_guc_interrupts(dev_priv);
guc->send = intel_guc_send_nop; guc->send = intel_guc_send_nop;
guc->handler = intel_guc_to_host_event_handler_nop;
} }
int intel_uc_init_misc(struct drm_i915_private *dev_priv) int intel_uc_init_misc(struct drm_i915_private *dev_priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment