]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915: move VLV IOSF SB unit specific helpers under display
authorJani Nikula <jani.nikula@intel.com>
Mon, 12 May 2025 14:56:56 +0000 (17:56 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 13 May 2025 07:26:45 +0000 (10:26 +0300)
Now that all the VLV IOSF SB unit specific helper users are under
display, relocate the helpers themselves under display as
well. Resurrect the vlv_sideband.[ch] name for this. Make everything
except DPIO helpers static inlines, as their implementations are
trivial.

All of this considerably simplifies the xe compat header.

v2: Rebase

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/e86c2498c9f1c1d30f8e83fa5f1c23526b87b9ab.1747061743.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
16 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/i9xx_wm.c
drivers/gpu/drm/i915/display/intel_cdclk.c
drivers/gpu/drm/i915/display/intel_display.c
drivers/gpu/drm/i915/display/intel_display_power.c
drivers/gpu/drm/i915/display/intel_display_power_well.c
drivers/gpu/drm/i915/display/intel_dpio_phy.c
drivers/gpu/drm/i915/display/intel_dpll.c
drivers/gpu/drm/i915/display/intel_dsi_vbt.c
drivers/gpu/drm/i915/display/vlv_dsi.c
drivers/gpu/drm/i915/display/vlv_dsi_pll.c
drivers/gpu/drm/i915/display/vlv_sideband.c [new file with mode: 0644]
drivers/gpu/drm/i915/display/vlv_sideband.h [new file with mode: 0644]
drivers/gpu/drm/i915/vlv_iosf_sb.c
drivers/gpu/drm/i915/vlv_iosf_sb.h
drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h

index 3e3e4f4bfa4e2ffa4b94f5436bba7d9774b6bf51..1a90eb1f180aab3e54aba8e411efd2c5bc42df77 100644 (file)
@@ -296,7 +296,8 @@ i915-y += \
        display/intel_wm.o \
        display/skl_scaler.o \
        display/skl_universal_plane.o \
-       display/skl_watermark.o
+       display/skl_watermark.o \
+       display/vlv_sideband.o
 i915-$(CONFIG_ACPI) += \
        display/intel_acpi.o \
        display/intel_opregion.o
index 02f33cbe6765c69f8c12ad423a24b48fa11db4e7..77876ef735b746b486e2efcb492d8b4752522ba2 100644 (file)
@@ -16,7 +16,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_wm.h"
 #include "skl_watermark.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 struct intel_watermark_params {
        u16 fifo_size;
index 501b794984149219a1c88a458a06724b288c27f4..b1718b491ffdab596f8313d518fa048243305afb 100644 (file)
@@ -47,7 +47,7 @@
 #include "skl_watermark.h"
 #include "skl_watermark_regs.h"
 #include "vlv_dsi.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 /**
  * DOC: CDCLK / RAWCLK
index c7a6b710b7c0a0b0c1b2cf430c2435faa2cfe43e..704ca079980c27c930146995350c70fbd35a61ad 100644 (file)
 #include "vlv_dsi.h"
 #include "vlv_dsi_pll.h"
 #include "vlv_dsi_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state);
 static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state);
index b3b05d7610e8a673aef847b47d5ed039c5171fd2..16356523816fb8438d88851ab2a19ccc1b7662ef 100644 (file)
@@ -27,7 +27,7 @@
 #include "intel_snps_phy.h"
 #include "skl_watermark.h"
 #include "skl_watermark_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 #define for_each_power_domain_well(__display, __power_well, __domain)  \
        for_each_power_well((__display), __power_well)                  \
