Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78577e29 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/guc: Rename intel_guc_is_alive to intel_guc_is_loaded 



This function just check our software flag, while 'is_alive'
may suggest that we are checking runtime firmware status.

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 avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190522193203.23932-5-michal.wajdeczko@intel.com
parent beca36ff

drivers/gpu/drm/i915/intel_guc.h

+5 −5
Original line number Diff line number Diff line
@@ -96,11 +96,6 @@ struct intel_guc { 
	void (*notify)(struct intel_guc *guc);

};



static inline bool intel_guc_is_alive(struct intel_guc *guc)

{

	return intel_uc_fw_is_loaded(&guc->fw);

}



static

inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)

{
@@ -176,6 +171,11 @@ u32 intel_guc_reserved_gtt_size(struct intel_guc *guc); 
int intel_guc_reserve_ggtt_top(struct intel_guc *guc);

void intel_guc_release_ggtt_top(struct intel_guc *guc);



static inline bool intel_guc_is_loaded(struct intel_guc *guc)

{

	return intel_uc_fw_is_loaded(&guc->fw);

}



static inline int intel_guc_sanitize(struct intel_guc *guc)

{

	intel_uc_fw_sanitize(&guc->fw);

drivers/gpu/drm/i915/intel_guc_submission.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ static void __guc_client_disable(struct intel_guc_client *client) 
	 * the case, instead of trying (in vain) to communicate with it, let's

	 * just cleanup the doorbell HW and our internal state.

	 */

	if (intel_guc_is_alive(client->guc))

	if (intel_guc_is_loaded(client->guc))

		destroy_doorbell(client);

	else

		__fini_doorbell(client);