drm/i915: move VLV IOSF sideband to display parent interface

Remove another direct dependency from display to i915 core by moving the
VLV IOSF sideband calls to the display parent interface. Xe doesn't need
this, so it'll remain optional and NULL.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/15dfc67b58f5b5b381be0f9bc66d60b43bebfecf.1774957233.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 8e0424a2c16f88d0f0f546f211231bc833ddb212..4a663dddf896436de67f3d2b029c0bd1c0340da2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -691,10 +691,10 @@ static void vlv_set_cdclk(struct intel_display *display,
         */
        wakeref = intel_display_power_get(display, POWER_DOMAIN_DISPLAY_CORE);
 
-       vlv_iosf_sb_get(display->drm,
-                       BIT(VLV_IOSF_SB_CCK) |
-                       BIT(VLV_IOSF_SB_BUNIT) |
-                       BIT(VLV_IOSF_SB_PUNIT));
+       intel_parent_vlv_iosf_get(display,
+                                 BIT(VLV_IOSF_SB_CCK) |
+                                 BIT(VLV_IOSF_SB_BUNIT) |
+                                 BIT(VLV_IOSF_SB_PUNIT));
 
        val = vlv_punit_read(display, PUNIT_REG_DSPSSPM);
        val &= ~DSPFREQGUAR_MASK;
