Commit 235198d7 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson

drm/i915/guc: Don't pass CTB while reading

Since we only have one RECV buffer we don't need to explicitly pass
it to the read function.
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200117082039.65644-4-michal.wajdeczko@intel.com
parent 6a327cb1
...@@ -576,8 +576,9 @@ static inline bool ct_header_is_response(u32 header) ...@@ -576,8 +576,9 @@ static inline bool ct_header_is_response(u32 header)
return !!(header & GUC_CT_MSG_IS_RESPONSE); return !!(header & GUC_CT_MSG_IS_RESPONSE);
} }
static int ctb_read(struct intel_guc_ct_buffer *ctb, u32 *data) static int ct_read(struct intel_guc_ct *ct, u32 *data)
{ {
struct intel_guc_ct_buffer *ctb = &ct->ctbs[CTB_RECV];
struct guc_ct_buffer_desc *desc = ctb->desc; struct guc_ct_buffer_desc *desc = ctb->desc;
u32 head = desc->head; u32 head = desc->head;
u32 tail = desc->tail; u32 tail = desc->tail;
...@@ -830,7 +831,6 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg) ...@@ -830,7 +831,6 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
*/ */
void intel_guc_ct_event_handler(struct intel_guc_ct *ct) void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
{ {
struct intel_guc_ct_buffer *ctb = &ct->ctbs[CTB_RECV];
u32 msg[GUC_CT_MSG_LEN_MASK + 1]; /* one extra dw for the header */ u32 msg[GUC_CT_MSG_LEN_MASK + 1]; /* one extra dw for the header */
int err = 0; int err = 0;
...@@ -840,7 +840,7 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct) ...@@ -840,7 +840,7 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
} }
do { do {
err = ctb_read(ctb, msg); err = ct_read(ct, msg);
if (err) if (err)
break; break;
......
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