diff options
| author | Michal Wajdeczko | 2019-05-22 21:32:00 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-05-23 22:58:36 +0200 |
| commit | f1e6b336bafae78ca9a94114a73a4fda5f29c73f (patch) | |
| tree | d08bcaf5d27de403eccef7bd7691afe156f8e338 /drivers/gpu/drm/i915/intel_uc.c | |
| parent | drm/i915/uc: Explicitly sanitize GuC/HuC on failure and finish (diff) | |
| download | kernel-qcow2-linux-f1e6b336bafae78ca9a94114a73a4fda5f29c73f.tar.gz kernel-qcow2-linux-f1e6b336bafae78ca9a94114a73a4fda5f29c73f.tar.xz kernel-qcow2-linux-f1e6b336bafae78ca9a94114a73a4fda5f29c73f.zip | |
drm/i915/uc: Use GuC firmware status helper
We already have helper function for checking GuC firmware
load status. Replace existing open-coded checks.
v2: drop redundant USES_GUC check
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@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/20190522193203.23932-7-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 415f4058ce2a..1a945f61cf69 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -494,7 +494,7 @@ void intel_uc_runtime_suspend(struct drm_i915_private *i915) struct intel_guc *guc = &i915->guc; int err; - if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS) + if (!intel_guc_is_loaded(guc)) return; err = intel_guc_suspend(guc); @@ -509,7 +509,7 @@ void intel_uc_suspend(struct drm_i915_private *i915) struct intel_guc *guc = &i915->guc; intel_wakeref_t wakeref; - if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS) + if (!intel_guc_is_loaded(guc)) return; with_intel_runtime_pm(i915, wakeref) @@ -521,10 +521,7 @@ int intel_uc_resume(struct drm_i915_private *i915) struct intel_guc *guc = &i915->guc; int err; - if (!USES_GUC(i915)) - return 0; - - if (guc->fw.load_status != INTEL_UC_FIRMWARE_SUCCESS) + if (!intel_guc_is_loaded(guc)) return 0; guc_enable_communication(guc); |