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

Commit 1300b4f8 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Inline gen6_sanitize_rps_pm_mask() 



gen6_sanitize_rps_pm_mask() is small enough that inlining it shrinks the
object code.

v2: Use const markup

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170312135426.2216-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent ef47a0e0

drivers/gpu/drm/i915/i915_irq.c

+0 −5
Original line number Diff line number Diff line
@@ -389,11 +389,6 @@ void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv) 
	spin_unlock_irq(&dev_priv->irq_lock);

}



u32 gen6_sanitize_rps_pm_mask(struct drm_i915_private *dev_priv, u32 mask)

{

	return (mask & ~dev_priv->rps.pm_intrmsk_mbz);

}



void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)

{

	if (!READ_ONCE(dev_priv->rps.interrupts_enabled))

drivers/gpu/drm/i915/intel_drv.h

+7 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,13 @@ void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); 
void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv);

void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv);

void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv);

u32 gen6_sanitize_rps_pm_mask(struct drm_i915_private *dev_priv, u32 mask);



static inline u32 gen6_sanitize_rps_pm_mask(const struct drm_i915_private *i915,

					    u32 mask)

{

	return mask & ~i915->rps.pm_intrmsk_mbz;

}



void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv);

void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv);

static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv)