diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-11-24 12:31:16 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-11-24 12:31:17 +0300 |
| commit | 69d5c4b50165754bf3bb22d5dc4152369de7dbac (patch) | |
| tree | c3c2320ff94fecbfb2fa8349c40df671318b6942 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | f287c536d9431f5788916b204febab8d27a5ce55 (diff) | |
| parent | 9a3a238b3de97b4210c6de66aa88b2d7021ac086 (diff) | |
| download | linux-69d5c4b50165754bf3bb22d5dc4152369de7dbac.tar.xz | |
Merge tag 'gvt-next-2020-11-23' of https://github.com/intel/gvt-linux into drm-intel-next-queued
gvt-next-2020-11-23
- Fix host suspend/resume with vGPU (Colin)
- optimize idr init (Varma)
- Change intel_gvt_mpt as const (Julian)
- One comment error fix (Yan)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201123090517.GC16939@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index d6e25212d5c0..abd49017aea1 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1271,6 +1271,8 @@ static int i915_drm_resume(struct drm_device *dev) intel_power_domains_enable(dev_priv); + intel_gvt_resume(dev_priv); + enable_rpm_wakeref_asserts(&dev_priv->runtime_pm); return 0; |