@@ -740,10 +740,10 @@ static void vlv_set_cdclk(struct intel_display *display,
                val |= 3000 / 250; /* 3.0 usec */
        vlv_bunit_write(display, BUNIT_REG_BISOC, val);
 
-       vlv_iosf_sb_put(display->drm,
-                       BIT(VLV_IOSF_SB_CCK) |
-                       BIT(VLV_IOSF_SB_BUNIT) |
-                       BIT(VLV_IOSF_SB_PUNIT));
+       intel_parent_vlv_iosf_put(display,
+                                 BIT(VLV_IOSF_SB_CCK) |
+                                 BIT(VLV_IOSF_SB_BUNIT) |
+                                 BIT(VLV_IOSF_SB_PUNIT));
 
        intel_update_cdclk(display);
 

diff --git a/drivers/gpu/drm/i915/display/intel_parent.c b/drivers/gpu/drm/i915/display/intel_parent.c
index 2e3bad2b3e6b70c2a09c9cd8218ae4eb0df37f5e..4e01423a03922f56b42dba8fbf9ff63bbf8ac282 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.c
+++ b/drivers/gpu/drm/i915/display/intel_parent.c
@@ -22,6 +22,7 @@
 
 #include "intel_display_core.h"
 #include "intel_parent.h"
+#include "vlv_iosf_sb.h"
 
 /* dpt */
 struct intel_dpt *intel_parent_dpt_create(struct intel_display *display,
@@ -338,6 +339,39 @@ void intel_parent_stolen_node_free(struct intel_display *display, const struct i
        display->parent->stolen->node_free(node);
 }
 
+/* vlv iosf */
+void intel_parent_vlv_iosf_get(struct intel_display *display, unsigned long unit_mask)
+{
+       if (drm_WARN_ON_ONCE(display->drm, !display->parent->vlv_iosf))
+               return;
+
+       display->parent->vlv_iosf->get(display->drm, unit_mask);
+}
+
+void intel_parent_vlv_iosf_put(struct intel_display *display, unsigned long unit_mask)
+{
+       if (drm_WARN_ON_ONCE(display->drm, !display->parent->vlv_iosf))
+               return;
+
+       display->parent->vlv_iosf->put(display->drm, unit_mask);
+}
+
+u32 intel_parent_vlv_iosf_read(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr)
+{
+       if (drm_WARN_ON_ONCE(display->drm, !display->parent->vlv_iosf))
+               return 0;
+
+       return display->parent->vlv_iosf->read(display->drm, unit, addr);
+}
+
+int intel_parent_vlv_iosf_write(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr, u32 val)
+{
+       if (drm_WARN_ON_ONCE(display->drm, !display->parent->vlv_iosf))
+               return -EINVAL;
+
+       return display->parent->vlv_iosf->write(display->drm, unit, addr, val);
+}
+
 /* vma */
 int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_parent.h b/drivers/gpu/drm/i915/display/intel_parent.h
index 2013e5ed5aa9b680dc42c24ced02b1c8ed8751f2..1e89d24163cc912b3089bef6bf991148f78fa0a1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_parent.h
+++ b/drivers/gpu/drm/i915/display/intel_parent.h
@@ -6,6 +6,7 @@
 
 #include <linux/types.h>
 
+enum vlv_iosf_sb_unit;
 struct dma_fence;
 struct drm_file;
 struct drm_gem_object;
@@ -109,6 +110,12 @@ u64 intel_parent_stolen_node_size(struct intel_display *display, const struct in
 struct intel_stolen_node *intel_parent_stolen_node_alloc(struct intel_display *display);
 void intel_parent_stolen_node_free(struct intel_display *display, const struct intel_stolen_node *node);
 
+/* vlv iosf */
+void intel_parent_vlv_iosf_get(struct intel_display *display, unsigned long unit_mask);
+void intel_parent_vlv_iosf_put(struct intel_display *display, unsigned long unit_mask);
+u32 intel_parent_vlv_iosf_read(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr);
+int intel_parent_vlv_iosf_write(struct intel_display *display, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
+
 /* vma */
 int intel_parent_vma_fence_id(struct intel_display *display, const struct i915_vma *vma);
 

diff --git a/drivers/gpu/drm/i915/display/vlv_sideband.c b/drivers/gpu/drm/i915/display/vlv_sideband.c
index a9c812da3c9117eb2d91b48c7e79c3c4837075c7..068f58bd9a2b2229e2792fca06de455c0a1d797f 100644 (file)
--- a/drivers/gpu/drm/i915/display/vlv_sideband.c
+++ b/drivers/gpu/drm/i915/display/vlv_sideband.c
@@ -6,71 +6,72 @@
 #include "intel_display_core.h"
 #include "intel_display_types.h"
 #include "intel_dpio_phy.h"
+#include "intel_parent.h"
 #include "vlv_sideband.h"
 
 void vlv_bunit_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_BUNIT));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_BUNIT));
 }
 
 u32 vlv_bunit_read(struct intel_display *display, u32 reg)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_BUNIT, reg);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_BUNIT, reg);
 }
 
 void vlv_bunit_write(struct intel_display *display, u32 reg, u32 val)
 {
-       vlv_iosf_sb_write(display->drm, VLV_IOSF_SB_BUNIT, reg, val);
+       intel_parent_vlv_iosf_write(display, VLV_IOSF_SB_BUNIT, reg, val);
 }
 
 void vlv_bunit_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_BUNIT));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_BUNIT));
 }
 
 void vlv_cck_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_CCK));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_CCK));
 }
 
 u32 vlv_cck_read(struct intel_display *display, u32 reg)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_CCK, reg);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_CCK, reg);
 }
 
 void vlv_cck_write(struct intel_display *display, u32 reg, u32 val)
 {
-       vlv_iosf_sb_write(display->drm, VLV_IOSF_SB_CCK, reg, val);
+       intel_parent_vlv_iosf_write(display, VLV_IOSF_SB_CCK, reg, val);
 }
 
 void vlv_cck_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_CCK));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_CCK));
 }
 
 void vlv_ccu_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_CCU));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_CCU));
 }
 
 u32 vlv_ccu_read(struct intel_display *display, u32 reg)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_CCU, reg);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_CCU, reg);
 }
 
 void vlv_ccu_write(struct intel_display *display, u32 reg, u32 val)
 {
-       vlv_iosf_sb_write(display->drm, VLV_IOSF_SB_CCU, reg, val);
+       intel_parent_vlv_iosf_write(display, VLV_IOSF_SB_CCU, reg, val);
 }
 
 void vlv_ccu_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_CCU));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_CCU));
 }
 
 void vlv_dpio_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
 }
 
 static enum vlv_iosf_sb_unit vlv_dpio_phy_to_unit(struct intel_display *display,
@@ -91,7 +92,7 @@ u32 vlv_dpio_read(struct intel_display *display, enum dpio_phy phy, int reg)
        enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(display, phy);
        u32 val;
 
-       val = vlv_iosf_sb_read(display->drm, unit, reg);
+       val = intel_parent_vlv_iosf_read(display, unit, reg);
 
        /*
         * FIXME: There might be some registers where all 1's is a valid value,
@@ -109,65 +110,65 @@ void vlv_dpio_write(struct intel_display *display,
 {
        enum vlv_iosf_sb_unit unit = vlv_dpio_phy_to_unit(display, phy);
 
-       vlv_iosf_sb_write(display->drm, unit, reg, val);
+       intel_parent_vlv_iosf_write(display, unit, reg, val);
 }
 
 void vlv_dpio_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_DPIO) | BIT(VLV_IOSF_SB_DPIO_2));
 }
 
 void vlv_flisdsi_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_FLISDSI));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_FLISDSI));
 }
 
 u32 vlv_flisdsi_read(struct intel_display *display, u32 reg)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_FLISDSI, reg);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_FLISDSI, reg);
 }
 
 void vlv_flisdsi_write(struct intel_display *display, u32 reg, u32 val)
 {
-       vlv_iosf_sb_write(display->drm, VLV_IOSF_SB_FLISDSI, reg, val);
+       intel_parent_vlv_iosf_write(display, VLV_IOSF_SB_FLISDSI, reg, val);
 }
 
 void vlv_flisdsi_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_FLISDSI));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_FLISDSI));
 }
 
 void vlv_nc_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_NC));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_NC));
 }
 
 u32 vlv_nc_read(struct intel_display *display, u8 addr)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_NC, addr);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_NC, addr);
 }
 
 void vlv_nc_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_NC));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_NC));
 }
 
 void vlv_punit_get(struct intel_display *display)
 {
-       vlv_iosf_sb_get(display->drm, BIT(VLV_IOSF_SB_PUNIT));
+       intel_parent_vlv_iosf_get(display, BIT(VLV_IOSF_SB_PUNIT));
 }
 
 u32 vlv_punit_read(struct intel_display *display, u32 addr)
 {
-       return vlv_iosf_sb_read(display->drm, VLV_IOSF_SB_PUNIT, addr);
+       return intel_parent_vlv_iosf_read(display, VLV_IOSF_SB_PUNIT, addr);
 }
 
 int vlv_punit_write(struct intel_display *display, u32 addr, u32 val)
 {
-       return vlv_iosf_sb_write(display->drm, VLV_IOSF_SB_PUNIT, addr, val);
+       return intel_parent_vlv_iosf_write(display, VLV_IOSF_SB_PUNIT, addr, val);
 }
 
 void vlv_punit_put(struct intel_display *display)
 {
-       vlv_iosf_sb_put(display->drm, BIT(VLV_IOSF_SB_PUNIT));
+       intel_parent_vlv_iosf_put(display, BIT(VLV_IOSF_SB_PUNIT));
 }

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 385a634c3ed0049a25c9d62d0f010420e4634770..c10cab38935a26d475208b2e830110d666e4b784 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -780,6 +780,7 @@ static const struct intel_display_parent_interface parent = {
        .rpm = &i915_display_rpm_interface,
        .rps = &i915_display_rps_interface,
        .stolen = &i915_display_stolen_interface,
+       .vlv_iosf = &i915_display_vlv_iosf_interface,
        .vma = &i915_display_vma_interface,
 
        .fence_priority_display = fence_priority_display,

diff --git a/drivers/gpu/drm/i915/vlv_iosf_sb.c b/drivers/gpu/drm/i915/vlv_iosf_sb.c
index 38a75651b0dc310388a910aaa1056d220bf1b7af..1f0332b4ad0df58af3b1bd0de7a9290dfa7cf758 100644 (file)
--- a/drivers/gpu/drm/i915/vlv_iosf_sb.c
+++ b/drivers/gpu/drm/i915/vlv_iosf_sb.c
@@ -4,6 +4,7 @@
  */
 
 #include <drm/drm_print.h>
+#include <drm/intel/display_parent_interface.h>
 
 #include "i915_drv.h"
 #include "i915_iosf_mbi.h"
@@ -229,3 +230,10 @@ void vlv_iosf_sb_fini(struct drm_i915_private *i915)
        if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))
                mutex_destroy(&i915->vlv_iosf_sb.lock);
 }
