diff options
| author | Herbert Xu | 2017-12-22 10:00:50 +0100 |
|---|---|---|
| committer | Herbert Xu | 2017-12-22 10:00:50 +0100 |
| commit | 45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8 (patch) | |
| tree | a5e7c8428030ec0462b58133d6548ddff3802018 /drivers/gpu/drm/i915/intel_uncore.h | |
| parent | crypto: aesni - add wrapper for generic gcm(aes) (diff) | |
| parent | crypto: inside-secure - do not use areq->result for partial results (diff) | |
| download | kernel-qcow2-linux-45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8.tar.gz kernel-qcow2-linux-45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8.tar.xz kernel-qcow2-linux-45fa9a324d0f5be9140ba2e0db9b8fb8a0b9b7e8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pick up inside-secure fixes.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 582771251b57..9ce079b5dd0d 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -134,6 +134,7 @@ bool intel_uncore_arm_unclaimed_mmio_detection(struct drm_i915_private *dev_priv void intel_uncore_fini(struct drm_i915_private *dev_priv); void intel_uncore_suspend(struct drm_i915_private *dev_priv); void intel_uncore_resume_early(struct drm_i915_private *dev_priv); +void intel_uncore_runtime_resume(struct drm_i915_private *dev_priv); u64 intel_uncore_edram_size(struct drm_i915_private *dev_priv); void assert_forcewakes_inactive(struct drm_i915_private *dev_priv); |