Commit ad7632ff authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/irq: make gen2_irq_init()/gen2_irq_reset() static 



The gen2 irq functions aren't used outside of i915_irq.h. Make them
static, and remove the useless macro wrappers.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b28f45ef4ef69ab7a6f96ffa3fa3118994667332.1667383630.git.jani.nikula@intel.com
parent 831209ec

drivers/gpu/drm/i915/i915_irq.c

+5 −5
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void gen3_irq_reset(struct intel_uncore *uncore, i915_reg_t imr, 
	intel_uncore_posting_read(uncore, iir);

}



void gen2_irq_reset(struct intel_uncore *uncore)

static void gen2_irq_reset(struct intel_uncore *uncore)

{

	intel_uncore_write16(uncore, GEN2_IMR, 0xffff);

	intel_uncore_posting_read16(uncore, GEN2_IMR);
@@ -309,7 +309,7 @@ void gen3_irq_init(struct intel_uncore *uncore, 
	intel_uncore_posting_read(uncore, imr);

}



void gen2_irq_init(struct intel_uncore *uncore,

static void gen2_irq_init(struct intel_uncore *uncore,

			  u32 imr_val, u32 ier_val)

{

	gen2_assert_iir_is_zero(uncore);
@@ -3871,7 +3871,7 @@ static void i8xx_irq_reset(struct drm_i915_private *dev_priv) 


	i9xx_pipestat_irq_reset(dev_priv);



	GEN2_IRQ_RESET(uncore);

	gen2_irq_reset(uncore);

	dev_priv->irq_mask = ~0u;

}
@@ -3897,7 +3897,7 @@ static void i8xx_irq_postinstall(struct drm_i915_private *dev_priv) 
		I915_MASTER_ERROR_INTERRUPT |

		I915_USER_INTERRUPT;



	GEN2_IRQ_INIT(uncore, dev_priv->irq_mask, enable_mask);

	gen2_irq_init(uncore, dev_priv->irq_mask, enable_mask);



	/* Interrupt setup is already guaranteed to be single-threaded, this is

	 * just to make the assert_spin_locked check happy. */

drivers/gpu/drm/i915/i915_irq.h

+0 −9
Original line number Diff line number Diff line
@@ -90,12 +90,9 @@ void i965_disable_vblank(struct drm_crtc *crtc); 
void ilk_disable_vblank(struct drm_crtc *crtc);

void bdw_disable_vblank(struct drm_crtc *crtc);



void gen2_irq_reset(struct intel_uncore *uncore);

void gen3_irq_reset(struct intel_uncore *uncore, i915_reg_t imr,

		    i915_reg_t iir, i915_reg_t ier);



void gen2_irq_init(struct intel_uncore *uncore,

		   u32 imr_val, u32 ier_val);

void gen3_irq_init(struct intel_uncore *uncore,

		   i915_reg_t imr, u32 imr_val,

		   i915_reg_t ier, u32 ier_val,
@@ -111,9 +108,6 @@ void gen3_irq_init(struct intel_uncore *uncore, 
#define GEN3_IRQ_RESET(uncore, type) \

	gen3_irq_reset((uncore), type##IMR, type##IIR, type##IER)



#define GEN2_IRQ_RESET(uncore) \

	gen2_irq_reset(uncore)



#define GEN8_IRQ_INIT_NDX(uncore, type, which, imr_val, ier_val) \

({ \

	unsigned int which_ = which; \
@@ -129,7 +123,4 @@ void gen3_irq_init(struct intel_uncore *uncore, 
		      type##IER, ier_val, \

		      type##IIR)



#define GEN2_IRQ_INIT(uncore, imr_val, ier_val) \

	gen2_irq_init((uncore), imr_val, ier_val)



#endif /* __I915_IRQ_H__ */