Commit 93b3c44d authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Jani Nikula
Browse files

drm/i915/de: Add more macros to remove all direct calls to uncore 



Add more de helpers to be able to avoid direct calls to uncore.

v3 by Jani:
- drop intel_de_write_samevalue/intel_de_rewrite_fw altogether

v2 by Jani:
- drop pcode stuff for now
- rename intel_de_write_samevalue -> intel_de_rewrite_fw

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0d051554dfeeb4d8aa3bc9136ed111fa35f647d8.1670433372.git.jani.nikula@intel.com
parent 40c30122

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

+35 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ intel_de_read(struct drm_i915_private *i915, i915_reg_t reg) 
	return intel_uncore_read(&i915->uncore, reg);

}



static inline u8

intel_de_read8(struct drm_i915_private *i915, i915_reg_t reg)

{

	return intel_uncore_read8(&i915->uncore, reg);

}



static inline void

intel_de_posting_read(struct drm_i915_private *i915, i915_reg_t reg)

{
@@ -41,6 +47,23 @@ intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg, 
	return intel_wait_for_register(&i915->uncore, reg, mask, value, timeout);

}



static inline int

intel_de_wait_for_register_fw(struct drm_i915_private *i915, i915_reg_t reg,

			      u32 mask, u32 value, unsigned int timeout)

{

	return intel_wait_for_register_fw(&i915->uncore, reg, mask, value, timeout);

}



static inline int

__intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg,

			     u32 mask, u32 value,

			     unsigned int fast_timeout_us,

			     unsigned int slow_timeout_ms, u32 *out_value)

{

	return __intel_wait_for_register(&i915->uncore, reg, mask, value,

					 fast_timeout_us, slow_timeout_ms, out_value);

}



static inline int

intel_de_wait_for_set(struct drm_i915_private *i915, i915_reg_t reg,

		      u32 mask, unsigned int timeout)
@@ -81,4 +104,16 @@ intel_de_write_fw(struct drm_i915_private *i915, i915_reg_t reg, u32 val) 
	intel_uncore_write_fw(&i915->uncore, reg, val);

}



static inline u32

intel_de_read_notrace(struct drm_i915_private *i915, i915_reg_t reg)

{

	return intel_uncore_read_notrace(&i915->uncore, reg);

}



static inline void

intel_de_write_notrace(struct drm_i915_private *i915, i915_reg_t reg, u32 val)

{

	intel_uncore_write_notrace(&i915->uncore, reg, val);

}



#endif /* __INTEL_DE_H__ */