On Fri, 2014-02-21 at 13:52 -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zan...@intel.com> > > 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: Paulo Zanoni <paulo.r.zan...@intel.com>
In subject: s/writing/reading/ . Otherwise:
Reviewed-by: Imre Deak <imre.d...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c
> b/drivers/gpu/drm/i915/intel_uncore.c
> index c3a4d6f..acce5e8 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -470,6 +470,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 \
> @@ -568,6 +569,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 \
> @@ -598,7 +600,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); \
> @@ -614,7 +615,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)) { \
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
