On Wed, Aug 24, 2016 at 05:03:11PM +0100, Matthew Auld wrote: > The comment which documents the proper usage of the *_FW family of macros makes > reference to intel_uncore_forcewake_irq{unlock, lock}, which is just > confusing, seeing as such a set of functions don't even exist and never have > for that matter(according to git). Let's fix that by replacing them with > intel_uncore_forcewake_{get, put}. > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@xxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index ff96b7a..c285d61 100644 > --- a/drivers/gpu/drm/i916/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3792,8 +3792,8 @@ __raw_write(64, q) > * critical sections inside IRQ handlers where forcewake is explicitly > * controlled. > * Think twice, and think again, before using these. > - * Note: Should only be used between intel_uncore_forcewake_irqlock() and > - * intel_uncore_forcewake_irqunlock(). > + * Note: Should only be used between intel_uncore_forcewake_get and > + * intel_uncore_forcewake_put. > */ > #define I915_READ_FW(reg__) __raw_i915_read32(dev_priv, (reg__)) > #define I915_WRITE_FW(reg__, val__) __raw_i915_write32(dev_priv, (reg__), (val__)) > -- > 2.7.4 -- Cheers, Arek _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx