diff options
| author | Chris Wilson | 2017-03-23 11:19:39 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-03-23 11:22:00 +0100 |
| commit | bd52750485e9d4b8372360a347c63788eb76db8a (patch) | |
| tree | c5da13940dc7b2ca6314a93690895a56f710c362 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915: Eliminate per-fw_domain i915 backpointer (diff) | |
| download | kernel-qcow2-linux-bd52750485e9d4b8372360a347c63788eb76db8a.tar.gz kernel-qcow2-linux-bd52750485e9d4b8372360a347c63788eb76db8a.tar.xz kernel-qcow2-linux-bd52750485e9d4b8372360a347c63788eb76db8a.zip | |
drm/i915: Use correct fw_domains during initialisation
In the next patch we will begin to sanity check that we do not attempt
to obtain the forcewake on an unsupport domain. However, that is exactly
what we do during our actual initialisation of fw_domains - rectify it
before it explodes.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170323101944.21627-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index aa2e7401efdc..6e415e8a3aa3 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1253,9 +1253,9 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv) FORCEWAKE_MT, FORCEWAKE_MT_ACK); spin_lock_irq(&dev_priv->uncore.lock); - fw_domains_get_with_thread_status(dev_priv, FORCEWAKE_ALL); + fw_domains_get_with_thread_status(dev_priv, FORCEWAKE_RENDER); ecobus = __raw_i915_read32(dev_priv, ECOBUS); - fw_domains_put_with_fifo(dev_priv, FORCEWAKE_ALL); + fw_domains_put_with_fifo(dev_priv, FORCEWAKE_RENDER); spin_unlock_irq(&dev_priv->uncore.lock); if (!(ecobus & FORCEWAKE_MT_ENABLE)) { |