diff options
| author | Michal Wajdeczko | 2019-05-27 20:36:01 +0200 |
|---|---|---|
| committer | Chris Wilson | 2019-05-28 11:07:06 +0200 |
| commit | e958cc908792d0a433c9abf9bf47e97648e4c204 (patch) | |
| tree | 4007da254ca12ea401df294ffd0ea31b04db0ef8 /drivers/gpu/drm/i915/intel_uc.c | |
| parent | drm/i915/guc: Reset GuC ADS during sanitize (diff) | |
| download | kernel-qcow2-linux-e958cc908792d0a433c9abf9bf47e97648e4c204.tar.gz kernel-qcow2-linux-e958cc908792d0a433c9abf9bf47e97648e4c204.tar.xz kernel-qcow2-linux-e958cc908792d0a433c9abf9bf47e97648e4c204.zip | |
drm/i915/guc: Always ask GuC to update power domain states
With newer GuC firmware it is always ok to ask GuC to update power
domain states. Make it an unconditional initialization step.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190527183613.17076-6-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 082036164c0c..3eb4f4320667 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -439,14 +439,14 @@ int intel_uc_init_hw(struct drm_i915_private *i915) goto err_communication; } + ret = intel_guc_sample_forcewake(guc); + if (ret) + goto err_communication; + if (USES_GUC_SUBMISSION(i915)) { ret = intel_guc_submission_enable(guc); if (ret) goto err_communication; - } else if (INTEL_GEN(i915) < 11) { - ret = intel_guc_sample_forcewake(guc); - if (ret) - goto err_communication; } dev_info(i915->drm.dev, "GuC firmware version %u.%u\n", |