Commit 06b975d5 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Andi Shyti
Browse files

drm/i915: make intel_uncore_rmw() write unconditionally 



Two small changes in intel_uncore_rmw will allow to use it more broadly:
- write register unconditionally, for use with latch registers,
- return old value of the register, IRQ cleanup and similar.

If we really want to keep write-only-if-changed feature maybe other
helper will be more suitable for it, intel_uncore_rmw name suggests
unconditional write.

Signed-off-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221006163200.2803722-4-andrzej.hajda@intel.com
parent e58c2cac

drivers/gpu/drm/i915/intel_uncore.h

+4 −4
Original line number Diff line number Diff line
@@ -413,15 +413,15 @@ intel_uncore_read64_2x32(struct intel_uncore *uncore, 
#define intel_uncore_write64_fw(...) __raw_uncore_write64(__VA_ARGS__)

#define intel_uncore_posting_read_fw(...) ((void)intel_uncore_read_fw(__VA_ARGS__))



static inline void intel_uncore_rmw(struct intel_uncore *uncore,

static inline u32 intel_uncore_rmw(struct intel_uncore *uncore,

				   i915_reg_t reg, u32 clear, u32 set)

{

	u32 old, val;



	old = intel_uncore_read(uncore, reg);

	val = (old & ~clear) | set;

	if (val != old)

	intel_uncore_write(uncore, reg, val);

	return old;

}



static inline void intel_uncore_rmw_fw(struct intel_uncore *uncore,