From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 5/9] drm/i915/debugfs: replace I915_READ() with intel_uncore_read()
Date: Thu, 12 Nov 2020 15:23:18 -0500 [thread overview]
Message-ID: <20201112202318.GF1198919@intel.com> (raw)
In-Reply-To: <75b46f483b760e3b6004d5887712ecc57183a832.1605181350.git.jani.nikula@intel.com>
On Thu, Nov 12, 2020 at 01:44:38PM +0200, Jani Nikula wrote:
> Another straggler with I915_READ() uses gone.
>
> Arguably some of these should use intel_de_read(), however not
> all. Prioritize I915_READ() removal in general over migrating to the
> pedantically correct replacement right away.
I agree!
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 214 ++++++++++++++--------------
> 1 file changed, 107 insertions(+), 107 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 151734a1a496..a8b0a67250b5 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -397,37 +397,37 @@ static void gen8_display_interrupt_info(struct seq_file *m)
> }
> seq_printf(m, "Pipe %c IMR:\t%08x\n",
> pipe_name(pipe),
> - I915_READ(GEN8_DE_PIPE_IMR(pipe)));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PIPE_IMR(pipe)));
> seq_printf(m, "Pipe %c IIR:\t%08x\n",
> pipe_name(pipe),
> - I915_READ(GEN8_DE_PIPE_IIR(pipe)));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PIPE_IIR(pipe)));
> seq_printf(m, "Pipe %c IER:\t%08x\n",
> pipe_name(pipe),
> - I915_READ(GEN8_DE_PIPE_IER(pipe)));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PIPE_IER(pipe)));
>
> intel_display_power_put(dev_priv, power_domain, wakeref);
> }
>
> seq_printf(m, "Display Engine port interrupt mask:\t%08x\n",
> - I915_READ(GEN8_DE_PORT_IMR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PORT_IMR));
> seq_printf(m, "Display Engine port interrupt identity:\t%08x\n",
> - I915_READ(GEN8_DE_PORT_IIR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PORT_IIR));
> seq_printf(m, "Display Engine port interrupt enable:\t%08x\n",
> - I915_READ(GEN8_DE_PORT_IER));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_PORT_IER));
>
> seq_printf(m, "Display Engine misc interrupt mask:\t%08x\n",
> - I915_READ(GEN8_DE_MISC_IMR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_MISC_IMR));
> seq_printf(m, "Display Engine misc interrupt identity:\t%08x\n",
> - I915_READ(GEN8_DE_MISC_IIR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_MISC_IIR));
> seq_printf(m, "Display Engine misc interrupt enable:\t%08x\n",
> - I915_READ(GEN8_DE_MISC_IER));
> + intel_uncore_read(&dev_priv->uncore, GEN8_DE_MISC_IER));
>
> seq_printf(m, "PCU interrupt mask:\t%08x\n",
> - I915_READ(GEN8_PCU_IMR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IMR));
> seq_printf(m, "PCU interrupt identity:\t%08x\n",
> - I915_READ(GEN8_PCU_IIR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IIR));
> seq_printf(m, "PCU interrupt enable:\t%08x\n",
> - I915_READ(GEN8_PCU_IER));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IER));
> }
>
> static int i915_interrupt_info(struct seq_file *m, void *data)
> @@ -443,16 +443,16 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
> intel_wakeref_t pref;
>
> seq_printf(m, "Master Interrupt Control:\t%08x\n",
> - I915_READ(GEN8_MASTER_IRQ));
> + intel_uncore_read(&dev_priv->uncore, GEN8_MASTER_IRQ));
>
> seq_printf(m, "Display IER:\t%08x\n",
> - I915_READ(VLV_IER));
> + intel_uncore_read(&dev_priv->uncore, VLV_IER));
> seq_printf(m, "Display IIR:\t%08x\n",
> - I915_READ(VLV_IIR));
> + intel_uncore_read(&dev_priv->uncore, VLV_IIR));
> seq_printf(m, "Display IIR_RW:\t%08x\n",
> - I915_READ(VLV_IIR_RW));
> + intel_uncore_read(&dev_priv->uncore, VLV_IIR_RW));
> seq_printf(m, "Display IMR:\t%08x\n",
> - I915_READ(VLV_IMR));
> + intel_uncore_read(&dev_priv->uncore, VLV_IMR));
> for_each_pipe(dev_priv, pipe) {
> enum intel_display_power_domain power_domain;
>
> @@ -467,71 +467,71 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
>
> seq_printf(m, "Pipe %c stat:\t%08x\n",
> pipe_name(pipe),
> - I915_READ(PIPESTAT(pipe)));
> + intel_uncore_read(&dev_priv->uncore, PIPESTAT(pipe)));
>
> intel_display_power_put(dev_priv, power_domain, pref);
> }
>
> pref = intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
> seq_printf(m, "Port hotplug:\t%08x\n",
> - I915_READ(PORT_HOTPLUG_EN));
> + intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_EN));
> seq_printf(m, "DPFLIPSTAT:\t%08x\n",
> - I915_READ(VLV_DPFLIPSTAT));
> + intel_uncore_read(&dev_priv->uncore, VLV_DPFLIPSTAT));
> seq_printf(m, "DPINVGTT:\t%08x\n",
> - I915_READ(DPINVGTT));
> + intel_uncore_read(&dev_priv->uncore, DPINVGTT));
> intel_display_power_put(dev_priv, POWER_DOMAIN_INIT, pref);
>
> for (i = 0; i < 4; i++) {
> seq_printf(m, "GT Interrupt IMR %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IMR(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IMR(i)));
> seq_printf(m, "GT Interrupt IIR %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IIR(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IIR(i)));
> seq_printf(m, "GT Interrupt IER %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IER(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IER(i)));
> }
>
> seq_printf(m, "PCU interrupt mask:\t%08x\n",
> - I915_READ(GEN8_PCU_IMR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IMR));
> seq_printf(m, "PCU interrupt identity:\t%08x\n",
> - I915_READ(GEN8_PCU_IIR));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IIR));
> seq_printf(m, "PCU interrupt enable:\t%08x\n",
> - I915_READ(GEN8_PCU_IER));
> + intel_uncore_read(&dev_priv->uncore, GEN8_PCU_IER));
> } else if (INTEL_GEN(dev_priv) >= 11) {
> if (HAS_MASTER_UNIT_IRQ(dev_priv))
> seq_printf(m, "Master Unit Interrupt Control: %08x\n",
> - I915_READ(DG1_MSTR_UNIT_INTR));
> + intel_uncore_read(&dev_priv->uncore, DG1_MSTR_UNIT_INTR));
>
> seq_printf(m, "Master Interrupt Control: %08x\n",
> - I915_READ(GEN11_GFX_MSTR_IRQ));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GFX_MSTR_IRQ));
>
> seq_printf(m, "Render/Copy Intr Enable: %08x\n",
> - I915_READ(GEN11_RENDER_COPY_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_RENDER_COPY_INTR_ENABLE));
> seq_printf(m, "VCS/VECS Intr Enable: %08x\n",
> - I915_READ(GEN11_VCS_VECS_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_VCS_VECS_INTR_ENABLE));
> seq_printf(m, "GUC/SG Intr Enable:\t %08x\n",
> - I915_READ(GEN11_GUC_SG_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GUC_SG_INTR_ENABLE));
> seq_printf(m, "GPM/WGBOXPERF Intr Enable: %08x\n",
> - I915_READ(GEN11_GPM_WGBOXPERF_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GPM_WGBOXPERF_INTR_ENABLE));
> seq_printf(m, "Crypto Intr Enable:\t %08x\n",
> - I915_READ(GEN11_CRYPTO_RSVD_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_CRYPTO_RSVD_INTR_ENABLE));
> seq_printf(m, "GUnit/CSME Intr Enable:\t %08x\n",
> - I915_READ(GEN11_GUNIT_CSME_INTR_ENABLE));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GUNIT_CSME_INTR_ENABLE));
>
> seq_printf(m, "Display Interrupt Control:\t%08x\n",
> - I915_READ(GEN11_DISPLAY_INT_CTL));
> + intel_uncore_read(&dev_priv->uncore, GEN11_DISPLAY_INT_CTL));
>
> gen8_display_interrupt_info(m);
> } else if (INTEL_GEN(dev_priv) >= 8) {
> seq_printf(m, "Master Interrupt Control:\t%08x\n",
> - I915_READ(GEN8_MASTER_IRQ));
> + intel_uncore_read(&dev_priv->uncore, GEN8_MASTER_IRQ));
>
> for (i = 0; i < 4; i++) {
> seq_printf(m, "GT Interrupt IMR %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IMR(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IMR(i)));
> seq_printf(m, "GT Interrupt IIR %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IIR(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IIR(i)));
> seq_printf(m, "GT Interrupt IER %d:\t%08x\n",
> - i, I915_READ(GEN8_GT_IER(i)));
> + i, intel_uncore_read(&dev_priv->uncore, GEN8_GT_IER(i)));
> }
>
> gen8_display_interrupt_info(m);
> @@ -539,13 +539,13 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
> intel_wakeref_t pref;
>
> seq_printf(m, "Display IER:\t%08x\n",
> - I915_READ(VLV_IER));
> + intel_uncore_read(&dev_priv->uncore, VLV_IER));
> seq_printf(m, "Display IIR:\t%08x\n",
> - I915_READ(VLV_IIR));
> + intel_uncore_read(&dev_priv->uncore, VLV_IIR));
> seq_printf(m, "Display IIR_RW:\t%08x\n",
> - I915_READ(VLV_IIR_RW));
> + intel_uncore_read(&dev_priv->uncore, VLV_IIR_RW));
> seq_printf(m, "Display IMR:\t%08x\n",
> - I915_READ(VLV_IMR));
> + intel_uncore_read(&dev_priv->uncore, VLV_IMR));
> for_each_pipe(dev_priv, pipe) {
> enum intel_display_power_domain power_domain;
>
> @@ -560,87 +560,87 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
>
> seq_printf(m, "Pipe %c stat:\t%08x\n",
> pipe_name(pipe),
> - I915_READ(PIPESTAT(pipe)));
> + intel_uncore_read(&dev_priv->uncore, PIPESTAT(pipe)));
> intel_display_power_put(dev_priv, power_domain, pref);
> }
>
> seq_printf(m, "Master IER:\t%08x\n",
> - I915_READ(VLV_MASTER_IER));
> + intel_uncore_read(&dev_priv->uncore, VLV_MASTER_IER));
>
> seq_printf(m, "Render IER:\t%08x\n",
> - I915_READ(GTIER));
> + intel_uncore_read(&dev_priv->uncore, GTIER));
> seq_printf(m, "Render IIR:\t%08x\n",
> - I915_READ(GTIIR));
> + intel_uncore_read(&dev_priv->uncore, GTIIR));
> seq_printf(m, "Render IMR:\t%08x\n",
> - I915_READ(GTIMR));
> + intel_uncore_read(&dev_priv->uncore, GTIMR));
>
> seq_printf(m, "PM IER:\t\t%08x\n",
> - I915_READ(GEN6_PMIER));
> + intel_uncore_read(&dev_priv->uncore, GEN6_PMIER));
> seq_printf(m, "PM IIR:\t\t%08x\n",
> - I915_READ(GEN6_PMIIR));
> + intel_uncore_read(&dev_priv->uncore, GEN6_PMIIR));
> seq_printf(m, "PM IMR:\t\t%08x\n",
> - I915_READ(GEN6_PMIMR));
> + intel_uncore_read(&dev_priv->uncore, GEN6_PMIMR));
>
> pref = intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
> seq_printf(m, "Port hotplug:\t%08x\n",
> - I915_READ(PORT_HOTPLUG_EN));
> + intel_uncore_read(&dev_priv->uncore, PORT_HOTPLUG_EN));
> seq_printf(m, "DPFLIPSTAT:\t%08x\n",
> - I915_READ(VLV_DPFLIPSTAT));
> + intel_uncore_read(&dev_priv->uncore, VLV_DPFLIPSTAT));
> seq_printf(m, "DPINVGTT:\t%08x\n",
> - I915_READ(DPINVGTT));
> + intel_uncore_read(&dev_priv->uncore, DPINVGTT));
> intel_display_power_put(dev_priv, POWER_DOMAIN_INIT, pref);
>
> } else if (!HAS_PCH_SPLIT(dev_priv)) {
> seq_printf(m, "Interrupt enable: %08x\n",
> - I915_READ(GEN2_IER));
> + intel_uncore_read(&dev_priv->uncore, GEN2_IER));
> seq_printf(m, "Interrupt identity: %08x\n",
> - I915_READ(GEN2_IIR));
> + intel_uncore_read(&dev_priv->uncore, GEN2_IIR));
> seq_printf(m, "Interrupt mask: %08x\n",
> - I915_READ(GEN2_IMR));
> + intel_uncore_read(&dev_priv->uncore, GEN2_IMR));
> for_each_pipe(dev_priv, pipe)
> seq_printf(m, "Pipe %c stat: %08x\n",
> pipe_name(pipe),
> - I915_READ(PIPESTAT(pipe)));
> + intel_uncore_read(&dev_priv->uncore, PIPESTAT(pipe)));
> } else {
> seq_printf(m, "North Display Interrupt enable: %08x\n",
> - I915_READ(DEIER));
> + intel_uncore_read(&dev_priv->uncore, DEIER));
> seq_printf(m, "North Display Interrupt identity: %08x\n",
> - I915_READ(DEIIR));
> + intel_uncore_read(&dev_priv->uncore, DEIIR));
> seq_printf(m, "North Display Interrupt mask: %08x\n",
> - I915_READ(DEIMR));
> + intel_uncore_read(&dev_priv->uncore, DEIMR));
> seq_printf(m, "South Display Interrupt enable: %08x\n",
> - I915_READ(SDEIER));
> + intel_uncore_read(&dev_priv->uncore, SDEIER));
> seq_printf(m, "South Display Interrupt identity: %08x\n",
> - I915_READ(SDEIIR));
> + intel_uncore_read(&dev_priv->uncore, SDEIIR));
> seq_printf(m, "South Display Interrupt mask: %08x\n",
> - I915_READ(SDEIMR));
> + intel_uncore_read(&dev_priv->uncore, SDEIMR));
> seq_printf(m, "Graphics Interrupt enable: %08x\n",
> - I915_READ(GTIER));
> + intel_uncore_read(&dev_priv->uncore, GTIER));
> seq_printf(m, "Graphics Interrupt identity: %08x\n",
> - I915_READ(GTIIR));
> + intel_uncore_read(&dev_priv->uncore, GTIIR));
> seq_printf(m, "Graphics Interrupt mask: %08x\n",
> - I915_READ(GTIMR));
> + intel_uncore_read(&dev_priv->uncore, GTIMR));
> }
>
> if (INTEL_GEN(dev_priv) >= 11) {
> seq_printf(m, "RCS Intr Mask:\t %08x\n",
> - I915_READ(GEN11_RCS0_RSVD_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_RCS0_RSVD_INTR_MASK));
> seq_printf(m, "BCS Intr Mask:\t %08x\n",
> - I915_READ(GEN11_BCS_RSVD_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_BCS_RSVD_INTR_MASK));
> seq_printf(m, "VCS0/VCS1 Intr Mask:\t %08x\n",
> - I915_READ(GEN11_VCS0_VCS1_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_VCS0_VCS1_INTR_MASK));
> seq_printf(m, "VCS2/VCS3 Intr Mask:\t %08x\n",
> - I915_READ(GEN11_VCS2_VCS3_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_VCS2_VCS3_INTR_MASK));
> seq_printf(m, "VECS0/VECS1 Intr Mask:\t %08x\n",
> - I915_READ(GEN11_VECS0_VECS1_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_VECS0_VECS1_INTR_MASK));
> seq_printf(m, "GUC/SG Intr Mask:\t %08x\n",
> - I915_READ(GEN11_GUC_SG_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GUC_SG_INTR_MASK));
> seq_printf(m, "GPM/WGBOXPERF Intr Mask: %08x\n",
> - I915_READ(GEN11_GPM_WGBOXPERF_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GPM_WGBOXPERF_INTR_MASK));
> seq_printf(m, "Crypto Intr Mask:\t %08x\n",
> - I915_READ(GEN11_CRYPTO_RSVD_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_CRYPTO_RSVD_INTR_MASK));
> seq_printf(m, "Gunit/CSME Intr Mask:\t %08x\n",
> - I915_READ(GEN11_GUNIT_CSME_INTR_MASK));
> + intel_uncore_read(&dev_priv->uncore, GEN11_GUNIT_CSME_INTR_MASK));
>
> } else if (INTEL_GEN(dev_priv) >= 6) {
> for_each_uabi_engine(engine, dev_priv) {
> @@ -802,7 +802,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
> } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> u32 rpmodectl, freq_sts;
>
> - rpmodectl = I915_READ(GEN6_RP_CONTROL);
> + rpmodectl = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CONTROL);
> seq_printf(m, "Video Turbo Mode: %s\n",
> yesno(rpmodectl & GEN6_RP_MEDIA_TURBO));
> seq_printf(m, "HW control enabled: %s\n",
> @@ -847,19 +847,19 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
> u32 pm_ier, pm_imr, pm_isr, pm_iir, pm_mask;
> int max_freq;
>
> - rp_state_limits = I915_READ(GEN6_RP_STATE_LIMITS);
> + rp_state_limits = intel_uncore_read(&dev_priv->uncore, GEN6_RP_STATE_LIMITS);
> if (IS_GEN9_LP(dev_priv)) {
> - rp_state_cap = I915_READ(BXT_RP_STATE_CAP);
> - gt_perf_status = I915_READ(BXT_GT_PERF_STATUS);
> + rp_state_cap = intel_uncore_read(&dev_priv->uncore, BXT_RP_STATE_CAP);
> + gt_perf_status = intel_uncore_read(&dev_priv->uncore, BXT_GT_PERF_STATUS);
> } else {
> - rp_state_cap = I915_READ(GEN6_RP_STATE_CAP);
> - gt_perf_status = I915_READ(GEN6_GT_PERF_STATUS);
> + rp_state_cap = intel_uncore_read(&dev_priv->uncore, GEN6_RP_STATE_CAP);
> + gt_perf_status = intel_uncore_read(&dev_priv->uncore, GEN6_GT_PERF_STATUS);
> }
>
> /* RPSTAT1 is in the GT power well */
> intel_uncore_forcewake_get(&dev_priv->uncore, FORCEWAKE_ALL);
>
> - reqf = I915_READ(GEN6_RPNSWREQ);
> + reqf = intel_uncore_read(&dev_priv->uncore, GEN6_RPNSWREQ);
> if (INTEL_GEN(dev_priv) >= 9)
> reqf >>= 23;
> else {
> @@ -871,24 +871,24 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
> }
> reqf = intel_gpu_freq(rps, reqf);
>
> - rpmodectl = I915_READ(GEN6_RP_CONTROL);
> - rpinclimit = I915_READ(GEN6_RP_UP_THRESHOLD);
> - rpdeclimit = I915_READ(GEN6_RP_DOWN_THRESHOLD);
> -
> - rpstat = I915_READ(GEN6_RPSTAT1);
> - rpupei = I915_READ(GEN6_RP_CUR_UP_EI) & GEN6_CURICONT_MASK;
> - rpcurup = I915_READ(GEN6_RP_CUR_UP) & GEN6_CURBSYTAVG_MASK;
> - rpprevup = I915_READ(GEN6_RP_PREV_UP) & GEN6_CURBSYTAVG_MASK;
> - rpdownei = I915_READ(GEN6_RP_CUR_DOWN_EI) & GEN6_CURIAVG_MASK;
> - rpcurdown = I915_READ(GEN6_RP_CUR_DOWN) & GEN6_CURBSYTAVG_MASK;
> - rpprevdown = I915_READ(GEN6_RP_PREV_DOWN) & GEN6_CURBSYTAVG_MASK;
> + rpmodectl = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CONTROL);
> + rpinclimit = intel_uncore_read(&dev_priv->uncore, GEN6_RP_UP_THRESHOLD);
> + rpdeclimit = intel_uncore_read(&dev_priv->uncore, GEN6_RP_DOWN_THRESHOLD);
> +
> + rpstat = intel_uncore_read(&dev_priv->uncore, GEN6_RPSTAT1);
> + rpupei = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CUR_UP_EI) & GEN6_CURICONT_MASK;
> + rpcurup = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CUR_UP) & GEN6_CURBSYTAVG_MASK;
> + rpprevup = intel_uncore_read(&dev_priv->uncore, GEN6_RP_PREV_UP) & GEN6_CURBSYTAVG_MASK;
> + rpdownei = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CUR_DOWN_EI) & GEN6_CURIAVG_MASK;
> + rpcurdown = intel_uncore_read(&dev_priv->uncore, GEN6_RP_CUR_DOWN) & GEN6_CURBSYTAVG_MASK;
> + rpprevdown = intel_uncore_read(&dev_priv->uncore, GEN6_RP_PREV_DOWN) & GEN6_CURBSYTAVG_MASK;
> cagf = intel_rps_read_actual_frequency(rps);
>
> intel_uncore_forcewake_put(&dev_priv->uncore, FORCEWAKE_ALL);
>
> if (INTEL_GEN(dev_priv) >= 11) {
> - pm_ier = I915_READ(GEN11_GPM_WGBOXPERF_INTR_ENABLE);
> - pm_imr = I915_READ(GEN11_GPM_WGBOXPERF_INTR_MASK);
> + pm_ier = intel_uncore_read(&dev_priv->uncore, GEN11_GPM_WGBOXPERF_INTR_ENABLE);
> + pm_imr = intel_uncore_read(&dev_priv->uncore, GEN11_GPM_WGBOXPERF_INTR_MASK);
> /*
> * The equivalent to the PM ISR & IIR cannot be read
> * without affecting the current state of the system
> @@ -896,17 +896,17 @@ static int i915_frequency_info(struct seq_file *m, void *unused)
> pm_isr = 0;
> pm_iir = 0;
> } else if (INTEL_GEN(dev_priv) >= 8) {
> - pm_ier = I915_READ(GEN8_GT_IER(2));
> - pm_imr = I915_READ(GEN8_GT_IMR(2));
> - pm_isr = I915_READ(GEN8_GT_ISR(2));
> - pm_iir = I915_READ(GEN8_GT_IIR(2));
> + pm_ier = intel_uncore_read(&dev_priv->uncore, GEN8_GT_IER(2));
> + pm_imr = intel_uncore_read(&dev_priv->uncore, GEN8_GT_IMR(2));
> + pm_isr = intel_uncore_read(&dev_priv->uncore, GEN8_GT_ISR(2));
> + pm_iir = intel_uncore_read(&dev_priv->uncore, GEN8_GT_IIR(2));
> } else {
> - pm_ier = I915_READ(GEN6_PMIER);
> - pm_imr = I915_READ(GEN6_PMIMR);
> - pm_isr = I915_READ(GEN6_PMISR);
> - pm_iir = I915_READ(GEN6_PMIIR);
> + pm_ier = intel_uncore_read(&dev_priv->uncore, GEN6_PMIER);
> + pm_imr = intel_uncore_read(&dev_priv->uncore, GEN6_PMIMR);
> + pm_isr = intel_uncore_read(&dev_priv->uncore, GEN6_PMISR);
> + pm_iir = intel_uncore_read(&dev_priv->uncore, GEN6_PMIIR);
> }
> - pm_mask = I915_READ(GEN6_PMINTRMSK);
> + pm_mask = intel_uncore_read(&dev_priv->uncore, GEN6_PMINTRMSK);
>
> seq_printf(m, "Video Turbo Mode: %s\n",
> yesno(rpmodectl & GEN6_RP_MEDIA_TURBO));
> @@ -1540,7 +1540,7 @@ i915_cache_sharing_get(void *data, u64 *val)
> return -ENODEV;
>
> with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
> - snpcr = I915_READ(GEN6_MBCUNIT_SNPCR);
> + snpcr = intel_uncore_read(&dev_priv->uncore, GEN6_MBCUNIT_SNPCR);
>
> *val = (snpcr & GEN6_MBC_SNPCR_MASK) >> GEN6_MBC_SNPCR_SHIFT;
>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-11-12 20:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 11:44 [Intel-gfx] [PATCH 0/9] drm/i915: nuke remaining legacy reg helpers (I915_READ/WRITE etc.) Jani Nikula
2020-11-12 11:44 ` [Intel-gfx] [PATCH 1/9] drm/i915: remove last users of I915_READ_FW() Jani Nikula
2020-11-12 20:17 ` Rodrigo Vivi
2020-11-12 20:24 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 2/9] drm/i915: remove last traces of I915_READ_FW() and I915_WRITE_FW() Jani Nikula
2020-11-12 20:19 ` Rodrigo Vivi
2020-11-12 20:26 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 3/9] drm/i915/cdclk: prefer intel_de_write() over I915_WRITE() Jani Nikula
2020-11-12 20:20 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 4/9] drm/i915/debugfs: replace I915_READ()+I915_WRITE() with intel_uncore_rmw() Jani Nikula
2020-11-12 20:21 ` Rodrigo Vivi
2020-11-12 20:28 ` Chris Wilson
2020-11-12 11:44 ` [Intel-gfx] [PATCH 5/9] drm/i915/debugfs: replace I915_READ() with intel_uncore_read() Jani Nikula
2020-11-12 20:23 ` Rodrigo Vivi [this message]
2020-11-12 11:44 ` [Intel-gfx] [PATCH 6/9] drm/i915/suspend: replace I915_READ()/WRITE() with intel_de_read()/write() Jani Nikula
2020-11-12 20:27 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 7/9] drm/i915/pm: replace I915_READ()/WRITE() with intel_uncore_read()/write() Jani Nikula
2020-11-12 21:00 ` Rodrigo Vivi
2020-11-13 7:47 ` Jani Nikula
2020-11-14 20:34 ` Rodrigo Vivi
2020-11-12 11:44 ` [Intel-gfx] [PATCH 8/9] drm/i915/irq: " Jani Nikula
2020-11-12 11:44 ` [Intel-gfx] [PATCH 9/9] drm/i915: remove last traces of I915_READ(), I915_WRITE() and POSTING_READ() Jani Nikula
2020-11-12 21:02 ` Rodrigo Vivi
2020-11-12 12:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: nuke remaining legacy reg helpers (I915_READ/WRITE etc.) Patchwork
2020-11-12 13:06 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-12 14:51 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20201112202318.GF1198919@intel.com \
--to=rodrigo.vivi@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.