]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: Notify GuC rc6 state
authorAlex Dai <yu.dai@intel.com>
Tue, 18 Aug 2015 21:34:47 +0000 (14:34 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 2 Sep 2015 08:39:01 +0000 (10:39 +0200)
If rc6 is enabled, notify GuC so it can do proper forcewake before
command submission.

Signed-off-by: Alex Dai <yu.dai@intel.com>
Reviewed-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_guc_submission.c

index ec703937f3632742cebfb87b9e38f28693e72ff1..792d0b958a2c9f95234cd395023d694240fc0a82 100644 (file)
@@ -151,6 +151,18 @@ static int host2guc_release_doorbell(struct intel_guc *guc,
        return host2guc_action(guc, data, 2);
 }
 
+static int host2guc_sample_forcewake(struct intel_guc *guc,
+                                    struct i915_guc_client *client)
+{
+       struct drm_i915_private *dev_priv = guc_to_i915(guc);
+       u32 data[2];
+
+       data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;
+       data[1] = (intel_enable_rc6(dev_priv->dev)) ? 1 : 0;
+
+       return host2guc_action(guc, data, 2);
+}
+
 /*
  * Initialise, update, or clear doorbell data shared with the GuC
  *
@@ -874,6 +886,9 @@ int i915_guc_submission_enable(struct drm_device *dev)
        }
 
        guc->execbuf_client = client;
+
+       host2guc_sample_forcewake(guc, client);
+
        return 0;
 }