]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/i915: noop forcewake get/put when vgpu activated
authorWeinan Li <weinan.z.li@intel.com>
Thu, 26 Jan 2017 05:20:13 +0000 (13:20 +0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 31 Jan 2017 10:03:48 +0000 (10:03 +0000)
For a virtualized GPU, the host maintains the forcewake state on the real
device. As we don't control forcewake ourselves, we can simply set
force_wake_get() and force_wake_put() to be no-ops. By setting the vfuncs,
we adjust both the manual control of forcewake and around the mmio
accessors (making our vgpu specific mmio routines redundant and to be
removed in the next patch).

Signed-off-by: Weinan Li <weinan.z.li@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1485408013-12780-1-git-send-email-weinan.z.li@intel.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_uncore.c

index abe08885a5ba4ef1726d67809544534cf35a57df..da81874dd4a5403b0811861eeeb89372475faf40 100644 (file)
@@ -132,6 +132,13 @@ fw_domains_put(struct drm_i915_private *dev_priv, enum forcewake_domains fw_doma
        }
 }
 
+static void
+vgpu_fw_domains_nop(struct drm_i915_private *dev_priv,
+                   enum forcewake_domains fw_domains)
+{
+       /* Guest driver doesn't need to takes care forcewake. */
+}
+
 static void
 fw_domains_posting_read(struct drm_i915_private *dev_priv)
 {
@@ -1375,6 +1382,11 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)
                               FORCEWAKE, FORCEWAKE_ACK);
        }
 
+       if (intel_vgpu_active(dev_priv)) {
+               dev_priv->uncore.funcs.force_wake_get = vgpu_fw_domains_nop;
+               dev_priv->uncore.funcs.force_wake_put = vgpu_fw_domains_nop;
+       }
+
        /* All future platforms are expected to require complex power gating */
        WARN_ON(dev_priv->uncore.fw_domains == 0);
 }