Commit 92ae3db4 authored by Dave Airlie's avatar Dave Airlie Committed by Jani Nikula
Browse files

drm/i915: move is_ccs_modifier to an inline 



There is no need for this to be out of line.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bb73a151b7b780f927edeb7e121449446592805d.1612536383.git.jani.nikula@intel.com
parent 14cebc1f

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

+0 −9
Original line number Diff line number Diff line
@@ -1826,15 +1826,6 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd) 
	}

}



bool is_ccs_modifier(u64 modifier)

{

	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||

	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||

	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||

	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||

	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;

}



static int gen12_ccs_aux_stride(struct drm_framebuffer *fb, int ccs_plane)

{

	return DIV_ROUND_UP(fb->pitches[skl_ccs_to_main_plane(fb, ccs_plane)],

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

+0 −1
Original line number Diff line number Diff line
@@ -517,7 +517,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes, 
			    int pixel_clock, int link_clock,

			    struct intel_link_m_n *m_n,

			    bool constant_n, bool fec_enable);

bool is_ccs_modifier(u64 modifier);

void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);

u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,

			      u32 pixel_format, u64 modifier);

drivers/gpu/drm/i915/display/intel_display_types.h

+9 −0
Original line number Diff line number Diff line
@@ -1946,6 +1946,15 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv, 
		return dev_priv->fdi_pll_freq;

}



static inline bool is_ccs_modifier(u64 modifier)

{

	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||

	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||

	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||

	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||

	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;

}



static inline bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)

{

	if (!is_ccs_modifier(fb->modifier))