From: Jani Nikula <jani.nikula@intel.com>
To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Intel-gfx@lists.freedesktop.org
Subject: Re: [RFC 08/12] drm/i915: Remove I915_POSTING_READ_FW
Date: Fri, 07 Jun 2019 15:48:41 +0300 [thread overview]
Message-ID: <87v9xhzhli.fsf@intel.com> (raw)
In-Reply-To: <20190607120838.20514-9-tvrtko.ursulin@linux.intel.com>
On Fri, 07 Jun 2019, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Only a few call sites remain which have been converted to uncore mmio
> accessors and so the macro can be removed.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 -
> drivers/gpu/drm/i915/i915_gem.c | 9 +++---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/intel_guc_submission.c | 4 +--
> drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++----------
> 5 files changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 13815795e197..9dcec93426de 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2891,7 +2891,6 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e,
> */
> #define I915_READ_FW(reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))
> #define I915_WRITE_FW(reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__))
> -#define POSTING_READ_FW(reg__) __I915_REG_OP(posting_read_fw, dev_priv, (reg__))
>
> /* "Broadcast RGB" property */
> #define INTEL_BROADCAST_RGB_AUTO 0
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 9f2e213c6046..94d85b0fb860 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -263,11 +263,12 @@ void i915_gem_flush_ggtt_writes(struct drm_i915_private *dev_priv)
> i915_gem_chipset_flush(dev_priv);
>
> with_intel_runtime_pm(dev_priv, wakeref) {
> - spin_lock_irq(&dev_priv->uncore.lock);
> + struct intel_uncore *uncore = &dev_priv->uncore;
>
> - POSTING_READ_FW(RING_HEAD(RENDER_RING_BASE));
> -
> - spin_unlock_irq(&dev_priv->uncore.lock);
> + spin_lock_irq(&uncore->lock);
> + intel_uncore_posting_read_fw(uncore,
> + RING_HEAD(RENDER_RING_BASE));
> + spin_unlock_irq(&uncore->lock);
> }
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index ca8f4226e598..0763ffffea53 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -386,7 +386,7 @@ static void ilk_update_gt_irq(struct drm_i915_private *dev_priv,
> void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, u32 mask)
> {
> ilk_update_gt_irq(dev_priv, mask, mask);
> - POSTING_READ_FW(GTIMR);
> + intel_uncore_posting_read_fw(&dev_priv->uncore, GTIMR);
> }
>
> void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, u32 mask)
> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
> index 89592ef778b8..97f6970d8da8 100644
> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
> @@ -557,10 +557,10 @@ static void guc_add_request(struct intel_guc *guc, struct i915_request *rq)
> */
> static void flush_ggtt_writes(struct i915_vma *vma)
> {
> - struct drm_i915_private *dev_priv = vma->vm->i915;
> + struct drm_i915_private *i915 = vma->vm->i915;
>
> if (i915_vma_is_map_and_fenceable(vma))
> - POSTING_READ_FW(GUC_STATUS);
> + intel_uncore_posting_read_fw(&i915->uncore, GUC_STATUS);
> }
>
> static void inject_preempt_context(struct work_struct *work)
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 93e411e6ad19..84588ff8732f 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -1949,6 +1949,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
> {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + struct intel_uncore *uncore = &dev_priv->uncore;
> const struct vlv_fifo_state *fifo_state =
> &crtc_state->wm.vlv.fifo_state;
> int sprite0_start, sprite1_start, fifo_size;
> @@ -1974,13 +1975,13 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
> * intel_pipe_update_start() has already disabled interrupts
> * for us, so a plain spin_lock() is sufficient here.
> */
> - spin_lock(&dev_priv->uncore.lock);
> + spin_lock(&uncore->lock);
>
> switch (crtc->pipe) {
> u32 dsparb, dsparb2, dsparb3;
> case PIPE_A:
> - dsparb = I915_READ_FW(DSPARB);
> - dsparb2 = I915_READ_FW(DSPARB2);
> + dsparb = intel_uncore_read_fw(uncore, DSPARB);
> + dsparb2 = intel_uncore_read_fw(uncore, DSPARB2);
>
> dsparb &= ~(VLV_FIFO(SPRITEA, 0xff) |
> VLV_FIFO(SPRITEB, 0xff));
> @@ -1992,12 +1993,12 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
> dsparb2 |= (VLV_FIFO(SPRITEA_HI, sprite0_start >> 8) |
> VLV_FIFO(SPRITEB_HI, sprite1_start >> 8));
>
> - I915_WRITE_FW(DSPARB, dsparb);
> - I915_WRITE_FW(DSPARB2, dsparb2);
> + intel_uncore_write_fw(uncore, DSPARB, dsparb);
> + intel_uncore_write_fw(uncore, DSPARB2, dsparb2);
> break;
> case PIPE_B:
> - dsparb = I915_READ_FW(DSPARB);
> - dsparb2 = I915_READ_FW(DSPARB2);
> + dsparb = intel_uncore_read_fw(uncore, DSPARB);
> + dsparb2 = intel_uncore_read_fw(uncore, DSPARB2);
>
> dsparb &= ~(VLV_FIFO(SPRITEC, 0xff) |
> VLV_FIFO(SPRITED, 0xff));
> @@ -2009,12 +2010,12 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
> dsparb2 |= (VLV_FIFO(SPRITEC_HI, sprite0_start >> 8) |
> VLV_FIFO(SPRITED_HI, sprite1_start >> 8));
>
> - I915_WRITE_FW(DSPARB, dsparb);
> - I915_WRITE_FW(DSPARB2, dsparb2);
> + intel_uncore_write_fw(uncore, DSPARB, dsparb);
> + intel_uncore_write_fw(uncore, DSPARB2, dsparb2);
> break;
> case PIPE_C:
> - dsparb3 = I915_READ_FW(DSPARB3);
> - dsparb2 = I915_READ_FW(DSPARB2);
> + dsparb3 = intel_uncore_read_fw(uncore, DSPARB3);
> + dsparb2 = intel_uncore_read_fw(uncore, DSPARB2);
>
> dsparb3 &= ~(VLV_FIFO(SPRITEE, 0xff) |
> VLV_FIFO(SPRITEF, 0xff));
> @@ -2026,16 +2027,16 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
> dsparb2 |= (VLV_FIFO(SPRITEE_HI, sprite0_start >> 8) |
> VLV_FIFO(SPRITEF_HI, sprite1_start >> 8));
>
> - I915_WRITE_FW(DSPARB3, dsparb3);
> - I915_WRITE_FW(DSPARB2, dsparb2);
> + intel_uncore_write_fw(uncore, DSPARB3, dsparb3);
> + intel_uncore_write_fw(uncore, DSPARB2, dsparb2);
> break;
> default:
> break;
> }
>
> - POSTING_READ_FW(DSPARB);
> + intel_uncore_posting_read_fw(uncore, DSPARB);
>
> - spin_unlock(&dev_priv->uncore.lock);
> + spin_unlock(&uncore->lock);
> }
>
> #undef VLV_FIFO
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-06-07 12:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 12:08 [RFC 00/12] Legacy mmio accessor macro pruning Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 01/12] drm/i915: Eliminate unused mmio accessors Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 02/12] drm/i915: Convert i915_reg_read_ioctl to use explicit " Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 03/12] drm/i915: Convert icl_get_stolen_reserved to uncore " Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 04/12] drm/i915: Convert gem_record_fences " Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 05/12] drm/i915: Convert intel_read_wm_latency " Tvrtko Ursulin
2019-06-07 12:08 ` [RFC 06/12] drm/i915: Remove I915_READ64 and I915_READ64_32x2 Tvrtko Ursulin
2019-06-07 12:44 ` Jani Nikula
2019-06-07 12:08 ` [RFC 07/12] drm/i915: Remove I915_READ8 Tvrtko Ursulin
2019-06-07 13:11 ` Jani Nikula
2019-06-07 13:19 ` Tvrtko Ursulin
2019-06-07 13:44 ` Jani Nikula
2019-06-11 8:47 ` Tvrtko Ursulin
2019-06-11 8:59 ` Jani Nikula
2019-06-11 8:58 ` Jani Nikula
2019-06-07 12:08 ` [RFC 08/12] drm/i915: Remove I915_POSTING_READ_FW Tvrtko Ursulin
2019-06-07 12:48 ` Jani Nikula [this message]
2019-06-07 12:08 ` [RFC 09/12] drm/i915: Remove POSTING_READ16 Tvrtko Ursulin
2019-06-07 12:49 ` Jani Nikula
2019-06-07 12:08 ` [RFC 10/12] drm/i915: Remove I915_WRITE_NOTRACE Tvrtko Ursulin
2019-06-07 12:50 ` Jani Nikula
2019-06-07 12:08 ` [RFC 11/12] drm/i915: Remove I915_READ_NOTRACE Tvrtko Ursulin
2019-06-11 8:57 ` Jani Nikula
2019-06-07 12:08 ` [RFC 12/12] drm/i915: Remove I915_READ16 and I915_WRITE16 Tvrtko Ursulin
2019-06-07 12:59 ` Jani Nikula
2019-06-07 14:36 ` ✗ Fi.CI.CHECKPATCH: warning for Legacy mmio accessor macro pruning Patchwork
2019-06-07 15:04 ` ✓ Fi.CI.BAT: success " Patchwork
2019-06-10 9:57 ` ✓ 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=87v9xhzhli.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=tvrtko.ursulin@linux.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.