From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH RESEND 4/6] drm/i915/gmbus: use intel de functions for forcewake register access
Date: Thu, 23 Jan 2020 16:13:41 +0200 [thread overview]
Message-ID: <20200123141341.GT13686@intel.com> (raw)
In-Reply-To: <20200123140004.14136-4-jani.nikula@intel.com>
On Thu, Jan 23, 2020 at 04:00:02PM +0200, Jani Nikula wrote:
> Move away from I915_READ_FW() and I915_WRITE_FW() in display code, and
> switch to using intel_de_read_fw() and intel_de_write_fw(),
> respectively. Also switch I915_READ() and I915_WRITE() over in this file
> while at it.
>
> No functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_gmbus.c | 74 ++++++++++------------
> 1 file changed, 35 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
> index 3d4d19ac1d14..508308555dc6 100644
> --- a/drivers/gpu/drm/i915/display/intel_gmbus.c
> +++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
<snip>
> @@ -404,15 +406,12 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
> len++;
> }
> size = len % 256 + 256;
> - I915_WRITE_FW(GMBUS0, gmbus0_reg | GMBUS_BYTE_CNT_OVERRIDE);
> + intel_de_write_fw(dev_priv, GMBUS0,
> + gmbus0_reg | GMBUS_BYTE_CNT_OVERRIDE);
> }
>
> - I915_WRITE_FW(GMBUS1,
> - gmbus1_index |
> - GMBUS_CYCLE_WAIT |
> - (size << GMBUS_BYTE_COUNT_SHIFT) |
> - (addr << GMBUS_SLAVE_ADDR_SHIFT) |
> - GMBUS_SLAVE_READ | GMBUS_SW_RDY);
> + intel_de_write_fw(dev_priv, GMBUS1,
> + gmbus1_index | GMBUS_CYCLE_WAIT | (size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_READ | GMBUS_SW_RDY);
This one turned a bit ugly.
> while (len) {
> int ret;
> u32 val, loop = 0;
> @@ -421,7 +420,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
> if (ret)
> return ret;
>
> - val = I915_READ_FW(GMBUS3);
> + val = intel_de_read_fw(dev_priv, GMBUS3);
> do {
> if (extra_byte_added && len == 1)
> break;
> @@ -432,7 +431,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,
>
> if (burst_read && len == size - 4)
> /* Reset the override bit */
> - I915_WRITE_FW(GMBUS0, gmbus0_reg);
> + intel_de_write_fw(dev_priv, GMBUS0, gmbus0_reg);
> }
>
> return 0;
> @@ -489,12 +488,9 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv,
> len -= 1;
> }
>
> - I915_WRITE_FW(GMBUS3, val);
> - I915_WRITE_FW(GMBUS1,
> - gmbus1_index | GMBUS_CYCLE_WAIT |
> - (chunk_size << GMBUS_BYTE_COUNT_SHIFT) |
> - (addr << GMBUS_SLAVE_ADDR_SHIFT) |
> - GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
> + intel_de_write_fw(dev_priv, GMBUS3, val);
> + intel_de_write_fw(dev_priv, GMBUS1,
> + gmbus1_index | GMBUS_CYCLE_WAIT | (chunk_size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
ditto
> while (len) {
> int ret;
>
> @@ -503,7 +499,7 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv,
> val |= *buf++ << (8 * loop);
> } while (--len && ++loop < 4);
>
> - I915_WRITE_FW(GMBUS3, val);
> + intel_de_write_fw(dev_priv, GMBUS3, val);
>
> ret = gmbus_wait(dev_priv, GMBUS_HW_RDY, GMBUS_HW_RDY_EN);
> if (ret)
> @@ -568,7 +564,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,
>
> /* GMBUS5 holds 16-bit index */
> if (gmbus5)
> - I915_WRITE_FW(GMBUS5, gmbus5);
> + intel_de_write_fw(dev_priv, GMBUS5, gmbus5);
>
> if (msgs[1].flags & I2C_M_RD)
> ret = gmbus_xfer_read(dev_priv, &msgs[1], gmbus0_reg,
> @@ -578,7 +574,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,
>
> /* Clear GMBUS5 after each index transfer */
> if (gmbus5)
> - I915_WRITE_FW(GMBUS5, 0);
> + intel_de_write_fw(dev_priv, GMBUS5, 0);
>
> return ret;
> }
> @@ -601,7 +597,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
> pch_gmbus_clock_gating(dev_priv, false);
>
> retry:
> - I915_WRITE_FW(GMBUS0, gmbus0_source | bus->reg0);
> + intel_de_write_fw(dev_priv, GMBUS0, gmbus0_source | bus->reg0);
>
> for (; i < num; i += inc) {
> inc = 1;
> @@ -629,7 +625,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
> * a STOP on the very first cycle. To simplify the code we
> * unconditionally generate the STOP condition with an additional gmbus
> * cycle. */
> - I915_WRITE_FW(GMBUS1, GMBUS_CYCLE_STOP | GMBUS_SW_RDY);
> + intel_de_write_fw(dev_priv, GMBUS1, 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,
> @@ -640,7 +636,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
> adapter->name);
> ret = -ETIMEDOUT;
> }
> - I915_WRITE_FW(GMBUS0, 0);
> + intel_de_write_fw(dev_priv, GMBUS0, 0);
> ret = ret ?: i;
> goto out;
>
> @@ -669,9 +665,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
> * of resetting the GMBUS controller and so clearing the
> * BUS_ERROR raised by the slave's NAK.
> */
> - I915_WRITE_FW(GMBUS1, GMBUS_SW_CLR_INT);
> - I915_WRITE_FW(GMBUS1, 0);
> - I915_WRITE_FW(GMBUS0, 0);
> + 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);
>
> DRM_DEBUG_KMS("GMBUS [%s] NAK for addr: %04x %c(%d)\n",
> adapter->name, msgs[i].addr,
> @@ -694,7 +690,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,
> timeout:
> DRM_DEBUG_KMS("GMBUS [%s] timed out, falling back to bit banging on pin %d\n",
> bus->adapter.name, bus->reg0 & 0xff);
> - I915_WRITE_FW(GMBUS0, 0);
> + intel_de_write_fw(dev_priv, GMBUS0, 0);
>
> /*
> * Hardware may not support GMBUS over these pins? Try GPIO bitbanging
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-01-23 14:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 13:59 [Intel-gfx] [PATCH RESEND 1/6] drm/i915/dmc: use intel uncore functions for forcewake register access Jani Nikula
2020-01-23 14:00 ` [Intel-gfx] [PATCH RESEND 2/6] drm/i915/display: use intel de " Jani Nikula
2020-01-23 14:00 ` [Intel-gfx] [PATCH RESEND 3/6] drm/i915/irq: " Jani Nikula
2020-01-23 14:00 ` [Intel-gfx] [PATCH RESEND 4/6] drm/i915/gmbus: " Jani Nikula
2020-01-23 14:13 ` Ville Syrjälä [this message]
2020-01-23 14:00 ` [Intel-gfx] [PATCH RESEND 5/6] drm/i915/sprite: " Jani Nikula
2020-01-23 14:00 ` [Intel-gfx] [PATCH RESEND 6/6] drm/i915/pm: " Jani Nikula
2020-01-23 14:16 ` Ville Syrjälä
2020-01-23 14:34 ` Chris Wilson
2020-01-27 9:18 ` Jani Nikula
2020-01-23 14:10 ` [Intel-gfx] [PATCH RESEND 1/6] drm/i915/dmc: use intel uncore " Ville Syrjälä
2020-01-23 14:18 ` Jani Nikula
2020-01-23 14:33 ` Chris Wilson
2020-01-23 23:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [RESEND,1/6] " Patchwork
2020-01-23 23:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-01-25 15:30 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200123141341.GT13686@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.