diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-01-18 07:02:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-01-18 07:02:19 +1000 |
| commit | 1df59b8497f47495e873c23abd6d3d290c730505 (patch) | |
| tree | 8fe819870ce75e21c413aabaa483b699c186d938 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | 28f03607bb2e7a3dab71d0a377fd13f6ed3ebb9f (diff) | |
| parent | 48ea1e32c39db94c59b63580b965222c7782112f (diff) | |
| download | linux-1df59b8497f47495e873c23abd6d3d290c730505.tar.gz linux-1df59b8497f47495e873c23abd6d3d290c730505.tar.bz2 linux-1df59b8497f47495e873c23abd6d3d290c730505.zip | |
Merge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm-intel into drm-next
misc i915 fixes all over the place.
* tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/drm-intel:
drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page
drm/i915: Widen return value for reservation_object_wait_timeout_rcu to long.
drm/i915: intel_hpd_init(): Fix suspend/resume reprobing
drm/i915: shut up gen8+ SDE irq dmesg noise, again
drm/i915: Restore inhibiting the load of the default context
drm/i915: Tune down rpm wakelock debug checks
drm/i915: Avoid writing relocs with addresses in non-canonical form
drm/i915: Move Braswell stop_machine GGTT insertion workaround
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d523ebb2f89d..ea5415851c6e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1442,8 +1442,10 @@ static inline void assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) { assert_rpm_device_not_suspended(dev_priv); - WARN_ONCE(!atomic_read(&dev_priv->pm.wakeref_count), - "RPM wakelock ref not held during HW access"); + /* FIXME: Needs to be converted back to WARN_ONCE, but currently causes + * too much noise. */ + if (!atomic_read(&dev_priv->pm.wakeref_count)) + DRM_DEBUG_DRIVER("RPM wakelock ref not held during HW access"); } static inline int |