leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/guc: Introduce guc_is_ready

Browse Source 
We already have guc_is_running function, but it only reflects
firmware status, while to fully use GuC we need to know if we've
already established communication with it.

v2: also s/intel_guc_is_running/intel_guc_is_fw_running (Chris)

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200131153706.109528-1-michal.wajdeczko@intel.com
This commit is contained in:
Michal Wajdeczko 2020-01-31 15:37:06 +00:00 committed by Chris Wilson
parent b0e02a73c5
commit e85de17703
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/gt/uc/intel_guc.h
View File

@ -148,11 +148,16 @@ static inline bool intel_guc_is_enabled(struct intel_guc *guc)
return intel_uc_fw_is_enabled(&guc->fw); return intel_uc_fw_is_enabled(&guc->fw);
} }
static inline bool intel_guc_is_running(struct intel_guc *guc) static inline bool intel_guc_is_fw_running(struct intel_guc *guc)
{ {
return intel_uc_fw_is_running(&guc->fw); return intel_uc_fw_is_running(&guc->fw);
} }
static inline bool intel_guc_is_ready(struct intel_guc *guc)
{
return intel_guc_is_fw_running(guc) && intel_guc_ct_enabled(&guc->ct);
}
static inline int intel_guc_sanitize(struct intel_guc *guc) static inline int intel_guc_sanitize(struct intel_guc *guc)
{ {
intel_uc_fw_sanitize(&guc->fw); intel_uc_fw_sanitize(&guc->fw);

2
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
View File

@ -279,7 +279,7 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct)
ct->enabled = false; ct->enabled = false;
if (intel_guc_is_running(guc)) { if (intel_guc_is_fw_running(guc)) {
ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_SEND); ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_SEND);
ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV); ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV);
} }

10
drivers/gpu/drm/i915/gt/uc/intel_uc.c
View File

@ -505,7 +505,7 @@ static void __uc_fini_hw(struct intel_uc *uc)
{ {
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_fw_running(guc))
return; return;
if (intel_uc_supports_guc_submission(uc)) if (intel_uc_supports_guc_submission(uc))
@ -527,7 +527,7 @@ void intel_uc_reset_prepare(struct intel_uc *uc)
{ {
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_ready(guc))
return; return;
guc_disable_communication(guc); guc_disable_communication(guc);
@ -539,7 +539,7 @@ void intel_uc_runtime_suspend(struct intel_uc *uc)
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
int err; int err;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_ready(guc))
return; return;
err = intel_guc_suspend(guc); err = intel_guc_suspend(guc);
@ -554,7 +554,7 @@ void intel_uc_suspend(struct intel_uc *uc)
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_ready(guc))
return; return;
with_intel_runtime_pm(uc_to_gt(uc)->uncore->rpm, wakeref) with_intel_runtime_pm(uc_to_gt(uc)->uncore->rpm, wakeref)
@ -566,7 +566,7 @@ static int __uc_resume(struct intel_uc *uc, bool enable_communication)
struct intel_guc *guc = &uc->guc; struct intel_guc *guc = &uc->guc;
int err; int err;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_fw_running(guc))
return 0; return 0;
/* Make sure we enable communication if and only if it's disabled */ /* Make sure we enable communication if and only if it's disabled */

2
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -1914,7 +1914,7 @@ static int i915_guc_log_relay_open(struct inode *inode, struct file *file)
struct intel_guc *guc = &i915->gt.uc.guc; struct intel_guc *guc = &i915->gt.uc.guc;
struct intel_guc_log *log = &guc->log; struct intel_guc_log *log = &guc->log;
if (!intel_guc_is_running(guc)) if (!intel_guc_is_ready(guc))
return -ENODEV; return -ENODEV;
file->private_data = log; file->private_data = log;

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2017,7 +2017,7 @@ i915_coherent_map_type(struct drm_i915_private *i915)
static inline bool intel_guc_submission_is_enabled(struct intel_guc *guc) static inline bool intel_guc_submission_is_enabled(struct intel_guc *guc)
{ {
return intel_guc_is_submission_supported(guc) && return intel_guc_is_submission_supported(guc) &&
intel_guc_is_running(guc); intel_guc_is_ready(guc);
} }
#endif #endif