projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4567084)
drm/i915/gmbus: stop using implicit dev_priv in register definitions
authorJani Nikula <jani.nikula@intel.com>
Tue, 30 Aug 2022 10:28:00 +0000 (13:28 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 31 Aug 2022 15:09:20 +0000 (18:09 +0300)
Since the beginning of time, we've implicitly assumed dev_priv is
present as a local variable in many places. We've gone a long way in
removing many of them, but the register macro definitions are the last
holdout. Remove them from the gmbus macros.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a4f482c1f523d7225420f8386f1eea6d639db843.1661855191.git.jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_gmbus.c patch | blob | history
drivers/gpu/drm/i915/display/intel_gmbus_regs.h patch | blob | history

diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
index 3270fcd3f009c4a3586e69d0326b77c72cfa1353..9e9691e2a45af91cb88a6aedf136e6dbc3b7ca3f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -171,10 +171,10 @@ to_intel_gmbus(struct i2c_adapter *i2c)
 }
 
 void
-intel_gmbus_reset(struct drm_i915_private *dev_priv)
+intel_gmbus_reset(struct drm_i915_private *i915)
 {
-       intel_de_write(dev_priv, GMBUS0, 0);
-       intel_de_write(dev_priv, GMBUS4, 0);
+       intel_de_write(i915, GMBUS0(i915), 0);
+       intel_de_write(i915, GMBUS4(i915), 0);
 }
 
 static void pnv_gmbus_clock_gating(struct drm_i915_private *dev_priv,
@@ -371,16 +371,16 @@ static int gmbus_wait(struct drm_i915_private *dev_priv, u32 status, u32 irq_en)
                irq_en = 0;
 
        add_wait_queue(&dev_priv->display.gmbus.wait_queue, &wait);
-       intel_de_write_fw(dev_priv, GMBUS4, irq_en);
+       intel_de_write_fw(dev_priv, GMBUS4(dev_priv), irq_en);
 
        status |= GMBUS_SATOER;
-       ret = wait_for_us((gmbus2 = intel_de_read_fw(dev_priv, GMBUS2)) & status,
+       ret = wait_for_us((gmbus2 = intel_de_read_fw(dev_priv, GMBUS2(dev_priv))) & status,
                          2);
        if (ret)
-               ret = wait_for((gmbus2 = intel_de_read_fw(dev_priv, GMBUS2)) & status,
+               ret = wait_for((gmbus2 = intel_de_read_fw(dev_priv, GMBUS2(dev_priv))) & status,
                               50);
 
-       intel_de_write_fw(dev_priv, GMBUS4, 0);
+       intel_de_write_fw(dev_priv, GMBUS4(dev_priv), 0);
        remove_wait_queue(&dev_priv->display.gmbus.wait_queue, &wait);
 
        if (gmbus2 & GMBUS_SATOER)
@@ -402,13 +402,13 @@ gmbus_wait_idle(struct drm_i915_private *dev_priv)
                irq_enable = GMBUS_IDLE_EN;
 
        add_wait_queue(&dev_priv->display.gmbus.wait_queue, &wait);
-       intel_de_write_fw(dev_priv, GMBUS4, irq_enable);
+       intel_de_write_fw(dev_priv, GMBUS4(dev_priv), irq_enable);
 
        ret = intel_wait_for_register_fw(&dev_priv->uncore,
-                                        GMBUS2, GMBUS_ACTIVE, 0,
+                                        GMBUS2(dev_priv), GMBUS_ACTIVE, 0,
                                         10);
 
-       intel_de_write_fw(dev_priv, GMBUS4, 0);
+       intel_de_write_fw(dev_priv, GMBUS4(dev_priv), 0);
        remove_wait_queue(&dev_priv->display.gmbus.wait_queue, &wait);
 
        return ret;
@@ -439,11 +439,11 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
                        len++;
                }
                size = len % 256 + 256;
-               intel_de_write_fw(dev_priv, GMBUS0,
+               intel_de_write_fw(dev_priv, GMBUS0(dev_priv),
                                  gmbus0_reg | GMBUS_BYTE_CNT_OVERRIDE);
        }
 
-       intel_de_write_fw(dev_priv, GMBUS1,
+       intel_de_write_fw(dev_priv, GMBUS1(dev_priv),
                          gmbus1_index | GMBUS_CYCLE_WAIT | (size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_READ | GMBUS_SW_RDY);
        while (len) {
                int ret;
@@ -453,7 +453,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
                if (ret)
                        return ret;
 
-               val = intel_de_read_fw(dev_priv, GMBUS3);
+               val = intel_de_read_fw(dev_priv, GMBUS3(dev_priv));
                do {
                        if (extra_byte_added && len == 1)
                                break;
@@ -464,7 +464,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
 
                if (burst_read && len == size - 4)
                        /* Reset the override bit */
-                       intel_de_write_fw(dev_priv, GMBUS0, gmbus0_reg);
+                       intel_de_write_fw(dev_priv, GMBUS0(dev_priv), gmbus0_reg);
        }
 
        return 0;
@@ -521,8 +521,8 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv,
                len -= 1;
        }
 
-       intel_de_write_fw(dev_priv, GMBUS3, val);
-       intel_de_write_fw(dev_priv, GMBUS1,
+       intel_de_write_fw(dev_priv, GMBUS3(dev_priv), val);
+       intel_de_write_fw(dev_priv, GMBUS1(dev_priv),
                          gmbus1_index | GMBUS_CYCLE_WAIT | (chunk_size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
        while (len) {
                int ret;
@@ -532,7 +532,7 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv,
                        val |= *buf++ << (8 * loop);
                } while (--len && ++loop < 4);
 
-               intel_de_write_fw(dev_priv, GMBUS3, val);
+               intel_de_write_fw(dev_priv, GMBUS3(dev_priv), val);
 
                ret = gmbus_wait(dev_priv, GMBUS_HW_RDY, GMBUS_HW_RDY_EN);
                if (ret)
@@ -597,7 +597,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,
 
        /* GMBUS5 holds 16-bit index */
        if (gmbus5)
-               intel_de_write_fw(dev_priv, GMBUS5, gmbus5);
+               intel_de_write_fw(dev_priv, GMBUS5(dev_priv), gmbus5);
 
        if (msgs[1].flags & I2C_M_RD)
                ret = gmbus_xfer_read(dev_priv, &msgs[1], gmbus0_reg,
@@ -607,7 +607,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,
 
        /* Clear GMBUS5 after each index transfer */
        if (gmbus5)
-               intel_de_write_fw(dev_priv, GMBUS5, 0);
+               intel_de_write_fw(dev_priv, GMBUS5(dev_priv), 0);
 
        return ret;
 }
@@ -628,7 +628,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
                pch_gmbus_clock_gating(dev_priv, false);
 
 retry:
-       intel_de_write_fw(dev_priv, GMBUS0, gmbus0_source | bus->reg0);
+       intel_de_write_fw(dev_priv, GMBUS0(dev_priv), gmbus0_source | bus->reg0);
 
        for (; i < num; i += inc) {
                inc = 1;
@@ -656,7 +656,7 @@ retry:
         * a STOP on the very first cycle. To simplify the code we
         * unconditionally generate the STOP condition with an additional gmbus
         * cycle. */
-       intel_de_write_fw(dev_priv, GMBUS1, GMBUS_CYCLE_STOP | GMBUS_SW_RDY);
+       intel_de_write_fw(dev_priv, GMBUS1(dev_priv), GMBUS_CYCLE_STOP | GMBUS_SW_RDY);
 
        /* Mark the GMBUS interface as disabled after waiting for idle.
         * We will re-enable it at the start of the next xfer,
@@ -668,7 +668,7 @@ retry:
                            adapter->name);
                ret = -ETIMEDOUT;
        }
-       intel_de_write_fw(dev_priv, GMBUS0, 0);
+       intel_de_write_fw(dev_priv, GMBUS0(dev_priv), 0);
        ret = ret ?: i;
        goto out;
 
@@ -698,9 +698,9 @@ clear_err:
         * of resetting the GMBUS controller and so clearing the
         * BUS_ERROR raised by the slave's NAK.
         */
-       intel_de_write_fw(dev_priv, GMBUS1, GMBUS_SW_CLR_INT);
-       intel_de_write_fw(dev_priv, GMBUS1, 0);
-       intel_de_write_fw(dev_priv, GMBUS0, 0);
+       intel_de_write_fw(dev_priv, GMBUS1(dev_priv), GMBUS_SW_CLR_INT);
+       intel_de_write_fw(dev_priv, GMBUS1(dev_priv), 0);
+       intel_de_write_fw(dev_priv, GMBUS0(dev_priv), 0);
 
        drm_dbg_kms(&dev_priv->drm, "GMBUS [%s] NAK for addr: %04x %c(%d)\n",
                    adapter->name, msgs[i].addr,
@@ -725,7 +725,7 @@ timeout:
        drm_dbg_kms(&dev_priv->drm,
                    "GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
                    bus->adapter.name, bus->reg0 & 0xff);
-       intel_de_write_fw(dev_priv, GMBUS0, 0);
+       intel_de_write_fw(dev_priv, GMBUS0(dev_priv), 0);
 
        /*
         * Hardware may not support GMBUS over these pins? Try GPIO bitbanging
@@ -915,7 +915,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv)
                if (IS_I830(dev_priv))
                        bus->force_bit = 1;
 
-               intel_gpio_setup(bus, GPIO(gmbus_pin->gpio));
+               intel_gpio_setup(bus, GPIO(dev_priv, gmbus_pin->gpio));
 
                ret = i2c_add_adapter(&bus->adapter);
                if (ret) {
diff --git a/drivers/gpu/drm/i915/display/intel_gmbus_regs.h b/drivers/gpu/drm/i915/display/intel_gmbus_regs.h
index 1d58925df85608185e4a69e9f0821566f2c371be..53aacbda983c49705957c905a371002b9258eb5d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_gmbus_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_gmbus_regs.h
@@ -10,7 +10,7 @@
 
 #define GMBUS_MMIO_BASE(__i915) ((__i915)->display.gmbus.mmio_base)
 
-#define GPIO(gpio)             _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5010 + 4 * (gpio))
+#define GPIO(__i915, gpio)     _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5010 + 4 * (gpio))
 #define   GPIO_CLOCK_DIR_MASK          (1 << 0)
 #define   GPIO_CLOCK_DIR_IN            (0 << 1)
 #define   GPIO_CLOCK_DIR_OUT           (1 << 1)
@@ -27,7 +27,7 @@
 #define   GPIO_DATA_PULLUP_DISABLE     (1 << 13)
 
 /* clock/port select */
-#define GMBUS0                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5100)
+#define GMBUS0(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5100)
 #define   GMBUS_AKSV_SELECT            (1 << 11)
 #define   GMBUS_RATE_100KHZ            (0 << 8)
 #define   GMBUS_RATE_50KHZ             (1 << 8)
@@ -37,7 +37,7 @@
 #define   GMBUS_BYTE_CNT_OVERRIDE      (1 << 6)
 
 /* command/status */
-#define GMBUS1                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5104)
+#define GMBUS1(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5104)
 #define   GMBUS_SW_CLR_INT             (1 << 31)
 #define   GMBUS_SW_RDY                 (1 << 30)
 #define   GMBUS_ENT                    (1 << 29) /* enable timeout */
@@ -54,7 +54,7 @@
 #define   GMBUS_SLAVE_WRITE            (0 << 0)
 
 /* status */
-#define GMBUS2                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5108)
+#define GMBUS2(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5108)
 #define   GMBUS_INUSE                  (1 << 15)
 #define   GMBUS_HW_WAIT_PHASE          (1 << 14)
 #define   GMBUS_STALL_TIMEOUT          (1 << 13)
@@ -64,10 +64,10 @@
 #define   GMBUS_ACTIVE                 (1 << 9)
 
 /* data buffer bytes 3-0 */
-#define GMBUS3                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x510c)
+#define GMBUS3(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x510c)
 
 /* interrupt mask (Pineview+) */
-#define GMBUS4                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5110)
+#define GMBUS4(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5110)
 #define   GMBUS_SLAVE_TIMEOUT_EN       (1 << 4)
 #define   GMBUS_NAK_EN                 (1 << 3)
 #define   GMBUS_IDLE_EN                        (1 << 2)
@@ -75,7 +75,7 @@
 #define   GMBUS_HW_RDY_EN              (1 << 0)
 
 /* byte index */
-#define GMBUS5                 _MMIO(GMBUS_MMIO_BASE(dev_priv) + 0x5120)
+#define GMBUS5(__i915)         _MMIO(GMBUS_MMIO_BASE(__i915) + 0x5120)
 #define   GMBUS_2BYTE_INDEX_EN         (1 << 31)
 
 #endif /* __INTEL_GMBUS_REGS_H__ */
Domain: System / Kernel;