Commit 81b55ef1 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: drop a bunch of superfluous inlines 



Remove a number of inlines from .c files, and let the compiler decide
what's best. There's more to do, but need to start somewhere, and need
to start setting the example.

Acked-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/20200420140438.14672-2-jani.nikula@intel.com
parent 3c304114

drivers/gpu/drm/i915/display/icl_dsi.c

+4 −4
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ 
#include "intel_panel.h"

#include "intel_vdsc.h"



static inline int header_credits_available(struct drm_i915_private *dev_priv,

static int header_credits_available(struct drm_i915_private *dev_priv,

				    enum transcoder dsi_trans)

{

	return (intel_de_read(dev_priv, DSI_CMD_TXCTL(dsi_trans)) & FREE_HEADER_CREDIT_MASK)

		>> FREE_HEADER_CREDIT_SHIFT;

}



static inline int payload_credits_available(struct drm_i915_private *dev_priv,

static int payload_credits_available(struct drm_i915_private *dev_priv,

				     enum transcoder dsi_trans)

{

	return (intel_de_read(dev_priv, DSI_CMD_TXCTL(dsi_trans)) & FREE_PLOAD_CREDIT_MASK)

drivers/gpu/drm/i915/display/intel_ddi.c

+3 −4
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder, 
	return true;

}



static inline enum intel_display_power_domain

static enum intel_display_power_domain

intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port)

{

	/* CNL+ HW requires corresponding AUX IOs to be powered up for PSR with
@@ -2693,8 +2693,7 @@ u32 ddi_signal_levels(struct intel_dp *intel_dp) 
	return DDI_BUF_TRANS_SELECT(level);

}



static inline

u32 icl_dpclka_cfgcr0_clk_off(struct drm_i915_private *dev_priv,

static u32 icl_dpclka_cfgcr0_clk_off(struct drm_i915_private *dev_priv,

				     enum phy phy)

{

	if (intel_phy_is_combo(dev_priv, phy)) {

drivers/gpu/drm/i915/display/intel_display.c

+5 −5
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ static void intel_update_czclk(struct drm_i915_private *dev_priv) 
		dev_priv->czclk_freq);

}













static inline u32 /* units of 100MHz */













intel_fdi_link_freq(struct drm_i915_private *dev_priv,













/* units of 100MHz */













static u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,















			       const struct intel_crtc_state *pipe_config)















{















	if (HAS_DDI(dev_priv))










@@ -8134,7 +8134,7 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv)













	}















}



























static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)













static bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)















{















	if (i915_modparams.panel_use_ssc >= 0)















		return i915_modparams.panel_use_ssc != 0;










@@ -12827,7 +12827,7 @@ static void intel_dump_crtc_timings(struct drm_i915_private *i915,













		    mode->type, mode->flags);















}



























static inline void













static void















intel_dump_m_n_config(const struct intel_crtc_state *pipe_config,















		      const char *id, unsigned int lane_count,















		      const struct intel_link_m_n *m_n)

































drivers/gpu/drm/i915/display/intel_display_power.c



+2
−3






























Original line number
Diff line number
Diff line








@@ -4515,8 +4515,7 @@ static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)













	mutex_unlock(&power_domains->lock);















}





























static inline













bool intel_dbuf_slice_set(struct drm_i915_private *dev_priv,













static bool intel_dbuf_slice_set(struct drm_i915_private *dev_priv,















				 i915_reg_t reg, bool enable)















{















	u32 val, status;

































drivers/gpu/drm/i915/display/intel_dp.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -6895,8 +6895,8 @@ static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = {













	  0, 0 },















};





























static inline













int intel_dp_hdcp2_read_rx_status(struct intel_digital_port *intel_dig_port,













static int













intel_dp_hdcp2_read_rx_status(struct intel_digital_port *intel_dig_port,















			      u8 *rx_status)















{















	struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE