Commit 9e6dcf33 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/irq: reduce inlines to reduce header dependencies 



Presumably if the compiler is smart, it does not generate an extra
function call to the update functions that are now static.

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

drivers/gpu/drm/i915/i915_irq.c

+40 −10
Original line number Diff line number Diff line
@@ -359,9 +359,8 @@ void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv, 
 * @interrupt_mask: mask of interrupt bits to update

 * @enabled_irq_mask: mask of interrupt bits to enable

 */

void ilk_update_display_irq(struct drm_i915_private *dev_priv,

			    u32 interrupt_mask,

			    u32 enabled_irq_mask)

static void ilk_update_display_irq(struct drm_i915_private *dev_priv,

				   u32 interrupt_mask, u32 enabled_irq_mask)

{

	u32 new_val;
@@ -380,6 +379,16 @@ void ilk_update_display_irq(struct drm_i915_private *dev_priv, 
	}

}



void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits)

{

	ilk_update_display_irq(i915, bits, bits);

}



void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits)

{

	ilk_update_display_irq(i915, bits, 0);

}



/**

 * bdw_update_port_irq - update DE port interrupt

 * @dev_priv: driver private
@@ -419,9 +428,8 @@ static void bdw_update_port_irq(struct drm_i915_private *dev_priv, 
 * @interrupt_mask: mask of interrupt bits to update

 * @enabled_irq_mask: mask of interrupt bits to enable

 */

void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,

			 enum pipe pipe,

			 u32 interrupt_mask,

static void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,

				enum pipe pipe, u32 interrupt_mask,

				u32 enabled_irq_mask)

{

	u32 new_val;
@@ -444,13 +452,25 @@ void bdw_update_pipe_irq(struct drm_i915_private *dev_priv, 
	}

}



void bdw_enable_pipe_irq(struct drm_i915_private *i915,

			 enum pipe pipe, u32 bits)

{

	bdw_update_pipe_irq(i915, pipe, bits, bits);

}



void bdw_disable_pipe_irq(struct drm_i915_private *i915,

			  enum pipe pipe, u32 bits)

{

	bdw_update_pipe_irq(i915, pipe, bits, 0);

}



/**

 * ibx_display_interrupt_update - update SDEIMR

 * @dev_priv: driver private

 * @interrupt_mask: mask of interrupt bits to update

 * @enabled_irq_mask: mask of interrupt bits to enable

 */

void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,

static void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,

					 u32 interrupt_mask,

					 u32 enabled_irq_mask)

{
@@ -469,6 +489,16 @@ void ibx_display_interrupt_update(struct drm_i915_private *dev_priv, 
	intel_uncore_posting_read(&dev_priv->uncore, SDEIMR);

}



void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits)

{

	ibx_display_interrupt_update(i915, bits, bits);

}



void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits)

{

	ibx_display_interrupt_update(i915, bits, 0);

}



u32 i915_pipestat_enable_mask(struct drm_i915_private *dev_priv,

			      enum pipe pipe)

{

drivers/gpu/drm/i915/i915_irq.h

+10 −41
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
#include <linux/ktime.h>

#include <linux/types.h>



#include "display/intel_display.h"

#include "i915_reg.h"



enum pipe;

struct drm_crtc;

struct drm_device;

struct drm_display_mode;
@@ -40,46 +40,15 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv); 
void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,

				   u32 mask,

				   u32 bits);

void ilk_update_display_irq(struct drm_i915_private *dev_priv,

			    u32 interrupt_mask,

			    u32 enabled_irq_mask);

static inline void

ilk_enable_display_irq(struct drm_i915_private *dev_priv, u32 bits)

{

	ilk_update_display_irq(dev_priv, bits, bits);

}

static inline void

ilk_disable_display_irq(struct drm_i915_private *dev_priv, u32 bits)

{

	ilk_update_display_irq(dev_priv, bits, 0);

}

void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,

			 enum pipe pipe,

			 u32 interrupt_mask,

			 u32 enabled_irq_mask);

static inline void bdw_enable_pipe_irq(struct drm_i915_private *dev_priv,

				       enum pipe pipe, u32 bits)

{

	bdw_update_pipe_irq(dev_priv, pipe, bits, bits);

}

static inline void bdw_disable_pipe_irq(struct drm_i915_private *dev_priv,

					enum pipe pipe, u32 bits)

{

	bdw_update_pipe_irq(dev_priv, pipe, bits, 0);

}

void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,

				  u32 interrupt_mask,

				  u32 enabled_irq_mask);

static inline void

ibx_enable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)

{

	ibx_display_interrupt_update(dev_priv, bits, bits);

}

static inline void

ibx_disable_display_interrupt(struct drm_i915_private *dev_priv, u32 bits)

{

	ibx_display_interrupt_update(dev_priv, bits, 0);

}



void ilk_enable_display_irq(struct drm_i915_private *i915, u32 bits);

void ilk_disable_display_irq(struct drm_i915_private *i915, u32 bits);



void bdw_enable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32 bits);

void bdw_disable_pipe_irq(struct drm_i915_private *i915, enum pipe pipe, u32 bits);



void ibx_enable_display_interrupt(struct drm_i915_private *i915, u32 bits);

void ibx_disable_display_interrupt(struct drm_i915_private *i915, u32 bits);



void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);

void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask);