[PATCH] HAX: Verify uncore->lock on all raw reads/writes

Matt Roper matthew.d.roper at intel.com
Thu Nov 3 23:44:29 UTC 2022


Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
---
 drivers/gpu/drm/i915/intel_uncore.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 5449146a0624..392cb0bca65a 100644
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -316,6 +316,7 @@ static inline u##x__ __raw_uncore_read##x__(const struct intel_uncore *uncore, \
 	u32 offset = i915_mmio_reg_offset(reg); \
 	if (IS_GSI_REG(offset)) \
 		offset += uncore->gsi_offset; \
+	lockdep_assert_held(&uncore->lock); \
 	return read##s__(uncore->regs + offset); \
 }
 
@@ -326,6 +327,7 @@ static inline void __raw_uncore_write##x__(const struct intel_uncore *uncore, \
 	u32 offset = i915_mmio_reg_offset(reg); \
 	if (IS_GSI_REG(offset)) \
 		offset += uncore->gsi_offset; \
+	lockdep_assert_held(&uncore->lock); \
 	write##s__(val, uncore->regs + offset); \
 }
 __raw_read(8, b)
-- 
2.38.1



More information about the Intel-gfx-trybot mailing list