Commit 47c3b5e9 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Support for extended GuC notification messages 



GuC may send notification messages with payload larger than
single u32. Prepare driver to accept longer messages.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Tomasz Lis <tomasz.lis@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/20190321120004.53012-1-michal.wajdeczko@intel.com
parent ddad5bab

drivers/gpu/drm/i915/intel_guc.c

+11 −3
Original line number Diff line number Diff line
@@ -484,17 +484,25 @@ void intel_guc_to_host_event_handler_mmio(struct intel_guc *guc) 
	spin_unlock(&guc->irq_lock);

	enable_rpm_wakeref_asserts(dev_priv);



	intel_guc_to_host_process_recv_msg(guc, msg);

	intel_guc_to_host_process_recv_msg(guc, &msg, 1);

}



void intel_guc_to_host_process_recv_msg(struct intel_guc *guc, u32 msg)

int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,

				       const u32 *payload, u32 len)

{

	u32 msg;



	if (unlikely(!len))

		return -EPROTO;



	/* Make sure to handle only enabled messages */

	msg &= guc->msg_enabled_mask;

	msg = payload[0] & guc->msg_enabled_mask;



	if (msg & (INTEL_GUC_RECV_MSG_FLUSH_LOG_BUFFER |

		   INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED))

		intel_guc_log_handle_flush_event(&guc->log);



	return 0;

}



int intel_guc_sample_forcewake(struct intel_guc *guc)

drivers/gpu/drm/i915/intel_guc.h

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len, 
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);

void intel_guc_to_host_process_recv_msg(struct intel_guc *guc, u32 msg);

int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,

				       const u32 *payload, u32 len);

int intel_guc_sample_forcewake(struct intel_guc *guc);

int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);

int intel_guc_suspend(struct intel_guc *guc);

drivers/gpu/drm/i915/intel_guc_ct.c

+3 −2
Original line number Diff line number Diff line
@@ -701,14 +701,15 @@ static void ct_process_request(struct intel_guc_ct *ct, 
			       u32 action, u32 len, const u32 *payload)

{

	struct intel_guc *guc = ct_to_guc(ct);

	int ret;



	CT_DEBUG_DRIVER("CT: request %x %*ph\n", action, 4 * len, payload);



	switch (action) {

	case INTEL_GUC_ACTION_DEFAULT:

		if (unlikely(len < 1))

		ret = intel_guc_to_host_process_recv_msg(guc, payload, len);

		if (unlikely(ret))

			goto fail_unexpected;

		intel_guc_to_host_process_recv_msg(guc, *payload);

		break;



	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE