Commit 56d2a47e authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/de: Move intel_de_wait*() into intel_de.c 



intel_de_wait*() end up doing quite a bit of stuff, so the one
function call overhead from them seems insignificant. Move the
implementation intel_de.c.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260313111028.25159-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 658b3c96

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

+72 −0
Original line number Diff line number Diff line
@@ -7,6 +7,78 @@ 


#include "intel_de.h"



int intel_de_wait_us(struct intel_display *display, i915_reg_t reg,

		     u32 mask, u32 value, unsigned int timeout_us,

		     u32 *out_value)

{

	int ret;



	intel_dmc_wl_get(display, reg);



	ret = __intel_wait_for_register(__to_uncore(display), reg, mask,

					value, timeout_us, 0, out_value);



	intel_dmc_wl_put(display, reg);



	return ret;

}



int intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,

		     u32 mask, u32 value, unsigned int timeout_ms,

		     u32 *out_value)

{

	int ret;



	intel_dmc_wl_get(display, reg);



	ret = __intel_wait_for_register(__to_uncore(display), reg, mask,

					value, 2, timeout_ms, out_value);



	intel_dmc_wl_put(display, reg);



	return ret;

}



int intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,

			u32 mask, u32 value, unsigned int timeout_ms,

			u32 *out_value)

{

	return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,

					    value, 2, timeout_ms, out_value);

}



int intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,

			       u32 mask, u32 value, unsigned int timeout_us,

			       u32 *out_value)

{

	return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,

					    value, timeout_us, 0, out_value);

}



int intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,

			     u32 mask, unsigned int timeout_us)

{

	return intel_de_wait_us(display, reg, mask, mask, timeout_us, NULL);

}



int intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,

			       u32 mask, unsigned int timeout_us)

{

	return intel_de_wait_us(display, reg, mask, 0, timeout_us, NULL);

}



int intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,

			     u32 mask, unsigned int timeout_ms)

{

	return intel_de_wait_ms(display, reg, mask, mask, timeout_ms, NULL);

}



int intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,

			       u32 mask, unsigned int timeout_ms)

{

	return intel_de_wait_ms(display, reg, mask, 0, timeout_ms, NULL);

}



u8 intel_de_read8(struct intel_display *display, i915_reg_t reg)

{

	/* this is only used on VGA registers (possible on pre-g4x) */

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

+20 −79
Original line number Diff line number Diff line
@@ -86,85 +86,26 @@ intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear, u32 set) 
	return val;

}



static inline int

intel_de_wait_us(struct intel_display *display, i915_reg_t reg,

int intel_de_wait_us(struct intel_display *display, i915_reg_t reg,

		     u32 mask, u32 value, unsigned int timeout_us,

		 u32 *out_value)

{

	int ret;



	intel_dmc_wl_get(display, reg);



	ret = __intel_wait_for_register(__to_uncore(display), reg, mask,

					value, timeout_us, 0, out_value);



	intel_dmc_wl_put(display, reg);



	return ret;

}



static inline int

intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,

		     u32 *out_value);

int intel_de_wait_ms(struct intel_display *display, i915_reg_t reg,

		     u32 mask, u32 value, unsigned int timeout_ms,

		 u32 *out_value)

{

	int ret;



	intel_dmc_wl_get(display, reg);



	ret = __intel_wait_for_register(__to_uncore(display), reg, mask,

					value, 2, timeout_ms, out_value);



	intel_dmc_wl_put(display, reg);



	return ret;

}



static inline int

intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,

		     u32 *out_value);

int intel_de_wait_fw_ms(struct intel_display *display, i915_reg_t reg,

			u32 mask, u32 value, unsigned int timeout_ms,

		    u32 *out_value)

{

	return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,

					    value, 2, timeout_ms, out_value);

}



static inline int

intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,

			u32 *out_value);

int intel_de_wait_fw_us_atomic(struct intel_display *display, i915_reg_t reg,

			       u32 mask, u32 value, unsigned int timeout_us,

			   u32 *out_value)

{

	return __intel_wait_for_register_fw(__to_uncore(display), reg, mask,

					    value, timeout_us, 0, out_value);

}



static inline int

intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,

			 u32 mask, unsigned int timeout_us)

{

	return intel_de_wait_us(display, reg, mask, mask, timeout_us, NULL);

}



static inline int

intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,

			   u32 mask, unsigned int timeout_us)

{

	return intel_de_wait_us(display, reg, mask, 0, timeout_us, NULL);

}



static inline int

intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,

			 u32 mask, unsigned int timeout_ms)

{

	return intel_de_wait_ms(display, reg, mask, mask, timeout_ms, NULL);

}



static inline int

intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,

			   u32 mask, unsigned int timeout_ms)

{

	return intel_de_wait_ms(display, reg, mask, 0, timeout_ms, NULL);

}

			       u32 *out_value);

int intel_de_wait_for_set_us(struct intel_display *display, i915_reg_t reg,

			     u32 mask, unsigned int timeout_us);

int intel_de_wait_for_clear_us(struct intel_display *display, i915_reg_t reg,

			       u32 mask, unsigned int timeout_us);

int intel_de_wait_for_set_ms(struct intel_display *display, i915_reg_t reg,

			     u32 mask, unsigned int timeout_ms);

int intel_de_wait_for_clear_ms(struct intel_display *display, i915_reg_t reg,

			       u32 mask, unsigned int timeout_ms);



/*

 * Unlocked mmio-accessors, think carefully before using these.