index 6772ac0c3f84c508effd26690d0826831b0df7d6..0a3d302f9d1b16ab632081a2c0f0f634c541cc89 100644 (file)
@@ -30,7 +30,7 @@
 #include "intel_vga.h"
 #include "skl_watermark.h"
 #include "vlv_dpio_phy_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 #include "vlv_iosf_sb_reg.h"
 
 struct i915_power_well_regs {
index 5b9c0852da2cfe29730146f55d25a5a3bd81d05f..69f2421394205f0186a674d8e141ce3febaa802c 100644 (file)
@@ -32,7 +32,7 @@
 #include "intel_dp.h"
 #include "intel_dpio_phy.h"
 #include "vlv_dpio_phy_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 /**
  * DOC: DPIO
index 055dd2b4a90437397fa2cfad9457acd0ff304a68..a9e9b98d0bf9c9c6ee33b48ff9306003d64962da 100644 (file)
@@ -22,7 +22,7 @@
 #include "intel_pps.h"
 #include "intel_snps_phy.h"
 #include "vlv_dpio_phy_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 struct intel_dpll_funcs {
        int (*crtc_compute_clock)(struct intel_atomic_state *state,
index dce4fdf091f679164f8107984e1a4ef9df45f4b7..29c9209834138e07af768ebc61faf1f78332c2f0 100644 (file)
@@ -49,7 +49,7 @@
 #include "intel_pps_regs.h"
 #include "vlv_dsi.h"
 #include "vlv_dsi_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 #define MIPI_TRANSFER_MODE_SHIFT       0
 #define MIPI_VIRTUAL_CHANNEL_SHIFT     1
index 110914bbc1348dede23f9b326084b7802506420d..346737f15fa93264ab8791912cc4cc128f2f3324 100644 (file)
@@ -49,7 +49,7 @@
 #include "vlv_dsi.h"
 #include "vlv_dsi_pll.h"
 #include "vlv_dsi_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 /* return pixels in terms of txbyteclkhs */
 static u16 txbyteclkhs(u16 pixels, int bpp, int lane_count,
index 79438cdfc3f9d38356bd83ba944b5ce72f9ffdc0..7ce924a5ef90b8ecdcc74800e8b368792ae0dad7 100644 (file)
@@ -34,7 +34,7 @@
 #include "intel_dsi.h"
 #include "vlv_dsi_pll.h"
 #include "vlv_dsi_pll_regs.h"
-#include "vlv_iosf_sb.h"
+#include "vlv_sideband.h"
 
 static const u16 lfsr_converts[] = {
        426, 469, 234, 373, 442, 221, 110, 311, 411,            /* 62 - 70 */
diff --git a/drivers/gpu/drm/i915/display/vlv_sideband.c b/drivers/gpu/drm/i915/display/vlv_sideband.c
new file mode 100644 (file)
index 0000000..f1caee3
--- /dev/null
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+/* Copyright © 2025 Intel Corporation */
+
+#include "i915_drv.h"
+#include "intel_dpio_phy.h"
+#include "vlv_sideband.h"
+
+static enum vlv_iosf_sb_unit vlv_dpio_phy_to_unit(struct drm_i915_private *i915,
+                                                 enum dpio_phy phy)
+{
+       /*
+        * IOSF_PORT_DPIO: VLV x2 PHY (DP/HDMI B and C), CHV x1 PHY (DP/HDMI D)
+        * IOSF_PORT_DPIO_2: CHV x2 PHY (DP/HDMI B and C)
+        */
+       if (IS_CHERRYVIEW(i915))
+               return phy == DPIO_PHY0 ? VLV_IOSF_SB_DPIO_2 : VLV_IOSF_SB_DPIO;
+       else
+               return VLV_IOSF_SB_DPIO;
+}
+
+u32 vlv_dpio_read(struct drm_i915_private *i915, enum dpio_phy phy, int reg)
+{
+       enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(i915, phy);
+       u32 val;
+
+       val = vlv_iosf_sb_read(i915, unit, reg);
+
+       /*
+        * FIXME: There might be some registers where all 1's is a valid value,
+        * so ideally we should check the register offset instead...
+        */
+       drm_WARN(&i915->drm, val == 0xffffffff,
+                "DPIO PHY%d read reg 0x%x == 0x%x\n",
+                phy, reg, val);
+
+       return val;
+}
+
+void vlv_dpio_write(struct drm_i915_private *i915,
+                   enum dpio_phy phy, int reg, u32 val)
+{
+       enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(i915, phy);
+
+       vlv_iosf_sb_write(i915, unit, reg, val);
+}
diff --git a/drivers/gpu/drm/i915/display/vlv_sideband.h b/drivers/gpu/drm/i915/display/vlv_sideband.h
new file mode 100644 (file)
index 0000000..beac691
--- /dev/null
@@ -0,0 +1,156 @@
+/* SPDX-License-Identifier: MIT */
+/* Copyright © 2025 Intel Corporation */
+
+#ifndef _VLV_SIDEBAND_H_
+#define _VLV_SIDEBAND_H_
+
+#include <linux/bitops.h>
+#include <linux/types.h>
+
+#include "vlv_iosf_sb.h"
+#include "vlv_iosf_sb_reg.h"
+
+enum dpio_phy;
+struct drm_i915_private;
+
+static inline void vlv_bunit_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_BUNIT));
+}
+
+static inline u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_BUNIT, reg);
+}
+
+static inline void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val)
+{
+       vlv_iosf_sb_write(i915, VLV_IOSF_SB_BUNIT, reg, val);
+}
+
+static inline void vlv_bunit_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_BUNIT));
+}
+
+static inline void vlv_cck_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCK));
+}
+
+static inline u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCK, reg);
+}
+
+static inline void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val)
+{
+       vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCK, reg, val);
+}
+
+static inline void vlv_cck_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCK));
+}
+
+static inline void vlv_ccu_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCU));
+}
+
+static inline u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCU, reg);
+}
+
+static inline void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val)
+{
+       vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCU, reg, val);
+}
+
+static inline void vlv_ccu_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCU));
+}
+
+static inline void vlv_dpio_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, 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,
+                   enum dpio_phy phy, int reg, u32 val);
+#else
+static inline u32 vlv_dpio_read(struct drm_i915_private *i915, int phy, int reg)
+{
+       return 0;
+}
+static inline void vlv_dpio_write(struct drm_i915_private *i915,
+                                 int phy, int reg, u32 val)
+{
+}
+#endif
+
+static inline void vlv_dpio_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
+}
+
+static inline void vlv_flisdsi_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_FLISDSI));
+}
+
+static inline u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_FLISDSI, reg);
+}
+
+static inline void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val)
+{
+       vlv_iosf_sb_write(i915, VLV_IOSF_SB_FLISDSI, reg, val);
+}
+
+static inline void vlv_flisdsi_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_FLISDSI));
+}
+
+static inline void vlv_nc_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_NC));
+}
+
+static inline u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_NC, addr);
+}
+
+static inline void vlv_nc_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_NC));
+}
+
+static inline void vlv_punit_get(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT));
+}
+
+static inline u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr)
+{
+       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_PUNIT, addr);
+}
+
+static inline int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val)
+{
+       return vlv_iosf_sb_write(i915, VLV_IOSF_SB_PUNIT, addr, val);
+}
+
+static inline void vlv_punit_put(struct drm_i915_private *i915)
+{
+       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT));
+}
+
+#endif /* _VLV_SIDEBAND_H_ */
index efb5ee39dbbb2ee9e0c1203419fefbe578fc55d5..c6418d54dae9fd77544819108f21f1703f2a4737 100644 (file)
@@ -196,100 +196,6 @@ int vlv_iosf_sb_write(struct drm_i915_private *i915, enum vlv_iosf_sb_unit unit,
        return vlv_sideband_rw(i915, devfn, port, opcode, addr, &val);
 }
 
