drm/i915: convert VLV IOSF SB interface to struct drm_device

With users both in i915 core and display, struct drm_device is the
common denominator for the VLV IOSF SB users. Also use drm_device for
the helpers on the display side to keep the static inlines as simple as
possible.

We can drop a number of dependencies on i915_drv.h with this.

v2,v3: Rebase

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/c1d013ed88ce2e3e5bdc15ce3bf01a3960b1e817.1747061743.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

1 files changed, 55 insertions, 55 deletions

diff --git a/drivers/gpu/drm/i915/display/vlv_sideband.h b/drivers/gpu/drm/i915/display/vlv_sideband.h
index beac69157d24..2c240d81fead 100644
--- a/drivers/gpu/drm/i915/display/vlv_sideband.h
+++ b/drivers/gpu/drm/i915/display/vlv_sideband.h
@@ -11,146 +11,146 @@
 #include "vlv_iosf_sb_reg.h"
 
 enum dpio_phy;
-struct drm_i915_private;
+struct drm_device;
 
-static inline void vlv_bunit_get(struct drm_i915_private *i915)
+static inline void vlv_bunit_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_BUNIT));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_BUNIT));
 }
 
-static inline u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg)
+static inline u32 vlv_bunit_read(struct drm_device *drm, u32 reg)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_BUNIT, reg);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_BUNIT, reg);
 }
 
-static inline void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val)
+static inline void vlv_bunit_write(struct drm_device *drm, u32 reg, u32 val)
 {
-	vlv_iosf_sb_write(i915, VLV_IOSF_SB_BUNIT, reg, val);
+	vlv_iosf_sb_write(drm, VLV_IOSF_SB_BUNIT, reg, val);
 }
 
-static inline void vlv_bunit_put(struct drm_i915_private *i915)
+static inline void vlv_bunit_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_BUNIT));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_BUNIT));
 }
 
-static inline void vlv_cck_get(struct drm_i915_private *i915)
+static inline void vlv_cck_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCK));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCK));
 }
 
-static inline u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg)
+static inline u32 vlv_cck_read(struct drm_device *drm, u32 reg)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCK, reg);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCK, reg);
 }
 
-static inline void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val)
+static inline void vlv_cck_write(struct drm_device *drm, u32 reg, u32 val)
 {
-	vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCK, reg, val);
+	vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCK, reg, val);
 }
 
-static inline void vlv_cck_put(struct drm_i915_private *i915)
+static inline void vlv_cck_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCK));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCK));
 }
 
-static inline void vlv_ccu_get(struct drm_i915_private *i915)
+static inline void vlv_ccu_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCU));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_CCU));
 }
 
-static inline u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg)
+static inline u32 vlv_ccu_read(struct drm_device *drm, u32 reg)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCU, reg);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_CCU, reg);
 }
 
-static inline void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val)
+static inline void vlv_ccu_write(struct drm_device *drm, u32 reg, u32 val)
 {
-	vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCU, reg, val);
+	vlv_iosf_sb_write(drm, VLV_IOSF_SB_CCU, reg, val);
 }
 
-static inline void vlv_ccu_put(struct drm_i915_private *i915)
+static inline void vlv_ccu_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCU));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_CCU));
 }
 
-static inline void vlv_dpio_get(struct drm_i915_private *i915)
+static inline void vlv_dpio_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
 }
 
 #ifdef I915
-u32 vlv_dpio_read(struct drm_i915_private *i915, enum dpio_phy phy, int reg);
-void vlv_dpio_write(struct drm_i915_private *i915,
+u32 vlv_dpio_read(struct drm_device *drm, enum dpio_phy phy, int reg);
+void vlv_dpio_write(struct drm_device *drm,
 		    enum dpio_phy phy, int reg, u32 val);
 #else
-static inline u32 vlv_dpio_read(struct drm_i915_private *i915, int phy, int reg)
+static inline u32 vlv_dpio_read(struct drm_device *drm, int phy, int reg)
 {
 	return 0;
 }
-static inline void vlv_dpio_write(struct drm_i915_private *i915,
+static inline void vlv_dpio_write(struct drm_device *drm,
 				  int phy, int reg, u32 val)
 {
 }
 #endif
 
-static inline void vlv_dpio_put(struct drm_i915_private *i915)
+static inline void vlv_dpio_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
 }
 
-static inline void vlv_flisdsi_get(struct drm_i915_private *i915)
+static inline void vlv_flisdsi_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_FLISDSI));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_FLISDSI));
 }
 
-static inline u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg)
+static inline u32 vlv_flisdsi_read(struct drm_device *drm, u32 reg)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_FLISDSI, reg);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_FLISDSI, reg);
 }
 
-static inline void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val)
+static inline void vlv_flisdsi_write(struct drm_device *drm, u32 reg, u32 val)
 {
-	vlv_iosf_sb_write(i915, VLV_IOSF_SB_FLISDSI, reg, val);
+	vlv_iosf_sb_write(drm, VLV_IOSF_SB_FLISDSI, reg, val);
 }
 
-static inline void vlv_flisdsi_put(struct drm_i915_private *i915)
+static inline void vlv_flisdsi_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_FLISDSI));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_FLISDSI));
 }
 
-static inline void vlv_nc_get(struct drm_i915_private *i915)
+static inline void vlv_nc_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_NC));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_NC));
 }
 
-static inline u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr)
+static inline u32 vlv_nc_read(struct drm_device *drm, u8 addr)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_NC, addr);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_NC, addr);
 }
 
-static inline void vlv_nc_put(struct drm_i915_private *i915)
+static inline void vlv_nc_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_NC));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_NC));
 }
 
-static inline void vlv_punit_get(struct drm_i915_private *i915)
+static inline void vlv_punit_get(struct drm_device *drm)
 {
-	vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT));
+	vlv_iosf_sb_get(drm, BIT(VLV_IOSF_SB_PUNIT));
 }
 
-static inline u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr)
+static inline u32 vlv_punit_read(struct drm_device *drm, u32 addr)
 {
-	return vlv_iosf_sb_read(i915, VLV_IOSF_SB_PUNIT, addr);
+	return vlv_iosf_sb_read(drm, VLV_IOSF_SB_PUNIT, addr);
 }
 
-static inline int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val)
+static inline int vlv_punit_write(struct drm_device *drm, u32 addr, u32 val)
 {
-	return vlv_iosf_sb_write(i915, VLV_IOSF_SB_PUNIT, addr, val);
+	return vlv_iosf_sb_write(drm, VLV_IOSF_SB_PUNIT, addr, val);
 }
 
-static inline void vlv_punit_put(struct drm_i915_private *i915)
+static inline void vlv_punit_put(struct drm_device *drm)
 {
-	vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT));
+	vlv_iosf_sb_put(drm, BIT(VLV_IOSF_SB_PUNIT));
 }
 
 #endif /* _VLV_SIDEBAND_H_ */