Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx> writes:
> On 13/02/18 08:37, Mika Kuoppala wrote:
>> From: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>>
>> v2: Update for POR changes. (Daniele Ceraolo Spurio)
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>> Cc: Ceraolo Spurio, Daniele <daniele.ceraolospurio@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/i915_debugfs.c | 82 ++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 81 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> index 960302668649..49d5bed87798 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -703,6 +703,64 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
>> i, I915_READ(GEN8_GT_IER(i)));
>> }
>>
>> + seq_printf(m, "PCU interrupt mask:\t%08x\n",
>> + I915_READ(GEN8_PCU_IMR));
>> + seq_printf(m, "PCU interrupt identity:\t%08x\n",
>> + I915_READ(GEN8_PCU_IIR));
>> + seq_printf(m, "PCU interrupt enable:\t%08x\n",
>> + I915_READ(GEN8_PCU_IER));
>> + } else if (INTEL_GEN(dev_priv) >= 11) {
>> + seq_printf(m, "Master Interrupt Control: %08x\n",
>> + I915_READ(GEN11_GFX_MSTR_IRQ));
>> +
>> + seq_printf(m, "Render/Copy Intr Enable: %08x\n",
>> + I915_READ(GEN11_RENDER_COPY_INTR_ENABLE));
>> + seq_printf(m, "VCS/VECS Intr Enable: %08x\n",
>> + I915_READ(GEN11_VCS_VECS_INTR_ENABLE));
>> + seq_printf(m, "GUC/SG Intr Enable:\t %08x\n",
>> + I915_READ(GEN11_GUC_SG_INTR_ENABLE));
>> + seq_printf(m, "GPM/WGBOXPERF Intr Enable: %08x\n",
>> + I915_READ(GEN11_GPM_WGBOXPERF_INTR_ENABLE));
>> + seq_printf(m, "Crypto Intr Enable:\t %08x\n",
>> + I915_READ(GEN11_CRYPTO_RSVD_INTR_ENABLE));
>> + seq_printf(m, "GUnit/CSME Intr Enable:\t %08x\n",
>> + I915_READ(GEN11_GUNIT_CSME_INTR_ENABLE));
>> +
>> + seq_printf(m, "Display Interrupt Control:\t%08x\n",
>> + I915_READ(GEN11_DISPLAY_INT_CTL));
>
> From here onwards the code in this statement is almost identical to the
> one in the GEN8 case, apart from a small difference which I believe can
> be removed (see comment below), so it'd probably be cleaner to move it
> to a common function.
>
>> +
>> + for_each_pipe(dev_priv, pipe) {
>> + if (!intel_display_power_is_enabled(dev_priv,
>> + POWER_DOMAIN_PIPE(pipe))) {
>
> The Gen8 code uses intel_display_power_get_if_enabled(), any reason not
> to do the same here?
We need the ref while we poke the registers, so the get_if_enabled
variant should be used. I will make a common function out of these
as you suggested.
With Tvrtko's permission, I have adopted this and the interrupt
patches. So I will post update patch soon.
-Mika
>
> Daniele
>
>> + seq_printf(m, "Pipe %c power disabled\n",
>> + pipe_name(pipe));
>> + continue;
>> + }
>> + seq_printf(m, "Pipe %c IMR:\t%08x\n",
>> + pipe_name(pipe),
>> + I915_READ(GEN8_DE_PIPE_IMR(pipe)));
>> + seq_printf(m, "Pipe %c IIR:\t%08x\n",
>> + pipe_name(pipe),
>> + I915_READ(GEN8_DE_PIPE_IIR(pipe)));
>> + seq_printf(m, "Pipe %c IER:\t%08x\n",
>> + pipe_name(pipe),
>> + I915_READ(GEN8_DE_PIPE_IER(pipe)));
>> + }
>> +
>> + seq_printf(m, "Display Engine port interrupt mask:\t%08x\n",
>> + I915_READ(GEN8_DE_PORT_IMR));
>> + seq_printf(m, "Display Engine port interrupt identity:\t%08x\n",
>> + I915_READ(GEN8_DE_PORT_IIR));
>> + seq_printf(m, "Display Engine port interrupt enable:\t%08x\n",
>> + I915_READ(GEN8_DE_PORT_IER));
>> +
>> + seq_printf(m, "Display Engine misc interrupt mask:\t%08x\n",
>> + I915_READ(GEN8_DE_MISC_IMR));
>> + seq_printf(m, "Display Engine misc interrupt identity:\t%08x\n",
>> + I915_READ(GEN8_DE_MISC_IIR));
>> + seq_printf(m, "Display Engine misc interrupt enable:\t%08x\n",
>> + I915_READ(GEN8_DE_MISC_IER));
>> +
>> seq_printf(m, "PCU interrupt mask:\t%08x\n",
>> I915_READ(GEN8_PCU_IMR));
>> seq_printf(m, "PCU interrupt identity:\t%08x\n",
>> @@ -846,13 +904,35 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
>> seq_printf(m, "Graphics Interrupt mask: %08x\n",
>> I915_READ(GTIMR));
>> }
>> - if (INTEL_GEN(dev_priv) >= 6) {
>> +
>> + if (INTEL_GEN(dev_priv) >= 11) {
>> + seq_printf(m, "RCS Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_RCS0_RSVD_INTR_MASK));
>> + seq_printf(m, "BCS Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_BCS_RSVD_INTR_MASK));
>> + seq_printf(m, "VCS0/VCS1 Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_VCS0_VCS1_INTR_MASK));
>> + seq_printf(m, "VCS2/VCS3 Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_VCS2_VCS3_INTR_MASK));
>> + seq_printf(m, "VECS0/VECS1 Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_VECS0_VECS1_INTR_MASK));
>> + seq_printf(m, "GUC/SG Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_GUC_SG_INTR_MASK));
>> + seq_printf(m, "GPM/WGBOXPERF Intr Mask: %08x\n",
>> + I915_READ(GEN11_GPM_WGBOXPERF_INTR_MASK));
>> + seq_printf(m, "Crypto Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_CRYPTO_RSVD_INTR_MASK));
>> + seq_printf(m, "Gunit/CSME Intr Mask:\t %08x\n",
>> + I915_READ(GEN11_GUNIT_CSME_INTR_MASK));
>> +
>> + } else if (INTEL_GEN(dev_priv) >= 6) {
>> for_each_engine(engine, dev_priv, id) {
>> seq_printf(m,
>> "Graphics Interrupt mask (%s): %08x\n",
>> engine->name, I915_READ_IMR(engine));
>> }
>> }
>> +
>> intel_runtime_pm_put(dev_priv);
>>
>> return 0;
>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
