drm/i915/de: return the old register value from intel_de_rmw()
authorJani Nikula <jani.nikula@intel.com>
Wed, 7 Dec 2022 17:17:19 +0000 (19:17 +0200)
committerJani Nikula <jani.nikula@intel.com>
Thu, 8 Dec 2022 12:57:27 +0000 (14:57 +0200)
A similar thing was added in intel_uncore_rmw(). Make it available for
display too.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b82cb29e8ece63e68499307f9e3e83139e590d23.1670433372.git.jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_de.h

index 004f019..3dbd76f 100644 (file)
@@ -34,10 +34,10 @@ intel_de_write(struct drm_i915_private *i915, i915_reg_t reg, u32 val)
        intel_uncore_write(&i915->uncore, reg, val);
 }
 
-static inline void
+static inline u32
 intel_de_rmw(struct drm_i915_private *i915, i915_reg_t reg, u32 clear, u32 set)
 {
-       intel_uncore_rmw(&i915->uncore, reg, clear, set);
+       return intel_uncore_rmw(&i915->uncore, reg, clear, set);
 }
 
 static inline int