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

drm/i915/uc: Use GuC firmware status helper

Browse Source 
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
This commit is contained in:
Michal Wajdeczko 2019-05-22 19:32:00 +00:00 committed by Chris Wilson
parent 89195bab5d
commit f1e6b336ba
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/intel_uc.c
View File

@ -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);