| Message ID | 20200521003803.18936-9-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce DG1 | expand |
On Wed, 2020-05-20 at 17:37 -0700, Lucas De Marchi wrote: > Return the old value read so some places of the code can still do the > rmw but add warnings/errors about the value it read. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/display/intel_de.h | 4 ++-- > drivers/gpu/drm/i915/intel_uncore.h | 10 +++++++--- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h > index 00da10bf35f5..d5441b1ba2fe 100644 > --- a/drivers/gpu/drm/i915/display/intel_de.h > +++ b/drivers/gpu/drm/i915/display/intel_de.h > @@ -42,10 +42,10 @@ intel_de_write_fw(struct drm_i915_private *i915, i915_reg_t reg, u32 val) > intel_uncore_write_fw(&i915->uncore, reg, val); > } > Maybe add function documentation with this new information about the return? With that: Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > -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 > diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h > index 8d3aa8b9acf9..5da43b56fa11 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.h > +++ b/drivers/gpu/drm/i915/intel_uncore.h > @@ -379,8 +379,8 @@ 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, > - i915_reg_t reg, u32 clear, u32 set) > +static inline u32 intel_uncore_rmw(struct intel_uncore *uncore, > + i915_reg_t reg, u32 clear, u32 set) > { > u32 old, val; > > @@ -388,9 +388,11 @@ static inline void intel_uncore_rmw(struct intel_uncore *uncore, > 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, > +static inline u32 intel_uncore_rmw_fw(struct intel_uncore *uncore, > i915_reg_t reg, u32 clear, u32 set) > { > u32 old, val; > @@ -399,6 +401,8 @@ static inline void intel_uncore_rmw_fw(struct intel_uncore *uncore, > val = (old & ~clear) | set; > if (val != old) > intel_uncore_write_fw(uncore, reg, val); > + > + return old; > } > > static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,
diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h index 00da10bf35f5..d5441b1ba2fe 100644 --- a/drivers/gpu/drm/i915/display/intel_de.h +++ b/drivers/gpu/drm/i915/display/intel_de.h @@ -42,10 +42,10 @@ 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 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 diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 8d3aa8b9acf9..5da43b56fa11 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -379,8 +379,8 @@ 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, - i915_reg_t reg, u32 clear, u32 set) +static inline u32 intel_uncore_rmw(struct intel_uncore *uncore, + i915_reg_t reg, u32 clear, u32 set) { u32 old, val; @@ -388,9 +388,11 @@ static inline void intel_uncore_rmw(struct intel_uncore *uncore, 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, +static inline u32 intel_uncore_rmw_fw(struct intel_uncore *uncore, i915_reg_t reg, u32 clear, u32 set) { u32 old, val; @@ -399,6 +401,8 @@ static inline void intel_uncore_rmw_fw(struct intel_uncore *uncore, val = (old & ~clear) | set; if (val != old) intel_uncore_write_fw(uncore, reg, val); + + return old; } static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,
Return the old value read so some places of the code can still do the rmw but add warnings/errors about the value it read. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/display/intel_de.h | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-)