-u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_PUNIT, addr);
-}
-
-int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val)
-{
-       return vlv_iosf_sb_write(i915, VLV_IOSF_SB_PUNIT, addr, val);
-}
-
-u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_BUNIT, reg);
-}
-
-void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-       vlv_iosf_sb_write(i915, VLV_IOSF_SB_BUNIT, reg, val);
-}
-
-u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_NC, addr);
-}
-
-u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCK, reg);
-}
-
-void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-       vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCK, reg, val);
-}
-
-u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_CCU, reg);
-}
-
-void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-       vlv_iosf_sb_write(i915, VLV_IOSF_SB_CCU, reg, val);
-}
-
-static enum vlv_iosf_sb_unit vlv_dpio_phy_to_unit(struct drm_i915_private *i915,
-                                                 enum dpio_phy phy)
-{
-       /*
-        * IOSF_PORT_DPIO: VLV x2 PHY (DP/HDMI B and C), CHV x1 PHY (DP/HDMI D)
-        * IOSF_PORT_DPIO_2: CHV x2 PHY (DP/HDMI B and C)
-        */
-       if (IS_CHERRYVIEW(i915))
-               return phy == DPIO_PHY0 ? VLV_IOSF_SB_DPIO_2 : VLV_IOSF_SB_DPIO;
-       else
-               return VLV_IOSF_SB_DPIO;
-}
-
-u32 vlv_dpio_read(struct drm_i915_private *i915, enum dpio_phy phy, int reg)
-{
-       enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(i915, phy);
-       u32 val;
-
-       val = vlv_iosf_sb_read(i915, unit, reg);
-
-       /*
-        * FIXME: There might be some registers where all 1's is a valid value,
-        * so ideally we should check the register offset instead...
-        */
-       drm_WARN(&i915->drm, val == 0xffffffff,
-                "DPIO PHY%d read reg 0x%x == 0x%x\n",
-                phy, reg, val);
-
-       return val;
-}
-
-void vlv_dpio_write(struct drm_i915_private *i915,
-                   enum dpio_phy phy, int reg, u32 val)
-{
-       enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(i915, phy);
-
-       vlv_iosf_sb_write(i915, unit, reg, val);
-}
-
-u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg)
-{
-       return vlv_iosf_sb_read(i915, VLV_IOSF_SB_FLISDSI, reg);
-}
-
-void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-       vlv_iosf_sb_write(i915, VLV_IOSF_SB_FLISDSI, reg, val);
-}
-
 void vlv_iosf_sb_init(struct drm_i915_private *i915)
 {
        if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))