+
+const struct intel_display_vlv_iosf_interface i915_display_vlv_iosf_interface = {
+       .get = vlv_iosf_sb_get,
+       .put = vlv_iosf_sb_put,
+       .read = vlv_iosf_sb_read,
+       .write = vlv_iosf_sb_write,
+};

diff --git a/drivers/gpu/drm/i915/vlv_iosf_sb.h b/drivers/gpu/drm/i915/vlv_iosf_sb.h
index e2fea29a30ea271a789758152976479fc0af8c2f..e4002d5b5a2e09d8c2aebfb584e8c383540ac37d 100644 (file)
--- a/drivers/gpu/drm/i915/vlv_iosf_sb.h
+++ b/drivers/gpu/drm/i915/vlv_iosf_sb.h
@@ -34,4 +34,6 @@ void vlv_iosf_sb_put(struct drm_device *drm, unsigned long unit_mask);
 u32 vlv_iosf_sb_read(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr);
 int vlv_iosf_sb_write(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
 
+extern const struct intel_display_vlv_iosf_interface i915_display_vlv_iosf_interface;
+
 #endif /* _VLV_IOSF_SB_H_ */

diff --git a/include/drm/intel/display_parent_interface.h b/include/drm/intel/display_parent_interface.h
index 97ec94a2e749314b91cc29f4345ef6a23061b25c..c0d18d5577f3cee417f321b4b454c701d3f8a76f 100644 (file)
--- a/include/drm/intel/display_parent_interface.h
+++ b/include/drm/intel/display_parent_interface.h
@@ -6,6 +6,7 @@
 
 #include <linux/types.h>
 
+enum vlv_iosf_sb_unit;
 struct dma_fence;
 struct drm_crtc;
 struct drm_device;
@@ -176,6 +177,13 @@ struct intel_display_stolen_interface {
        void (*node_free)(const struct intel_stolen_node *node);
 };
 
+struct intel_display_vlv_iosf_interface {
+       void (*get)(struct drm_device *drm, unsigned long unit_mask);
+       void (*put)(struct drm_device *drm, unsigned long unit_mask);
+       u32 (*read)(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr);
+       int (*write)(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);
+};
+
 struct intel_display_vma_interface {
        int (*fence_id)(const struct i915_vma *vma);
 };
@@ -235,6 +243,9 @@ struct intel_display_parent_interface {
        /** @stolen: Stolen memory. */
        const struct intel_display_stolen_interface *stolen;
 
+       /** @vlv_iosf: VLV IOSF sideband. Optional. */
+       const struct intel_display_vlv_iosf_interface *vlv_iosf;
+
        /** @vma: VMA interface. Optional. */
        const struct intel_display_vma_interface *vma;