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

diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 987ff586d7f9e0e4c1b9ac63a0c70573f3e009fc..ffdab22db2b079aad94e4ab86e0da3618c613305 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -1426,10 +1426,6 @@ int intel_guc_submission_enable(struct intel_guc *guc)
 
        GEM_BUG_ON(!guc->execbuf_client);
 
-       err = intel_guc_sample_forcewake(guc);
-       if (err)
-               return err;
-
        err = guc_clients_enable(guc);
        if (err)
                return err;

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 082036164c0cbf782c1752099c8a4640b1f38cde..3eb4f43206676abc5c6200ad2f81879a773e46ab 100644 (file)
--- 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",