index 66f8918d497433f02f83b3a713e03a6feb05288f..f4fb7213fe3773b2efc6c0e8c322c81fe9983a99 100644 (file)
@@ -6,12 +6,10 @@
 #ifndef _VLV_IOSF_SB_H_
 #define _VLV_IOSF_SB_H_
 
-#include <linux/bitops.h>
 #include <linux/types.h>
 
 #include "vlv_iosf_sb_reg.h"
 
-enum dpio_phy;
 struct drm_i915_private;
 
 enum vlv_iosf_sb_unit {
@@ -35,95 +33,4 @@ void vlv_iosf_sb_put(struct drm_i915_private *i915, unsigned long ports);
 u32 vlv_iosf_sb_read(struct drm_i915_private *i915, enum vlv_iosf_sb_unit unit, u32 addr);
 int vlv_iosf_sb_write(struct drm_i915_private *i915, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
 
-static inline void vlv_bunit_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_BUNIT));
-}
-
-u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg);
-void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val);
-
-static inline void vlv_bunit_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_BUNIT));
-}
-
-static inline void vlv_cck_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCK));
-}
-
-u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg);
-void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val);
-
-static inline void vlv_cck_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCK));
-}
-
-static inline void vlv_ccu_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_CCU));
-}
-
-u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg);
-void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val);
-
-static inline void vlv_ccu_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_CCU));
-}
-
-static inline void vlv_dpio_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
-}
-
-u32 vlv_dpio_read(struct drm_i915_private *i915, enum dpio_phy phy, int reg);
-void vlv_dpio_write(struct drm_i915_private *i915,
-                   enum dpio_phy phy, int reg, u32 val);
-
-static inline void vlv_dpio_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
-}
-
-static inline void vlv_flisdsi_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_FLISDSI));
-}
-
-u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg);
-void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val);
-
-static inline void vlv_flisdsi_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_FLISDSI));
-}
-
-static inline void vlv_nc_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_NC));
-}
-
-u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr);
-
-static inline void vlv_nc_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_NC));
-}
-
-static inline void vlv_punit_get(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_get(i915, BIT(VLV_IOSF_SB_PUNIT));
-}
-
-u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr);
-int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val);
-
-static inline void vlv_punit_put(struct drm_i915_private *i915)
-{
-       vlv_iosf_sb_put(i915, BIT(VLV_IOSF_SB_PUNIT));
-}
-
 #endif /* _VLV_IOSF_SB_H_ */
index 57f7dde90ced81ab74cb0f3b806411be47979d59..e34d9c72a587fb4012341fb18357b4c598c980fa 100644 (file)
@@ -10,7 +10,6 @@
 
 #include "vlv_iosf_sb_reg.h"
 
-enum pipe;
 struct drm_i915_private;
 
 enum vlv_iosf_sb_unit {
@@ -39,95 +38,5 @@ static inline int vlv_iosf_sb_write(struct drm_i915_private *i915, enum vlv_iosf
 static inline void vlv_iosf_sb_put(struct drm_i915_private *i915, unsigned long ports)
 {
 }
-static inline void vlv_bunit_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_bunit_read(struct drm_i915_private *i915, u32 reg)
-{
-       return 0;
-}
-static inline void vlv_bunit_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-}
-static inline void vlv_bunit_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_cck_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg)
-{
-       return 0;
-}
-static inline void vlv_cck_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-}
-static inline void vlv_cck_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_ccu_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_ccu_read(struct drm_i915_private *i915, u32 reg)
-{
-       return 0;
-}
-static inline void vlv_ccu_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-}
-static inline void vlv_ccu_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_dpio_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_dpio_read(struct drm_i915_private *i915, int pipe, int reg)
-{
-       return 0;
-}
-static inline void vlv_dpio_write(struct drm_i915_private *i915,
-                                 int pipe, int reg, u32 val)
-{
-}
-static inline void vlv_dpio_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_flisdsi_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_flisdsi_read(struct drm_i915_private *i915, u32 reg)
-{
-       return 0;
-}
-static inline void vlv_flisdsi_write(struct drm_i915_private *i915, u32 reg, u32 val)
-{
-}
-static inline void vlv_flisdsi_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_nc_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr)
-{
-       return 0;
-}
-static inline void vlv_nc_put(struct drm_i915_private *i915)
-{
-}
-static inline void vlv_punit_get(struct drm_i915_private *i915)
-{
-}
-static inline u32 vlv_punit_read(struct drm_i915_private *i915, u32 addr)
-{
-       return 0;
-}
-static inline int vlv_punit_write(struct drm_i915_private *i915, u32 addr, u32 val)
-{
-       return 0;
-}
-static inline void vlv_punit_put(struct drm_i915_private *i915)
-{
-}
 
 #endif /* _VLV_IOSF_SB_H_ */