Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f0ea9e2 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: assert we're not runtime suspended when accessing registers 



I could swear this was already happening in the current code...

Also, put the reads and writes in a generic place, so we don't forget
it again when we add runtime PM support to new platforms.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e998c40f

drivers/gpu/drm/i915/intel_uncore.c

+2 −2
Original line number Diff line number Diff line
@@ -471,6 +471,7 @@ hsw_unclaimed_reg_check(struct drm_i915_private *dev_priv, u32 reg) 
#define REG_READ_HEADER(x) \

	unsigned long irqflags; \

	u##x val = 0; \

	assert_device_not_suspended(dev_priv); \

	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags)



#define REG_READ_FOOTER \
@@ -567,6 +568,7 @@ __gen4_read(64) 
#define REG_WRITE_HEADER \

	unsigned long irqflags; \

	trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \

	assert_device_not_suspended(dev_priv); \

	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags)



#define REG_WRITE_FOOTER \
@@ -597,7 +599,6 @@ gen6_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace 
	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \

		__fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \

	} \

	assert_device_not_suspended(dev_priv); \

	__raw_i915_write##x(dev_priv, reg, val); \

	if (unlikely(__fifo_ret)) { \

		gen6_gt_check_fifodbg(dev_priv); \
@@ -613,7 +614,6 @@ hsw_write##x(struct drm_i915_private *dev_priv, off_t reg, u##x val, bool trace) 
	if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \

		__fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \

	} \

	assert_device_not_suspended(dev_priv); \

	hsw_unclaimed_reg_clear(dev_priv, reg); \

	__raw_i915_write##x(dev_priv, reg, val); \

	if (unlikely(__fifo_ret)) { \