diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-07 11:06:58 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-07 11:07:03 +1000 |
commit | 67c6ed7cf9ebe53815f15bfdeb49ad91801c2235 (patch) | |
tree | ad797b109a044835ea8567b2660d18feabd3251e /drivers/gpu/drm/i915/gvt/mmio_context.c | |
parent | Linux 4.19-rc2 (diff) | |
parent | drm/i915/dp_mst: Fix enabling pipe clock for all streams (diff) | |
download | linux-dev-67c6ed7cf9ebe53815f15bfdeb49ad91801c2235.tar.xz linux-dev-67c6ed7cf9ebe53815f15bfdeb49ad91801c2235.zip |
Merge tag 'drm-intel-fixes-2018-09-05' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
The critical fix here on display side is the DP MST regression one.
But this pull also include fixes for DP SST, small VDSC register fix
and GVT's bucked with "BXT fixes, two guest warning fixes, dmabuf
format mod fix and one for recent multiple VM timeout failure."
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180905183000.GA2151@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/mmio_context.c')
-rw-r--r-- | drivers/gpu/drm/i915/gvt/mmio_context.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/mmio_context.c b/drivers/gpu/drm/i915/gvt/mmio_context.c index 42e1e6bdcc2c..e872f4847fbe 100644 --- a/drivers/gpu/drm/i915/gvt/mmio_context.c +++ b/drivers/gpu/drm/i915/gvt/mmio_context.c @@ -562,11 +562,9 @@ void intel_gvt_switch_mmio(struct intel_vgpu *pre, * performace for batch mmio read/write, so we need * handle forcewake mannually. */ - intel_runtime_pm_get(dev_priv); intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL); switch_mmio(pre, next, ring_id); intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL); - intel_runtime_pm_put(dev_priv); } /** |