2006-01-02 09:14:23 +00:00
|
|
|
/* i915_irq.c -- IRQ support for the I915 -*- linux-c -*-
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2006-01-02 09:14:23 +00:00
|
|
|
/*
|
2005-04-16 22:20:36 +00:00
|
|
|
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
|
|
|
|
* All Rights Reserved.
|
2005-06-23 12:46:46 +00:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the
|
|
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
|
|
* of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
|
|
|
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
|
|
|
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
|
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
|
|
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*
|
2006-01-02 09:14:23 +00:00
|
|
|
*/
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2009-06-18 23:56:52 +00:00
|
|
|
#include <linux/sysrq.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2013-10-15 17:55:29 +00:00
|
|
|
#include <linux/circ_buf.h>
|
2012-10-02 17:01:07 +00:00
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include <drm/i915_drm.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include "i915_drv.h"
|
2009-08-25 10:15:50 +00:00
|
|
|
#include "i915_trace.h"
|
DRM: i915: add mode setting support
This commit adds i915 driver support for the DRM mode setting APIs.
Currently, VGA, LVDS, SDVO DVI & VGA, TV and DVO LVDS outputs are
supported. HDMI, DisplayPort and additional SDVO output support will
follow.
Support for the mode setting code is controlled by the new 'modeset'
module option. A new config option, CONFIG_DRM_I915_KMS controls the
default behavior, and whether a PCI ID list is built into the module for
use by user level module utilities.
Note that if mode setting is enabled, user level drivers that access
display registers directly or that don't use the kernel graphics memory
manager will likely corrupt kernel graphics memory, disrupt output
configuration (possibly leading to hangs and/or blank displays), and
prevent panic/oops messages from appearing. So use caution when
enabling this code; be sure your user level code supports the new
interfaces.
A new SysRq key, 'g', provides emergency support for switching back to
the kernel's framebuffer console; which is useful for testing.
Co-authors: Dave Airlie <airlied@linux.ie>, Hong Liu <hong.liu@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2008-11-07 22:24:08 +00:00
|
|
|
#include "intel_drv.h"
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* DOC: interrupt handling
|
|
|
|
*
|
|
|
|
* These functions provide the basic support for enabling and disabling the
|
|
|
|
* interrupt handling support. There's a lot more functionality in i915_irq.c
|
|
|
|
* and related files, but that will be described in separate chapters.
|
|
|
|
*/
|
|
|
|
|
2015-08-27 20:56:03 +00:00
|
|
|
static const u32 hpd_ilk[HPD_NUM_PINS] = {
|
|
|
|
[HPD_PORT_A] = DE_DP_A_HOTPLUG,
|
|
|
|
};
|
|
|
|
|
2015-08-27 20:56:04 +00:00
|
|
|
static const u32 hpd_ivb[HPD_NUM_PINS] = {
|
|
|
|
[HPD_PORT_A] = DE_DP_A_HOTPLUG_IVB,
|
|
|
|
};
|
|
|
|
|
2015-08-27 20:56:06 +00:00
|
|
|
static const u32 hpd_bdw[HPD_NUM_PINS] = {
|
|
|
|
[HPD_PORT_A] = GEN8_PORT_DP_A_HOTPLUG,
|
|
|
|
};
|
|
|
|
|
2015-01-09 12:21:12 +00:00
|
|
|
static const u32 hpd_ibx[HPD_NUM_PINS] = {
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG,
|
|
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG,
|
|
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG,
|
|
|
|
[HPD_PORT_C] = SDE_PORTC_HOTPLUG,
|
|
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG
|
|
|
|
};
|
|
|
|
|
2015-01-09 12:21:12 +00:00
|
|
|
static const u32 hpd_cpt[HPD_NUM_PINS] = {
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG_CPT,
|
2013-03-26 21:38:43 +00:00
|
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG_CPT,
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
|
|
|
|
[HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,
|
|
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
|
|
|
|
};
|
|
|
|
|
2015-08-17 07:55:50 +00:00
|
|
|
static const u32 hpd_spt[HPD_NUM_PINS] = {
|
2015-08-27 20:56:07 +00:00
|
|
|
[HPD_PORT_A] = SDE_PORTA_HOTPLUG_SPT,
|
2015-08-17 07:55:50 +00:00
|
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
|
|
|
|
[HPD_PORT_C] = SDE_PORTC_HOTPLUG_CPT,
|
|
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT,
|
|
|
|
[HPD_PORT_E] = SDE_PORTE_HOTPLUG_SPT
|
|
|
|
};
|
|
|
|
|
2015-01-09 12:21:12 +00:00
|
|
|
static const u32 hpd_mask_i915[HPD_NUM_PINS] = {
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_EN,
|
|
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_EN,
|
|
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_EN,
|
|
|
|
[HPD_PORT_B] = PORTB_HOTPLUG_INT_EN,
|
|
|
|
[HPD_PORT_C] = PORTC_HOTPLUG_INT_EN,
|
|
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_EN
|
|
|
|
};
|
|
|
|
|
2015-01-09 12:21:12 +00:00
|
|
|
static const u32 hpd_status_g4x[HPD_NUM_PINS] = {
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_G4X,
|
|
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_G4X,
|
|
|
|
[HPD_PORT_B] = PORTB_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_PORT_C] = PORTC_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS
|
|
|
|
};
|
|
|
|
|
drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV
so that we don't confuse the AUX status bits with SDVO status bits.
Avoid pointless log spam as below while handling AUX interrupts:
[drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000
[drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000
[drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000
[drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000
[drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Note that there's no functional issue, it's just that the sdvo bits
overlap with the dp aux bits. Hence every time we receive an aux
interrupt we also think there's an sdvo hpd interrupt, but due to lack
of any sdvo encoders nothing ever happens because of that.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
[danvet: Add Ville's explanation why nothing functional really
changes.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-11 17:49:10 +00:00
|
|
|
static const u32 hpd_status_i915[HPD_NUM_PINS] = {
|
2013-02-28 09:17:12 +00:00
|
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915,
|
|
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915,
|
|
|
|
[HPD_PORT_B] = PORTB_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_PORT_C] = PORTC_HOTPLUG_INT_STATUS,
|
|
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS
|
|
|
|
};
|
|
|
|
|
2015-03-27 12:54:14 +00:00
|
|
|
/* BXT hpd list */
|
|
|
|
static const u32 hpd_bxt[HPD_NUM_PINS] = {
|
2015-08-10 05:05:35 +00:00
|
|
|
[HPD_PORT_A] = BXT_DE_PORT_HP_DDIA,
|
2015-03-27 12:54:14 +00:00
|
|
|
[HPD_PORT_B] = BXT_DE_PORT_HP_DDIB,
|
|
|
|
[HPD_PORT_C] = BXT_DE_PORT_HP_DDIC
|
|
|
|
};
|
|
|
|
|
2014-04-01 18:37:11 +00:00
|
|
|
/* IIR can theoretically queue up two events. Be paranoid. */
|
2014-04-01 18:37:14 +00:00
|
|
|
#define GEN8_IRQ_RESET_NDX(type, which) do { \
|
2014-04-01 18:37:11 +00:00
|
|
|
I915_WRITE(GEN8_##type##_IMR(which), 0xffffffff); \
|
|
|
|
POSTING_READ(GEN8_##type##_IMR(which)); \
|
|
|
|
I915_WRITE(GEN8_##type##_IER(which), 0); \
|
|
|
|
I915_WRITE(GEN8_##type##_IIR(which), 0xffffffff); \
|
|
|
|
POSTING_READ(GEN8_##type##_IIR(which)); \
|
|
|
|
I915_WRITE(GEN8_##type##_IIR(which), 0xffffffff); \
|
|
|
|
POSTING_READ(GEN8_##type##_IIR(which)); \
|
|
|
|
} while (0)
|
|
|
|
|
2014-04-01 18:37:14 +00:00
|
|
|
#define GEN5_IRQ_RESET(type) do { \
|
2014-04-01 18:37:09 +00:00
|
|
|
I915_WRITE(type##IMR, 0xffffffff); \
|
2014-04-01 18:37:11 +00:00
|
|
|
POSTING_READ(type##IMR); \
|
2014-04-01 18:37:09 +00:00
|
|
|
I915_WRITE(type##IER, 0); \
|
2014-04-01 18:37:11 +00:00
|
|
|
I915_WRITE(type##IIR, 0xffffffff); \
|
|
|
|
POSTING_READ(type##IIR); \
|
|
|
|
I915_WRITE(type##IIR, 0xffffffff); \
|
|
|
|
POSTING_READ(type##IIR); \
|
2014-04-01 18:37:09 +00:00
|
|
|
} while (0)
|
|
|
|
|
2014-04-01 18:37:16 +00:00
|
|
|
/*
|
|
|
|
* We should clear IMR at preinstall/uninstall, and just check at postinstall.
|
|
|
|
*/
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
static void gen5_assert_iir_is_zero(struct drm_i915_private *dev_priv,
|
|
|
|
i915_reg_t reg)
|
2015-09-18 17:03:41 +00:00
|
|
|
{
|
|
|
|
u32 val = I915_READ(reg);
|
|
|
|
|
|
|
|
if (val == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
WARN(1, "Interrupt register 0x%x is not zero: 0x%08x\n",
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_mmio_reg_offset(reg), val);
|
2015-09-18 17:03:41 +00:00
|
|
|
I915_WRITE(reg, 0xffffffff);
|
|
|
|
POSTING_READ(reg);
|
|
|
|
I915_WRITE(reg, 0xffffffff);
|
|
|
|
POSTING_READ(reg);
|
|
|
|
}
|
2014-04-01 18:37:16 +00:00
|
|
|
|
2014-04-01 18:37:15 +00:00
|
|
|
#define GEN8_IRQ_INIT_NDX(type, which, imr_val, ier_val) do { \
|
2015-09-18 17:03:41 +00:00
|
|
|
gen5_assert_iir_is_zero(dev_priv, GEN8_##type##_IIR(which)); \
|
2014-04-01 18:37:15 +00:00
|
|
|
I915_WRITE(GEN8_##type##_IER(which), (ier_val)); \
|
drm/i915: Apply some ocd for IMR vs. IER order during irq enable
When disabling interrupts we do the writes in this order:
IMR,IER,IIR,IIR. But when enabling interrupts we don't do use the
mirrored order, and instead do IIR,IIR,IMR,IER.
I like consistency unless there's a good reason against it, which I
can't think of here, so change the enable order to IIR,IIR,IER,IMR.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-10-30 17:42:50 +00:00
|
|
|
I915_WRITE(GEN8_##type##_IMR(which), (imr_val)); \
|
|
|
|
POSTING_READ(GEN8_##type##_IMR(which)); \
|
2014-04-01 18:37:15 +00:00
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define GEN5_IRQ_INIT(type, imr_val, ier_val) do { \
|
2015-09-18 17:03:41 +00:00
|
|
|
gen5_assert_iir_is_zero(dev_priv, type##IIR); \
|
2014-04-01 18:37:15 +00:00
|
|
|
I915_WRITE(type##IER, (ier_val)); \
|
drm/i915: Apply some ocd for IMR vs. IER order during irq enable
When disabling interrupts we do the writes in this order:
IMR,IER,IIR,IIR. But when enabling interrupts we don't do use the
mirrored order, and instead do IIR,IIR,IMR,IER.
I like consistency unless there's a good reason against it, which I
can't think of here, so change the enable order to IIR,IIR,IER,IMR.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-10-30 17:42:50 +00:00
|
|
|
I915_WRITE(type##IMR, (imr_val)); \
|
|
|
|
POSTING_READ(type##IMR); \
|
2014-04-01 18:37:15 +00:00
|
|
|
} while (0)
|
|
|
|
|
2014-11-05 18:48:37 +00:00
|
|
|
static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir);
|
|
|
|
|
2015-09-23 14:15:27 +00:00
|
|
|
/* For display hotplug interrupt */
|
|
|
|
static inline void
|
|
|
|
i915_hotplug_interrupt_update_locked(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t mask,
|
|
|
|
uint32_t bits)
|
|
|
|
{
|
|
|
|
uint32_t val;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
WARN_ON(bits & ~mask);
|
|
|
|
|
|
|
|
val = I915_READ(PORT_HOTPLUG_EN);
|
|
|
|
val &= ~mask;
|
|
|
|
val |= bits;
|
|
|
|
I915_WRITE(PORT_HOTPLUG_EN, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* i915_hotplug_interrupt_update - update hotplug interrupt enable
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @mask: bits to update
|
|
|
|
* @bits: bits to enable
|
|
|
|
* NOTE: the HPD enable bits are modified both inside and outside
|
|
|
|
* of an interrupt context. To avoid that read-modify-write cycles
|
|
|
|
* interfer, these bits are protected by a spinlock. Since this
|
|
|
|
* function is usually not called from a context where the lock is
|
|
|
|
* held already, this function acquires the lock itself. A non-locking
|
|
|
|
* version is also available.
|
|
|
|
*/
|
|
|
|
void i915_hotplug_interrupt_update(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t mask,
|
|
|
|
uint32_t bits)
|
|
|
|
{
|
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
|
|
|
i915_hotplug_interrupt_update_locked(dev_priv, mask, bits);
|
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
}
|
|
|
|
|
2015-08-27 20:55:58 +00:00
|
|
|
/**
|
|
|
|
* ilk_update_display_irq - update DEIMR
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
2015-11-23 16:06:16 +00:00
|
|
|
void ilk_update_display_irq(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
2009-06-08 06:40:19 +00:00
|
|
|
{
|
2015-08-27 20:55:58 +00:00
|
|
|
uint32_t new_val;
|
|
|
|
|
2013-06-27 11:44:58 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
2015-08-27 20:55:58 +00:00
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
2014-06-20 16:29:20 +00:00
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
2013-08-19 16:18:09 +00:00
|
|
|
return;
|
|
|
|
|
2015-08-27 20:55:58 +00:00
|
|
|
new_val = dev_priv->irq_mask;
|
|
|
|
new_val &= ~interrupt_mask;
|
|
|
|
new_val |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
|
|
|
|
if (new_val != dev_priv->irq_mask) {
|
|
|
|
dev_priv->irq_mask = new_val;
|
2010-12-04 11:30:53 +00:00
|
|
|
I915_WRITE(DEIMR, dev_priv->irq_mask);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(DEIMR);
|
2009-06-08 06:40:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-06 21:57:12 +00:00
|
|
|
/**
|
|
|
|
* ilk_update_gt_irq - update GTIMR
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
|
|
|
static void ilk_update_gt_irq(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
2014-12-08 15:30:00 +00:00
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
2014-06-20 16:29:20 +00:00
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
2013-08-19 16:18:09 +00:00
|
|
|
return;
|
|
|
|
|
2013-08-06 21:57:12 +00:00
|
|
|
dev_priv->gt_irq_mask &= ~interrupt_mask;
|
|
|
|
dev_priv->gt_irq_mask |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
I915_WRITE(GTIMR, dev_priv->gt_irq_mask);
|
|
|
|
}
|
|
|
|
|
2014-07-16 07:49:40 +00:00
|
|
|
void gen5_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask)
|
2013-08-06 21:57:12 +00:00
|
|
|
{
|
|
|
|
ilk_update_gt_irq(dev_priv, mask, mask);
|
2016-07-01 16:23:27 +00:00
|
|
|
POSTING_READ_FW(GTIMR);
|
2013-08-06 21:57:12 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 07:49:40 +00:00
|
|
|
void gen5_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask)
|
2013-08-06 21:57:12 +00:00
|
|
|
{
|
|
|
|
ilk_update_gt_irq(dev_priv, mask, 0);
|
|
|
|
}
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
static i915_reg_t gen6_pm_iir(struct drm_i915_private *dev_priv)
|
2014-11-05 18:48:48 +00:00
|
|
|
{
|
|
|
|
return INTEL_INFO(dev_priv)->gen >= 8 ? GEN8_GT_IIR(2) : GEN6_PMIIR;
|
|
|
|
}
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
static i915_reg_t gen6_pm_imr(struct drm_i915_private *dev_priv)
|
2014-11-05 18:48:31 +00:00
|
|
|
{
|
|
|
|
return INTEL_INFO(dev_priv)->gen >= 8 ? GEN8_GT_IMR(2) : GEN6_PMIMR;
|
|
|
|
}
|
|
|
|
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
static i915_reg_t gen6_pm_ier(struct drm_i915_private *dev_priv)
|
2014-11-05 18:48:48 +00:00
|
|
|
{
|
|
|
|
return INTEL_INFO(dev_priv)->gen >= 8 ? GEN8_GT_IER(2) : GEN6_PMIER;
|
|
|
|
}
|
|
|
|
|
2013-08-06 21:57:13 +00:00
|
|
|
/**
|
2015-11-25 14:21:30 +00:00
|
|
|
* snb_update_pm_irq - update GEN6_PMIMR
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
2013-08-06 21:57:13 +00:00
|
|
|
static void snb_update_pm_irq(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
|
|
|
{
|
2013-08-06 21:57:15 +00:00
|
|
|
uint32_t new_val;
|
2013-08-06 21:57:13 +00:00
|
|
|
|
2014-12-08 15:30:00 +00:00
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
2013-08-06 21:57:13 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
2013-08-06 21:57:15 +00:00
|
|
|
new_val = dev_priv->pm_irq_mask;
|
2013-08-06 21:57:14 +00:00
|
|
|
new_val &= ~interrupt_mask;
|
|
|
|
new_val |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
|
2013-08-06 21:57:15 +00:00
|
|
|
if (new_val != dev_priv->pm_irq_mask) {
|
|
|
|
dev_priv->pm_irq_mask = new_val;
|
2014-11-05 18:48:31 +00:00
|
|
|
I915_WRITE(gen6_pm_imr(dev_priv), dev_priv->pm_irq_mask);
|
|
|
|
POSTING_READ(gen6_pm_imr(dev_priv));
|
2013-08-06 21:57:14 +00:00
|
|
|
}
|
2013-08-06 21:57:13 +00:00
|
|
|
}
|
|
|
|
|
2014-07-16 07:49:40 +00:00
|
|
|
void gen6_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask)
|
2013-08-06 21:57:13 +00:00
|
|
|
{
|
2014-11-20 21:01:47 +00:00
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
|
|
|
return;
|
|
|
|
|
2013-08-06 21:57:13 +00:00
|
|
|
snb_update_pm_irq(dev_priv, mask, mask);
|
|
|
|
}
|
|
|
|
|
2014-11-20 21:01:47 +00:00
|
|
|
static void __gen6_disable_pm_irq(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t mask)
|
2013-08-06 21:57:13 +00:00
|
|
|
{
|
|
|
|
snb_update_pm_irq(dev_priv, mask, 0);
|
|
|
|
}
|
|
|
|
|
2014-11-20 21:01:47 +00:00
|
|
|
void gen6_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask)
|
|
|
|
{
|
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
__gen6_disable_pm_irq(dev_priv, mask);
|
|
|
|
}
|
|
|
|
|
2016-05-10 13:10:04 +00:00
|
|
|
void gen6_reset_rps_interrupts(struct drm_i915_private *dev_priv)
|
2014-11-19 13:30:03 +00:00
|
|
|
{
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = gen6_pm_iir(dev_priv);
|
2014-11-19 13:30:03 +00:00
|
|
|
|
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
|
|
|
I915_WRITE(reg, dev_priv->pm_rps_events);
|
|
|
|
I915_WRITE(reg, dev_priv->pm_rps_events);
|
|
|
|
POSTING_READ(reg);
|
2015-03-23 17:11:35 +00:00
|
|
|
dev_priv->rps.pm_iir = 0;
|
2014-11-19 13:30:03 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
void gen6_enable_rps_interrupts(struct drm_i915_private *dev_priv)
|
2014-11-05 18:48:48 +00:00
|
|
|
{
|
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-07-04 07:08:36 +00:00
|
|
|
WARN_ON_ONCE(dev_priv->rps.pm_iir);
|
|
|
|
WARN_ON_ONCE(I915_READ(gen6_pm_iir(dev_priv)) & dev_priv->pm_rps_events);
|
drm/i915: sanitize rps irq disabling
When disabling the RPS interrupts there is a tricky dependency between
the thread disabling the interrupts, the RPS interrupt handler and the
corresponding RPS work. The RPS work can reenable the interrupts, so
there is no straightforward order in the disabling thread to (1) make
sure that any RPS work is flushed and to (2) disable all RPS
interrupts. Currently this is solved by masking the interrupts using two
separate mask registers (first level display IMR and PM IMR) and doing
the disabling when all first level interrupts are disabled.
This works, but the requirement to run with all first level interrupts
disabled is unnecessary making the suspend / unload time ordering of RPS
disabling wrt. other unitialization steps difficult and error prone.
Removing this restriction allows us to disable RPS early during suspend
/ unload and forget about it for the rest of the sequence. By adding a
more explicit method for avoiding the above race, it also becomes easier
to prove its correctness. Finally currently we can hit the WARN in
snb_update_pm_irq(), when a final RPS work runs with the first level
interrupts already disabled. This won't lead to any problem (due to the
separate interrupt masks), but with the change in this and the next
patch we can get rid of the WARN, while leaving it in place for other
scenarios.
To address the above points, add a new RPS interrupts_enabled flag and
use this during RPS disabling to avoid requeuing the RPS work and
reenabling of the RPS interrupts. Since the interrupt disabling happens
now in intel_suspend_gt_powersave(), we will disable RPS interrupts
explicitly during suspend (and not just through the first level mask),
but there is no problem doing so, it's also more consistent and allows
us to unify more of the RPS disabling during suspend and unload time in
the next patch.
v2/v3:
- rebase on patch "drm/i915: move rps irq disable one level up" in the
patchset
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-19 13:30:04 +00:00
|
|
|
dev_priv->rps.interrupts_enabled = true;
|
2014-12-15 16:59:27 +00:00
|
|
|
I915_WRITE(gen6_pm_ier(dev_priv), I915_READ(gen6_pm_ier(dev_priv)) |
|
|
|
|
dev_priv->pm_rps_events);
|
2014-11-05 18:48:48 +00:00
|
|
|
gen6_enable_pm_irq(dev_priv, dev_priv->pm_rps_events);
|
2014-12-15 16:59:27 +00:00
|
|
|
|
2014-11-05 18:48:48 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
}
|
|
|
|
|
2014-12-19 17:33:26 +00:00
|
|
|
u32 gen6_sanitize_rps_pm_mask(struct drm_i915_private *dev_priv, u32 mask)
|
|
|
|
{
|
2016-05-31 08:28:27 +00:00
|
|
|
return (mask & ~dev_priv->rps.pm_intr_keep);
|
2014-12-19 17:33:26 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv)
|
2014-11-05 18:48:48 +00:00
|
|
|
{
|
drm/i915: sanitize rps irq disabling
When disabling the RPS interrupts there is a tricky dependency between
the thread disabling the interrupts, the RPS interrupt handler and the
corresponding RPS work. The RPS work can reenable the interrupts, so
there is no straightforward order in the disabling thread to (1) make
sure that any RPS work is flushed and to (2) disable all RPS
interrupts. Currently this is solved by masking the interrupts using two
separate mask registers (first level display IMR and PM IMR) and doing
the disabling when all first level interrupts are disabled.
This works, but the requirement to run with all first level interrupts
disabled is unnecessary making the suspend / unload time ordering of RPS
disabling wrt. other unitialization steps difficult and error prone.
Removing this restriction allows us to disable RPS early during suspend
/ unload and forget about it for the rest of the sequence. By adding a
more explicit method for avoiding the above race, it also becomes easier
to prove its correctness. Finally currently we can hit the WARN in
snb_update_pm_irq(), when a final RPS work runs with the first level
interrupts already disabled. This won't lead to any problem (due to the
separate interrupt masks), but with the change in this and the next
patch we can get rid of the WARN, while leaving it in place for other
scenarios.
To address the above points, add a new RPS interrupts_enabled flag and
use this during RPS disabling to avoid requeuing the RPS work and
reenabling of the RPS interrupts. Since the interrupt disabling happens
now in intel_suspend_gt_powersave(), we will disable RPS interrupts
explicitly during suspend (and not just through the first level mask),
but there is no problem doing so, it's also more consistent and allows
us to unify more of the RPS disabling during suspend and unload time in
the next patch.
v2/v3:
- rebase on patch "drm/i915: move rps irq disable one level up" in the
patchset
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-19 13:30:04 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
|
|
|
dev_priv->rps.interrupts_enabled = false;
|
2014-11-20 21:01:47 +00:00
|
|
|
|
2014-12-19 17:33:26 +00:00
|
|
|
I915_WRITE(GEN6_PMINTRMSK, gen6_sanitize_rps_pm_mask(dev_priv, ~0));
|
2014-11-20 21:01:47 +00:00
|
|
|
|
|
|
|
__gen6_disable_pm_irq(dev_priv, dev_priv->pm_rps_events);
|
2014-11-05 18:48:48 +00:00
|
|
|
I915_WRITE(gen6_pm_ier(dev_priv), I915_READ(gen6_pm_ier(dev_priv)) &
|
|
|
|
~dev_priv->pm_rps_events);
|
2015-03-23 17:11:34 +00:00
|
|
|
|
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2016-07-05 09:40:23 +00:00
|
|
|
synchronize_irq(dev_priv->drm.irq);
|
2016-07-04 07:08:36 +00:00
|
|
|
|
|
|
|
/* Now that we will not be generating any more work, flush any
|
|
|
|
* outsanding tasks. As we are called on the RPS idle path,
|
|
|
|
* we will reset the GPU to minimum frequencies, so the current
|
|
|
|
* state of the worker can be discarded.
|
|
|
|
*/
|
|
|
|
cancel_work_sync(&dev_priv->rps.work);
|
|
|
|
gen6_reset_rps_interrupts(dev_priv);
|
2014-11-05 18:48:48 +00:00
|
|
|
}
|
|
|
|
|
2015-08-27 20:56:06 +00:00
|
|
|
/**
|
2015-11-25 14:21:30 +00:00
|
|
|
* bdw_update_port_irq - update DE port interrupt
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
2015-08-27 20:56:06 +00:00
|
|
|
static void bdw_update_port_irq(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
|
|
|
{
|
|
|
|
uint32_t new_val;
|
|
|
|
uint32_t old_val;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
old_val = I915_READ(GEN8_DE_PORT_IMR);
|
|
|
|
|
|
|
|
new_val = old_val;
|
|
|
|
new_val &= ~interrupt_mask;
|
|
|
|
new_val |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
|
|
|
|
if (new_val != old_val) {
|
|
|
|
I915_WRITE(GEN8_DE_PORT_IMR, new_val);
|
|
|
|
POSTING_READ(GEN8_DE_PORT_IMR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-23 16:06:17 +00:00
|
|
|
/**
|
|
|
|
* bdw_update_pipe_irq - update DE pipe interrupt
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @pipe: pipe whose interrupt to update
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
|
|
|
void bdw_update_pipe_irq(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
|
|
|
{
|
|
|
|
uint32_t new_val;
|
|
|
|
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
new_val = dev_priv->de_irq_mask[pipe];
|
|
|
|
new_val &= ~interrupt_mask;
|
|
|
|
new_val |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
|
|
|
|
if (new_val != dev_priv->de_irq_mask[pipe]) {
|
|
|
|
dev_priv->de_irq_mask[pipe] = new_val;
|
|
|
|
I915_WRITE(GEN8_DE_PIPE_IMR(pipe), dev_priv->de_irq_mask[pipe]);
|
|
|
|
POSTING_READ(GEN8_DE_PIPE_IMR(pipe));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-04 21:35:21 +00:00
|
|
|
/**
|
|
|
|
* ibx_display_interrupt_update - update SDEIMR
|
|
|
|
* @dev_priv: driver private
|
|
|
|
* @interrupt_mask: mask of interrupt bits to update
|
|
|
|
* @enabled_irq_mask: mask of interrupt bits to enable
|
|
|
|
*/
|
2014-09-30 08:56:46 +00:00
|
|
|
void ibx_display_interrupt_update(struct drm_i915_private *dev_priv,
|
|
|
|
uint32_t interrupt_mask,
|
|
|
|
uint32_t enabled_irq_mask)
|
2013-07-04 21:35:21 +00:00
|
|
|
{
|
|
|
|
uint32_t sdeimr = I915_READ(SDEIMR);
|
|
|
|
sdeimr &= ~interrupt_mask;
|
|
|
|
sdeimr |= (~enabled_irq_mask & interrupt_mask);
|
|
|
|
|
2014-12-08 15:30:00 +00:00
|
|
|
WARN_ON(enabled_irq_mask & ~interrupt_mask);
|
|
|
|
|
2013-07-04 21:35:21 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
2014-06-20 16:29:20 +00:00
|
|
|
if (WARN_ON(!intel_irqs_enabled(dev_priv)))
|
2013-08-19 16:18:09 +00:00
|
|
|
return;
|
|
|
|
|
2013-07-04 21:35:21 +00:00
|
|
|
I915_WRITE(SDEIMR, sdeimr);
|
|
|
|
POSTING_READ(SDEIMR);
|
|
|
|
}
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
2014-03-02 20:18:00 +00:00
|
|
|
static void
|
2014-02-10 16:42:47 +00:00
|
|
|
__i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
|
|
|
u32 enable_mask, u32 status_mask)
|
2008-11-04 10:03:27 +00:00
|
|
|
{
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = PIPESTAT(pipe);
|
2014-02-10 16:42:47 +00:00
|
|
|
u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;
|
2008-11-04 10:03:27 +00:00
|
|
|
|
2013-06-27 15:52:10 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
2014-08-27 08:43:37 +00:00
|
|
|
WARN_ON(!intel_irqs_enabled(dev_priv));
|
2013-06-27 15:52:10 +00:00
|
|
|
|
2014-04-03 10:28:33 +00:00
|
|
|
if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
|
|
|
|
status_mask & ~PIPESTAT_INT_STATUS_MASK,
|
|
|
|
"pipe %c: enable_mask=0x%x, status_mask=0x%x\n",
|
|
|
|
pipe_name(pipe), enable_mask, status_mask))
|
2014-02-10 16:42:47 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
if ((pipestat & enable_mask) == enable_mask)
|
2013-02-20 19:16:18 +00:00
|
|
|
return;
|
|
|
|
|
2014-02-10 16:42:49 +00:00
|
|
|
dev_priv->pipestat_irq_mask[pipe] |= status_mask;
|
|
|
|
|
2013-02-20 19:16:18 +00:00
|
|
|
/* Enable the interrupt, clear any pending status */
|
2014-02-10 16:42:47 +00:00
|
|
|
pipestat |= enable_mask | status_mask;
|
2013-02-20 19:16:18 +00:00
|
|
|
I915_WRITE(reg, pipestat);
|
|
|
|
POSTING_READ(reg);
|
2008-11-04 10:03:27 +00:00
|
|
|
}
|
|
|
|
|
2014-03-02 20:18:00 +00:00
|
|
|
static void
|
2014-02-10 16:42:47 +00:00
|
|
|
__i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
|
|
|
u32 enable_mask, u32 status_mask)
|
2008-11-04 10:03:27 +00:00
|
|
|
{
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = PIPESTAT(pipe);
|
2014-02-10 16:42:47 +00:00
|
|
|
u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;
|
2008-11-04 10:03:27 +00:00
|
|
|
|
2013-06-27 15:52:10 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
2014-08-27 08:43:37 +00:00
|
|
|
WARN_ON(!intel_irqs_enabled(dev_priv));
|
2013-06-27 15:52:10 +00:00
|
|
|
|
2014-04-03 10:28:33 +00:00
|
|
|
if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
|
|
|
|
status_mask & ~PIPESTAT_INT_STATUS_MASK,
|
|
|
|
"pipe %c: enable_mask=0x%x, status_mask=0x%x\n",
|
|
|
|
pipe_name(pipe), enable_mask, status_mask))
|
2013-02-20 19:16:18 +00:00
|
|
|
return;
|
|
|
|
|
2014-02-10 16:42:47 +00:00
|
|
|
if ((pipestat & enable_mask) == 0)
|
|
|
|
return;
|
|
|
|
|
2014-02-10 16:42:49 +00:00
|
|
|
dev_priv->pipestat_irq_mask[pipe] &= ~status_mask;
|
|
|
|
|
2014-02-10 16:42:47 +00:00
|
|
|
pipestat &= ~enable_mask;
|
2013-02-20 19:16:18 +00:00
|
|
|
I915_WRITE(reg, pipestat);
|
|
|
|
POSTING_READ(reg);
|
2008-11-04 10:03:27 +00:00
|
|
|
}
|
|
|
|
|
2014-02-10 16:42:48 +00:00
|
|
|
static u32 vlv_get_pipestat_enable_mask(struct drm_device *dev, u32 status_mask)
|
|
|
|
{
|
|
|
|
u32 enable_mask = status_mask << 16;
|
|
|
|
|
|
|
|
/*
|
2014-04-09 10:28:48 +00:00
|
|
|
* On pipe A we don't support the PSR interrupt yet,
|
|
|
|
* on pipe B and C the same bit MBZ.
|
2014-02-10 16:42:48 +00:00
|
|
|
*/
|
|
|
|
if (WARN_ON_ONCE(status_mask & PIPE_A_PSR_STATUS_VLV))
|
|
|
|
return 0;
|
2014-04-09 10:28:48 +00:00
|
|
|
/*
|
|
|
|
* On pipe B and C we don't support the PSR interrupt yet, on pipe
|
|
|
|
* A the same bit is for perf counters which we don't use either.
|
|
|
|
*/
|
|
|
|
if (WARN_ON_ONCE(status_mask & PIPE_B_PSR_STATUS_VLV))
|
|
|
|
return 0;
|
2014-02-10 16:42:48 +00:00
|
|
|
|
|
|
|
enable_mask &= ~(PIPE_FIFO_UNDERRUN_STATUS |
|
|
|
|
SPRITE0_FLIP_DONE_INT_EN_VLV |
|
|
|
|
SPRITE1_FLIP_DONE_INT_EN_VLV);
|
|
|
|
if (status_mask & SPRITE0_FLIP_DONE_INT_STATUS_VLV)
|
|
|
|
enable_mask |= SPRITE0_FLIP_DONE_INT_EN_VLV;
|
|
|
|
if (status_mask & SPRITE1_FLIP_DONE_INT_STATUS_VLV)
|
|
|
|
enable_mask |= SPRITE1_FLIP_DONE_INT_EN_VLV;
|
|
|
|
|
|
|
|
return enable_mask;
|
|
|
|
}
|
|
|
|
|
2014-02-10 16:42:47 +00:00
|
|
|
void
|
|
|
|
i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
|
|
|
u32 status_mask)
|
|
|
|
{
|
|
|
|
u32 enable_mask;
|
|
|
|
|
2015-12-09 20:29:35 +00:00
|
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
|
2016-07-05 09:40:23 +00:00
|
|
|
enable_mask = vlv_get_pipestat_enable_mask(&dev_priv->drm,
|
2014-02-10 16:42:48 +00:00
|
|
|
status_mask);
|
|
|
|
else
|
|
|
|
enable_mask = status_mask << 16;
|
2014-02-10 16:42:47 +00:00
|
|
|
__i915_enable_pipestat(dev_priv, pipe, enable_mask, status_mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
|
|
|
u32 status_mask)
|
|
|
|
{
|
|
|
|
u32 enable_mask;
|
|
|
|
|
2015-12-09 20:29:35 +00:00
|
|
|
if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
|
2016-07-05 09:40:23 +00:00
|
|
|
enable_mask = vlv_get_pipestat_enable_mask(&dev_priv->drm,
|
2014-02-10 16:42:48 +00:00
|
|
|
status_mask);
|
|
|
|
else
|
|
|
|
enable_mask = status_mask << 16;
|
2014-02-10 16:42:47 +00:00
|
|
|
__i915_disable_pipestat(dev_priv, pipe, enable_mask, status_mask);
|
|
|
|
}
|
|
|
|
|
2009-10-28 05:10:00 +00:00
|
|
|
/**
|
2013-04-29 10:02:54 +00:00
|
|
|
* i915_enable_asle_pipestat - enable ASLE pipestat for OpRegion
|
2016-06-03 13:02:17 +00:00
|
|
|
* @dev_priv: i915 device private
|
2009-10-28 05:10:00 +00:00
|
|
|
*/
|
2016-05-06 13:48:28 +00:00
|
|
|
static void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv)
|
2009-10-28 05:10:00 +00:00
|
|
|
{
|
2016-05-06 13:48:28 +00:00
|
|
|
if (!dev_priv->opregion.asle || !IS_MOBILE(dev_priv))
|
2013-04-29 10:02:54 +00:00
|
|
|
return;
|
|
|
|
|
2014-09-15 12:55:29 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2009-10-28 05:10:00 +00:00
|
|
|
|
2014-02-10 16:42:47 +00:00
|
|
|
i915_enable_pipestat(dev_priv, PIPE_B, PIPE_LEGACY_BLC_EVENT_STATUS);
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 4)
|
2013-10-21 16:04:35 +00:00
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_LEGACY_BLC_EVENT_STATUS);
|
2010-12-04 11:30:53 +00:00
|
|
|
|
2014-09-15 12:55:29 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2009-10-28 05:10:00 +00:00
|
|
|
}
|
|
|
|
|
2014-05-15 17:20:36 +00:00
|
|
|
/*
|
|
|
|
* This timing diagram depicts the video signal in and
|
|
|
|
* around the vertical blanking period.
|
|
|
|
*
|
|
|
|
* Assumptions about the fictitious mode used in this example:
|
|
|
|
* vblank_start >= 3
|
|
|
|
* vsync_start = vblank_start + 1
|
|
|
|
* vsync_end = vblank_start + 2
|
|
|
|
* vtotal = vblank_start + 3
|
|
|
|
*
|
|
|
|
* start of vblank:
|
|
|
|
* latch double buffered registers
|
|
|
|
* increment frame counter (ctg+)
|
|
|
|
* generate start of vblank interrupt (gen4+)
|
|
|
|
* |
|
|
|
|
* | frame start:
|
|
|
|
* | generate frame start interrupt (aka. vblank interrupt) (gmch)
|
|
|
|
* | may be shifted forward 1-3 extra lines via PIPECONF
|
|
|
|
* | |
|
|
|
|
* | | start of vsync:
|
|
|
|
* | | generate vsync interrupt
|
|
|
|
* | | |
|
|
|
|
* ___xxxx___ ___xxxx___ ___xxxx___ ___xxxx___ ___xxxx___ ___xxxx
|
|
|
|
* . \hs/ . \hs/ \hs/ \hs/ . \hs/
|
|
|
|
* ----va---> <-----------------vb--------------------> <--------va-------------
|
|
|
|
* | | <----vs-----> |
|
|
|
|
* -vbs-----> <---vbs+1---> <---vbs+2---> <-----0-----> <-----1-----> <-----2--- (scanline counter gen2)
|
|
|
|
* -vbs-2---> <---vbs-1---> <---vbs-----> <---vbs+1---> <---vbs+2---> <-----0--- (scanline counter gen3+)
|
|
|
|
* -vbs-2---> <---vbs-2---> <---vbs-1---> <---vbs-----> <---vbs+1---> <---vbs+2- (scanline counter hsw+ hdmi)
|
|
|
|
* | | |
|
|
|
|
* last visible pixel first visible pixel
|
|
|
|
* | increment frame counter (gen3/4)
|
|
|
|
* pixel counter = vblank_start * htotal pixel counter = 0 (gen3/4)
|
|
|
|
*
|
|
|
|
* x = horizontal active
|
|
|
|
* _ = horizontal blanking
|
|
|
|
* hs = horizontal sync
|
|
|
|
* va = vertical active
|
|
|
|
* vb = vertical blanking
|
|
|
|
* vs = vertical sync
|
|
|
|
* vbs = vblank_start (number)
|
|
|
|
*
|
|
|
|
* Summary:
|
|
|
|
* - most events happen at the start of horizontal sync
|
|
|
|
* - frame start happens at the start of horizontal blank, 1-4 lines
|
|
|
|
* (depending on PIPECONF settings) after the start of vblank
|
|
|
|
* - gen3/4 pixel and frame counter are synchronized with the start
|
|
|
|
* of horizontal active on the first line of vertical active
|
|
|
|
*/
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
|
2013-10-11 18:52:44 +00:00
|
|
|
{
|
|
|
|
/* Gen2 doesn't have a hardware frame counter */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-19 02:39:29 +00:00
|
|
|
/* Called from drm generic code, passed a 'crtc', which
|
|
|
|
* we use as a pipe index
|
|
|
|
*/
|
2015-09-24 16:35:31 +00:00
|
|
|
static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
|
2008-09-30 19:14:26 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t high_frame, low_frame;
|
2014-04-29 10:35:50 +00:00
|
|
|
u32 high1, high2, low, pixel, vbl_start, hsync_start, htotal;
|
2015-02-13 20:03:44 +00:00
|
|
|
struct intel_crtc *intel_crtc =
|
|
|
|
to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
|
2015-06-01 10:50:07 +00:00
|
|
|
const struct drm_display_mode *mode = &intel_crtc->base.hwmode;
|
2008-09-30 19:14:26 +00:00
|
|
|
|
2015-02-13 20:03:44 +00:00
|
|
|
htotal = mode->crtc_htotal;
|
|
|
|
hsync_start = mode->crtc_hsync_start;
|
|
|
|
vbl_start = mode->crtc_vblank_start;
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
vbl_start = DIV_ROUND_UP(vbl_start, 2);
|
2013-09-25 16:55:26 +00:00
|
|
|
|
2014-04-29 10:35:50 +00:00
|
|
|
/* Convert to pixel count */
|
|
|
|
vbl_start *= htotal;
|
|
|
|
|
|
|
|
/* Start of vblank event occurs at start of hsync */
|
|
|
|
vbl_start -= htotal - hsync_start;
|
|
|
|
|
2011-02-07 20:26:52 +00:00
|
|
|
high_frame = PIPEFRAME(pipe);
|
|
|
|
low_frame = PIPEFRAMEPIXEL(pipe);
|
2010-09-11 12:48:45 +00:00
|
|
|
|
2008-09-30 19:14:26 +00:00
|
|
|
/*
|
|
|
|
* High & low register fields aren't synchronized, so make sure
|
|
|
|
* we get a low value that's stable across two reads of the high
|
|
|
|
* register.
|
|
|
|
*/
|
|
|
|
do {
|
2010-09-11 12:48:45 +00:00
|
|
|
high1 = I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK;
|
2013-09-25 16:55:26 +00:00
|
|
|
low = I915_READ(low_frame);
|
2010-09-11 12:48:45 +00:00
|
|
|
high2 = I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK;
|
2008-09-30 19:14:26 +00:00
|
|
|
} while (high1 != high2);
|
|
|
|
|
2010-09-11 12:48:45 +00:00
|
|
|
high1 >>= PIPE_FRAME_HIGH_SHIFT;
|
2013-09-25 16:55:26 +00:00
|
|
|
pixel = low & PIPE_PIXEL_MASK;
|
2010-09-11 12:48:45 +00:00
|
|
|
low >>= PIPE_FRAME_LOW_SHIFT;
|
2013-09-25 16:55:26 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The frame counter increments at beginning of active.
|
|
|
|
* Cook up a vblank counter by also checking the pixel
|
|
|
|
* counter against vblank start.
|
|
|
|
*/
|
2013-11-06 15:56:27 +00:00
|
|
|
return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
|
2008-09-30 19:14:26 +00:00
|
|
|
}
|
|
|
|
|
2015-10-29 23:45:33 +00:00
|
|
|
static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
|
2009-02-06 18:22:41 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2009-02-06 18:22:41 +00:00
|
|
|
|
2015-09-22 16:50:01 +00:00
|
|
|
return I915_READ(PIPE_FRMCOUNT_G4X(pipe));
|
2009-02-06 18:22:41 +00:00
|
|
|
}
|
|
|
|
|
2015-10-22 12:34:56 +00:00
|
|
|
/* I915_READ_FW, only for fast reads of display block, no need for forcewake etc. */
|
2014-04-29 10:35:45 +00:00
|
|
|
static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->base.dev;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2015-06-01 10:50:07 +00:00
|
|
|
const struct drm_display_mode *mode = &crtc->base.hwmode;
|
2014-04-29 10:35:45 +00:00
|
|
|
enum pipe pipe = crtc->pipe;
|
2014-05-15 17:23:23 +00:00
|
|
|
int position, vtotal;
|
2014-04-29 10:35:45 +00:00
|
|
|
|
2014-05-15 17:23:23 +00:00
|
|
|
vtotal = mode->crtc_vtotal;
|
2014-04-29 10:35:45 +00:00
|
|
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
vtotal /= 2;
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_GEN2(dev_priv))
|
2015-10-22 12:34:56 +00:00
|
|
|
position = I915_READ_FW(PIPEDSL(pipe)) & DSL_LINEMASK_GEN2;
|
2014-04-29 10:35:45 +00:00
|
|
|
else
|
2015-10-22 12:34:56 +00:00
|
|
|
position = I915_READ_FW(PIPEDSL(pipe)) & DSL_LINEMASK_GEN3;
|
2014-04-29 10:35:45 +00:00
|
|
|
|
2015-09-22 19:15:54 +00:00
|
|
|
/*
|
|
|
|
* On HSW, the DSL reg (0x70000) appears to return 0 if we
|
|
|
|
* read it just before the start of vblank. So try it again
|
|
|
|
* so we don't accidentally end up spanning a vblank frame
|
|
|
|
* increment, causing the pipe_update_end() code to squak at us.
|
|
|
|
*
|
|
|
|
* The nature of this problem means we can't simply check the ISR
|
|
|
|
* bit and return the vblank start value; nor can we use the scanline
|
|
|
|
* debug register in the transcoder as it appears to have the same
|
|
|
|
* problem. We may need to extend this to include other platforms,
|
|
|
|
* but so far testing only shows the problem on HSW.
|
|
|
|
*/
|
2016-05-06 13:48:28 +00:00
|
|
|
if (HAS_DDI(dev_priv) && !position) {
|
2015-09-22 19:15:54 +00:00
|
|
|
int i, temp;
|
|
|
|
|
|
|
|
for (i = 0; i < 100; i++) {
|
|
|
|
udelay(1);
|
|
|
|
temp = __raw_i915_read32(dev_priv, PIPEDSL(pipe)) &
|
|
|
|
DSL_LINEMASK_GEN3;
|
|
|
|
if (temp != position) {
|
|
|
|
position = temp;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-29 10:35:45 +00:00
|
|
|
/*
|
2014-05-15 17:23:23 +00:00
|
|
|
* See update_scanline_offset() for the details on the
|
|
|
|
* scanline_offset adjustment.
|
2014-04-29 10:35:45 +00:00
|
|
|
*/
|
2014-05-15 17:23:23 +00:00
|
|
|
return (position + crtc->scanline_offset) % vtotal;
|
2014-04-29 10:35:45 +00:00
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
|
2013-10-28 18:50:48 +00:00
|
|
|
unsigned int flags, int *vpos, int *hpos,
|
2015-09-14 19:43:44 +00:00
|
|
|
ktime_t *stime, ktime_t *etime,
|
|
|
|
const struct drm_display_mode *mode)
|
2010-12-08 03:07:19 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-09-23 11:48:50 +00:00
|
|
|
struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
|
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
2013-10-11 16:10:32 +00:00
|
|
|
int position;
|
2014-04-29 10:35:44 +00:00
|
|
|
int vbl_start, vbl_end, hsync_start, htotal, vtotal;
|
2010-12-08 03:07:19 +00:00
|
|
|
bool in_vbl = true;
|
|
|
|
int ret = 0;
|
2013-10-30 04:13:08 +00:00
|
|
|
unsigned long irqflags;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
2015-06-01 10:50:07 +00:00
|
|
|
if (WARN_ON(!mode->crtc_clock)) {
|
2010-12-08 03:07:19 +00:00
|
|
|
DRM_DEBUG_DRIVER("trying to get scanoutpos for disabled "
|
2011-02-07 20:26:52 +00:00
|
|
|
"pipe %c\n", pipe_name(pipe));
|
2010-12-08 03:07:19 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-09-23 11:48:50 +00:00
|
|
|
htotal = mode->crtc_htotal;
|
2014-04-29 10:35:44 +00:00
|
|
|
hsync_start = mode->crtc_hsync_start;
|
2013-09-23 11:48:50 +00:00
|
|
|
vtotal = mode->crtc_vtotal;
|
|
|
|
vbl_start = mode->crtc_vblank_start;
|
|
|
|
vbl_end = mode->crtc_vblank_end;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
2013-10-28 14:31:41 +00:00
|
|
|
if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
|
|
|
|
vbl_start = DIV_ROUND_UP(vbl_start, 2);
|
|
|
|
vbl_end /= 2;
|
|
|
|
vtotal /= 2;
|
|
|
|
}
|
|
|
|
|
2013-09-23 11:48:50 +00:00
|
|
|
ret |= DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_ACCURATE;
|
|
|
|
|
2013-10-30 04:13:08 +00:00
|
|
|
/*
|
|
|
|
* Lock uncore.lock, as we will do multiple timing critical raw
|
|
|
|
* register reads, potentially with preemption disabled, so the
|
|
|
|
* following code must not block on uncore.lock.
|
|
|
|
*/
|
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
2014-04-29 10:35:44 +00:00
|
|
|
|
2013-10-30 04:13:08 +00:00
|
|
|
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
|
|
|
|
/* Get optional system timestamp before query. */
|
|
|
|
if (stime)
|
|
|
|
*stime = ktime_get();
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_GEN2(dev_priv) || IS_G4X(dev_priv) || INTEL_GEN(dev_priv) >= 5) {
|
2010-12-08 03:07:19 +00:00
|
|
|
/* No obvious pixelcount register. Only query vertical
|
|
|
|
* scanout position from Display scan line register.
|
|
|
|
*/
|
2014-04-29 10:35:45 +00:00
|
|
|
position = __intel_get_crtc_scanline(intel_crtc);
|
2010-12-08 03:07:19 +00:00
|
|
|
} else {
|
|
|
|
/* Have access to pixelcount since start of frame.
|
|
|
|
* We can split this into vertical and horizontal
|
|
|
|
* scanout position.
|
|
|
|
*/
|
2015-10-22 12:34:56 +00:00
|
|
|
position = (I915_READ_FW(PIPEFRAMEPIXEL(pipe)) & PIPE_PIXEL_MASK) >> PIPE_PIXEL_SHIFT;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
2013-10-11 16:10:32 +00:00
|
|
|
/* convert to pixel counts */
|
|
|
|
vbl_start *= htotal;
|
|
|
|
vbl_end *= htotal;
|
|
|
|
vtotal *= htotal;
|
2014-04-29 10:35:44 +00:00
|
|
|
|
2014-04-29 10:35:49 +00:00
|
|
|
/*
|
|
|
|
* In interlaced modes, the pixel counter counts all pixels,
|
|
|
|
* so one field will have htotal more pixels. In order to avoid
|
|
|
|
* the reported position from jumping backwards when the pixel
|
|
|
|
* counter is beyond the length of the shorter field, just
|
|
|
|
* clamp the position the length of the shorter field. This
|
|
|
|
* matches how the scanline counter based position works since
|
|
|
|
* the scanline counter doesn't count the two half lines.
|
|
|
|
*/
|
|
|
|
if (position >= vtotal)
|
|
|
|
position = vtotal - 1;
|
|
|
|
|
2014-04-29 10:35:44 +00:00
|
|
|
/*
|
|
|
|
* Start of vblank interrupt is triggered at start of hsync,
|
|
|
|
* just prior to the first active line of vblank. However we
|
|
|
|
* consider lines to start at the leading edge of horizontal
|
|
|
|
* active. So, should we get here before we've crossed into
|
|
|
|
* the horizontal active of the first line in vblank, we would
|
|
|
|
* not set the DRM_SCANOUTPOS_INVBL flag. In order to fix that,
|
|
|
|
* always add htotal-hsync_start to the current pixel position.
|
|
|
|
*/
|
|
|
|
position = (position + htotal - hsync_start) % vtotal;
|
2010-12-08 03:07:19 +00:00
|
|
|
}
|
|
|
|
|
2013-10-30 04:13:08 +00:00
|
|
|
/* Get optional system timestamp after query. */
|
|
|
|
if (etime)
|
|
|
|
*etime = ktime_get();
|
|
|
|
|
|
|
|
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
2013-10-11 16:10:32 +00:00
|
|
|
in_vbl = position >= vbl_start && position < vbl_end;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* While in vblank, position will be negative
|
|
|
|
* counting up towards 0 at vbl_end. And outside
|
|
|
|
* vblank, position will be positive counting
|
|
|
|
* up since vbl_end.
|
|
|
|
*/
|
|
|
|
if (position >= vbl_start)
|
|
|
|
position -= vbl_end;
|
|
|
|
else
|
|
|
|
position += vtotal - vbl_end;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_GEN2(dev_priv) || IS_G4X(dev_priv) || INTEL_GEN(dev_priv) >= 5) {
|
2013-10-11 16:10:32 +00:00
|
|
|
*vpos = position;
|
|
|
|
*hpos = 0;
|
|
|
|
} else {
|
|
|
|
*vpos = position / htotal;
|
|
|
|
*hpos = position - (*vpos * htotal);
|
|
|
|
}
|
2010-12-08 03:07:19 +00:00
|
|
|
|
|
|
|
/* In vblank? */
|
|
|
|
if (in_vbl)
|
2014-09-10 15:36:11 +00:00
|
|
|
ret |= DRM_SCANOUTPOS_IN_VBLANK;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-04-29 10:35:45 +00:00
|
|
|
int intel_get_crtc_scanline(struct intel_crtc *crtc)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2014-04-29 10:35:45 +00:00
|
|
|
unsigned long irqflags;
|
|
|
|
int position;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
|
|
|
|
position = __intel_get_crtc_scanline(crtc);
|
|
|
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
|
|
|
|
|
|
|
return position;
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static int i915_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe,
|
2010-12-08 03:07:19 +00:00
|
|
|
int *max_error,
|
|
|
|
struct timeval *vblank_time,
|
|
|
|
unsigned flags)
|
|
|
|
{
|
2011-01-22 10:07:56 +00:00
|
|
|
struct drm_crtc *crtc;
|
2010-12-08 03:07:19 +00:00
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
if (pipe >= INTEL_INFO(dev)->num_pipes) {
|
|
|
|
DRM_ERROR("Invalid crtc %u\n", pipe);
|
2010-12-08 03:07:19 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get drm_crtc to timestamp: */
|
2011-01-22 10:07:56 +00:00
|
|
|
crtc = intel_get_crtc_for_pipe(dev, pipe);
|
|
|
|
if (crtc == NULL) {
|
2015-09-24 16:35:31 +00:00
|
|
|
DRM_ERROR("Invalid crtc %u\n", pipe);
|
2011-01-22 10:07:56 +00:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2015-06-01 10:50:07 +00:00
|
|
|
if (!crtc->hwmode.crtc_clock) {
|
2015-09-24 16:35:31 +00:00
|
|
|
DRM_DEBUG_KMS("crtc %u is disabled\n", pipe);
|
2011-01-22 10:07:56 +00:00
|
|
|
return -EBUSY;
|
|
|
|
}
|
2010-12-08 03:07:19 +00:00
|
|
|
|
|
|
|
/* Helper routine in DRM core does all the work: */
|
2011-01-22 10:07:56 +00:00
|
|
|
return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,
|
|
|
|
vblank_time, flags,
|
2015-06-01 10:50:07 +00:00
|
|
|
&crtc->hwmode);
|
2010-12-08 03:07:19 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ironlake_rps_change_irq_handler(struct drm_i915_private *dev_priv)
|
2010-01-29 19:27:07 +00:00
|
|
|
{
|
2010-02-02 18:30:47 +00:00
|
|
|
u32 busy_up, busy_down, max_avg, min_avg;
|
2012-08-09 14:46:01 +00:00
|
|
|
u8 new_delay;
|
|
|
|
|
2013-07-04 21:35:25 +00:00
|
|
|
spin_lock(&mchdev_lock);
|
2010-01-29 19:27:07 +00:00
|
|
|
|
2012-08-08 21:35:37 +00:00
|
|
|
I915_WRITE16(MEMINTRSTS, I915_READ(MEMINTRSTS));
|
|
|
|
|
2012-08-08 21:35:39 +00:00
|
|
|
new_delay = dev_priv->ips.cur_delay;
|
2012-08-09 14:46:01 +00:00
|
|
|
|
2010-05-20 21:28:11 +00:00
|
|
|
I915_WRITE16(MEMINTRSTS, MEMINT_EVAL_CHG);
|
2010-02-02 18:30:47 +00:00
|
|
|
busy_up = I915_READ(RCPREVBSYTUPAVG);
|
|
|
|
busy_down = I915_READ(RCPREVBSYTDNAVG);
|
2010-01-29 19:27:07 +00:00
|
|
|
max_avg = I915_READ(RCBMAXAVG);
|
|
|
|
min_avg = I915_READ(RCBMINAVG);
|
|
|
|
|
|
|
|
/* Handle RCS change request from hw */
|
2010-02-02 18:30:47 +00:00
|
|
|
if (busy_up > max_avg) {
|
2012-08-08 21:35:39 +00:00
|
|
|
if (dev_priv->ips.cur_delay != dev_priv->ips.max_delay)
|
|
|
|
new_delay = dev_priv->ips.cur_delay - 1;
|
|
|
|
if (new_delay < dev_priv->ips.max_delay)
|
|
|
|
new_delay = dev_priv->ips.max_delay;
|
2010-02-02 18:30:47 +00:00
|
|
|
} else if (busy_down < min_avg) {
|
2012-08-08 21:35:39 +00:00
|
|
|
if (dev_priv->ips.cur_delay != dev_priv->ips.min_delay)
|
|
|
|
new_delay = dev_priv->ips.cur_delay + 1;
|
|
|
|
if (new_delay > dev_priv->ips.min_delay)
|
|
|
|
new_delay = dev_priv->ips.min_delay;
|
2010-01-29 19:27:07 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (ironlake_set_drps(dev_priv, new_delay))
|
2012-08-08 21:35:39 +00:00
|
|
|
dev_priv->ips.cur_delay = new_delay;
|
2010-01-29 19:27:07 +00:00
|
|
|
|
2013-07-04 21:35:25 +00:00
|
|
|
spin_unlock(&mchdev_lock);
|
2012-08-09 14:46:01 +00:00
|
|
|
|
2010-01-29 19:27:07 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static void notify_ring(struct intel_engine_cs *engine)
|
2010-10-19 10:19:32 +00:00
|
|
|
{
|
2016-07-06 11:39:02 +00:00
|
|
|
smp_store_mb(engine->breadcrumbs.irq_posted, true);
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
if (intel_engine_wakeup(engine)) {
|
|
|
|
trace_i915_gem_request_notify(engine);
|
2016-07-06 11:39:02 +00:00
|
|
|
engine->breadcrumbs.irq_wakeups++;
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
}
|
2010-10-19 10:19:32 +00:00
|
|
|
}
|
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
static void vlv_c0_read(struct drm_i915_private *dev_priv,
|
|
|
|
struct intel_rps_ei *ei)
|
2014-07-03 21:33:01 +00:00
|
|
|
{
|
2015-03-18 09:48:22 +00:00
|
|
|
ei->cz_clock = vlv_punit_read(dev_priv, PUNIT_REG_CZ_TIMESTAMP);
|
|
|
|
ei->render_c0 = I915_READ(VLV_RENDER_C0_COUNT);
|
|
|
|
ei->media_c0 = I915_READ(VLV_MEDIA_C0_COUNT);
|
|
|
|
}
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
static bool vlv_c0_above(struct drm_i915_private *dev_priv,
|
|
|
|
const struct intel_rps_ei *old,
|
|
|
|
const struct intel_rps_ei *now,
|
|
|
|
int threshold)
|
|
|
|
{
|
|
|
|
u64 time, c0;
|
2015-09-24 20:29:20 +00:00
|
|
|
unsigned int mul = 100;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
if (old->cz_clock == 0)
|
|
|
|
return false;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-09-24 20:29:20 +00:00
|
|
|
if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)
|
|
|
|
mul <<= 8;
|
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
time = now->cz_clock - old->cz_clock;
|
2015-09-24 20:29:20 +00:00
|
|
|
time *= threshold * dev_priv->czclk_freq;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
/* Workload can be split between render + media, e.g. SwapBuffers
|
|
|
|
* being blitted in X after being rendered in mesa. To account for
|
|
|
|
* this we need to combine both engines into our activity counter.
|
2014-07-03 21:33:01 +00:00
|
|
|
*/
|
2015-03-18 09:48:22 +00:00
|
|
|
c0 = now->render_c0 - old->render_c0;
|
|
|
|
c0 += now->media_c0 - old->media_c0;
|
2015-09-24 20:29:20 +00:00
|
|
|
c0 *= mul * VLV_CZ_CLOCK_TO_MILLI_SEC;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
return c0 >= time;
|
2014-07-03 21:33:01 +00:00
|
|
|
}
|
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
void gen6_rps_reset_ei(struct drm_i915_private *dev_priv)
|
2014-07-03 21:33:01 +00:00
|
|
|
{
|
2015-03-18 09:48:22 +00:00
|
|
|
vlv_c0_read(dev_priv, &dev_priv->rps.down_ei);
|
|
|
|
dev_priv->rps.up_ei = dev_priv->rps.down_ei;
|
|
|
|
}
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
static u32 vlv_wa_c0_ei(struct drm_i915_private *dev_priv, u32 pm_iir)
|
|
|
|
{
|
|
|
|
struct intel_rps_ei now;
|
|
|
|
u32 events = 0;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:23 +00:00
|
|
|
if ((pm_iir & (GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED)) == 0)
|
2015-03-18 09:48:22 +00:00
|
|
|
return 0;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
vlv_c0_read(dev_priv, &now);
|
|
|
|
if (now.cz_clock == 0)
|
|
|
|
return 0;
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
if (pm_iir & GEN6_PM_RP_DOWN_EI_EXPIRED) {
|
|
|
|
if (!vlv_c0_above(dev_priv,
|
|
|
|
&dev_priv->rps.down_ei, &now,
|
2015-04-07 15:20:28 +00:00
|
|
|
dev_priv->rps.down_threshold))
|
2015-03-18 09:48:22 +00:00
|
|
|
events |= GEN6_PM_RP_DOWN_THRESHOLD;
|
|
|
|
dev_priv->rps.down_ei = now;
|
|
|
|
}
|
2014-07-03 21:33:01 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
if (pm_iir & GEN6_PM_RP_UP_EI_EXPIRED) {
|
|
|
|
if (vlv_c0_above(dev_priv,
|
|
|
|
&dev_priv->rps.up_ei, &now,
|
2015-04-07 15:20:28 +00:00
|
|
|
dev_priv->rps.up_threshold))
|
2015-03-18 09:48:22 +00:00
|
|
|
events |= GEN6_PM_RP_UP_THRESHOLD;
|
|
|
|
dev_priv->rps.up_ei = now;
|
2014-07-03 21:33:01 +00:00
|
|
|
}
|
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
return events;
|
2014-07-03 21:33:01 +00:00
|
|
|
}
|
|
|
|
|
2015-04-27 12:41:23 +00:00
|
|
|
static bool any_waiters(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
2016-03-16 11:00:36 +00:00
|
|
|
struct intel_engine_cs *engine;
|
2015-04-27 12:41:23 +00:00
|
|
|
|
2016-03-24 11:20:38 +00:00
|
|
|
for_each_engine(engine, dev_priv)
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
if (intel_engine_has_waiter(engine))
|
2015-04-27 12:41:23 +00:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2011-04-25 18:25:20 +00:00
|
|
|
static void gen6_pm_rps_work(struct work_struct *work)
|
2010-12-17 22:19:02 +00:00
|
|
|
{
|
2014-03-31 11:27:17 +00:00
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
container_of(work, struct drm_i915_private, rps.work);
|
2015-05-21 20:01:47 +00:00
|
|
|
bool client_boost;
|
|
|
|
int new_delay, adj, min, max;
|
2013-08-06 21:57:13 +00:00
|
|
|
u32 pm_iir;
|
2011-04-25 18:25:20 +00:00
|
|
|
|
2013-07-04 21:35:28 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
drm/i915: sanitize rps irq disabling
When disabling the RPS interrupts there is a tricky dependency between
the thread disabling the interrupts, the RPS interrupt handler and the
corresponding RPS work. The RPS work can reenable the interrupts, so
there is no straightforward order in the disabling thread to (1) make
sure that any RPS work is flushed and to (2) disable all RPS
interrupts. Currently this is solved by masking the interrupts using two
separate mask registers (first level display IMR and PM IMR) and doing
the disabling when all first level interrupts are disabled.
This works, but the requirement to run with all first level interrupts
disabled is unnecessary making the suspend / unload time ordering of RPS
disabling wrt. other unitialization steps difficult and error prone.
Removing this restriction allows us to disable RPS early during suspend
/ unload and forget about it for the rest of the sequence. By adding a
more explicit method for avoiding the above race, it also becomes easier
to prove its correctness. Finally currently we can hit the WARN in
snb_update_pm_irq(), when a final RPS work runs with the first level
interrupts already disabled. This won't lead to any problem (due to the
separate interrupt masks), but with the change in this and the next
patch we can get rid of the WARN, while leaving it in place for other
scenarios.
To address the above points, add a new RPS interrupts_enabled flag and
use this during RPS disabling to avoid requeuing the RPS work and
reenabling of the RPS interrupts. Since the interrupt disabling happens
now in intel_suspend_gt_powersave(), we will disable RPS interrupts
explicitly during suspend (and not just through the first level mask),
but there is no problem doing so, it's also more consistent and allows
us to unify more of the RPS disabling during suspend and unload time in
the next patch.
v2/v3:
- rebase on patch "drm/i915: move rps irq disable one level up" in the
patchset
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-19 13:30:04 +00:00
|
|
|
/* Speed up work cancelation during disabling rps interrupts. */
|
|
|
|
if (!dev_priv->rps.interrupts_enabled) {
|
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
return;
|
|
|
|
}
|
2015-12-16 00:52:19 +00:00
|
|
|
|
2012-08-08 21:35:35 +00:00
|
|
|
pm_iir = dev_priv->rps.pm_iir;
|
|
|
|
dev_priv->rps.pm_iir = 0;
|
2014-11-05 18:48:31 +00:00
|
|
|
/* Make sure not to corrupt PMIMR state used by ringbuffer on GEN6 */
|
|
|
|
gen6_enable_pm_irq(dev_priv, dev_priv->pm_rps_events);
|
2015-05-21 20:01:47 +00:00
|
|
|
client_boost = dev_priv->rps.client_boost;
|
|
|
|
dev_priv->rps.client_boost = false;
|
2013-07-04 21:35:28 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2010-12-17 22:19:02 +00:00
|
|
|
|
2013-08-15 14:50:01 +00:00
|
|
|
/* Make sure we didn't queue anything we're not going to process. */
|
2014-03-15 14:53:22 +00:00
|
|
|
WARN_ON(pm_iir & ~dev_priv->pm_rps_events);
|
2013-08-15 14:50:01 +00:00
|
|
|
|
2015-05-21 20:01:47 +00:00
|
|
|
if ((pm_iir & dev_priv->pm_rps_events) == 0 && !client_boost)
|
2016-07-04 07:08:36 +00:00
|
|
|
return;
|
2010-12-17 22:19:02 +00:00
|
|
|
|
2012-11-02 18:14:01 +00:00
|
|
|
mutex_lock(&dev_priv->rps.hw_lock);
|
2012-04-28 07:56:39 +00:00
|
|
|
|
2015-03-18 09:48:22 +00:00
|
|
|
pm_iir |= vlv_wa_c0_ei(dev_priv, pm_iir);
|
|
|
|
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
adj = dev_priv->rps.last_adj;
|
2015-04-07 15:20:29 +00:00
|
|
|
new_delay = dev_priv->rps.cur_freq;
|
2015-05-21 20:01:47 +00:00
|
|
|
min = dev_priv->rps.min_freq_softlimit;
|
|
|
|
max = dev_priv->rps.max_freq_softlimit;
|
2016-07-13 08:10:35 +00:00
|
|
|
if (client_boost || any_waiters(dev_priv))
|
|
|
|
max = dev_priv->rps.max_freq;
|
|
|
|
if (client_boost && new_delay < dev_priv->rps.boost_freq) {
|
|
|
|
new_delay = dev_priv->rps.boost_freq;
|
2015-05-21 20:01:47 +00:00
|
|
|
adj = 0;
|
|
|
|
} else if (pm_iir & GEN6_PM_RP_UP_THRESHOLD) {
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
if (adj > 0)
|
|
|
|
adj *= 2;
|
2015-04-07 15:20:29 +00:00
|
|
|
else /* CHV needs even encode values */
|
|
|
|
adj = IS_CHERRYVIEW(dev_priv) ? 2 : 1;
|
2013-06-25 18:38:11 +00:00
|
|
|
/*
|
|
|
|
* For better performance, jump directly
|
|
|
|
* to RPe if we're below it.
|
|
|
|
*/
|
2015-04-07 15:20:29 +00:00
|
|
|
if (new_delay < dev_priv->rps.efficient_freq - adj) {
|
2014-03-20 01:31:11 +00:00
|
|
|
new_delay = dev_priv->rps.efficient_freq;
|
2015-04-07 15:20:29 +00:00
|
|
|
adj = 0;
|
|
|
|
}
|
2016-07-13 08:10:35 +00:00
|
|
|
} else if (client_boost || any_waiters(dev_priv)) {
|
2015-04-27 12:41:23 +00:00
|
|
|
adj = 0;
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
} else if (pm_iir & GEN6_PM_RP_DOWN_TIMEOUT) {
|
2014-03-20 01:31:11 +00:00
|
|
|
if (dev_priv->rps.cur_freq > dev_priv->rps.efficient_freq)
|
|
|
|
new_delay = dev_priv->rps.efficient_freq;
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
else
|
2014-03-20 01:31:11 +00:00
|
|
|
new_delay = dev_priv->rps.min_freq_softlimit;
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
adj = 0;
|
|
|
|
} else if (pm_iir & GEN6_PM_RP_DOWN_THRESHOLD) {
|
|
|
|
if (adj < 0)
|
|
|
|
adj *= 2;
|
2015-04-07 15:20:29 +00:00
|
|
|
else /* CHV needs even encode values */
|
|
|
|
adj = IS_CHERRYVIEW(dev_priv) ? -2 : -1;
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
} else { /* unknown event */
|
2015-04-07 15:20:29 +00:00
|
|
|
adj = 0;
|
drm/i915: Tweak RPS thresholds to more aggressively downclock
After applying wait-boost we often find ourselves stuck at higher clocks
than required. The current threshold value requires the GPU to be
continuously and completely idle for 313ms before it is dropped by one
bin. Conversely, we require the GPU to be busy for an average of 90% over
a 84ms period before we upclock. So the current thresholds almost never
downclock the GPU, and respond very slowly to sudden demands for more
power. It is easy to observe that we currently lock into the wrong bin
and both underperform in benchmarks and consume more power than optimal
(just by repeating the task and measuring the different results).
An alternative approach, as discussed in the bspec, is to use a
continuous threshold for upclocking, and an average value for downclocking.
This is good for quickly detecting and reacting to state changes within a
frame, however it fails with the common throttling method of waiting
upon the outstanding frame - at least it is difficult to choose a
threshold that works well at 15,000fps and at 60fps. So continue to use
average busy/idle loads to determine frequency change.
v2: Use 3 power zones to keep frequencies low in steady-state mostly
idle (e.g. scrolling, interactive 2D drawing), and frequencies high
for demanding games. In between those end-states, we use a
fast-reclocking algorithm to converge more quickly on the desired bin.
v3: Bug fixes - make sure we reset adj after switching power zones.
v4: Tune - drop the continuous busy thresholds as it prevents us from
choosing the right frequency for glxgears style swap benchmarks. Instead
the goal is to be able to find the right clocks irrespective of the
wait-boost.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Stéphane Marchesin <stephane.marchesin@gmail.com>
Cc: Owen Taylor <otaylor@redhat.com>
Cc: "Meng, Mengmeng" <mengmeng.meng@intel.com>
Cc: "Zhuang, Lena" <lena.zhuang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-09-25 16:34:57 +00:00
|
|
|
}
|
2010-12-17 22:19:02 +00:00
|
|
|
|
2015-04-07 15:20:29 +00:00
|
|
|
dev_priv->rps.last_adj = adj;
|
|
|
|
|
2012-09-08 02:43:42 +00:00
|
|
|
/* sysfs frequency interfaces may have snuck in while servicing the
|
|
|
|
* interrupt
|
|
|
|
*/
|
2015-04-07 15:20:29 +00:00
|
|
|
new_delay += adj;
|
2015-05-21 20:01:47 +00:00
|
|
|
new_delay = clamp_t(int, new_delay, min, max);
|
2014-01-27 16:05:05 +00:00
|
|
|
|
2016-05-10 13:10:04 +00:00
|
|
|
intel_set_rps(dev_priv, new_delay);
|
2010-12-17 22:19:02 +00:00
|
|
|
|
2012-11-02 18:14:01 +00:00
|
|
|
mutex_unlock(&dev_priv->rps.hw_lock);
|
2010-12-17 22:19:02 +00:00
|
|
|
}
|
|
|
|
|
2012-05-25 23:56:22 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* ivybridge_parity_work - Workqueue called when a parity error interrupt
|
|
|
|
* occurred.
|
|
|
|
* @work: workqueue struct
|
|
|
|
*
|
|
|
|
* Doesn't actually do anything except notify userspace. As a consequence of
|
|
|
|
* this event, userspace should try to remap the bad rows since statistically
|
|
|
|
* it is likely the same row is more likely to go bad again.
|
|
|
|
*/
|
|
|
|
static void ivybridge_parity_work(struct work_struct *work)
|
|
|
|
{
|
2014-03-31 11:27:17 +00:00
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
container_of(work, struct drm_i915_private, l3_parity.error_work);
|
2012-05-25 23:56:22 +00:00
|
|
|
u32 error_status, row, bank, subbank;
|
2013-09-19 18:13:41 +00:00
|
|
|
char *parity_event[6];
|
2012-05-25 23:56:22 +00:00
|
|
|
uint32_t misccpctl;
|
2013-09-19 18:13:41 +00:00
|
|
|
uint8_t slice = 0;
|
2012-05-25 23:56:22 +00:00
|
|
|
|
|
|
|
/* We must turn off DOP level clock gating to access the L3 registers.
|
|
|
|
* In order to prevent a get/put style interface, acquire struct mutex
|
|
|
|
* any time we access those registers.
|
|
|
|
*/
|
2016-07-05 09:40:23 +00:00
|
|
|
mutex_lock(&dev_priv->drm.struct_mutex);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
/* If we've screwed up tracking, just let the interrupt fire again */
|
|
|
|
if (WARN_ON(!dev_priv->l3_parity.which_slice))
|
|
|
|
goto out;
|
|
|
|
|
2012-05-25 23:56:22 +00:00
|
|
|
misccpctl = I915_READ(GEN7_MISCCPCTL);
|
|
|
|
I915_WRITE(GEN7_MISCCPCTL, misccpctl & ~GEN7_DOP_CLOCK_GATE_ENABLE);
|
|
|
|
POSTING_READ(GEN7_MISCCPCTL);
|
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
while ((slice = ffs(dev_priv->l3_parity.which_slice)) != 0) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg;
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
slice--;
|
2016-04-07 08:08:05 +00:00
|
|
|
if (WARN_ON_ONCE(slice >= NUM_L3_SLICES(dev_priv)))
|
2013-09-19 18:13:41 +00:00
|
|
|
break;
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
dev_priv->l3_parity.which_slice &= ~(1<<slice);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2015-11-04 21:20:02 +00:00
|
|
|
reg = GEN7_L3CDERRST1(slice);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
error_status = I915_READ(reg);
|
|
|
|
row = GEN7_PARITY_ERROR_ROW(error_status);
|
|
|
|
bank = GEN7_PARITY_ERROR_BANK(error_status);
|
|
|
|
subbank = GEN7_PARITY_ERROR_SUBBANK(error_status);
|
|
|
|
|
|
|
|
I915_WRITE(reg, GEN7_PARITY_ERROR_VALID | GEN7_L3CDERRST1_ENABLE);
|
|
|
|
POSTING_READ(reg);
|
|
|
|
|
|
|
|
parity_event[0] = I915_L3_PARITY_UEVENT "=1";
|
|
|
|
parity_event[1] = kasprintf(GFP_KERNEL, "ROW=%d", row);
|
|
|
|
parity_event[2] = kasprintf(GFP_KERNEL, "BANK=%d", bank);
|
|
|
|
parity_event[3] = kasprintf(GFP_KERNEL, "SUBBANK=%d", subbank);
|
|
|
|
parity_event[4] = kasprintf(GFP_KERNEL, "SLICE=%d", slice);
|
|
|
|
parity_event[5] = NULL;
|
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
kobject_uevent_env(&dev_priv->drm.primary->kdev->kobj,
|
2013-09-19 18:13:41 +00:00
|
|
|
KOBJ_CHANGE, parity_event);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
DRM_DEBUG("Parity error: Slice = %d, Row = %d, Bank = %d, Sub bank = %d.\n",
|
|
|
|
slice, row, bank, subbank);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
kfree(parity_event[4]);
|
|
|
|
kfree(parity_event[3]);
|
|
|
|
kfree(parity_event[2]);
|
|
|
|
kfree(parity_event[1]);
|
|
|
|
}
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
I915_WRITE(GEN7_MISCCPCTL, misccpctl);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2013-09-19 18:13:41 +00:00
|
|
|
out:
|
|
|
|
WARN_ON(dev_priv->l3_parity.which_slice);
|
2014-09-15 12:55:26 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-07 08:08:05 +00:00
|
|
|
gen5_enable_gt_irq(dev_priv, GT_PARITY_ERROR(dev_priv));
|
2014-09-15 12:55:26 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2013-09-19 18:13:41 +00:00
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
mutex_unlock(&dev_priv->drm.struct_mutex);
|
2012-05-25 23:56:22 +00:00
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:57 +00:00
|
|
|
static void ivybridge_parity_error_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 iir)
|
2012-05-25 23:56:22 +00:00
|
|
|
{
|
2016-04-13 18:19:57 +00:00
|
|
|
if (!HAS_L3_DPF(dev_priv))
|
2012-05-25 23:56:22 +00:00
|
|
|
return;
|
|
|
|
|
2013-07-04 21:35:25 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2016-04-13 18:19:57 +00:00
|
|
|
gen5_disable_gt_irq(dev_priv, GT_PARITY_ERROR(dev_priv));
|
2013-07-04 21:35:25 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2016-04-13 18:19:57 +00:00
|
|
|
iir &= GT_PARITY_ERROR(dev_priv);
|
2013-09-19 18:13:41 +00:00
|
|
|
if (iir & GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1)
|
|
|
|
dev_priv->l3_parity.which_slice |= 1 << 1;
|
|
|
|
|
|
|
|
if (iir & GT_RENDER_L3_PARITY_ERROR_INTERRUPT)
|
|
|
|
dev_priv->l3_parity.which_slice |= 1 << 0;
|
|
|
|
|
2012-11-02 18:55:07 +00:00
|
|
|
queue_work(dev_priv->wq, &dev_priv->l3_parity.error_work);
|
2012-05-25 23:56:22 +00:00
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:57 +00:00
|
|
|
static void ilk_gt_irq_handler(struct drm_i915_private *dev_priv,
|
2013-07-12 22:56:30 +00:00
|
|
|
u32 gt_iir)
|
|
|
|
{
|
2016-07-01 16:23:21 +00:00
|
|
|
if (gt_iir & GT_RENDER_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[RCS]);
|
2013-07-12 22:56:30 +00:00
|
|
|
if (gt_iir & ILK_BSD_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[VCS]);
|
2013-07-12 22:56:30 +00:00
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:57 +00:00
|
|
|
static void snb_gt_irq_handler(struct drm_i915_private *dev_priv,
|
2012-03-30 18:24:35 +00:00
|
|
|
u32 gt_iir)
|
|
|
|
{
|
2016-07-01 16:23:21 +00:00
|
|
|
if (gt_iir & GT_RENDER_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[RCS]);
|
2013-05-29 02:22:29 +00:00
|
|
|
if (gt_iir & GT_BSD_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[VCS]);
|
2013-05-29 02:22:29 +00:00
|
|
|
if (gt_iir & GT_BLT_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[BCS]);
|
2012-03-30 18:24:35 +00:00
|
|
|
|
2013-05-29 02:22:29 +00:00
|
|
|
if (gt_iir & (GT_BLT_CS_ERROR_INTERRUPT |
|
|
|
|
GT_BSD_CS_ERROR_INTERRUPT |
|
2014-11-04 14:52:22 +00:00
|
|
|
GT_RENDER_CS_MASTER_ERROR_INTERRUPT))
|
|
|
|
DRM_DEBUG("Command parser error, gt_iir 0x%08x\n", gt_iir);
|
2012-05-25 23:56:22 +00:00
|
|
|
|
2016-04-13 18:19:57 +00:00
|
|
|
if (gt_iir & GT_PARITY_ERROR(dev_priv))
|
|
|
|
ivybridge_parity_error_irq_handler(dev_priv, gt_iir);
|
2012-03-30 18:24:35 +00:00
|
|
|
}
|
|
|
|
|
2015-10-20 09:23:52 +00:00
|
|
|
static __always_inline void
|
2016-03-16 11:00:37 +00:00
|
|
|
gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)
|
2015-10-20 09:23:52 +00:00
|
|
|
{
|
|
|
|
if (iir & (GT_RENDER_USER_INTERRUPT << test_shift))
|
2016-03-16 11:00:37 +00:00
|
|
|
notify_ring(engine);
|
2015-10-20 09:23:52 +00:00
|
|
|
if (iir & (GT_CONTEXT_SWITCH_INTERRUPT << test_shift))
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 11:11:56 +00:00
|
|
|
tasklet_schedule(&engine->irq_tasklet);
|
2015-10-20 09:23:52 +00:00
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:58 +00:00
|
|
|
static irqreturn_t gen8_gt_irq_ack(struct drm_i915_private *dev_priv,
|
|
|
|
u32 master_ctl,
|
|
|
|
u32 gt_iir[4])
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
{
|
|
|
|
irqreturn_t ret = IRQ_NONE;
|
|
|
|
|
|
|
|
if (master_ctl & (GEN8_GT_RCS_IRQ | GEN8_GT_BCS_IRQ)) {
|
2016-04-13 18:19:58 +00:00
|
|
|
gt_iir[0] = I915_READ_FW(GEN8_GT_IIR(0));
|
|
|
|
if (gt_iir[0]) {
|
|
|
|
I915_WRITE_FW(GEN8_GT_IIR(0), gt_iir[0]);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
} else
|
|
|
|
DRM_ERROR("The master control interrupt lied (GT0)!\n");
|
|
|
|
}
|
|
|
|
|
2014-04-17 02:37:38 +00:00
|
|
|
if (master_ctl & (GEN8_GT_VCS1_IRQ | GEN8_GT_VCS2_IRQ)) {
|
2016-04-13 18:19:58 +00:00
|
|
|
gt_iir[1] = I915_READ_FW(GEN8_GT_IIR(1));
|
|
|
|
if (gt_iir[1]) {
|
|
|
|
I915_WRITE_FW(GEN8_GT_IIR(1), gt_iir[1]);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2014-05-15 17:58:08 +00:00
|
|
|
} else
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
DRM_ERROR("The master control interrupt lied (GT1)!\n");
|
2014-05-15 17:58:08 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
if (master_ctl & GEN8_GT_VECS_IRQ) {
|
2016-04-13 18:19:58 +00:00
|
|
|
gt_iir[3] = I915_READ_FW(GEN8_GT_IIR(3));
|
|
|
|
if (gt_iir[3]) {
|
|
|
|
I915_WRITE_FW(GEN8_GT_IIR(3), gt_iir[3]);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
} else
|
|
|
|
DRM_ERROR("The master control interrupt lied (GT3)!\n");
|
|
|
|
}
|
|
|
|
|
2014-05-15 17:58:08 +00:00
|
|
|
if (master_ctl & GEN8_GT_PM_IRQ) {
|
2016-04-13 18:19:58 +00:00
|
|
|
gt_iir[2] = I915_READ_FW(GEN8_GT_IIR(2));
|
|
|
|
if (gt_iir[2] & dev_priv->pm_rps_events) {
|
2015-04-07 15:21:04 +00:00
|
|
|
I915_WRITE_FW(GEN8_GT_IIR(2),
|
2016-04-13 18:19:58 +00:00
|
|
|
gt_iir[2] & dev_priv->pm_rps_events);
|
2014-06-16 15:10:59 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2014-05-15 17:58:08 +00:00
|
|
|
} else
|
|
|
|
DRM_ERROR("The master control interrupt lied (PM)!\n");
|
|
|
|
}
|
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:58 +00:00
|
|
|
static void gen8_gt_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 gt_iir[4])
|
|
|
|
{
|
|
|
|
if (gt_iir[0]) {
|
|
|
|
gen8_cs_irq_handler(&dev_priv->engine[RCS],
|
|
|
|
gt_iir[0], GEN8_RCS_IRQ_SHIFT);
|
|
|
|
gen8_cs_irq_handler(&dev_priv->engine[BCS],
|
|
|
|
gt_iir[0], GEN8_BCS_IRQ_SHIFT);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gt_iir[1]) {
|
|
|
|
gen8_cs_irq_handler(&dev_priv->engine[VCS],
|
|
|
|
gt_iir[1], GEN8_VCS1_IRQ_SHIFT);
|
|
|
|
gen8_cs_irq_handler(&dev_priv->engine[VCS2],
|
|
|
|
gt_iir[1], GEN8_VCS2_IRQ_SHIFT);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gt_iir[3])
|
|
|
|
gen8_cs_irq_handler(&dev_priv->engine[VECS],
|
|
|
|
gt_iir[3], GEN8_VECS_IRQ_SHIFT);
|
|
|
|
|
|
|
|
if (gt_iir[2] & dev_priv->pm_rps_events)
|
|
|
|
gen6_rps_irq_handler(dev_priv, gt_iir[2]);
|
|
|
|
}
|
|
|
|
|
2015-07-20 21:43:39 +00:00
|
|
|
static bool bxt_port_hotplug_long_detect(enum port port, u32 val)
|
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_A:
|
2015-08-27 20:56:00 +00:00
|
|
|
return val & PORTA_HOTPLUG_LONG_DETECT;
|
2015-07-20 21:43:39 +00:00
|
|
|
case PORT_B:
|
|
|
|
return val & PORTB_HOTPLUG_LONG_DETECT;
|
|
|
|
case PORT_C:
|
|
|
|
return val & PORTC_HOTPLUG_LONG_DETECT;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-27 20:56:02 +00:00
|
|
|
static bool spt_port_hotplug2_long_detect(enum port port, u32 val)
|
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_E:
|
|
|
|
return val & PORTE_HOTPLUG_LONG_DETECT;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-27 20:56:07 +00:00
|
|
|
static bool spt_port_hotplug_long_detect(enum port port, u32 val)
|
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_A:
|
|
|
|
return val & PORTA_HOTPLUG_LONG_DETECT;
|
|
|
|
case PORT_B:
|
|
|
|
return val & PORTB_HOTPLUG_LONG_DETECT;
|
|
|
|
case PORT_C:
|
|
|
|
return val & PORTC_HOTPLUG_LONG_DETECT;
|
|
|
|
case PORT_D:
|
|
|
|
return val & PORTD_HOTPLUG_LONG_DETECT;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-27 20:56:03 +00:00
|
|
|
static bool ilk_port_hotplug_long_detect(enum port port, u32 val)
|
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_A:
|
|
|
|
return val & DIGITAL_PORTA_HOTPLUG_LONG_DETECT;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-28 12:43:53 +00:00
|
|
|
static bool pch_port_hotplug_long_detect(enum port port, u32 val)
|
2014-06-18 01:29:35 +00:00
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTB_HOTPLUG_LONG_DETECT;
|
2014-06-18 01:29:35 +00:00
|
|
|
case PORT_C:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTC_HOTPLUG_LONG_DETECT;
|
2014-06-18 01:29:35 +00:00
|
|
|
case PORT_D:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTD_HOTPLUG_LONG_DETECT;
|
|
|
|
default:
|
|
|
|
return false;
|
2014-06-18 01:29:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-28 12:43:53 +00:00
|
|
|
static bool i9xx_port_hotplug_long_detect(enum port port, u32 val)
|
2014-06-18 01:29:35 +00:00
|
|
|
{
|
|
|
|
switch (port) {
|
|
|
|
case PORT_B:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTB_HOTPLUG_INT_LONG_PULSE;
|
2014-06-18 01:29:35 +00:00
|
|
|
case PORT_C:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTC_HOTPLUG_INT_LONG_PULSE;
|
2014-06-18 01:29:35 +00:00
|
|
|
case PORT_D:
|
2015-05-28 12:43:53 +00:00
|
|
|
return val & PORTD_HOTPLUG_INT_LONG_PULSE;
|
|
|
|
default:
|
|
|
|
return false;
|
2014-06-18 01:29:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-28 18:26:27 +00:00
|
|
|
/*
|
|
|
|
* Get a bit mask of pins that have triggered, and which ones may be long.
|
|
|
|
* This can be called multiple times with the same masks to accumulate
|
|
|
|
* hotplug detection results from several registers.
|
|
|
|
*
|
|
|
|
* Note that the caller is expected to zero out the masks initially.
|
|
|
|
*/
|
2015-07-21 22:32:44 +00:00
|
|
|
static void intel_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
|
2015-06-18 10:06:17 +00:00
|
|
|
u32 hotplug_trigger, u32 dig_hotplug_reg,
|
2015-07-21 22:32:44 +00:00
|
|
|
const u32 hpd[HPD_NUM_PINS],
|
|
|
|
bool long_pulse_detect(enum port port, u32 val))
|
2015-05-28 12:43:53 +00:00
|
|
|
{
|
2015-06-18 10:06:17 +00:00
|
|
|
enum port port;
|
2015-05-28 12:43:53 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for_each_hpd_pin(i) {
|
2015-06-18 10:06:17 +00:00
|
|
|
if ((hpd[i] & hotplug_trigger) == 0)
|
|
|
|
continue;
|
2015-05-28 12:43:53 +00:00
|
|
|
|
2015-06-18 10:06:17 +00:00
|
|
|
*pin_mask |= BIT(i);
|
|
|
|
|
2015-07-21 22:32:45 +00:00
|
|
|
if (!intel_hpd_pin_to_port(i, &port))
|
|
|
|
continue;
|
|
|
|
|
2015-07-21 22:32:44 +00:00
|
|
|
if (long_pulse_detect(port, dig_hotplug_reg))
|
2015-06-18 10:06:17 +00:00
|
|
|
*long_mask |= BIT(i);
|
2015-05-28 12:43:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, dig 0x%08x, pins 0x%08x\n",
|
|
|
|
hotplug_trigger, dig_hotplug_reg, *pin_mask);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void gmbus_irq_handler(struct drm_i915_private *dev_priv)
|
2012-12-01 12:53:44 +00:00
|
|
|
{
|
2012-12-01 12:53:45 +00:00
|
|
|
wake_up_all(&dev_priv->gmbus_wait_queue);
|
2012-12-01 12:53:44 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void dp_aux_irq_handler(struct drm_i915_private *dev_priv)
|
2012-12-01 12:53:47 +00:00
|
|
|
{
|
drm/i915: irq-drive the dp aux communication
At least on the platforms that have a dp aux irq and also have it
enabled - vlvhsw should have one, too. But I don't have a machine to
test this on. Judging from docs there's no dp aux interrupt for gm45.
Also, I only have an ivb cpu edp machine, so the dp aux A code for
snb/ilk is untested.
For dpcd probing when nothing is connected it slashes about 5ms of cpu
time (cpu time is now negligible), which agrees with 3 * 5 400 usec
timeouts.
A previous version of this patch increases the time required to go
through the dp_detect cycle (which includes reading the edid) from
around 33 ms to around 40 ms. Experiments indicated that this is
purely due to the irq latency - the hw doesn't allow us to queue up
dp aux transactions and hence irq latency directly affects throughput.
gmbus is much better, there we have a 8 byte buffer, and we get the
irq once another 4 bytes can be queued up.
But by using the pm_qos interface to request the lowest possible cpu
wake-up latency this slowdown completely disappeared.
Since all our output detection logic is single-threaded with the
mode_config mutex right now anyway, I've decide not ot play fancy and
to just reuse the gmbus wait queue. But this would definitely prep the
way to run dp detection on different ports in parallel
v2: Add a timeout for dp aux transfers when using interrupts - the hw
_does_ prevent this with the hw-based 400 usec timeout, but if the
irq somehow doesn't arrive we're screwed. Lesson learned while
developing this ;-)
v3: While at it also convert the busy-loop to wait_for_atomic, so that
we don't run the risk of an infinite loop any more.
v4: Ensure we have the smallest possible irq latency by using the
pm_qos interface.
v5: Add a comment to the code to explain why we frob pm_qos. Suggested
by Chris Wilson.
v6: Disable dp irq for vlv, that's easier than trying to get at docs
and hw.
v7: Squash in a fix for Haswell that Paulo Zanoni tracked down - the
dp aux registers aren't at a fixed offset any more, but can be on the
PCH while the DP port is on the cpu die.
Reviewed-by: Imre Deak <imre.deak@intel.com> (v6)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-01 12:53:48 +00:00
|
|
|
wake_up_all(&dev_priv->gmbus_wait_queue);
|
2012-12-01 12:53:47 +00:00
|
|
|
}
|
|
|
|
|
2013-10-15 17:55:27 +00:00
|
|
|
#if defined(CONFIG_DEBUG_FS)
|
2016-05-06 13:48:28 +00:00
|
|
|
static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe,
|
2013-10-18 14:37:07 +00:00
|
|
|
uint32_t crc0, uint32_t crc1,
|
|
|
|
uint32_t crc2, uint32_t crc3,
|
|
|
|
uint32_t crc4)
|
2013-10-15 17:55:27 +00:00
|
|
|
{
|
|
|
|
struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
|
|
|
|
struct intel_pipe_crc_entry *entry;
|
2013-10-15 17:55:30 +00:00
|
|
|
int head, tail;
|
2013-10-15 17:55:29 +00:00
|
|
|
|
2013-10-21 13:29:30 +00:00
|
|
|
spin_lock(&pipe_crc->lock);
|
|
|
|
|
2013-10-15 17:55:37 +00:00
|
|
|
if (!pipe_crc->entries) {
|
2013-10-21 13:29:30 +00:00
|
|
|
spin_unlock(&pipe_crc->lock);
|
2014-11-26 15:29:04 +00:00
|
|
|
DRM_DEBUG_KMS("spurious interrupt\n");
|
2013-10-15 17:55:37 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-21 13:29:30 +00:00
|
|
|
head = pipe_crc->head;
|
|
|
|
tail = pipe_crc->tail;
|
2013-10-15 17:55:29 +00:00
|
|
|
|
|
|
|
if (CIRC_SPACE(head, tail, INTEL_PIPE_CRC_ENTRIES_NR) < 1) {
|
2013-10-21 13:29:30 +00:00
|
|
|
spin_unlock(&pipe_crc->lock);
|
2013-10-15 17:55:29 +00:00
|
|
|
DRM_ERROR("CRC buffer overflowing\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry = &pipe_crc->entries[head];
|
2013-10-15 17:55:27 +00:00
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
entry->frame = dev_priv->drm.driver->get_vblank_counter(&dev_priv->drm,
|
2016-05-06 13:48:28 +00:00
|
|
|
pipe);
|
2013-10-16 20:55:46 +00:00
|
|
|
entry->crc[0] = crc0;
|
|
|
|
entry->crc[1] = crc1;
|
|
|
|
entry->crc[2] = crc2;
|
|
|
|
entry->crc[3] = crc3;
|
|
|
|
entry->crc[4] = crc4;
|
2013-10-15 17:55:29 +00:00
|
|
|
|
|
|
|
head = (head + 1) & (INTEL_PIPE_CRC_ENTRIES_NR - 1);
|
2013-10-21 13:29:30 +00:00
|
|
|
pipe_crc->head = head;
|
|
|
|
|
|
|
|
spin_unlock(&pipe_crc->lock);
|
2013-10-15 17:55:40 +00:00
|
|
|
|
|
|
|
wake_up_interruptible(&pipe_crc->wq);
|
2013-10-15 17:55:27 +00:00
|
|
|
}
|
2013-10-18 14:37:07 +00:00
|
|
|
#else
|
|
|
|
static inline void
|
2016-05-06 13:48:28 +00:00
|
|
|
display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe,
|
2013-10-18 14:37:07 +00:00
|
|
|
uint32_t crc0, uint32_t crc1,
|
|
|
|
uint32_t crc2, uint32_t crc3,
|
|
|
|
uint32_t crc4) {}
|
|
|
|
#endif
|
|
|
|
|
2013-10-16 20:55:46 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void hsw_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe)
|
2013-10-16 20:55:52 +00:00
|
|
|
{
|
2016-05-06 13:48:28 +00:00
|
|
|
display_pipe_crc_irq_handler(dev_priv, pipe,
|
2013-10-18 14:37:07 +00:00
|
|
|
I915_READ(PIPE_CRC_RES_1_IVB(pipe)),
|
|
|
|
0, 0, 0, 0);
|
2013-10-16 20:55:52 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ivb_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe)
|
2013-10-16 20:55:46 +00:00
|
|
|
{
|
2016-05-06 13:48:28 +00:00
|
|
|
display_pipe_crc_irq_handler(dev_priv, pipe,
|
2013-10-18 14:37:07 +00:00
|
|
|
I915_READ(PIPE_CRC_RES_1_IVB(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_2_IVB(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_3_IVB(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_4_IVB(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_5_IVB(pipe)));
|
2013-10-16 20:55:46 +00:00
|
|
|
}
|
2013-10-16 20:55:48 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void i9xx_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
enum pipe pipe)
|
2013-10-16 20:55:48 +00:00
|
|
|
{
|
2013-10-16 20:55:53 +00:00
|
|
|
uint32_t res1, res2;
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 3)
|
2013-10-16 20:55:53 +00:00
|
|
|
res1 = I915_READ(PIPE_CRC_RES_RES1_I915(pipe));
|
|
|
|
else
|
|
|
|
res1 = 0;
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
|
2013-10-16 20:55:53 +00:00
|
|
|
res2 = I915_READ(PIPE_CRC_RES_RES2_G4X(pipe));
|
|
|
|
else
|
|
|
|
res2 = 0;
|
2013-10-16 20:55:48 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
display_pipe_crc_irq_handler(dev_priv, pipe,
|
2013-10-18 14:37:07 +00:00
|
|
|
I915_READ(PIPE_CRC_RES_RED(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_GREEN(pipe)),
|
|
|
|
I915_READ(PIPE_CRC_RES_BLUE(pipe)),
|
|
|
|
res1, res2);
|
2013-10-16 20:55:48 +00:00
|
|
|
}
|
2013-10-15 17:55:27 +00:00
|
|
|
|
2013-08-15 14:51:32 +00:00
|
|
|
/* The RPS events need forcewake, so we add them to a work queue and mask their
|
|
|
|
* IMR bits until the work is done. Other interrupts can be processed without
|
|
|
|
* the work queue. */
|
|
|
|
static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)
|
2013-05-29 02:22:24 +00:00
|
|
|
{
|
2014-03-15 14:53:22 +00:00
|
|
|
if (pm_iir & dev_priv->pm_rps_events) {
|
2013-07-04 21:35:28 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2014-07-16 07:49:40 +00:00
|
|
|
gen6_disable_pm_irq(dev_priv, pm_iir & dev_priv->pm_rps_events);
|
drm/i915: sanitize rps irq disabling
When disabling the RPS interrupts there is a tricky dependency between
the thread disabling the interrupts, the RPS interrupt handler and the
corresponding RPS work. The RPS work can reenable the interrupts, so
there is no straightforward order in the disabling thread to (1) make
sure that any RPS work is flushed and to (2) disable all RPS
interrupts. Currently this is solved by masking the interrupts using two
separate mask registers (first level display IMR and PM IMR) and doing
the disabling when all first level interrupts are disabled.
This works, but the requirement to run with all first level interrupts
disabled is unnecessary making the suspend / unload time ordering of RPS
disabling wrt. other unitialization steps difficult and error prone.
Removing this restriction allows us to disable RPS early during suspend
/ unload and forget about it for the rest of the sequence. By adding a
more explicit method for avoiding the above race, it also becomes easier
to prove its correctness. Finally currently we can hit the WARN in
snb_update_pm_irq(), when a final RPS work runs with the first level
interrupts already disabled. This won't lead to any problem (due to the
separate interrupt masks), but with the change in this and the next
patch we can get rid of the WARN, while leaving it in place for other
scenarios.
To address the above points, add a new RPS interrupts_enabled flag and
use this during RPS disabling to avoid requeuing the RPS work and
reenabling of the RPS interrupts. Since the interrupt disabling happens
now in intel_suspend_gt_powersave(), we will disable RPS interrupts
explicitly during suspend (and not just through the first level mask),
but there is no problem doing so, it's also more consistent and allows
us to unify more of the RPS disabling during suspend and unload time in
the next patch.
v2/v3:
- rebase on patch "drm/i915: move rps irq disable one level up" in the
patchset
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-19 13:30:04 +00:00
|
|
|
if (dev_priv->rps.interrupts_enabled) {
|
|
|
|
dev_priv->rps.pm_iir |= pm_iir & dev_priv->pm_rps_events;
|
2016-07-04 07:08:36 +00:00
|
|
|
schedule_work(&dev_priv->rps.work);
|
drm/i915: sanitize rps irq disabling
When disabling the RPS interrupts there is a tricky dependency between
the thread disabling the interrupts, the RPS interrupt handler and the
corresponding RPS work. The RPS work can reenable the interrupts, so
there is no straightforward order in the disabling thread to (1) make
sure that any RPS work is flushed and to (2) disable all RPS
interrupts. Currently this is solved by masking the interrupts using two
separate mask registers (first level display IMR and PM IMR) and doing
the disabling when all first level interrupts are disabled.
This works, but the requirement to run with all first level interrupts
disabled is unnecessary making the suspend / unload time ordering of RPS
disabling wrt. other unitialization steps difficult and error prone.
Removing this restriction allows us to disable RPS early during suspend
/ unload and forget about it for the rest of the sequence. By adding a
more explicit method for avoiding the above race, it also becomes easier
to prove its correctness. Finally currently we can hit the WARN in
snb_update_pm_irq(), when a final RPS work runs with the first level
interrupts already disabled. This won't lead to any problem (due to the
separate interrupt masks), but with the change in this and the next
patch we can get rid of the WARN, while leaving it in place for other
scenarios.
To address the above points, add a new RPS interrupts_enabled flag and
use this during RPS disabling to avoid requeuing the RPS work and
reenabling of the RPS interrupts. Since the interrupt disabling happens
now in intel_suspend_gt_powersave(), we will disable RPS interrupts
explicitly during suspend (and not just through the first level mask),
but there is no problem doing so, it's also more consistent and allows
us to unify more of the RPS disabling during suspend and unload time in
the next patch.
v2/v3:
- rebase on patch "drm/i915: move rps irq disable one level up" in the
patchset
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-19 13:30:04 +00:00
|
|
|
}
|
2013-07-04 21:35:28 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2013-05-29 02:22:24 +00:00
|
|
|
}
|
|
|
|
|
2014-11-05 18:48:37 +00:00
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 8)
|
|
|
|
return;
|
|
|
|
|
2016-04-07 08:08:05 +00:00
|
|
|
if (HAS_VEBOX(dev_priv)) {
|
2013-08-15 14:51:32 +00:00
|
|
|
if (pm_iir & PM_VEBOX_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[VECS]);
|
2013-05-29 02:22:31 +00:00
|
|
|
|
2014-11-04 14:52:22 +00:00
|
|
|
if (pm_iir & PM_VEBOX_CS_ERROR_INTERRUPT)
|
|
|
|
DRM_DEBUG("Command parser error, pm_iir 0x%08x\n", pm_iir);
|
2013-05-29 02:22:31 +00:00
|
|
|
}
|
2013-05-29 02:22:24 +00:00
|
|
|
}
|
|
|
|
|
2016-05-24 15:13:53 +00:00
|
|
|
static bool intel_pipe_handle_vblank(struct drm_i915_private *dev_priv,
|
2016-05-06 13:48:28 +00:00
|
|
|
enum pipe pipe)
|
2014-04-29 10:35:46 +00:00
|
|
|
{
|
2016-05-24 15:13:53 +00:00
|
|
|
bool ret;
|
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
ret = drm_handle_vblank(&dev_priv->drm, pipe);
|
2016-05-24 15:13:53 +00:00
|
|
|
if (ret)
|
2016-05-17 13:07:49 +00:00
|
|
|
intel_finish_page_flip_mmio(dev_priv, pipe);
|
2016-05-24 15:13:53 +00:00
|
|
|
|
|
|
|
return ret;
|
2014-04-29 10:35:46 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void valleyview_pipestat_irq_ack(struct drm_i915_private *dev_priv,
|
|
|
|
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
|
2014-02-04 19:35:46 +00:00
|
|
|
{
|
|
|
|
int pipe;
|
|
|
|
|
2014-02-04 19:35:47 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2016-02-18 19:54:26 +00:00
|
|
|
|
|
|
|
if (!dev_priv->display_irqs_enabled) {
|
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg;
|
2014-02-12 16:55:36 +00:00
|
|
|
u32 mask, iir_bit = 0;
|
2014-02-10 16:42:49 +00:00
|
|
|
|
2014-02-12 16:55:36 +00:00
|
|
|
/*
|
|
|
|
* PIPESTAT bits get signalled even when the interrupt is
|
|
|
|
* disabled with the mask bits, and some of the status bits do
|
|
|
|
* not generate interrupts at all (like the underrun bit). Hence
|
|
|
|
* we need to be careful that we only handle what we want to
|
|
|
|
* handle.
|
|
|
|
*/
|
2014-09-30 08:56:49 +00:00
|
|
|
|
|
|
|
/* fifo underruns are filterered in the underrun handler. */
|
|
|
|
mask = PIPE_FIFO_UNDERRUN_STATUS;
|
2014-02-12 16:55:36 +00:00
|
|
|
|
|
|
|
switch (pipe) {
|
|
|
|
case PIPE_A:
|
|
|
|
iir_bit = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
|
|
|
|
break;
|
|
|
|
case PIPE_B:
|
|
|
|
iir_bit = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
|
|
|
|
break;
|
2014-04-09 10:28:49 +00:00
|
|
|
case PIPE_C:
|
|
|
|
iir_bit = I915_DISPLAY_PIPE_C_EVENT_INTERRUPT;
|
|
|
|
break;
|
2014-02-12 16:55:36 +00:00
|
|
|
}
|
|
|
|
if (iir & iir_bit)
|
|
|
|
mask |= dev_priv->pipestat_irq_mask[pipe];
|
|
|
|
|
|
|
|
if (!mask)
|
2014-02-10 16:42:49 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
reg = PIPESTAT(pipe);
|
2014-02-12 16:55:36 +00:00
|
|
|
mask |= PIPESTAT_INT_ENABLE_MASK;
|
|
|
|
pipe_stats[pipe] = I915_READ(reg) & mask;
|
2014-02-04 19:35:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the PIPE*STAT regs before the IIR
|
|
|
|
*/
|
2014-02-10 16:42:49 +00:00
|
|
|
if (pipe_stats[pipe] & (PIPE_FIFO_UNDERRUN_STATUS |
|
|
|
|
PIPESTAT_INT_STATUS_MASK))
|
2014-02-04 19:35:46 +00:00
|
|
|
I915_WRITE(reg, pipe_stats[pipe]);
|
|
|
|
}
|
2014-02-04 19:35:47 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2016-04-13 18:19:55 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void valleyview_pipestat_irq_handler(struct drm_i915_private *dev_priv,
|
2016-04-13 18:19:55 +00:00
|
|
|
u32 pipe_stats[I915_MAX_PIPES])
|
|
|
|
{
|
|
|
|
enum pipe pipe;
|
2014-02-04 19:35:46 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
|
|
|
|
intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
2014-02-04 19:35:46 +00:00
|
|
|
|
2016-05-17 13:07:47 +00:00
|
|
|
if (pipe_stats[pipe] & PLANE_FLIP_DONE_INT_STATUS_VLV)
|
2016-05-17 13:07:49 +00:00
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
2014-02-04 19:35:46 +00:00
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_pipe_crc_irq_handler(dev_priv, pipe);
|
2014-02-04 19:35:46 +00:00
|
|
|
|
2014-09-30 08:56:48 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
|
2014-02-04 19:35:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
gmbus_irq_handler(dev_priv);
|
2014-02-04 19:35:46 +00:00
|
|
|
}
|
|
|
|
|
2016-04-13 18:19:54 +00:00
|
|
|
static u32 i9xx_hpd_irq_ack(struct drm_i915_private *dev_priv)
|
2014-04-01 07:54:36 +00:00
|
|
|
{
|
|
|
|
u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
|
|
|
|
|
2016-04-13 18:19:54 +00:00
|
|
|
if (hotplug_status)
|
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
|
2014-04-01 07:54:36 +00:00
|
|
|
|
2016-04-13 18:19:54 +00:00
|
|
|
return hotplug_status;
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void i9xx_hpd_irq_handler(struct drm_i915_private *dev_priv,
|
2016-04-13 18:19:54 +00:00
|
|
|
u32 hotplug_status)
|
|
|
|
{
|
|
|
|
u32 pin_mask = 0, long_mask = 0;
|
2014-04-01 07:54:36 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
|
|
|
|
IS_CHERRYVIEW(dev_priv)) {
|
2015-05-27 12:03:39 +00:00
|
|
|
u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X;
|
2014-04-01 07:54:36 +00:00
|
|
|
|
drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt
On GMCH plaforms we are now getting the following spew on aux
interrupts:
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Prevent it by not calling intel_get_hpd_pins() unless one of the HPD
interrupt bits are actually set.
I already fixed similar annoyance once with
4bca26d0a6518d51a9abe64fbde4b12f04c74053 drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
but another source for it got added in
fd63e2a972c670887e5e8a08440111d3812c0996 drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
due to pch_get_hpd_pins() being chosen over i9xx_get_hpd_pins() to
serve as the new unified piece of code. pch_get_hpd_pins() had the debug
print, and i9xx_get_hpd_pins() didn't.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-28 19:59:08 +00:00
|
|
|
if (hotplug_trigger) {
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
|
|
|
hotplug_trigger, hpd_status_g4x,
|
|
|
|
i9xx_port_hotplug_long_detect);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt
On GMCH plaforms we are now getting the following spew on aux
interrupts:
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Prevent it by not calling intel_get_hpd_pins() unless one of the HPD
interrupt bits are actually set.
I already fixed similar annoyance once with
4bca26d0a6518d51a9abe64fbde4b12f04c74053 drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
but another source for it got added in
fd63e2a972c670887e5e8a08440111d3812c0996 drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
due to pch_get_hpd_pins() being chosen over i9xx_get_hpd_pins() to
serve as the new unified piece of code. pch_get_hpd_pins() had the debug
print, and i9xx_get_hpd_pins() didn't.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-28 19:59:08 +00:00
|
|
|
}
|
2015-05-27 12:03:40 +00:00
|
|
|
|
|
|
|
if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2015-05-27 12:03:39 +00:00
|
|
|
} else {
|
|
|
|
u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
|
2014-04-01 07:54:36 +00:00
|
|
|
|
drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt
On GMCH plaforms we are now getting the following spew on aux
interrupts:
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Prevent it by not calling intel_get_hpd_pins() unless one of the HPD
interrupt bits are actually set.
I already fixed similar annoyance once with
4bca26d0a6518d51a9abe64fbde4b12f04c74053 drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
but another source for it got added in
fd63e2a972c670887e5e8a08440111d3812c0996 drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
due to pch_get_hpd_pins() being chosen over i9xx_get_hpd_pins() to
serve as the new unified piece of code. pch_get_hpd_pins() had the debug
print, and i9xx_get_hpd_pins() didn't.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-28 19:59:08 +00:00
|
|
|
if (hotplug_trigger) {
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
2015-09-30 06:47:41 +00:00
|
|
|
hotplug_trigger, hpd_status_i915,
|
drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt
On GMCH plaforms we are now getting the following spew on aux
interrupts:
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Prevent it by not calling intel_get_hpd_pins() unless one of the HPD
interrupt bits are actually set.
I already fixed similar annoyance once with
4bca26d0a6518d51a9abe64fbde4b12f04c74053 drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
but another source for it got added in
fd63e2a972c670887e5e8a08440111d3812c0996 drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
due to pch_get_hpd_pins() being chosen over i9xx_get_hpd_pins() to
serve as the new unified piece of code. pch_get_hpd_pins() had the debug
print, and i9xx_get_hpd_pins() didn't.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-28 19:59:08 +00:00
|
|
|
i9xx_port_hotplug_long_detect);
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
drm/i915: Don't call intel_get_hpd_pins() when there's no hotplug interrupt
On GMCH plaforms we are now getting the following spew on aux
interrupts:
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_get_hpd_pins] hotplug event received, stat 0x00000000, dig 0x00000000, pins 0x00000000
[drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064
Prevent it by not calling intel_get_hpd_pins() unless one of the HPD
interrupt bits are actually set.
I already fixed similar annoyance once with
4bca26d0a6518d51a9abe64fbde4b12f04c74053 drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV
but another source for it got added in
fd63e2a972c670887e5e8a08440111d3812c0996 drm/i915: combine i9xx_get_hpd_pins and pch_get_hpd_pins
due to pch_get_hpd_pins() being chosen over i9xx_get_hpd_pins() to
serve as the new unified piece of code. pch_get_hpd_pins() had the debug
print, and i9xx_get_hpd_pins() didn't.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-28 19:59:08 +00:00
|
|
|
}
|
2014-06-16 15:10:58 +00:00
|
|
|
}
|
2014-04-01 07:54:36 +00:00
|
|
|
}
|
|
|
|
|
2012-10-02 13:10:55 +00:00
|
|
|
static irqreturn_t valleyview_irq_handler(int irq, void *arg)
|
2012-03-28 20:39:38 +00:00
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
irqreturn_t ret = IRQ_NONE;
|
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2016-04-13 18:19:52 +00:00
|
|
|
do {
|
2016-04-13 18:19:53 +00:00
|
|
|
u32 iir, gt_iir, pm_iir;
|
2016-04-13 18:19:55 +00:00
|
|
|
u32 pipe_stats[I915_MAX_PIPES] = {};
|
2016-04-13 18:19:54 +00:00
|
|
|
u32 hotplug_status = 0;
|
2016-04-13 18:19:51 +00:00
|
|
|
u32 ier = 0;
|
2014-06-16 15:10:58 +00:00
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
gt_iir = I915_READ(GTIIR);
|
|
|
|
pm_iir = I915_READ(GEN6_PMIIR);
|
2014-06-16 15:10:58 +00:00
|
|
|
iir = I915_READ(VLV_IIR);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
|
|
|
if (gt_iir == 0 && pm_iir == 0 && iir == 0)
|
2016-04-13 18:19:52 +00:00
|
|
|
break;
|
2012-03-28 20:39:38 +00:00
|
|
|
|
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
|
2016-04-13 18:19:51 +00:00
|
|
|
/*
|
|
|
|
* Theory on interrupt generation, based on empirical evidence:
|
|
|
|
*
|
|
|
|
* x = ((VLV_IIR & VLV_IER) ||
|
|
|
|
* (((GT_IIR & GT_IER) || (GEN6_PMIIR & GEN6_PMIER)) &&
|
|
|
|
* (VLV_MASTER_IER & MASTER_INTERRUPT_ENABLE)));
|
|
|
|
*
|
|
|
|
* A CPU interrupt will only be raised when 'x' has a 0->1 edge.
|
|
|
|
* Hence we clear MASTER_INTERRUPT_ENABLE and VLV_IER to
|
|
|
|
* guarantee the CPU interrupt will be raised again even if we
|
|
|
|
* don't end up clearing all the VLV_IIR, GT_IIR, GEN6_PMIIR
|
|
|
|
* bits this time around.
|
|
|
|
*/
|
2016-04-13 18:19:50 +00:00
|
|
|
I915_WRITE(VLV_MASTER_IER, 0);
|
2016-04-13 18:19:51 +00:00
|
|
|
ier = I915_READ(VLV_IER);
|
|
|
|
I915_WRITE(VLV_IER, 0);
|
2016-04-13 18:19:50 +00:00
|
|
|
|
|
|
|
if (gt_iir)
|
|
|
|
I915_WRITE(GTIIR, gt_iir);
|
|
|
|
if (pm_iir)
|
|
|
|
I915_WRITE(GEN6_PMIIR, pm_iir);
|
|
|
|
|
2016-04-13 18:19:49 +00:00
|
|
|
if (iir & I915_DISPLAY_PORT_INTERRUPT)
|
2016-04-13 18:19:54 +00:00
|
|
|
hotplug_status = i9xx_hpd_irq_ack(dev_priv);
|
2016-04-13 18:19:49 +00:00
|
|
|
|
2014-06-16 15:10:58 +00:00
|
|
|
/* Call regardless, as some status bits might not be
|
|
|
|
* signalled in iir */
|
2016-05-06 13:48:28 +00:00
|
|
|
valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
|
2016-04-13 18:19:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* VLV_IIR is single buffered, and reflects the level
|
|
|
|
* from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
|
|
|
|
*/
|
|
|
|
if (iir)
|
|
|
|
I915_WRITE(VLV_IIR, iir);
|
2016-04-13 18:19:50 +00:00
|
|
|
|
2016-04-13 18:19:51 +00:00
|
|
|
I915_WRITE(VLV_IER, ier);
|
2016-04-13 18:19:50 +00:00
|
|
|
I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE);
|
|
|
|
POSTING_READ(VLV_MASTER_IER);
|
2016-04-13 18:19:54 +00:00
|
|
|
|
2016-04-13 18:19:56 +00:00
|
|
|
if (gt_iir)
|
2016-04-13 18:19:57 +00:00
|
|
|
snb_gt_irq_handler(dev_priv, gt_iir);
|
2016-04-13 18:19:56 +00:00
|
|
|
if (pm_iir)
|
|
|
|
gen6_rps_irq_handler(dev_priv, pm_iir);
|
|
|
|
|
2016-04-13 18:19:54 +00:00
|
|
|
if (hotplug_status)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
2016-04-13 18:19:55 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
|
2016-04-13 18:19:52 +00:00
|
|
|
} while (0);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-04-09 17:40:52 +00:00
|
|
|
static irqreturn_t cherryview_irq_handler(int irq, void *arg)
|
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-04-09 17:40:52 +00:00
|
|
|
irqreturn_t ret = IRQ_NONE;
|
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2016-03-14 09:01:57 +00:00
|
|
|
do {
|
2016-04-13 18:19:53 +00:00
|
|
|
u32 master_ctl, iir;
|
2016-04-13 18:19:58 +00:00
|
|
|
u32 gt_iir[4] = {};
|
2016-04-13 18:19:55 +00:00
|
|
|
u32 pipe_stats[I915_MAX_PIPES] = {};
|
2016-04-13 18:19:54 +00:00
|
|
|
u32 hotplug_status = 0;
|
2016-04-13 18:19:51 +00:00
|
|
|
u32 ier = 0;
|
|
|
|
|
2014-04-09 10:28:50 +00:00
|
|
|
master_ctl = I915_READ(GEN8_MASTER_IRQ) & ~GEN8_MASTER_IRQ_CONTROL;
|
|
|
|
iir = I915_READ(VLV_IIR);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2014-04-09 10:28:50 +00:00
|
|
|
if (master_ctl == 0 && iir == 0)
|
|
|
|
break;
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2014-06-16 15:11:00 +00:00
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
|
2016-04-13 18:19:51 +00:00
|
|
|
/*
|
|
|
|
* Theory on interrupt generation, based on empirical evidence:
|
|
|
|
*
|
|
|
|
* x = ((VLV_IIR & VLV_IER) ||
|
|
|
|
* ((GEN8_MASTER_IRQ & ~GEN8_MASTER_IRQ_CONTROL) &&
|
|
|
|
* (GEN8_MASTER_IRQ & GEN8_MASTER_IRQ_CONTROL)));
|
|
|
|
*
|
|
|
|
* A CPU interrupt will only be raised when 'x' has a 0->1 edge.
|
|
|
|
* Hence we clear GEN8_MASTER_IRQ_CONTROL and VLV_IER to
|
|
|
|
* guarantee the CPU interrupt will be raised again even if we
|
|
|
|
* don't end up clearing all the VLV_IIR and GEN8_MASTER_IRQ_CONTROL
|
|
|
|
* bits this time around.
|
|
|
|
*/
|
2014-04-09 10:28:50 +00:00
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, 0);
|
2016-04-13 18:19:51 +00:00
|
|
|
ier = I915_READ(VLV_IER);
|
|
|
|
I915_WRITE(VLV_IER, 0);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2016-04-13 18:19:58 +00:00
|
|
|
gen8_gt_irq_ack(dev_priv, master_ctl, gt_iir);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2016-04-13 18:19:49 +00:00
|
|
|
if (iir & I915_DISPLAY_PORT_INTERRUPT)
|
2016-04-13 18:19:54 +00:00
|
|
|
hotplug_status = i9xx_hpd_irq_ack(dev_priv);
|
2016-04-13 18:19:49 +00:00
|
|
|
|
2014-06-16 15:11:00 +00:00
|
|
|
/* Call regardless, as some status bits might not be
|
|
|
|
* signalled in iir */
|
2016-05-06 13:48:28 +00:00
|
|
|
valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2016-04-13 18:19:49 +00:00
|
|
|
/*
|
|
|
|
* VLV_IIR is single buffered, and reflects the level
|
|
|
|
* from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
|
|
|
|
*/
|
|
|
|
if (iir)
|
|
|
|
I915_WRITE(VLV_IIR, iir);
|
|
|
|
|
2016-04-13 18:19:51 +00:00
|
|
|
I915_WRITE(VLV_IER, ier);
|
2016-04-13 18:19:47 +00:00
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
|
2014-04-09 10:28:50 +00:00
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
2016-04-13 18:19:54 +00:00
|
|
|
|
2016-04-13 18:19:58 +00:00
|
|
|
gen8_gt_irq_handler(dev_priv, gt_iir);
|
|
|
|
|
2016-04-13 18:19:54 +00:00
|
|
|
if (hotplug_status)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
2016-04-13 18:19:55 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
|
2016-03-14 09:01:57 +00:00
|
|
|
} while (0);
|
2014-04-09 10:28:49 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2014-04-09 17:40:52 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ibx_hpd_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 hotplug_trigger,
|
2015-08-27 20:56:10 +00:00
|
|
|
const u32 hpd[HPD_NUM_PINS])
|
|
|
|
{
|
|
|
|
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
|
|
|
|
|
2015-11-25 14:47:22 +00:00
|
|
|
/*
|
|
|
|
* Somehow the PCH doesn't seem to really ack the interrupt to the CPU
|
|
|
|
* unless we touch the hotplug register, even if hotplug_trigger is
|
|
|
|
* zero. Not acking leads to "The master control interrupt lied (SDE)!"
|
|
|
|
* errors.
|
|
|
|
*/
|
2015-08-27 20:56:10 +00:00
|
|
|
dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG);
|
2015-11-25 14:47:22 +00:00
|
|
|
if (!hotplug_trigger) {
|
|
|
|
u32 mask = PORTA_HOTPLUG_STATUS_MASK |
|
|
|
|
PORTD_HOTPLUG_STATUS_MASK |
|
|
|
|
PORTC_HOTPLUG_STATUS_MASK |
|
|
|
|
PORTB_HOTPLUG_STATUS_MASK;
|
|
|
|
dig_hotplug_reg &= ~mask;
|
|
|
|
}
|
|
|
|
|
2015-08-27 20:56:10 +00:00
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, dig_hotplug_reg);
|
2015-11-25 14:47:22 +00:00
|
|
|
if (!hotplug_trigger)
|
|
|
|
return;
|
2015-08-27 20:56:10 +00:00
|
|
|
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
|
|
|
dig_hotplug_reg, hpd,
|
|
|
|
pch_port_hotplug_long_detect);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
2015-08-27 20:56:10 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ibx_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
|
2011-01-04 23:09:39 +00:00
|
|
|
{
|
2011-02-07 20:26:52 +00:00
|
|
|
int pipe;
|
2013-04-16 11:36:54 +00:00
|
|
|
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK;
|
2014-06-18 01:29:35 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
ibx_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ibx);
|
2013-06-27 15:52:14 +00:00
|
|
|
|
2013-04-17 14:48:48 +00:00
|
|
|
if (pch_iir & SDE_AUDIO_POWER_MASK) {
|
|
|
|
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >>
|
|
|
|
SDE_AUDIO_POWER_SHIFT);
|
2011-01-04 23:09:39 +00:00
|
|
|
DRM_DEBUG_DRIVER("PCH audio power change on port %d\n",
|
2013-04-17 14:48:48 +00:00
|
|
|
port_name(port));
|
|
|
|
}
|
2011-01-04 23:09:39 +00:00
|
|
|
|
2012-12-01 12:53:47 +00:00
|
|
|
if (pch_iir & SDE_AUX_MASK)
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2012-12-01 12:53:47 +00:00
|
|
|
|
2011-01-04 23:09:39 +00:00
|
|
|
if (pch_iir & SDE_GMBUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
gmbus_irq_handler(dev_priv);
|
2011-01-04 23:09:39 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_AUDIO_HDCP_MASK)
|
|
|
|
DRM_DEBUG_DRIVER("PCH HDCP audio interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & SDE_AUDIO_TRANS_MASK)
|
|
|
|
DRM_DEBUG_DRIVER("PCH transcoder audio interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & SDE_POISON)
|
|
|
|
DRM_ERROR("PCH poison interrupt\n");
|
|
|
|
|
2011-02-07 20:26:52 +00:00
|
|
|
if (pch_iir & SDE_FDI_MASK)
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2011-02-07 20:26:52 +00:00
|
|
|
DRM_DEBUG_DRIVER(" pipe %c FDI IIR: 0x%08x\n",
|
|
|
|
pipe_name(pipe),
|
|
|
|
I915_READ(FDI_RX_IIR(pipe)));
|
2011-01-04 23:09:39 +00:00
|
|
|
|
|
|
|
if (pch_iir & (SDE_TRANSB_CRC_DONE | SDE_TRANSA_CRC_DONE))
|
|
|
|
DRM_DEBUG_DRIVER("PCH transcoder CRC done interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & (SDE_TRANSB_CRC_ERR | SDE_TRANSA_CRC_ERR))
|
|
|
|
DRM_DEBUG_DRIVER("PCH transcoder CRC error interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & SDE_TRANSA_FIFO_UNDER)
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_A);
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_TRANSB_FIFO_UNDER)
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_B);
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ivb_err_int_handler(struct drm_i915_private *dev_priv)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
{
|
|
|
|
u32 err_int = I915_READ(GEN7_ERR_INT);
|
2013-10-16 20:55:52 +00:00
|
|
|
enum pipe pipe;
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
2013-04-12 20:57:58 +00:00
|
|
|
if (err_int & ERR_INT_POISON)
|
|
|
|
DRM_ERROR("Poison interrupt\n");
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2014-09-30 08:56:48 +00:00
|
|
|
if (err_int & ERR_INT_FIFO_UNDERRUN(pipe))
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
|
2013-10-15 17:55:27 +00:00
|
|
|
|
2013-10-16 20:55:52 +00:00
|
|
|
if (err_int & ERR_INT_PIPE_CRC_DONE(pipe)) {
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_IVYBRIDGE(dev_priv))
|
|
|
|
ivb_pipe_crc_irq_handler(dev_priv, pipe);
|
2013-10-16 20:55:52 +00:00
|
|
|
else
|
2016-05-06 13:48:28 +00:00
|
|
|
hsw_pipe_crc_irq_handler(dev_priv, pipe);
|
2013-10-16 20:55:52 +00:00
|
|
|
}
|
|
|
|
}
|
2013-10-15 17:55:27 +00:00
|
|
|
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
I915_WRITE(GEN7_ERR_INT, err_int);
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void cpt_serr_int_handler(struct drm_i915_private *dev_priv)
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
{
|
|
|
|
u32 serr_int = I915_READ(SERR_INT);
|
|
|
|
|
2013-04-12 20:57:58 +00:00
|
|
|
if (serr_int & SERR_INT_POISON)
|
|
|
|
DRM_ERROR("PCH poison interrupt\n");
|
|
|
|
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
if (serr_int & SERR_INT_TRANS_A_FIFO_UNDERRUN)
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_A);
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
|
|
|
if (serr_int & SERR_INT_TRANS_B_FIFO_UNDERRUN)
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_B);
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
|
|
|
if (serr_int & SERR_INT_TRANS_C_FIFO_UNDERRUN)
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_pch_fifo_underrun_irq_handler(dev_priv, TRANSCODER_C);
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
|
|
|
I915_WRITE(SERR_INT, serr_int);
|
2011-01-04 23:09:39 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
|
2012-06-06 19:45:44 +00:00
|
|
|
{
|
|
|
|
int pipe;
|
2015-08-27 20:56:02 +00:00
|
|
|
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_CPT;
|
2014-06-18 01:29:35 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
ibx_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_cpt);
|
2013-06-27 15:52:14 +00:00
|
|
|
|
2013-04-17 14:48:48 +00:00
|
|
|
if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) {
|
|
|
|
int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >>
|
|
|
|
SDE_AUDIO_POWER_SHIFT_CPT);
|
|
|
|
DRM_DEBUG_DRIVER("PCH audio power change on port %c\n",
|
|
|
|
port_name(port));
|
|
|
|
}
|
2012-06-06 19:45:44 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_AUX_MASK_CPT)
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2012-06-06 19:45:44 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_GMBUS_CPT)
|
2016-05-06 13:48:28 +00:00
|
|
|
gmbus_irq_handler(dev_priv);
|
2012-06-06 19:45:44 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_AUDIO_CP_REQ_CPT)
|
|
|
|
DRM_DEBUG_DRIVER("Audio CP request interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & SDE_AUDIO_CP_CHG_CPT)
|
|
|
|
DRM_DEBUG_DRIVER("Audio CP change interrupt\n");
|
|
|
|
|
|
|
|
if (pch_iir & SDE_FDI_MASK_CPT)
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-06-06 19:45:44 +00:00
|
|
|
DRM_DEBUG_DRIVER(" pipe %c FDI IIR: 0x%08x\n",
|
|
|
|
pipe_name(pipe),
|
|
|
|
I915_READ(FDI_RX_IIR(pipe)));
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_ERROR_CPT)
|
2016-05-06 13:48:28 +00:00
|
|
|
cpt_serr_int_handler(dev_priv);
|
2012-06-06 19:45:44 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void spt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)
|
2015-08-27 20:56:02 +00:00
|
|
|
{
|
|
|
|
u32 hotplug_trigger = pch_iir & SDE_HOTPLUG_MASK_SPT &
|
|
|
|
~SDE_PORTE_HOTPLUG_SPT;
|
|
|
|
u32 hotplug2_trigger = pch_iir & SDE_PORTE_HOTPLUG_SPT;
|
|
|
|
u32 pin_mask = 0, long_mask = 0;
|
|
|
|
|
|
|
|
if (hotplug_trigger) {
|
|
|
|
u32 dig_hotplug_reg;
|
|
|
|
|
|
|
|
dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG);
|
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, dig_hotplug_reg);
|
|
|
|
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
|
|
|
dig_hotplug_reg, hpd_spt,
|
2015-08-27 20:56:07 +00:00
|
|
|
spt_port_hotplug_long_detect);
|
2015-08-27 20:56:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hotplug2_trigger) {
|
|
|
|
u32 dig_hotplug_reg;
|
|
|
|
|
|
|
|
dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG2);
|
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG2, dig_hotplug_reg);
|
|
|
|
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug2_trigger,
|
|
|
|
dig_hotplug_reg, hpd_spt,
|
|
|
|
spt_port_hotplug2_long_detect);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pin_mask)
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
2015-08-27 20:56:02 +00:00
|
|
|
|
|
|
|
if (pch_iir & SDE_GMBUS_CPT)
|
2016-05-06 13:48:28 +00:00
|
|
|
gmbus_irq_handler(dev_priv);
|
2015-08-27 20:56:02 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ilk_hpd_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 hotplug_trigger,
|
2015-08-27 20:56:10 +00:00
|
|
|
const u32 hpd[HPD_NUM_PINS])
|
|
|
|
{
|
|
|
|
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
|
|
|
|
|
|
|
|
dig_hotplug_reg = I915_READ(DIGITAL_PORT_HOTPLUG_CNTRL);
|
|
|
|
I915_WRITE(DIGITAL_PORT_HOTPLUG_CNTRL, dig_hotplug_reg);
|
|
|
|
|
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
|
|
|
dig_hotplug_reg, hpd,
|
|
|
|
ilk_port_hotplug_long_detect);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
2015-08-27 20:56:10 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ilk_display_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 de_iir)
|
2013-07-12 19:35:10 +00:00
|
|
|
{
|
2013-10-21 16:04:36 +00:00
|
|
|
enum pipe pipe;
|
2015-08-27 20:56:03 +00:00
|
|
|
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
|
|
|
|
|
2015-08-27 20:56:10 +00:00
|
|
|
if (hotplug_trigger)
|
2016-05-06 13:48:28 +00:00
|
|
|
ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ilk);
|
2013-07-12 19:35:10 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_AUX_CHANNEL_A)
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2013-07-12 19:35:10 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_GSE)
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_opregion_asle_intr(dev_priv);
|
2013-07-12 19:35:10 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_POISON)
|
|
|
|
DRM_ERROR("Poison interrupt\n");
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
if (de_iir & DE_PIPE_VBLANK(pipe) &&
|
|
|
|
intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
2013-10-16 20:55:48 +00:00
|
|
|
|
2013-10-21 16:04:36 +00:00
|
|
|
if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
|
2014-09-30 08:56:48 +00:00
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
|
2013-10-16 20:55:48 +00:00
|
|
|
|
2013-10-21 16:04:36 +00:00
|
|
|
if (de_iir & DE_PIPE_CRC_DONE(pipe))
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_pipe_crc_irq_handler(dev_priv, pipe);
|
2013-07-12 19:35:10 +00:00
|
|
|
|
2013-10-21 16:04:36 +00:00
|
|
|
/* plane/pipes map 1:1 on ilk+ */
|
2016-05-17 13:07:47 +00:00
|
|
|
if (de_iir & DE_PLANE_FLIP_DONE(pipe))
|
2016-05-17 13:07:49 +00:00
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
2013-07-12 19:35:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check event from PCH */
|
|
|
|
if (de_iir & DE_PCH_EVENT) {
|
|
|
|
u32 pch_iir = I915_READ(SDEIIR);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (HAS_PCH_CPT(dev_priv))
|
|
|
|
cpt_irq_handler(dev_priv, pch_iir);
|
2013-07-12 19:35:10 +00:00
|
|
|
else
|
2016-05-06 13:48:28 +00:00
|
|
|
ibx_irq_handler(dev_priv, pch_iir);
|
2013-07-12 19:35:10 +00:00
|
|
|
|
|
|
|
/* should clear PCH hotplug event before clear CPU irq */
|
|
|
|
I915_WRITE(SDEIIR, pch_iir);
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_GEN5(dev_priv) && de_iir & DE_PCU_EVENT)
|
|
|
|
ironlake_rps_change_irq_handler(dev_priv);
|
2013-07-12 19:35:10 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ivb_display_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 de_iir)
|
2013-07-12 19:35:11 +00:00
|
|
|
{
|
2014-03-03 17:31:46 +00:00
|
|
|
enum pipe pipe;
|
2015-08-27 20:56:04 +00:00
|
|
|
u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
|
|
|
|
|
2015-08-27 20:56:10 +00:00
|
|
|
if (hotplug_trigger)
|
2016-05-06 13:48:28 +00:00
|
|
|
ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ivb);
|
2013-07-12 19:35:11 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_ERR_INT_IVB)
|
2016-05-06 13:48:28 +00:00
|
|
|
ivb_err_int_handler(dev_priv);
|
2013-07-12 19:35:11 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_AUX_CHANNEL_A_IVB)
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2013-07-12 19:35:11 +00:00
|
|
|
|
|
|
|
if (de_iir & DE_GSE_IVB)
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_opregion_asle_intr(dev_priv);
|
2013-07-12 19:35:11 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
if (de_iir & (DE_PIPE_VBLANK_IVB(pipe)) &&
|
|
|
|
intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
2013-10-21 16:04:36 +00:00
|
|
|
|
|
|
|
/* plane/pipes map 1:1 on ilk+ */
|
2016-05-17 13:07:47 +00:00
|
|
|
if (de_iir & DE_PLANE_FLIP_DONE_IVB(pipe))
|
2016-05-17 13:07:49 +00:00
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
2013-07-12 19:35:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* check event from PCH */
|
2016-05-06 13:48:28 +00:00
|
|
|
if (!HAS_PCH_NOP(dev_priv) && (de_iir & DE_PCH_EVENT_IVB)) {
|
2013-07-12 19:35:11 +00:00
|
|
|
u32 pch_iir = I915_READ(SDEIIR);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
cpt_irq_handler(dev_priv, pch_iir);
|
2013-07-12 19:35:11 +00:00
|
|
|
|
|
|
|
/* clear PCH hotplug event before clear CPU irq */
|
|
|
|
I915_WRITE(SDEIIR, pch_iir);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-16 15:10:57 +00:00
|
|
|
/*
|
|
|
|
* To handle irqs with the minimum potential races with fresh interrupts, we:
|
|
|
|
* 1 - Disable Master Interrupt Control.
|
|
|
|
* 2 - Find the source(s) of the interrupt.
|
|
|
|
* 3 - Clear the Interrupt Identity bits (IIR).
|
|
|
|
* 4 - Process the interrupt(s) that had bits set in the IIRs.
|
|
|
|
* 5 - Re-enable Master Interrupt Control.
|
|
|
|
*/
|
2013-07-12 22:56:30 +00:00
|
|
|
static irqreturn_t ironlake_irq_handler(int irq, void *arg)
|
2011-04-06 19:13:38 +00:00
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-07-12 22:56:30 +00:00
|
|
|
u32 de_iir, gt_iir, de_ier, sde_ier = 0;
|
2012-05-09 20:45:44 +00:00
|
|
|
irqreturn_t ret = IRQ_NONE;
|
2011-04-06 19:13:38 +00:00
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2011-04-06 19:13:38 +00:00
|
|
|
/* disable master interrupt before clearing iir */
|
|
|
|
de_ier = I915_READ(DEIER);
|
|
|
|
I915_WRITE(DEIER, de_ier & ~DE_MASTER_IRQ_CONTROL);
|
2013-07-12 19:35:14 +00:00
|
|
|
POSTING_READ(DEIER);
|
2011-04-06 19:13:38 +00:00
|
|
|
|
drm/i915: also disable south interrupts when handling them
From the docs:
"IIR can queue up to two interrupt events. When the IIR is cleared,
it will set itself again after one clock if a second event was
stored."
"Only the rising edge of the PCH Display interrupt will cause the
North Display IIR (DEIIR) PCH Display Interrupt even bit to be set,
so all PCH Display Interrupts, including back to back interrupts,
must be cleared before a new PCH Display interrupt can cause DEIIR
to be set".
The current code works fine because we don't get many interrupts, but
if we enable the PCH FIFO underrun interrupts we'll start getting so
many interrupts that at some point new PCH interrupts won't cause
DEIIR to be set.
The initial implementation I tried was to turn the code that checks
SDEIIR into a loop, but we can still get interrupts even after the
loop is done (and before the irq handler finishes), so we have to
either disable the interrupts or mask them. In the end I concluded
that just disabling the PCH interrupts is enough, you don't even need
the loop, so this is what this patch implements. I've tested it and it
passes the 2 "PCH FIFO underrun interrupt storms" I can reproduce:
the "ironlake_crtc_disable" case and the "wrong watermarks" case.
In other words, here's how to reproduce the problem fixed by this
patch:
1 - Enable PCH FIFO underrun interrupts (SERR_INT on SNB+)
2 - Boot the machine
3 - While booting we'll get tons of PCH FIFO underrun interrupts
4 - Plug a new monitor
5 - Run xrandr, notice it won't detect the new monitor
6 - Read SDEIIR and notice it's not 0 while DEIIR is 0
Q: Can't we just clear DEIIR before SDEIIR?
A: It doesn't work. SDEIIR has to be completely cleared (including the
interrupts stored on its back queue) before it can flip DEIIR's bit to
1 again, and even while you're clearing it you'll be getting more and
more interrupts.
Q: Why does it work by just disabling+enabling the south interrupts?
A: Because when we re-enable them, if there's something on the SDEIIR
register (maybe an interrupt stored on the queue), the re-enabling
will make DEIIR's bit flip to 1, and since we'll already have
interrupts enabled we'll get another interrupt, then run our irq
handler again to process the "back" interrupts.
v2: Even bigger commit message, added code comments.
Note that this fixes missed dp aux irqs which have been reported for
3.9-rc1. This regression has been introduced by switching to
irq-driven dp aux transactions with
commit 9ee32fea5fe810ec06af3a15e4c65478de56d4f5
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat Dec 1 13:53:48 2012 +0100
drm/i915: irq-drive the dp aux communication
References: http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg18588.html
References: https://lkml.org/lkml/2013/2/26/769
Tested-by: Imre Deak <imre.deak@intel.com>
Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Pimp commit message with references for the dp aux irq
timeout regression this fixes.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-02-22 20:05:28 +00:00
|
|
|
/* Disable south interrupts. We'll only write to SDEIIR once, so further
|
|
|
|
* interrupts will will be stored on its back queue, and then we'll be
|
|
|
|
* able to process them after we restore SDEIER (as soon as we restore
|
|
|
|
* it, we'll get an interrupt if SDEIIR still has something to process
|
|
|
|
* due to its back queue). */
|
2016-05-06 13:48:28 +00:00
|
|
|
if (!HAS_PCH_NOP(dev_priv)) {
|
2013-04-05 20:12:41 +00:00
|
|
|
sde_ier = I915_READ(SDEIER);
|
|
|
|
I915_WRITE(SDEIER, 0);
|
|
|
|
POSTING_READ(SDEIER);
|
|
|
|
}
|
drm/i915: also disable south interrupts when handling them
From the docs:
"IIR can queue up to two interrupt events. When the IIR is cleared,
it will set itself again after one clock if a second event was
stored."
"Only the rising edge of the PCH Display interrupt will cause the
North Display IIR (DEIIR) PCH Display Interrupt even bit to be set,
so all PCH Display Interrupts, including back to back interrupts,
must be cleared before a new PCH Display interrupt can cause DEIIR
to be set".
The current code works fine because we don't get many interrupts, but
if we enable the PCH FIFO underrun interrupts we'll start getting so
many interrupts that at some point new PCH interrupts won't cause
DEIIR to be set.
The initial implementation I tried was to turn the code that checks
SDEIIR into a loop, but we can still get interrupts even after the
loop is done (and before the irq handler finishes), so we have to
either disable the interrupts or mask them. In the end I concluded
that just disabling the PCH interrupts is enough, you don't even need
the loop, so this is what this patch implements. I've tested it and it
passes the 2 "PCH FIFO underrun interrupt storms" I can reproduce:
the "ironlake_crtc_disable" case and the "wrong watermarks" case.
In other words, here's how to reproduce the problem fixed by this
patch:
1 - Enable PCH FIFO underrun interrupts (SERR_INT on SNB+)
2 - Boot the machine
3 - While booting we'll get tons of PCH FIFO underrun interrupts
4 - Plug a new monitor
5 - Run xrandr, notice it won't detect the new monitor
6 - Read SDEIIR and notice it's not 0 while DEIIR is 0
Q: Can't we just clear DEIIR before SDEIIR?
A: It doesn't work. SDEIIR has to be completely cleared (including the
interrupts stored on its back queue) before it can flip DEIIR's bit to
1 again, and even while you're clearing it you'll be getting more and
more interrupts.
Q: Why does it work by just disabling+enabling the south interrupts?
A: Because when we re-enable them, if there's something on the SDEIIR
register (maybe an interrupt stored on the queue), the re-enabling
will make DEIIR's bit flip to 1, and since we'll already have
interrupts enabled we'll get another interrupt, then run our irq
handler again to process the "back" interrupts.
v2: Even bigger commit message, added code comments.
Note that this fixes missed dp aux irqs which have been reported for
3.9-rc1. This regression has been introduced by switching to
irq-driven dp aux transactions with
commit 9ee32fea5fe810ec06af3a15e4c65478de56d4f5
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat Dec 1 13:53:48 2012 +0100
drm/i915: irq-drive the dp aux communication
References: http://www.mail-archive.com/intel-gfx@lists.freedesktop.org/msg18588.html
References: https://lkml.org/lkml/2013/2/26/769
Tested-by: Imre Deak <imre.deak@intel.com>
Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Pimp commit message with references for the dp aux irq
timeout regression this fixes.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-02-22 20:05:28 +00:00
|
|
|
|
2014-06-16 15:10:57 +00:00
|
|
|
/* Find, clear, then process each source of interrupt */
|
|
|
|
|
2011-04-06 19:13:38 +00:00
|
|
|
gt_iir = I915_READ(GTIIR);
|
2012-05-09 20:45:44 +00:00
|
|
|
if (gt_iir) {
|
2014-06-16 15:10:57 +00:00
|
|
|
I915_WRITE(GTIIR, gt_iir);
|
|
|
|
ret = IRQ_HANDLED;
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6)
|
2016-04-13 18:19:57 +00:00
|
|
|
snb_gt_irq_handler(dev_priv, gt_iir);
|
2013-07-19 21:57:55 +00:00
|
|
|
else
|
2016-04-13 18:19:57 +00:00
|
|
|
ilk_gt_irq_handler(dev_priv, gt_iir);
|
2011-04-06 19:13:38 +00:00
|
|
|
}
|
|
|
|
|
2012-05-09 20:45:44 +00:00
|
|
|
de_iir = I915_READ(DEIIR);
|
|
|
|
if (de_iir) {
|
2014-06-16 15:10:57 +00:00
|
|
|
I915_WRITE(DEIIR, de_iir);
|
|
|
|
ret = IRQ_HANDLED;
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 7)
|
|
|
|
ivb_display_irq_handler(dev_priv, de_iir);
|
2013-07-12 22:56:30 +00:00
|
|
|
else
|
2016-05-06 13:48:28 +00:00
|
|
|
ilk_display_irq_handler(dev_priv, de_iir);
|
2011-04-06 19:13:38 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6) {
|
2013-07-12 22:56:30 +00:00
|
|
|
u32 pm_iir = I915_READ(GEN6_PMIIR);
|
|
|
|
if (pm_iir) {
|
|
|
|
I915_WRITE(GEN6_PMIIR, pm_iir);
|
|
|
|
ret = IRQ_HANDLED;
|
2014-06-16 15:10:57 +00:00
|
|
|
gen6_rps_irq_handler(dev_priv, pm_iir);
|
2013-07-12 22:56:30 +00:00
|
|
|
}
|
2012-05-09 20:45:44 +00:00
|
|
|
}
|
2011-04-06 19:13:38 +00:00
|
|
|
|
|
|
|
I915_WRITE(DEIER, de_ier);
|
|
|
|
POSTING_READ(DEIER);
|
2016-05-06 13:48:28 +00:00
|
|
|
if (!HAS_PCH_NOP(dev_priv)) {
|
2013-04-05 20:12:41 +00:00
|
|
|
I915_WRITE(SDEIER, sde_ier);
|
|
|
|
POSTING_READ(SDEIER);
|
|
|
|
}
|
2011-04-06 19:13:38 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2011-04-06 19:13:38 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void bxt_hpd_irq_handler(struct drm_i915_private *dev_priv,
|
|
|
|
u32 hotplug_trigger,
|
2015-08-27 20:56:10 +00:00
|
|
|
const u32 hpd[HPD_NUM_PINS])
|
2014-08-22 12:10:41 +00:00
|
|
|
{
|
2015-08-27 20:56:09 +00:00
|
|
|
u32 dig_hotplug_reg, pin_mask = 0, long_mask = 0;
|
2014-08-22 12:10:41 +00:00
|
|
|
|
2015-08-27 20:56:11 +00:00
|
|
|
dig_hotplug_reg = I915_READ(PCH_PORT_HOTPLUG);
|
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, dig_hotplug_reg);
|
2014-08-22 12:10:41 +00:00
|
|
|
|
2015-08-27 20:56:09 +00:00
|
|
|
intel_get_hpd_pins(&pin_mask, &long_mask, hotplug_trigger,
|
2015-08-27 20:56:10 +00:00
|
|
|
dig_hotplug_reg, hpd,
|
2015-08-27 20:56:09 +00:00
|
|
|
bxt_port_hotplug_long_detect);
|
2015-08-27 20:56:10 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_hpd_irq_handler(dev_priv, pin_mask, long_mask);
|
2014-08-22 12:10:41 +00:00
|
|
|
}
|
|
|
|
|
2016-01-12 16:04:07 +00:00
|
|
|
static irqreturn_t
|
|
|
|
gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
{
|
|
|
|
irqreturn_t ret = IRQ_NONE;
|
2016-01-12 16:04:07 +00:00
|
|
|
u32 iir;
|
2013-11-07 10:05:40 +00:00
|
|
|
enum pipe pipe;
|
2014-11-13 17:51:48 +00:00
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
if (master_ctl & GEN8_DE_MISC_IRQ) {
|
2016-01-12 16:04:06 +00:00
|
|
|
iir = I915_READ(GEN8_DE_MISC_IIR);
|
|
|
|
if (iir) {
|
|
|
|
I915_WRITE(GEN8_DE_MISC_IIR, iir);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2016-01-12 16:04:06 +00:00
|
|
|
if (iir & GEN8_DE_MISC_GSE)
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_opregion_asle_intr(dev_priv);
|
2014-06-16 15:10:59 +00:00
|
|
|
else
|
|
|
|
DRM_ERROR("Unexpected DE Misc interrupt\n");
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
2014-06-16 15:10:59 +00:00
|
|
|
else
|
|
|
|
DRM_ERROR("The master control interrupt lied (DE MISC)!\n");
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
|
|
|
|
2013-11-07 13:49:55 +00:00
|
|
|
if (master_ctl & GEN8_DE_PORT_IRQ) {
|
2016-01-12 16:04:06 +00:00
|
|
|
iir = I915_READ(GEN8_DE_PORT_IIR);
|
|
|
|
if (iir) {
|
|
|
|
u32 tmp_mask;
|
2014-08-22 12:10:41 +00:00
|
|
|
bool found = false;
|
2015-08-27 20:56:09 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
I915_WRITE(GEN8_DE_PORT_IIR, iir);
|
2013-11-07 13:49:55 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2014-11-13 17:51:48 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
tmp_mask = GEN8_AUX_CHANNEL_A;
|
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 9)
|
|
|
|
tmp_mask |= GEN9_AUX_CHANNEL_B |
|
|
|
|
GEN9_AUX_CHANNEL_C |
|
|
|
|
GEN9_AUX_CHANNEL_D;
|
|
|
|
|
|
|
|
if (iir & tmp_mask) {
|
2016-05-06 13:48:28 +00:00
|
|
|
dp_aux_irq_handler(dev_priv);
|
2014-08-22 12:10:41 +00:00
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
if (IS_BROXTON(dev_priv)) {
|
|
|
|
tmp_mask = iir & BXT_DE_PORT_HOTPLUG_MASK;
|
|
|
|
if (tmp_mask) {
|
2016-05-06 13:48:28 +00:00
|
|
|
bxt_hpd_irq_handler(dev_priv, tmp_mask,
|
|
|
|
hpd_bxt);
|
2016-01-12 16:04:06 +00:00
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
} else if (IS_BROADWELL(dev_priv)) {
|
|
|
|
tmp_mask = iir & GEN8_PORT_DP_A_HOTPLUG;
|
|
|
|
if (tmp_mask) {
|
2016-05-06 13:48:28 +00:00
|
|
|
ilk_hpd_irq_handler(dev_priv,
|
|
|
|
tmp_mask, hpd_bdw);
|
2016-01-12 16:04:06 +00:00
|
|
|
found = true;
|
|
|
|
}
|
2014-08-22 12:10:41 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_BROXTON(dev_priv) && (iir & BXT_DE_PORT_GMBUS)) {
|
|
|
|
gmbus_irq_handler(dev_priv);
|
2014-08-22 12:10:43 +00:00
|
|
|
found = true;
|
|
|
|
}
|
|
|
|
|
2014-08-22 12:10:41 +00:00
|
|
|
if (!found)
|
2014-06-16 15:10:59 +00:00
|
|
|
DRM_ERROR("Unexpected DE Port interrupt\n");
|
2013-11-07 13:49:55 +00:00
|
|
|
}
|
2014-06-16 15:10:59 +00:00
|
|
|
else
|
|
|
|
DRM_ERROR("The master control interrupt lied (DE PORT)!\n");
|
2013-11-07 13:49:55 +00:00
|
|
|
}
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-01-12 16:04:06 +00:00
|
|
|
u32 flip_done, fault_errors;
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2013-11-07 10:05:40 +00:00
|
|
|
if (!(master_ctl & GEN8_DE_PIPE_IRQ(pipe)))
|
|
|
|
continue;
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
iir = I915_READ(GEN8_DE_PIPE_IIR(pipe));
|
|
|
|
if (!iir) {
|
|
|
|
DRM_ERROR("The master control interrupt lied (DE PIPE)!\n");
|
|
|
|
continue;
|
|
|
|
}
|
2014-03-20 20:45:01 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
I915_WRITE(GEN8_DE_PIPE_IIR(pipe), iir);
|
2014-06-16 15:10:59 +00:00
|
|
|
|
2016-05-24 15:13:53 +00:00
|
|
|
if (iir & GEN8_PIPE_VBLANK &&
|
|
|
|
intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
2014-03-20 20:45:01 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
flip_done = iir;
|
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 9)
|
|
|
|
flip_done &= GEN9_PIPE_PLANE1_FLIP_DONE;
|
|
|
|
else
|
|
|
|
flip_done &= GEN8_PIPE_PRIMARY_FLIP_DONE;
|
2014-06-16 15:10:59 +00:00
|
|
|
|
2016-05-17 13:07:47 +00:00
|
|
|
if (flip_done)
|
2016-05-17 13:07:49 +00:00
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
2014-06-16 15:10:59 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
if (iir & GEN8_PIPE_CDCLK_CRC_DONE)
|
2016-05-06 13:48:28 +00:00
|
|
|
hsw_pipe_crc_irq_handler(dev_priv, pipe);
|
2014-06-16 15:10:59 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
if (iir & GEN8_PIPE_FIFO_UNDERRUN)
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
|
2014-03-20 20:45:01 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
fault_errors = iir;
|
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 9)
|
|
|
|
fault_errors &= GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
|
|
|
|
else
|
|
|
|
fault_errors &= GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
|
2014-03-20 20:45:01 +00:00
|
|
|
|
2016-01-12 16:04:06 +00:00
|
|
|
if (fault_errors)
|
|
|
|
DRM_ERROR("Fault errors on pipe %c\n: 0x%08x",
|
|
|
|
pipe_name(pipe),
|
|
|
|
fault_errors);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (HAS_PCH_SPLIT(dev_priv) && !HAS_PCH_NOP(dev_priv) &&
|
2014-08-22 12:10:42 +00:00
|
|
|
master_ctl & GEN8_DE_PCH_IRQ) {
|
2013-11-07 10:05:43 +00:00
|
|
|
/*
|
|
|
|
* FIXME(BDW): Assume for now that the new interrupt handling
|
|
|
|
* scheme also closed the SDE interrupt handling race we've seen
|
|
|
|
* on older pch-split platforms. But this needs testing.
|
|
|
|
*/
|
2016-01-12 16:04:06 +00:00
|
|
|
iir = I915_READ(SDEIIR);
|
|
|
|
if (iir) {
|
|
|
|
I915_WRITE(SDEIIR, iir);
|
2013-11-07 10:05:43 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2015-08-27 20:56:02 +00:00
|
|
|
|
2016-07-02 00:07:12 +00:00
|
|
|
if (HAS_PCH_SPT(dev_priv) || HAS_PCH_KBP(dev_priv))
|
2016-05-06 13:48:28 +00:00
|
|
|
spt_irq_handler(dev_priv, iir);
|
2015-08-27 20:56:02 +00:00
|
|
|
else
|
2016-05-06 13:48:28 +00:00
|
|
|
cpt_irq_handler(dev_priv, iir);
|
2016-01-07 08:29:10 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Like on previous PCH there seems to be something
|
|
|
|
* fishy going on with forwarding PCH interrupts.
|
|
|
|
*/
|
|
|
|
DRM_DEBUG_DRIVER("The master control interrupt lied (SDE)!\n");
|
|
|
|
}
|
2013-11-07 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
2016-01-12 16:04:07 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static irqreturn_t gen8_irq_handler(int irq, void *arg)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2016-01-12 16:04:07 +00:00
|
|
|
u32 master_ctl;
|
2016-04-13 18:19:58 +00:00
|
|
|
u32 gt_iir[4] = {};
|
2016-01-12 16:04:07 +00:00
|
|
|
irqreturn_t ret;
|
|
|
|
|
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
|
|
|
master_ctl = I915_READ_FW(GEN8_MASTER_IRQ);
|
|
|
|
master_ctl &= ~GEN8_MASTER_IRQ_CONTROL;
|
|
|
|
if (!master_ctl)
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
|
|
|
I915_WRITE_FW(GEN8_MASTER_IRQ, 0);
|
|
|
|
|
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
|
|
|
/* Find, clear, then process each source of interrupt */
|
2016-04-13 18:19:58 +00:00
|
|
|
ret = gen8_gt_irq_ack(dev_priv, master_ctl, gt_iir);
|
|
|
|
gen8_gt_irq_handler(dev_priv, gt_iir);
|
2016-01-12 16:04:07 +00:00
|
|
|
ret |= gen8_de_irq_handler(dev_priv, master_ctl);
|
|
|
|
|
2015-04-07 15:21:04 +00:00
|
|
|
I915_WRITE_FW(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
|
|
|
|
POSTING_READ_FW(GEN8_MASTER_IRQ);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-07-01 16:23:14 +00:00
|
|
|
static void i915_error_wake_up(struct drm_i915_private *dev_priv)
|
2013-09-08 19:57:13 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Notify all waiters for GPU completion events that reset state has
|
|
|
|
* been changed, and that they need to restart their wait after
|
|
|
|
* checking for potential errors (and bail out to drop locks if there is
|
|
|
|
* a gpu reset pending so that i915_error_work_func can acquire them).
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Wake up __wait_seqno, potentially holding dev->struct_mutex. */
|
2016-07-01 16:23:14 +00:00
|
|
|
wake_up_all(&dev_priv->gpu_error.wait_queue);
|
2013-09-08 19:57:13 +00:00
|
|
|
|
|
|
|
/* Wake up intel_crtc_wait_for_pending_flips, holding crtc->mutex. */
|
|
|
|
wake_up_all(&dev_priv->pending_flip_queue);
|
|
|
|
}
|
|
|
|
|
2009-07-11 20:48:03 +00:00
|
|
|
/**
|
2015-01-28 15:03:14 +00:00
|
|
|
* i915_reset_and_wakeup - do process context error handling work
|
2016-06-03 13:02:17 +00:00
|
|
|
* @dev_priv: i915 device private
|
2009-07-11 20:48:03 +00:00
|
|
|
*
|
|
|
|
* Fire an error uevent so userspace can see that a hang or error
|
|
|
|
* was detected.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)
|
2009-07-11 20:48:03 +00:00
|
|
|
{
|
2016-07-05 09:40:23 +00:00
|
|
|
struct kobject *kobj = &dev_priv->drm.primary->kdev->kobj;
|
2013-07-19 16:16:42 +00:00
|
|
|
char *error_event[] = { I915_ERROR_UEVENT "=1", NULL };
|
|
|
|
char *reset_event[] = { I915_RESET_UEVENT "=1", NULL };
|
|
|
|
char *reset_done_event[] = { I915_ERROR_UEVENT "=0", NULL };
|
2013-09-08 19:57:13 +00:00
|
|
|
int ret;
|
2009-07-11 20:48:03 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
kobject_uevent_env(kobj, KOBJ_CHANGE, error_event);
|
2009-09-14 21:48:46 +00:00
|
|
|
|
2012-12-06 15:23:37 +00:00
|
|
|
/*
|
|
|
|
* Note that there's only one work item which does gpu resets, so we
|
|
|
|
* need not worry about concurrent gpu resets potentially incrementing
|
|
|
|
* error->reset_counter twice. We only need to take care of another
|
|
|
|
* racing irq/hangcheck declaring the gpu dead for a second time. A
|
|
|
|
* quick check for that is good enough: schedule_work ensures the
|
|
|
|
* correct ordering between hang detection and this work item, and since
|
|
|
|
* the reset in-progress bit is only ever set by code outside of this
|
|
|
|
* work we don't need to worry about any other races.
|
|
|
|
*/
|
2016-04-13 16:35:05 +00:00
|
|
|
if (i915_reset_in_progress(&dev_priv->gpu_error)) {
|
2010-09-19 11:38:26 +00:00
|
|
|
DRM_DEBUG_DRIVER("resetting chip\n");
|
2016-05-06 14:40:21 +00:00
|
|
|
kobject_uevent_env(kobj, KOBJ_CHANGE, reset_event);
|
2012-11-15 16:17:22 +00:00
|
|
|
|
2014-04-22 22:09:04 +00:00
|
|
|
/*
|
|
|
|
* In most cases it's guaranteed that we get here with an RPM
|
|
|
|
* reference held, for example because there is a pending GPU
|
|
|
|
* request that won't finish until the reset is done. This
|
|
|
|
* isn't the case at least when we get here by doing a
|
|
|
|
* simulated reset via debugs, so get an RPM reference.
|
|
|
|
*/
|
|
|
|
intel_runtime_pm_get(dev_priv);
|
2014-11-24 16:28:11 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
intel_prepare_reset(dev_priv);
|
2014-11-24 16:28:11 +00:00
|
|
|
|
2013-09-08 19:57:13 +00:00
|
|
|
/*
|
|
|
|
* All state reset _must_ be completed before we update the
|
|
|
|
* reset counter, for otherwise waiters might miss the reset
|
|
|
|
* pending state and not properly drop locks, resulting in
|
|
|
|
* deadlocks with the reset work.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
ret = i915_reset(dev_priv);
|
drm/i915: create a race-free reset detection
With the previous patch the state transition handling of the reset
code itself is now (hopefully) race free and solid. But that still
leaves out everyone else - with the various lock-free wait paths
we have there's the possibility that the reset happens between the
point where we read the seqno we should wait on and the actual wait.
And if __wait_seqno then never sees the RESET_IN_PROGRESS state, we'll
happily wait for a seqno which will in all likelyhood never signal.
In practice this is not a big problem since the X server gets
constantly interrupted, and can then submit more work (hopefully) to
unblock everyone else: As soon as a new seqno write lands, all waiters
will unblock. But running the i-g-t reset testcase ZZ_hangman can
expose this race, especially on slower hw with fewer cpu cores.
Now looking forward to ARB_robustness and friends that's not the best
possible behaviour, hence this patch adds a reset_counter to be able
to detect any reset, even if a given thread never observed the
in-progress state.
The important part is to correctly order things:
- The write side needs to increment the counter after any seqno gets
reset. Hence we need to do that at the end of the reset work, and
again wake everyone up. We also need to place a barrier in between
any possible seqno changes and the counter increment, since any
unlock operations only guarantee that nothing leaks out, but not
that at later load operation gets moved ahead.
- On the read side we need to ensure that no reset can sneak in and
invalidate the seqno. In all cases we can use the one-sided barrier
that unlock operations guarantee (of the lock protecting the
respective seqno/ring pair) to ensure correct ordering. Hence it is
sufficient to place the atomic read before the mutex/spin_unlock and
no additional barriers are required.
The end-result of all this is that we need to wake up everyone twice
in a reset operation:
- First, before the reset starts, to get any lockholders of the locks,
so that the reset can proceed.
- Second, after the reset is completed, to allow waiters to properly
and reliably detect the reset condition and bail out.
I admit that this entire reset_counter thing smells a bit like
overkill, but I think it's justified since it makes it really explicit
what the bail-out condition is. And we need a reset counter anyway to
implement ARB_robustness, and imo with finer-grained locking on the
horizont this is the most resilient scheme I could think of.
v2: Drop spurious change in the wait_for_error EXIT_COND - we only
need to wait until we leave the reset-in-progress wedged state.
v3: Don't play tricks with barriers in the throttle ioctl, the
spin_unlock is barrier enough.
I've also considered using a little helper to grab the current
reset_counter, but then decided that hiding the atomic_read isn't a
great idea, since having it explicitly show up in the code is a nice
remainder to reviews to check the memory barriers.
v4: Add a comment to explain why we need to fall through in
__wait_seqno in the end variable assignments.
v5: Review from Damien:
- s/smb/smp/ in a comment
- don't increment the reset counter after we've set it to WEDGED. Now
we (again) properly wedge the gpu when the reset fails.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-06 08:01:42 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
intel_finish_reset(dev_priv);
|
2013-09-08 19:57:13 +00:00
|
|
|
|
2014-04-22 22:09:04 +00:00
|
|
|
intel_runtime_pm_put(dev_priv);
|
|
|
|
|
2016-04-13 16:35:05 +00:00
|
|
|
if (ret == 0)
|
2016-05-06 14:40:21 +00:00
|
|
|
kobject_uevent_env(kobj,
|
drm/i915: create a race-free reset detection
With the previous patch the state transition handling of the reset
code itself is now (hopefully) race free and solid. But that still
leaves out everyone else - with the various lock-free wait paths
we have there's the possibility that the reset happens between the
point where we read the seqno we should wait on and the actual wait.
And if __wait_seqno then never sees the RESET_IN_PROGRESS state, we'll
happily wait for a seqno which will in all likelyhood never signal.
In practice this is not a big problem since the X server gets
constantly interrupted, and can then submit more work (hopefully) to
unblock everyone else: As soon as a new seqno write lands, all waiters
will unblock. But running the i-g-t reset testcase ZZ_hangman can
expose this race, especially on slower hw with fewer cpu cores.
Now looking forward to ARB_robustness and friends that's not the best
possible behaviour, hence this patch adds a reset_counter to be able
to detect any reset, even if a given thread never observed the
in-progress state.
The important part is to correctly order things:
- The write side needs to increment the counter after any seqno gets
reset. Hence we need to do that at the end of the reset work, and
again wake everyone up. We also need to place a barrier in between
any possible seqno changes and the counter increment, since any
unlock operations only guarantee that nothing leaks out, but not
that at later load operation gets moved ahead.
- On the read side we need to ensure that no reset can sneak in and
invalidate the seqno. In all cases we can use the one-sided barrier
that unlock operations guarantee (of the lock protecting the
respective seqno/ring pair) to ensure correct ordering. Hence it is
sufficient to place the atomic read before the mutex/spin_unlock and
no additional barriers are required.
The end-result of all this is that we need to wake up everyone twice
in a reset operation:
- First, before the reset starts, to get any lockholders of the locks,
so that the reset can proceed.
- Second, after the reset is completed, to allow waiters to properly
and reliably detect the reset condition and bail out.
I admit that this entire reset_counter thing smells a bit like
overkill, but I think it's justified since it makes it really explicit
what the bail-out condition is. And we need a reset counter anyway to
implement ARB_robustness, and imo with finer-grained locking on the
horizont this is the most resilient scheme I could think of.
v2: Drop spurious change in the wait_for_error EXIT_COND - we only
need to wait until we leave the reset-in-progress wedged state.
v3: Don't play tricks with barriers in the throttle ioctl, the
spin_unlock is barrier enough.
I've also considered using a little helper to grab the current
reset_counter, but then decided that hiding the atomic_read isn't a
great idea, since having it explicitly show up in the code is a nice
remainder to reviews to check the memory barriers.
v4: Add a comment to explain why we need to fall through in
__wait_seqno in the end variable assignments.
v5: Review from Damien:
- s/smb/smp/ in a comment
- don't increment the reset counter after we've set it to WEDGED. Now
we (again) properly wedge the gpu when the reset fails.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-06 08:01:42 +00:00
|
|
|
KOBJ_CHANGE, reset_done_event);
|
2012-11-15 16:17:22 +00:00
|
|
|
|
2013-09-08 19:57:13 +00:00
|
|
|
/*
|
|
|
|
* Note: The wake_up also serves as a memory barrier so that
|
|
|
|
* waiters see the update value of the reset counter atomic_t.
|
|
|
|
*/
|
2016-07-01 16:23:14 +00:00
|
|
|
wake_up_all(&dev_priv->gpu_error.reset_queue);
|
2009-09-14 21:48:46 +00:00
|
|
|
}
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
static void i915_report_and_clear_eir(struct drm_i915_private *dev_priv)
|
2009-07-11 20:48:03 +00:00
|
|
|
{
|
2012-08-23 22:18:09 +00:00
|
|
|
uint32_t instdone[I915_NUM_INSTDONE_REG];
|
2009-07-11 20:48:03 +00:00
|
|
|
u32 eir = I915_READ(EIR);
|
2012-08-22 18:32:15 +00:00
|
|
|
int pipe, i;
|
2009-07-11 20:48:03 +00:00
|
|
|
|
2010-05-27 12:18:12 +00:00
|
|
|
if (!eir)
|
|
|
|
return;
|
2009-07-11 20:48:03 +00:00
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("render error detected, EIR: 0x%08x\n", eir);
|
2009-07-11 20:48:03 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_get_extra_instdone(dev_priv, instdone);
|
2012-08-23 22:18:09 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (IS_G4X(dev_priv)) {
|
2009-07-11 20:48:03 +00:00
|
|
|
if (eir & (GM45_ERROR_MEM_PRIV | GM45_ERROR_CP_PRIV)) {
|
|
|
|
u32 ipeir = I915_READ(IPEIR_I965);
|
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
|
|
|
|
pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
|
2012-08-22 18:32:15 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(instdone); i++)
|
|
|
|
pr_err(" INSTDONE_%d: 0x%08x\n", i, instdone[i]);
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
|
|
|
|
pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD_I965));
|
2009-07-11 20:48:03 +00:00
|
|
|
I915_WRITE(IPEIR_I965, ipeir);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(IPEIR_I965);
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
if (eir & GM45_ERROR_PAGE_TABLE) {
|
|
|
|
u32 pgtbl_err = I915_READ(PGTBL_ER);
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("page table error\n");
|
|
|
|
pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
|
2009-07-11 20:48:03 +00:00
|
|
|
I915_WRITE(PGTBL_ER, pgtbl_err);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(PGTBL_ER);
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (!IS_GEN2(dev_priv)) {
|
2009-07-11 20:48:03 +00:00
|
|
|
if (eir & I915_ERROR_PAGE_TABLE) {
|
|
|
|
u32 pgtbl_err = I915_READ(PGTBL_ER);
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("page table error\n");
|
|
|
|
pr_err(" PGTBL_ER: 0x%08x\n", pgtbl_err);
|
2009-07-11 20:48:03 +00:00
|
|
|
I915_WRITE(PGTBL_ER, pgtbl_err);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(PGTBL_ER);
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (eir & I915_ERROR_MEMORY_REFRESH) {
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("memory refresh error:\n");
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("pipe %c stat: 0x%08x\n",
|
2011-02-07 20:26:52 +00:00
|
|
|
pipe_name(pipe), I915_READ(PIPESTAT(pipe)));
|
2009-07-11 20:48:03 +00:00
|
|
|
/* pipestat has already been acked */
|
|
|
|
}
|
|
|
|
if (eir & I915_ERROR_INSTRUCTION) {
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err("instruction error\n");
|
|
|
|
pr_err(" INSTPM: 0x%08x\n", I915_READ(INSTPM));
|
2012-08-22 18:32:15 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(instdone); i++)
|
|
|
|
pr_err(" INSTDONE_%d: 0x%08x\n", i, instdone[i]);
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 4) {
|
2009-07-11 20:48:03 +00:00
|
|
|
u32 ipeir = I915_READ(IPEIR);
|
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR));
|
|
|
|
pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR));
|
|
|
|
pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD));
|
2009-07-11 20:48:03 +00:00
|
|
|
I915_WRITE(IPEIR, ipeir);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(IPEIR);
|
2009-07-11 20:48:03 +00:00
|
|
|
} else {
|
|
|
|
u32 ipeir = I915_READ(IPEIR_I965);
|
|
|
|
|
2012-03-18 20:00:11 +00:00
|
|
|
pr_err(" IPEIR: 0x%08x\n", I915_READ(IPEIR_I965));
|
|
|
|
pr_err(" IPEHR: 0x%08x\n", I915_READ(IPEHR_I965));
|
|
|
|
pr_err(" INSTPS: 0x%08x\n", I915_READ(INSTPS));
|
|
|
|
pr_err(" ACTHD: 0x%08x\n", I915_READ(ACTHD_I965));
|
2009-07-11 20:48:03 +00:00
|
|
|
I915_WRITE(IPEIR_I965, ipeir);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(IPEIR_I965);
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
I915_WRITE(EIR, eir);
|
2010-11-16 15:55:10 +00:00
|
|
|
POSTING_READ(EIR);
|
2009-07-11 20:48:03 +00:00
|
|
|
eir = I915_READ(EIR);
|
|
|
|
if (eir) {
|
|
|
|
/*
|
|
|
|
* some errors might have become stuck,
|
|
|
|
* mask them.
|
|
|
|
*/
|
|
|
|
DRM_ERROR("EIR stuck: 0x%08x, masking\n", eir);
|
|
|
|
I915_WRITE(EMR, I915_READ(EMR) | eir);
|
|
|
|
I915_WRITE(IIR, I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
|
|
|
|
}
|
2010-05-27 12:18:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2015-01-28 15:03:14 +00:00
|
|
|
* i915_handle_error - handle a gpu error
|
2016-06-03 13:02:17 +00:00
|
|
|
* @dev_priv: i915 device private
|
2016-03-18 20:07:55 +00:00
|
|
|
* @engine_mask: mask representing engines that are hung
|
2015-10-08 07:57:49 +00:00
|
|
|
* Do some basic checking of register state at error time and
|
2010-05-27 12:18:12 +00:00
|
|
|
* dump it to the syslog. Also call i915_capture_error_state() to make
|
|
|
|
* sure we get a record and make it available in debugfs. Fire a uevent
|
|
|
|
* so userspace knows something bad happened (should trigger collection
|
|
|
|
* of a ring dump etc.).
|
2016-06-03 13:02:17 +00:00
|
|
|
* @fmt: Error message format string
|
2010-05-27 12:18:12 +00:00
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
void i915_handle_error(struct drm_i915_private *dev_priv,
|
|
|
|
u32 engine_mask,
|
2014-02-25 15:11:26 +00:00
|
|
|
const char *fmt, ...)
|
2010-05-27 12:18:12 +00:00
|
|
|
{
|
2014-02-25 15:11:26 +00:00
|
|
|
va_list args;
|
|
|
|
char error_msg[80];
|
2010-05-27 12:18:12 +00:00
|
|
|
|
2014-02-25 15:11:26 +00:00
|
|
|
va_start(args, fmt);
|
|
|
|
vscnprintf(error_msg, sizeof(error_msg), fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_capture_error_state(dev_priv, engine_mask, error_msg);
|
|
|
|
i915_report_and_clear_eir(dev_priv);
|
2009-07-11 20:48:03 +00:00
|
|
|
|
2016-03-18 20:07:55 +00:00
|
|
|
if (engine_mask) {
|
2015-04-23 23:12:32 +00:00
|
|
|
atomic_or(I915_RESET_IN_PROGRESS_FLAG,
|
drm/i915: create a race-free reset detection
With the previous patch the state transition handling of the reset
code itself is now (hopefully) race free and solid. But that still
leaves out everyone else - with the various lock-free wait paths
we have there's the possibility that the reset happens between the
point where we read the seqno we should wait on and the actual wait.
And if __wait_seqno then never sees the RESET_IN_PROGRESS state, we'll
happily wait for a seqno which will in all likelyhood never signal.
In practice this is not a big problem since the X server gets
constantly interrupted, and can then submit more work (hopefully) to
unblock everyone else: As soon as a new seqno write lands, all waiters
will unblock. But running the i-g-t reset testcase ZZ_hangman can
expose this race, especially on slower hw with fewer cpu cores.
Now looking forward to ARB_robustness and friends that's not the best
possible behaviour, hence this patch adds a reset_counter to be able
to detect any reset, even if a given thread never observed the
in-progress state.
The important part is to correctly order things:
- The write side needs to increment the counter after any seqno gets
reset. Hence we need to do that at the end of the reset work, and
again wake everyone up. We also need to place a barrier in between
any possible seqno changes and the counter increment, since any
unlock operations only guarantee that nothing leaks out, but not
that at later load operation gets moved ahead.
- On the read side we need to ensure that no reset can sneak in and
invalidate the seqno. In all cases we can use the one-sided barrier
that unlock operations guarantee (of the lock protecting the
respective seqno/ring pair) to ensure correct ordering. Hence it is
sufficient to place the atomic read before the mutex/spin_unlock and
no additional barriers are required.
The end-result of all this is that we need to wake up everyone twice
in a reset operation:
- First, before the reset starts, to get any lockholders of the locks,
so that the reset can proceed.
- Second, after the reset is completed, to allow waiters to properly
and reliably detect the reset condition and bail out.
I admit that this entire reset_counter thing smells a bit like
overkill, but I think it's justified since it makes it really explicit
what the bail-out condition is. And we need a reset counter anyway to
implement ARB_robustness, and imo with finer-grained locking on the
horizont this is the most resilient scheme I could think of.
v2: Drop spurious change in the wait_for_error EXIT_COND - we only
need to wait until we leave the reset-in-progress wedged state.
v3: Don't play tricks with barriers in the throttle ioctl, the
spin_unlock is barrier enough.
I've also considered using a little helper to grab the current
reset_counter, but then decided that hiding the atomic_read isn't a
great idea, since having it explicitly show up in the code is a nice
remainder to reviews to check the memory barriers.
v4: Add a comment to explain why we need to fall through in
__wait_seqno in the end variable assignments.
v5: Review from Damien:
- s/smb/smp/ in a comment
- don't increment the reset counter after we've set it to WEDGED. Now
we (again) properly wedge the gpu when the reset fails.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-06 08:01:42 +00:00
|
|
|
&dev_priv->gpu_error.reset_counter);
|
2009-09-14 21:48:47 +00:00
|
|
|
|
2009-09-14 21:48:45 +00:00
|
|
|
/*
|
2015-01-28 15:03:14 +00:00
|
|
|
* Wakeup waiting processes so that the reset function
|
|
|
|
* i915_reset_and_wakeup doesn't deadlock trying to grab
|
|
|
|
* various locks. By bumping the reset counter first, the woken
|
2013-09-08 19:57:13 +00:00
|
|
|
* processes will see a reset in progress and back off,
|
|
|
|
* releasing their locks and then wait for the reset completion.
|
|
|
|
* We must do this for _all_ gpu waiters that might hold locks
|
|
|
|
* that the reset work needs to acquire.
|
|
|
|
*
|
|
|
|
* Note: The wake_up serves as the required memory barrier to
|
|
|
|
* ensure that the waiters see the updated value of the reset
|
|
|
|
* counter atomic_t.
|
2009-09-14 21:48:45 +00:00
|
|
|
*/
|
2016-07-01 16:23:14 +00:00
|
|
|
i915_error_wake_up(dev_priv);
|
2009-09-14 21:48:45 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_reset_and_wakeup(dev_priv);
|
2009-07-11 20:48:03 +00:00
|
|
|
}
|
|
|
|
|
2008-10-19 02:39:29 +00:00
|
|
|
/* Called from drm generic code, passed 'crtc' which
|
|
|
|
* we use as a pipe index
|
|
|
|
*/
|
2015-09-24 16:35:31 +00:00
|
|
|
static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
2008-09-30 19:14:26 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2008-10-16 18:31:38 +00:00
|
|
|
unsigned long irqflags;
|
2009-01-08 18:42:15 +00:00
|
|
|
|
2010-12-04 11:30:53 +00:00
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2011-04-07 20:58:17 +00:00
|
|
|
if (INTEL_INFO(dev)->gen >= 4)
|
2008-11-04 10:03:27 +00:00
|
|
|
i915_enable_pipestat(dev_priv, pipe,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_START_VBLANK_INTERRUPT_STATUS);
|
2008-10-16 18:31:38 +00:00
|
|
|
else
|
2008-11-04 10:03:27 +00:00
|
|
|
i915_enable_pipestat(dev_priv, pipe,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_VBLANK_INTERRUPT_STATUS);
|
2010-12-04 11:30:53 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
2011-02-05 10:08:21 +00:00
|
|
|
|
2008-09-30 19:14:26 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
2011-04-07 20:58:17 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2011-04-07 20:58:17 +00:00
|
|
|
unsigned long irqflags;
|
2013-07-12 23:00:08 +00:00
|
|
|
uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) :
|
2013-10-21 16:04:36 +00:00
|
|
|
DE_PIPE_VBLANK(pipe);
|
2011-04-07 20:58:17 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2015-11-23 16:06:16 +00:00
|
|
|
ilk_enable_display_irq(dev_priv, bit);
|
2011-04-06 19:13:38 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
2012-03-28 20:39:38 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2012-06-20 17:53:11 +00:00
|
|
|
i915_enable_pipestat(dev_priv, pipe,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_START_VBLANK_INTERRUPT_STATUS);
|
2012-03-28 20:39:38 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2015-11-23 16:06:17 +00:00
|
|
|
bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
2015-11-23 16:06:17 +00:00
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-10-19 02:39:29 +00:00
|
|
|
/* Called from drm generic code, passed 'crtc' which
|
|
|
|
* we use as a pipe index
|
|
|
|
*/
|
2015-09-24 16:35:31 +00:00
|
|
|
static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
2008-09-30 19:14:26 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2008-10-16 18:31:38 +00:00
|
|
|
unsigned long irqflags;
|
2008-09-30 19:14:26 +00:00
|
|
|
|
2010-12-04 11:30:53 +00:00
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2011-04-07 20:58:17 +00:00
|
|
|
i915_disable_pipestat(dev_priv, pipe,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_VBLANK_INTERRUPT_STATUS |
|
|
|
|
PIPE_START_VBLANK_INTERRUPT_STATUS);
|
2011-04-07 20:58:17 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
2011-04-07 20:58:17 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2011-04-07 20:58:17 +00:00
|
|
|
unsigned long irqflags;
|
2013-07-12 23:00:08 +00:00
|
|
|
uint32_t bit = (INTEL_INFO(dev)->gen >= 7) ? DE_PIPE_VBLANK_IVB(pipe) :
|
2013-10-21 16:04:36 +00:00
|
|
|
DE_PIPE_VBLANK(pipe);
|
2011-04-07 20:58:17 +00:00
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2015-11-23 16:06:16 +00:00
|
|
|
ilk_disable_display_irq(dev_priv, bit);
|
2011-04-06 19:13:38 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
2012-03-28 20:39:38 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2012-06-20 17:53:11 +00:00
|
|
|
i915_disable_pipestat(dev_priv, pipe,
|
2014-02-10 16:42:47 +00:00
|
|
|
PIPE_START_VBLANK_INTERRUPT_STATUS);
|
2012-03-28 20:39:38 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
2015-09-24 16:35:31 +00:00
|
|
|
static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
unsigned long irqflags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
2015-11-23 16:06:17 +00:00
|
|
|
bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
|
|
|
}
|
|
|
|
|
2013-06-10 10:20:20 +00:00
|
|
|
static bool
|
2016-03-16 11:00:37 +00:00
|
|
|
ring_idle(struct intel_engine_cs *engine, u32 seqno)
|
2013-06-10 10:20:20 +00:00
|
|
|
{
|
2016-04-07 06:29:18 +00:00
|
|
|
return i915_seqno_passed(seqno,
|
|
|
|
READ_ONCE(engine->last_submitted_seqno));
|
2009-09-14 21:48:44 +00:00
|
|
|
}
|
|
|
|
|
2014-03-14 23:08:56 +00:00
|
|
|
static bool
|
2016-07-01 16:23:27 +00:00
|
|
|
ipehr_is_semaphore_wait(struct intel_engine_cs *engine, u32 ipehr)
|
2014-03-14 23:08:56 +00:00
|
|
|
{
|
2016-07-01 16:23:27 +00:00
|
|
|
if (INTEL_GEN(engine->i915) >= 8) {
|
2014-06-30 16:53:39 +00:00
|
|
|
return (ipehr >> 23) == 0x1c;
|
2014-03-14 23:08:56 +00:00
|
|
|
} else {
|
|
|
|
ipehr &= ~MI_SEMAPHORE_SYNC_MASK;
|
|
|
|
return ipehr == (MI_SEMAPHORE_MBOX | MI_SEMAPHORE_COMPARE |
|
|
|
|
MI_SEMAPHORE_REGISTER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-22 13:13:33 +00:00
|
|
|
static struct intel_engine_cs *
|
2016-03-16 11:00:37 +00:00
|
|
|
semaphore_wait_to_signaller_ring(struct intel_engine_cs *engine, u32 ipehr,
|
|
|
|
u64 offset)
|
2014-03-18 09:26:04 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-05-22 13:13:33 +00:00
|
|
|
struct intel_engine_cs *signaller;
|
2014-03-18 09:26:04 +00:00
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 8) {
|
2016-03-24 11:20:38 +00:00
|
|
|
for_each_engine(signaller, dev_priv) {
|
2016-03-16 11:00:37 +00:00
|
|
|
if (engine == signaller)
|
2014-06-30 16:53:39 +00:00
|
|
|
continue;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (offset == signaller->semaphore.signal_ggtt[engine->id])
|
2014-06-30 16:53:39 +00:00
|
|
|
return signaller;
|
|
|
|
}
|
2014-03-18 09:26:04 +00:00
|
|
|
} else {
|
|
|
|
u32 sync_bits = ipehr & MI_SEMAPHORE_SYNC_MASK;
|
|
|
|
|
2016-03-24 11:20:38 +00:00
|
|
|
for_each_engine(signaller, dev_priv) {
|
2016-03-16 11:00:37 +00:00
|
|
|
if(engine == signaller)
|
2014-03-18 09:26:04 +00:00
|
|
|
continue;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (sync_bits == signaller->semaphore.mbox.wait[engine->id])
|
2014-03-18 09:26:04 +00:00
|
|
|
return signaller;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-30 16:53:39 +00:00
|
|
|
DRM_ERROR("No signaller ring found for ring %i, ipehr 0x%08x, offset 0x%016llx\n",
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->id, ipehr, offset);
|
2014-03-18 09:26:04 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-05-22 13:13:33 +00:00
|
|
|
static struct intel_engine_cs *
|
2016-03-16 11:00:37 +00:00
|
|
|
semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
|
2013-03-14 15:52:05 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-07-20 12:31:55 +00:00
|
|
|
void __iomem *vaddr;
|
2014-03-14 23:08:55 +00:00
|
|
|
u32 cmd, ipehr, head;
|
2014-06-30 16:53:39 +00:00
|
|
|
u64 offset = 0;
|
|
|
|
int i, backwards;
|
2013-03-14 15:52:05 +00:00
|
|
|
|
2015-10-08 18:31:33 +00:00
|
|
|
/*
|
|
|
|
* This function does not support execlist mode - any attempt to
|
|
|
|
* proceed further into this function will result in a kernel panic
|
|
|
|
* when dereferencing ring->buffer, which is not set up in execlist
|
|
|
|
* mode.
|
|
|
|
*
|
|
|
|
* The correct way of doing it would be to derive the currently
|
|
|
|
* executing ring buffer from the current context, which is derived
|
|
|
|
* from the currently running request. Unfortunately, to get the
|
|
|
|
* current request we would have to grab the struct_mutex before doing
|
|
|
|
* anything else, which would be ill-advised since some other thread
|
|
|
|
* might have grabbed it already and managed to hang itself, causing
|
|
|
|
* the hang checker to deadlock.
|
|
|
|
*
|
|
|
|
* Therefore, this function does not support execlist mode in its
|
|
|
|
* current form. Just return NULL and move on.
|
|
|
|
*/
|
2016-03-16 11:00:37 +00:00
|
|
|
if (engine->buffer == NULL)
|
2015-10-08 18:31:33 +00:00
|
|
|
return NULL;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
ipehr = I915_READ(RING_IPEHR(engine->mmio_base));
|
2016-07-01 16:23:27 +00:00
|
|
|
if (!ipehr_is_semaphore_wait(engine, ipehr))
|
2013-06-10 10:20:21 +00:00
|
|
|
return NULL;
|
2013-03-14 15:52:05 +00:00
|
|
|
|
2014-03-14 23:08:55 +00:00
|
|
|
/*
|
|
|
|
* HEAD is likely pointing to the dword after the actual command,
|
|
|
|
* so scan backwards until we find the MBOX. But limit it to just 3
|
2014-06-30 16:53:39 +00:00
|
|
|
* or 4 dwords depending on the semaphore wait command size.
|
|
|
|
* Note that we don't care about ACTHD here since that might
|
2014-03-14 23:08:55 +00:00
|
|
|
* point at at batch, and semaphores are always emitted into the
|
|
|
|
* ringbuffer itself.
|
2013-03-14 15:52:05 +00:00
|
|
|
*/
|
2016-03-16 11:00:37 +00:00
|
|
|
head = I915_READ_HEAD(engine) & HEAD_ADDR;
|
2016-05-06 14:40:21 +00:00
|
|
|
backwards = (INTEL_GEN(dev_priv) >= 8) ? 5 : 4;
|
2016-07-20 12:31:56 +00:00
|
|
|
vaddr = (void __iomem *)engine->buffer->vaddr;
|
2014-03-14 23:08:55 +00:00
|
|
|
|
2014-06-30 16:53:39 +00:00
|
|
|
for (i = backwards; i; --i) {
|
2014-03-14 23:08:55 +00:00
|
|
|
/*
|
|
|
|
* Be paranoid and presume the hw has gone off into the wild -
|
|
|
|
* our ring is smaller than what the hardware (and hence
|
|
|
|
* HEAD_ADDR) allows. Also handles wrap-around.
|
|
|
|
*/
|
2016-03-16 11:00:37 +00:00
|
|
|
head &= engine->buffer->size - 1;
|
2014-03-14 23:08:55 +00:00
|
|
|
|
|
|
|
/* This here seems to blow up */
|
2016-07-20 12:31:55 +00:00
|
|
|
cmd = ioread32(vaddr + head);
|
2013-03-14 15:52:05 +00:00
|
|
|
if (cmd == ipehr)
|
|
|
|
break;
|
|
|
|
|
2014-03-14 23:08:55 +00:00
|
|
|
head -= 4;
|
|
|
|
}
|
2013-03-14 15:52:05 +00:00
|
|
|
|
2014-03-14 23:08:55 +00:00
|
|
|
if (!i)
|
|
|
|
return NULL;
|
2013-03-14 15:52:05 +00:00
|
|
|
|
2016-07-20 12:31:55 +00:00
|
|
|
*seqno = ioread32(vaddr + head + 4) + 1;
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 8) {
|
2016-07-20 12:31:55 +00:00
|
|
|
offset = ioread32(vaddr + head + 12);
|
2014-06-30 16:53:39 +00:00
|
|
|
offset <<= 32;
|
2016-07-20 12:31:55 +00:00
|
|
|
offset |= ioread32(vaddr + head + 8);
|
2014-06-30 16:53:39 +00:00
|
|
|
}
|
2016-03-16 11:00:37 +00:00
|
|
|
return semaphore_wait_to_signaller_ring(engine, ipehr, offset);
|
2013-03-14 15:52:05 +00:00
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static int semaphore_passed(struct intel_engine_cs *engine)
|
2013-06-10 10:20:21 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-05-22 13:13:33 +00:00
|
|
|
struct intel_engine_cs *signaller;
|
2014-07-19 11:40:42 +00:00
|
|
|
u32 seqno;
|
2013-06-10 10:20:21 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->hangcheck.deadlock++;
|
2013-06-10 10:20:21 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
signaller = semaphore_waits_for(engine, &seqno);
|
2014-06-06 09:22:29 +00:00
|
|
|
if (signaller == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Prevent pathological recursion due to driver bugs */
|
2016-03-16 11:00:39 +00:00
|
|
|
if (signaller->hangcheck.deadlock >= I915_NUM_ENGINES)
|
2013-06-10 10:20:21 +00:00
|
|
|
return -1;
|
|
|
|
|
2016-07-01 16:23:17 +00:00
|
|
|
if (i915_seqno_passed(intel_engine_get_seqno(signaller), seqno))
|
2014-06-06 09:22:29 +00:00
|
|
|
return 1;
|
|
|
|
|
2014-07-19 11:40:42 +00:00
|
|
|
/* cursory check for an unkickable deadlock */
|
|
|
|
if (I915_READ_CTL(signaller) & RING_WAIT_SEMAPHORE &&
|
|
|
|
semaphore_passed(signaller) < 0)
|
2014-06-06 09:22:29 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
2013-06-10 10:20:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void semaphore_clear_deadlocks(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
2016-03-16 11:00:36 +00:00
|
|
|
struct intel_engine_cs *engine;
|
2013-06-10 10:20:21 +00:00
|
|
|
|
2016-03-24 11:20:38 +00:00
|
|
|
for_each_engine(engine, dev_priv)
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.deadlock = 0;
|
2013-06-10 10:20:21 +00:00
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static bool subunits_stuck(struct intel_engine_cs *engine)
|
2010-12-04 11:30:53 +00:00
|
|
|
{
|
2015-12-01 15:56:12 +00:00
|
|
|
u32 instdone[I915_NUM_INSTDONE_REG];
|
|
|
|
bool stuck;
|
|
|
|
int i;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (engine->id != RCS)
|
2015-12-01 15:56:12 +00:00
|
|
|
return true;
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_get_extra_instdone(engine->i915, instdone);
|
2013-06-10 10:20:20 +00:00
|
|
|
|
2015-12-01 15:56:12 +00:00
|
|
|
/* There might be unstable subunit states even when
|
|
|
|
* actual head is not moving. Filter out the unstable ones by
|
|
|
|
* accumulating the undone -> done transitions and only
|
|
|
|
* consider those as progress.
|
|
|
|
*/
|
|
|
|
stuck = true;
|
|
|
|
for (i = 0; i < I915_NUM_INSTDONE_REG; i++) {
|
2016-03-16 11:00:37 +00:00
|
|
|
const u32 tmp = instdone[i] | engine->hangcheck.instdone[i];
|
2015-12-01 15:56:12 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (tmp != engine->hangcheck.instdone[i])
|
2015-12-01 15:56:12 +00:00
|
|
|
stuck = false;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->hangcheck.instdone[i] |= tmp;
|
2015-12-01 15:56:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return stuck;
|
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:21 +00:00
|
|
|
static enum intel_engine_hangcheck_action
|
2016-03-16 11:00:37 +00:00
|
|
|
head_stuck(struct intel_engine_cs *engine, u64 acthd)
|
2015-12-01 15:56:12 +00:00
|
|
|
{
|
2016-03-16 11:00:37 +00:00
|
|
|
if (acthd != engine->hangcheck.acthd) {
|
2015-12-01 15:56:12 +00:00
|
|
|
|
|
|
|
/* Clear subunit states on head movement */
|
2016-03-16 11:00:37 +00:00
|
|
|
memset(engine->hangcheck.instdone, 0,
|
|
|
|
sizeof(engine->hangcheck.instdone));
|
2015-12-01 15:56:12 +00:00
|
|
|
|
2016-03-02 14:48:29 +00:00
|
|
|
return HANGCHECK_ACTIVE;
|
2014-08-05 14:16:26 +00:00
|
|
|
}
|
2013-06-10 10:20:21 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (!subunits_stuck(engine))
|
2015-12-01 15:56:12 +00:00
|
|
|
return HANGCHECK_ACTIVE;
|
|
|
|
|
|
|
|
return HANGCHECK_HUNG;
|
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:21 +00:00
|
|
|
static enum intel_engine_hangcheck_action
|
|
|
|
engine_stuck(struct intel_engine_cs *engine, u64 acthd)
|
2015-12-01 15:56:12 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-08-02 21:50:21 +00:00
|
|
|
enum intel_engine_hangcheck_action ha;
|
2015-12-01 15:56:12 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
ha = head_stuck(engine, acthd);
|
2015-12-01 15:56:12 +00:00
|
|
|
if (ha != HANGCHECK_HUNG)
|
|
|
|
return ha;
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (IS_GEN2(dev_priv))
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_HUNG;
|
2013-06-10 10:20:20 +00:00
|
|
|
|
|
|
|
/* Is the chip hanging on a WAIT_FOR_EVENT?
|
|
|
|
* If so we can simply poke the RB_WAIT bit
|
|
|
|
* and break the hang. This should work on
|
|
|
|
* all but the second generation chipsets.
|
|
|
|
*/
|
2016-03-16 11:00:37 +00:00
|
|
|
tmp = I915_READ_CTL(engine);
|
2010-12-04 11:30:53 +00:00
|
|
|
if (tmp & RING_WAIT) {
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_handle_error(dev_priv, 0,
|
2014-02-25 15:11:26 +00:00
|
|
|
"Kicking stuck wait on %s",
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->name);
|
|
|
|
I915_WRITE_CTL(engine, tmp);
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_KICK;
|
2013-06-10 10:20:21 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6 && tmp & RING_WAIT_SEMAPHORE) {
|
2016-03-16 11:00:37 +00:00
|
|
|
switch (semaphore_passed(engine)) {
|
2013-06-10 10:20:21 +00:00
|
|
|
default:
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_HUNG;
|
2013-06-10 10:20:21 +00:00
|
|
|
case 1:
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_handle_error(dev_priv, 0,
|
2014-02-25 15:11:26 +00:00
|
|
|
"Kicking stuck semaphore on %s",
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->name);
|
|
|
|
I915_WRITE_CTL(engine, tmp);
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_KICK;
|
2013-06-10 10:20:21 +00:00
|
|
|
case 0:
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_WAIT;
|
2013-06-10 10:20:21 +00:00
|
|
|
}
|
2013-06-10 10:20:20 +00:00
|
|
|
}
|
2013-05-13 13:32:11 +00:00
|
|
|
|
2013-08-11 09:44:01 +00:00
|
|
|
return HANGCHECK_HUNG;
|
2013-05-13 13:32:11 +00:00
|
|
|
}
|
|
|
|
|
2016-07-06 11:39:02 +00:00
|
|
|
static unsigned long kick_waiters(struct intel_engine_cs *engine)
|
2016-04-09 09:57:55 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *i915 = engine->i915;
|
2016-07-06 11:39:02 +00:00
|
|
|
unsigned long irq_count = READ_ONCE(engine->breadcrumbs.irq_wakeups);
|
2016-04-09 09:57:55 +00:00
|
|
|
|
2016-07-06 11:39:02 +00:00
|
|
|
if (engine->hangcheck.user_interrupts == irq_count &&
|
2016-04-09 09:57:55 +00:00
|
|
|
!test_and_set_bit(engine->id, &i915->gpu_error.missed_irq_rings)) {
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
if (!test_bit(engine->id, &i915->gpu_error.test_irq_rings))
|
2016-04-09 09:57:55 +00:00
|
|
|
DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
|
|
|
|
engine->name);
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
|
|
|
|
intel_engine_enable_fake_irq(engine);
|
2016-04-09 09:57:55 +00:00
|
|
|
}
|
|
|
|
|
2016-07-06 11:39:02 +00:00
|
|
|
return irq_count;
|
2016-04-09 09:57:55 +00:00
|
|
|
}
|
2015-01-26 16:03:03 +00:00
|
|
|
/*
|
2009-09-14 21:48:44 +00:00
|
|
|
* This is called when the chip hasn't reported back with completed
|
2013-05-30 06:04:29 +00:00
|
|
|
* batchbuffers in a long time. We keep track per ring seqno progress and
|
|
|
|
* if there are no progress, hangcheck score for that ring is increased.
|
|
|
|
* Further, acthd is inspected to see if the ring is stuck. On stuck case
|
|
|
|
* we kick the ring. If we see no progress on three subsequent calls
|
|
|
|
* we assume chip is wedged and try to fix it by resetting the chip.
|
2009-09-14 21:48:44 +00:00
|
|
|
*/
|
2015-01-26 16:03:03 +00:00
|
|
|
static void i915_hangcheck_elapsed(struct work_struct *work)
|
2009-09-14 21:48:44 +00:00
|
|
|
{
|
2015-01-26 16:03:03 +00:00
|
|
|
struct drm_i915_private *dev_priv =
|
|
|
|
container_of(work, typeof(*dev_priv),
|
|
|
|
gpu_error.hangcheck_work.work);
|
2016-03-16 11:00:36 +00:00
|
|
|
struct intel_engine_cs *engine;
|
2016-07-04 07:48:32 +00:00
|
|
|
unsigned int hung = 0, stuck = 0;
|
|
|
|
int busy_count = 0;
|
2013-06-10 10:20:20 +00:00
|
|
|
#define BUSY 1
|
|
|
|
#define KICK 5
|
|
|
|
#define HUNG 20
|
2016-03-02 14:48:29 +00:00
|
|
|
#define ACTIVE_DECAY 15
|
2010-10-27 13:44:35 +00:00
|
|
|
|
2014-01-21 09:24:25 +00:00
|
|
|
if (!i915.enable_hangcheck)
|
2011-06-29 17:26:42 +00:00
|
|
|
return;
|
|
|
|
|
2016-07-05 07:54:36 +00:00
|
|
|
if (!READ_ONCE(dev_priv->gt.awake))
|
2016-07-04 07:08:31 +00:00
|
|
|
return;
|
2015-12-16 00:52:19 +00:00
|
|
|
|
2015-12-16 07:26:48 +00:00
|
|
|
/* As enabling the GPU requires fairly extensive mmio access,
|
|
|
|
* periodically arm the mmio checker to see if we are triggering
|
|
|
|
* any invalid access.
|
|
|
|
*/
|
|
|
|
intel_uncore_arm_unclaimed_mmio_detection(dev_priv);
|
|
|
|
|
2016-07-04 07:48:32 +00:00
|
|
|
for_each_engine(engine, dev_priv) {
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-01 16:23:15 +00:00
|
|
|
bool busy = intel_engine_has_waiter(engine);
|
2014-03-21 12:41:53 +00:00
|
|
|
u64 acthd;
|
|
|
|
u32 seqno;
|
2016-04-09 09:57:55 +00:00
|
|
|
unsigned user_interrupts;
|
2013-05-30 06:04:29 +00:00
|
|
|
|
2013-06-10 10:20:21 +00:00
|
|
|
semaphore_clear_deadlocks(dev_priv);
|
|
|
|
|
2016-04-09 09:57:54 +00:00
|
|
|
/* We don't strictly need an irq-barrier here, as we are not
|
|
|
|
* serving an interrupt request, be paranoid in case the
|
|
|
|
* barrier has side-effects (such as preventing a broken
|
|
|
|
* cacheline snoop) and so be sure that we can see the seqno
|
|
|
|
* advance. If the seqno should stick, due to a stale
|
|
|
|
* cacheline, we would erroneously declare the GPU hung.
|
|
|
|
*/
|
|
|
|
if (engine->irq_seqno_barrier)
|
|
|
|
engine->irq_seqno_barrier(engine);
|
|
|
|
|
2016-08-02 21:50:21 +00:00
|
|
|
acthd = intel_engine_get_active_head(engine);
|
2016-07-01 16:23:17 +00:00
|
|
|
seqno = intel_engine_get_seqno(engine);
|
2012-05-11 13:29:30 +00:00
|
|
|
|
2016-04-09 09:57:55 +00:00
|
|
|
/* Reset stuck interrupts between batch advances */
|
|
|
|
user_interrupts = 0;
|
|
|
|
|
2016-03-16 11:00:36 +00:00
|
|
|
if (engine->hangcheck.seqno == seqno) {
|
|
|
|
if (ring_idle(engine, seqno)) {
|
|
|
|
engine->hangcheck.action = HANGCHECK_IDLE;
|
2016-07-01 16:23:11 +00:00
|
|
|
if (busy) {
|
2013-09-25 16:34:55 +00:00
|
|
|
/* Safeguard against driver failure */
|
2016-04-09 09:57:55 +00:00
|
|
|
user_interrupts = kick_waiters(engine);
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.score += BUSY;
|
2016-07-01 16:23:11 +00:00
|
|
|
}
|
2013-05-30 06:04:29 +00:00
|
|
|
} else {
|
2013-06-10 10:20:21 +00:00
|
|
|
/* We always increment the hangcheck score
|
2016-07-27 08:07:30 +00:00
|
|
|
* if the engine is busy and still processing
|
2013-06-10 10:20:21 +00:00
|
|
|
* the same request, so that no single request
|
|
|
|
* can run indefinitely (such as a chain of
|
|
|
|
* batches). The only time we do not increment
|
|
|
|
* the hangcheck score on this ring, if this
|
2016-07-27 08:07:30 +00:00
|
|
|
* engine is in a legitimate wait for another
|
|
|
|
* engine. In that case the waiting engine is a
|
2013-06-10 10:20:21 +00:00
|
|
|
* victim and we want to be sure we catch the
|
|
|
|
* right culprit. Then every time we do kick
|
|
|
|
* the ring, add a small increment to the
|
|
|
|
* score so that we can catch a batch that is
|
|
|
|
* being repeatedly kicked and so responsible
|
|
|
|
* for stalling the machine.
|
|
|
|
*/
|
2016-08-02 21:50:21 +00:00
|
|
|
engine->hangcheck.action =
|
|
|
|
engine_stuck(engine, acthd);
|
2013-06-12 09:35:32 +00:00
|
|
|
|
2016-03-16 11:00:36 +00:00
|
|
|
switch (engine->hangcheck.action) {
|
2013-09-06 13:03:28 +00:00
|
|
|
case HANGCHECK_IDLE:
|
2013-08-11 09:44:01 +00:00
|
|
|
case HANGCHECK_WAIT:
|
2014-08-05 14:16:26 +00:00
|
|
|
break;
|
2016-03-02 14:48:29 +00:00
|
|
|
case HANGCHECK_ACTIVE:
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.score += BUSY;
|
2013-06-10 10:20:21 +00:00
|
|
|
break;
|
2013-08-11 09:44:01 +00:00
|
|
|
case HANGCHECK_KICK:
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.score += KICK;
|
2013-06-10 10:20:21 +00:00
|
|
|
break;
|
2013-08-11 09:44:01 +00:00
|
|
|
case HANGCHECK_HUNG:
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.score += HUNG;
|
2013-06-10 10:20:21 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-05-30 06:04:29 +00:00
|
|
|
}
|
2016-07-04 07:48:32 +00:00
|
|
|
|
|
|
|
if (engine->hangcheck.score >= HANGCHECK_SCORE_RING_HUNG) {
|
|
|
|
hung |= intel_engine_flag(engine);
|
|
|
|
if (engine->hangcheck.action != HANGCHECK_HUNG)
|
|
|
|
stuck |= intel_engine_flag(engine);
|
|
|
|
}
|
2013-06-10 10:20:20 +00:00
|
|
|
} else {
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.action = HANGCHECK_ACTIVE;
|
2013-09-06 13:03:28 +00:00
|
|
|
|
2013-06-10 10:20:20 +00:00
|
|
|
/* Gradually reduce the count so that we catch DoS
|
|
|
|
* attempts across multiple batches.
|
|
|
|
*/
|
2016-03-16 11:00:36 +00:00
|
|
|
if (engine->hangcheck.score > 0)
|
|
|
|
engine->hangcheck.score -= ACTIVE_DECAY;
|
|
|
|
if (engine->hangcheck.score < 0)
|
|
|
|
engine->hangcheck.score = 0;
|
2014-08-05 14:16:26 +00:00
|
|
|
|
2015-12-01 15:56:12 +00:00
|
|
|
/* Clear head and subunit states on seqno movement */
|
2016-04-09 09:57:55 +00:00
|
|
|
acthd = 0;
|
2015-12-01 15:56:12 +00:00
|
|
|
|
2016-03-16 11:00:36 +00:00
|
|
|
memset(engine->hangcheck.instdone, 0,
|
|
|
|
sizeof(engine->hangcheck.instdone));
|
2012-04-10 16:00:41 +00:00
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:36 +00:00
|
|
|
engine->hangcheck.seqno = seqno;
|
|
|
|
engine->hangcheck.acthd = acthd;
|
2016-04-09 09:57:55 +00:00
|
|
|
engine->hangcheck.user_interrupts = user_interrupts;
|
2013-06-10 10:20:20 +00:00
|
|
|
busy_count += busy;
|
2010-10-27 13:44:35 +00:00
|
|
|
}
|
2010-01-08 22:25:16 +00:00
|
|
|
|
2016-07-04 07:48:32 +00:00
|
|
|
if (hung) {
|
|
|
|
char msg[80];
|
|
|
|
int len;
|
2013-05-24 14:16:07 +00:00
|
|
|
|
2016-07-04 07:48:32 +00:00
|
|
|
/* If some rings hung but others were still busy, only
|
|
|
|
* blame the hanging rings in the synopsis.
|
|
|
|
*/
|
|
|
|
if (stuck != hung)
|
|
|
|
hung &= ~stuck;
|
|
|
|
len = scnprintf(msg, sizeof(msg),
|
|
|
|
"%s on ", stuck == hung ? "No progress" : "Hang");
|
|
|
|
for_each_engine_masked(engine, dev_priv, hung)
|
|
|
|
len += scnprintf(msg + len, sizeof(msg) - len,
|
|
|
|
"%s, ", engine->name);
|
|
|
|
msg[len-2] = '\0';
|
|
|
|
|
|
|
|
return i915_handle_error(dev_priv, hung, msg);
|
|
|
|
}
|
2009-09-14 21:48:44 +00:00
|
|
|
|
2016-07-01 16:23:11 +00:00
|
|
|
/* Reset timer in case GPU hangs without another request being added */
|
2013-05-30 06:04:29 +00:00
|
|
|
if (busy_count)
|
2016-05-06 14:40:21 +00:00
|
|
|
i915_queue_hangcheck(dev_priv);
|
2013-07-03 14:22:08 +00:00
|
|
|
}
|
|
|
|
|
2014-04-01 18:37:23 +00:00
|
|
|
static void ibx_irq_reset(struct drm_device *dev)
|
2013-06-05 17:21:51 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-06-05 17:21:51 +00:00
|
|
|
|
|
|
|
if (HAS_PCH_NOP(dev))
|
|
|
|
return;
|
|
|
|
|
2014-04-01 18:37:14 +00:00
|
|
|
GEN5_IRQ_RESET(SDE);
|
2014-04-01 18:37:17 +00:00
|
|
|
|
|
|
|
if (HAS_PCH_CPT(dev) || HAS_PCH_LPT(dev))
|
|
|
|
I915_WRITE(SERR_INT, 0xffffffff);
|
2014-04-01 18:37:22 +00:00
|
|
|
}
|
2014-04-01 18:37:17 +00:00
|
|
|
|
2014-04-01 18:37:22 +00:00
|
|
|
/*
|
|
|
|
* SDEIER is also touched by the interrupt handler to work around missed PCH
|
|
|
|
* interrupts. Hence we can't update it after the interrupt handler is enabled -
|
|
|
|
* instead we unconditionally enable all PCH interrupt sources here, but then
|
|
|
|
* only unmask them as needed with SDEIMR.
|
|
|
|
*
|
|
|
|
* This function needs to be called before interrupts are enabled.
|
|
|
|
*/
|
|
|
|
static void ibx_irq_pre_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-04-01 18:37:22 +00:00
|
|
|
|
|
|
|
if (HAS_PCH_NOP(dev))
|
|
|
|
return;
|
|
|
|
|
|
|
|
WARN_ON(I915_READ(SDEIER) != 0);
|
2013-06-05 17:21:51 +00:00
|
|
|
I915_WRITE(SDEIER, 0xffffffff);
|
|
|
|
POSTING_READ(SDEIER);
|
|
|
|
}
|
|
|
|
|
2014-04-01 18:37:19 +00:00
|
|
|
static void gen5_gt_irq_reset(struct drm_device *dev)
|
2013-07-12 20:43:25 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-07-12 20:43:25 +00:00
|
|
|
|
2014-04-01 18:37:14 +00:00
|
|
|
GEN5_IRQ_RESET(GT);
|
2014-04-01 18:37:09 +00:00
|
|
|
if (INTEL_INFO(dev)->gen >= 6)
|
2014-04-01 18:37:14 +00:00
|
|
|
GEN5_IRQ_RESET(GEN6_PM);
|
2013-07-12 20:43:25 +00:00
|
|
|
}
|
|
|
|
|
2014-10-30 17:42:58 +00:00
|
|
|
static void vlv_display_irq_reset(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
enum pipe pipe;
|
|
|
|
|
2016-04-11 13:56:31 +00:00
|
|
|
if (IS_CHERRYVIEW(dev_priv))
|
|
|
|
I915_WRITE(DPINVGTT, DPINVGTT_STATUS_MASK_CHV);
|
|
|
|
else
|
|
|
|
I915_WRITE(DPINVGTT, DPINVGTT_STATUS_MASK);
|
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
i915_hotplug_interrupt_update_locked(dev_priv, 0xffffffff, 0);
|
2014-10-30 17:42:58 +00:00
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
|
|
|
I915_WRITE(PIPESTAT(pipe),
|
|
|
|
PIPE_FIFO_UNDERRUN_STATUS |
|
|
|
|
PIPESTAT_INT_STATUS_MASK);
|
|
|
|
dev_priv->pipestat_irq_mask[pipe] = 0;
|
|
|
|
}
|
2014-10-30 17:42:58 +00:00
|
|
|
|
|
|
|
GEN5_IRQ_RESET(VLV_);
|
2016-04-12 15:56:14 +00:00
|
|
|
dev_priv->irq_mask = ~0;
|
2014-10-30 17:42:58 +00:00
|
|
|
}
|
|
|
|
|
2016-04-12 15:56:44 +00:00
|
|
|
static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
u32 pipestat_mask;
|
2016-04-11 13:56:28 +00:00
|
|
|
u32 enable_mask;
|
2016-04-12 15:56:44 +00:00
|
|
|
enum pipe pipe;
|
|
|
|
|
|
|
|
pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
|
|
|
|
PIPE_CRC_DONE_INTERRUPT_STATUS;
|
|
|
|
|
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
|
|
|
|
for_each_pipe(dev_priv, pipe)
|
|
|
|
i915_enable_pipestat(dev_priv, pipe, pipestat_mask);
|
|
|
|
|
2016-04-11 13:56:28 +00:00
|
|
|
enable_mask = I915_DISPLAY_PORT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
|
2016-04-12 15:56:44 +00:00
|
|
|
if (IS_CHERRYVIEW(dev_priv))
|
2016-04-11 13:56:28 +00:00
|
|
|
enable_mask |= I915_DISPLAY_PIPE_C_EVENT_INTERRUPT;
|
2016-04-11 13:56:29 +00:00
|
|
|
|
|
|
|
WARN_ON(dev_priv->irq_mask != ~0);
|
|
|
|
|
2016-04-11 13:56:28 +00:00
|
|
|
dev_priv->irq_mask = ~enable_mask;
|
|
|
|
|
|
|
|
GEN5_IRQ_INIT(VLV_, dev_priv->irq_mask, enable_mask);
|
2016-04-12 15:56:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* drm_dma.h hooks
|
|
|
|
*/
|
|
|
|
static void ironlake_irq_reset(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2016-04-12 15:56:44 +00:00
|
|
|
|
|
|
|
I915_WRITE(HWSTAM, 0xffffffff);
|
|
|
|
|
|
|
|
GEN5_IRQ_RESET(DE);
|
|
|
|
if (IS_GEN7(dev))
|
|
|
|
I915_WRITE(GEN7_ERR_INT, 0xffffffff);
|
|
|
|
|
|
|
|
gen5_gt_irq_reset(dev);
|
|
|
|
|
|
|
|
ibx_irq_reset(dev);
|
|
|
|
}
|
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
static void valleyview_irq_preinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
2016-04-13 18:19:48 +00:00
|
|
|
I915_WRITE(VLV_MASTER_IER, 0);
|
|
|
|
POSTING_READ(VLV_MASTER_IER);
|
|
|
|
|
2014-04-01 18:37:19 +00:00
|
|
|
gen5_gt_irq_reset(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_reset(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2012-03-28 20:39:38 +00:00
|
|
|
}
|
|
|
|
|
2014-05-22 20:18:22 +00:00
|
|
|
static void gen8_gt_irq_reset(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
GEN8_IRQ_RESET_NDX(GT, 0);
|
|
|
|
GEN8_IRQ_RESET_NDX(GT, 1);
|
|
|
|
GEN8_IRQ_RESET_NDX(GT, 2);
|
|
|
|
GEN8_IRQ_RESET_NDX(GT, 3);
|
|
|
|
}
|
|
|
|
|
2014-04-01 18:37:26 +00:00
|
|
|
static void gen8_irq_reset(struct drm_device *dev)
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
int pipe;
|
|
|
|
|
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, 0);
|
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
|
|
|
|
2014-05-22 20:18:22 +00:00
|
|
|
gen8_gt_irq_reset(dev_priv);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2014-09-30 08:56:39 +00:00
|
|
|
if (intel_display_power_is_enabled(dev_priv,
|
|
|
|
POWER_DOMAIN_PIPE(pipe)))
|
2014-07-04 14:50:29 +00:00
|
|
|
GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2014-04-01 18:37:14 +00:00
|
|
|
GEN5_IRQ_RESET(GEN8_DE_PORT_);
|
|
|
|
GEN5_IRQ_RESET(GEN8_DE_MISC_);
|
|
|
|
GEN5_IRQ_RESET(GEN8_PCU_);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2014-08-22 12:10:42 +00:00
|
|
|
if (HAS_PCH_SPLIT(dev))
|
|
|
|
ibx_irq_reset(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
2014-01-10 21:13:09 +00:00
|
|
|
|
2015-03-06 18:50:48 +00:00
|
|
|
void gen8_irq_power_well_post_enable(struct drm_i915_private *dev_priv,
|
|
|
|
unsigned int pipe_mask)
|
2014-07-04 14:50:31 +00:00
|
|
|
{
|
2014-10-07 21:02:52 +00:00
|
|
|
uint32_t extra_ier = GEN8_PIPE_VBLANK | GEN8_PIPE_FIFO_UNDERRUN;
|
2016-02-19 18:47:31 +00:00
|
|
|
enum pipe pipe;
|
2014-07-04 14:50:31 +00:00
|
|
|
|
2014-09-15 12:55:29 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-02-19 18:47:31 +00:00
|
|
|
for_each_pipe_masked(dev_priv, pipe, pipe_mask)
|
|
|
|
GEN8_IRQ_INIT_NDX(DE_PIPE, pipe,
|
|
|
|
dev_priv->de_irq_mask[pipe],
|
|
|
|
~dev_priv->de_irq_mask[pipe] | extra_ier);
|
2014-09-15 12:55:29 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2014-07-04 14:50:31 +00:00
|
|
|
}
|
|
|
|
|
2016-02-19 18:47:30 +00:00
|
|
|
void gen8_irq_power_well_pre_disable(struct drm_i915_private *dev_priv,
|
|
|
|
unsigned int pipe_mask)
|
|
|
|
{
|
2016-02-19 18:47:31 +00:00
|
|
|
enum pipe pipe;
|
|
|
|
|
2016-02-19 18:47:30 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-02-19 18:47:31 +00:00
|
|
|
for_each_pipe_masked(dev_priv, pipe, pipe_mask)
|
|
|
|
GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
|
2016-02-19 18:47:30 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
|
|
|
|
/* make sure we're done processing display irqs */
|
2016-07-05 09:40:23 +00:00
|
|
|
synchronize_irq(dev_priv->drm.irq);
|
2016-02-19 18:47:30 +00:00
|
|
|
}
|
|
|
|
|
2014-04-09 17:40:52 +00:00
|
|
|
static void cherryview_irq_preinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, 0);
|
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
|
|
|
|
2014-05-22 20:18:22 +00:00
|
|
|
gen8_gt_irq_reset(dev_priv);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
|
|
|
GEN5_IRQ_RESET(GEN8_PCU_);
|
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_reset(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2014-04-09 17:40:52 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static u32 intel_hpd_enabled_irqs(struct drm_i915_private *dev_priv,
|
2015-08-27 20:55:57 +00:00
|
|
|
const u32 hpd[HPD_NUM_PINS])
|
|
|
|
{
|
|
|
|
struct intel_encoder *encoder;
|
|
|
|
u32 enabled_irqs = 0;
|
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
for_each_intel_encoder(&dev_priv->drm, encoder)
|
2015-08-27 20:55:57 +00:00
|
|
|
if (dev_priv->hotplug.stats[encoder->hpd_pin].state == HPD_ENABLED)
|
|
|
|
enabled_irqs |= hpd[encoder->hpd_pin];
|
|
|
|
|
|
|
|
return enabled_irqs;
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ibx_hpd_irq_setup(struct drm_i915_private *dev_priv)
|
2011-09-19 20:31:02 +00:00
|
|
|
{
|
2015-08-27 20:55:57 +00:00
|
|
|
u32 hotplug_irqs, hotplug, enabled_irqs;
|
2013-03-27 14:55:01 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (HAS_PCH_IBX(dev_priv)) {
|
2013-07-04 21:35:21 +00:00
|
|
|
hotplug_irqs = SDE_HOTPLUG_MASK;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ibx);
|
2013-03-27 14:55:01 +00:00
|
|
|
} else {
|
2013-07-04 21:35:21 +00:00
|
|
|
hotplug_irqs = SDE_HOTPLUG_MASK_CPT;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_cpt);
|
2013-03-27 14:55:01 +00:00
|
|
|
}
|
2011-09-19 20:31:02 +00:00
|
|
|
|
2013-07-04 21:35:21 +00:00
|
|
|
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
|
2013-03-27 14:55:01 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Enable digital hotplug on the PCH, and configure the DP short pulse
|
2015-08-27 20:56:02 +00:00
|
|
|
* duration to 2ms (which is the minimum in the Display Port spec).
|
|
|
|
* The pulse duration bits are reserved on LPT+.
|
2013-03-27 14:55:01 +00:00
|
|
|
*/
|
2011-09-19 20:31:02 +00:00
|
|
|
hotplug = I915_READ(PCH_PORT_HOTPLUG);
|
|
|
|
hotplug &= ~(PORTD_PULSE_DURATION_MASK|PORTC_PULSE_DURATION_MASK|PORTB_PULSE_DURATION_MASK);
|
|
|
|
hotplug |= PORTD_HOTPLUG_ENABLE | PORTD_PULSE_DURATION_2ms;
|
|
|
|
hotplug |= PORTC_HOTPLUG_ENABLE | PORTC_PULSE_DURATION_2ms;
|
|
|
|
hotplug |= PORTB_HOTPLUG_ENABLE | PORTB_PULSE_DURATION_2ms;
|
2015-08-27 20:56:05 +00:00
|
|
|
/*
|
|
|
|
* When CPU and PCH are on the same package, port A
|
|
|
|
* HPD must be enabled in both north and south.
|
|
|
|
*/
|
2016-05-06 13:48:28 +00:00
|
|
|
if (HAS_PCH_LPT_LP(dev_priv))
|
2015-08-27 20:56:05 +00:00
|
|
|
hotplug |= PORTA_HOTPLUG_ENABLE;
|
2011-09-19 20:31:02 +00:00
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
|
2015-08-27 20:56:02 +00:00
|
|
|
}
|
2015-08-17 07:55:50 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void spt_hpd_irq_setup(struct drm_i915_private *dev_priv)
|
2015-08-27 20:56:02 +00:00
|
|
|
{
|
|
|
|
u32 hotplug_irqs, hotplug, enabled_irqs;
|
|
|
|
|
|
|
|
hotplug_irqs = SDE_HOTPLUG_MASK_SPT;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_spt);
|
2015-08-27 20:56:02 +00:00
|
|
|
|
|
|
|
ibx_display_interrupt_update(dev_priv, hotplug_irqs, enabled_irqs);
|
|
|
|
|
|
|
|
/* Enable digital hotplug on the PCH */
|
|
|
|
hotplug = I915_READ(PCH_PORT_HOTPLUG);
|
|
|
|
hotplug |= PORTD_HOTPLUG_ENABLE | PORTC_HOTPLUG_ENABLE |
|
2015-08-27 20:56:07 +00:00
|
|
|
PORTB_HOTPLUG_ENABLE | PORTA_HOTPLUG_ENABLE;
|
2015-08-27 20:56:02 +00:00
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
|
|
|
|
|
|
|
|
hotplug = I915_READ(PCH_PORT_HOTPLUG2);
|
|
|
|
hotplug |= PORTE_HOTPLUG_ENABLE;
|
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG2, hotplug);
|
2011-09-19 20:31:02 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void ilk_hpd_irq_setup(struct drm_i915_private *dev_priv)
|
2015-08-27 20:56:03 +00:00
|
|
|
{
|
|
|
|
u32 hotplug_irqs, hotplug, enabled_irqs;
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 8) {
|
2015-08-27 20:56:06 +00:00
|
|
|
hotplug_irqs = GEN8_PORT_DP_A_HOTPLUG;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bdw);
|
2015-08-27 20:56:06 +00:00
|
|
|
|
|
|
|
bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
|
2016-05-06 13:48:28 +00:00
|
|
|
} else if (INTEL_GEN(dev_priv) >= 7) {
|
2015-08-27 20:56:04 +00:00
|
|
|
hotplug_irqs = DE_DP_A_HOTPLUG_IVB;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ivb);
|
2015-08-27 20:56:06 +00:00
|
|
|
|
|
|
|
ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
|
2015-08-27 20:56:04 +00:00
|
|
|
} else {
|
|
|
|
hotplug_irqs = DE_DP_A_HOTPLUG;
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_ilk);
|
2015-08-27 20:56:03 +00:00
|
|
|
|
2015-08-27 20:56:06 +00:00
|
|
|
ilk_update_display_irq(dev_priv, hotplug_irqs, enabled_irqs);
|
|
|
|
}
|
2015-08-27 20:56:03 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Enable digital hotplug on the CPU, and configure the DP short pulse
|
|
|
|
* duration to 2ms (which is the minimum in the Display Port spec)
|
2015-08-27 20:56:04 +00:00
|
|
|
* The pulse duration bits are reserved on HSW+.
|
2015-08-27 20:56:03 +00:00
|
|
|
*/
|
|
|
|
hotplug = I915_READ(DIGITAL_PORT_HOTPLUG_CNTRL);
|
|
|
|
hotplug &= ~DIGITAL_PORTA_PULSE_DURATION_MASK;
|
|
|
|
hotplug |= DIGITAL_PORTA_HOTPLUG_ENABLE | DIGITAL_PORTA_PULSE_DURATION_2ms;
|
|
|
|
I915_WRITE(DIGITAL_PORT_HOTPLUG_CNTRL, hotplug);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
ibx_hpd_irq_setup(dev_priv);
|
2015-08-27 20:56:03 +00:00
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void bxt_hpd_irq_setup(struct drm_i915_private *dev_priv)
|
2015-03-27 12:54:14 +00:00
|
|
|
{
|
2015-08-27 20:56:11 +00:00
|
|
|
u32 hotplug_irqs, hotplug, enabled_irqs;
|
2015-03-27 12:54:14 +00:00
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bxt);
|
2015-08-27 20:56:11 +00:00
|
|
|
hotplug_irqs = BXT_DE_PORT_HOTPLUG_MASK;
|
2015-03-27 12:54:14 +00:00
|
|
|
|
2015-08-27 20:56:11 +00:00
|
|
|
bdw_update_port_irq(dev_priv, hotplug_irqs, enabled_irqs);
|
2015-03-27 12:54:14 +00:00
|
|
|
|
2015-08-27 20:56:11 +00:00
|
|
|
hotplug = I915_READ(PCH_PORT_HOTPLUG);
|
|
|
|
hotplug |= PORTC_HOTPLUG_ENABLE | PORTB_HOTPLUG_ENABLE |
|
|
|
|
PORTA_HOTPLUG_ENABLE;
|
2016-03-31 10:41:47 +00:00
|
|
|
|
|
|
|
DRM_DEBUG_KMS("Invert bit setting: hp_ctl:%x hp_port:%x\n",
|
|
|
|
hotplug, enabled_irqs);
|
|
|
|
hotplug &= ~BXT_DDI_HPD_INVERT_MASK;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For BXT invert bit has to be set based on AOB design
|
|
|
|
* for HPD detection logic, update it based on VBT fields.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((enabled_irqs & BXT_DE_PORT_HP_DDIA) &&
|
|
|
|
intel_bios_is_port_hpd_inverted(dev_priv, PORT_A))
|
|
|
|
hotplug |= BXT_DDIA_HPD_INVERT;
|
|
|
|
if ((enabled_irqs & BXT_DE_PORT_HP_DDIB) &&
|
|
|
|
intel_bios_is_port_hpd_inverted(dev_priv, PORT_B))
|
|
|
|
hotplug |= BXT_DDIB_HPD_INVERT;
|
|
|
|
if ((enabled_irqs & BXT_DE_PORT_HP_DDIC) &&
|
|
|
|
intel_bios_is_port_hpd_inverted(dev_priv, PORT_C))
|
|
|
|
hotplug |= BXT_DDIC_HPD_INVERT;
|
|
|
|
|
2015-08-27 20:56:11 +00:00
|
|
|
I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
|
2015-03-27 12:54:14 +00:00
|
|
|
}
|
|
|
|
|
2013-02-08 19:35:15 +00:00
|
|
|
static void ibx_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-03-27 14:55:01 +00:00
|
|
|
u32 mask;
|
2013-02-28 09:17:12 +00:00
|
|
|
|
2013-05-29 19:43:05 +00:00
|
|
|
if (HAS_PCH_NOP(dev))
|
|
|
|
return;
|
|
|
|
|
2014-04-01 18:37:17 +00:00
|
|
|
if (HAS_PCH_IBX(dev))
|
2014-03-07 19:34:46 +00:00
|
|
|
mask = SDE_GMBUS | SDE_AUX_MASK | SDE_POISON;
|
2014-04-01 18:37:17 +00:00
|
|
|
else
|
2014-03-07 19:34:46 +00:00
|
|
|
mask = SDE_GMBUS_CPT | SDE_AUX_MASK_CPT;
|
drm/i915: report Gen5+ CPU and PCH FIFO underruns
In this commit we enable both CPU and PCH FIFO underrun reporting and
start reporting them. We follow a few rules:
- after we receive one of these errors, we mask the interrupt, so
we won't get an "interrupt storm" and we also won't flood dmesg;
- at each mode set we enable the interrupts again, so we'll see each
message at most once per mode set;
- in the specific places where we need to ignore the errors, we
completely mask the interrupts.
The downside of this patch is that since we're completely disabling
(masking) the interrupts instead of just not printing error messages,
we will mask more than just what we want on IVB/HSW CPU interrupts
(due to GEN7_ERR_INT) and on CPT/PPT/LPT PCHs (due to SERR_INT). So
when we decide to mask PCH FIFO underruns for pipe A on CPT, we'll
also be masking PCH FIFO underruns for pipe B, because both are
reported by SERR_INT, which has to be either completely enabled or
completely disabled (in othe words, there's no way to disable/enable
specific bits of GEN7_ERR_INT and SERR_INT).
V2: Rename some functions and variables, downgrade messages to
DRM_DEBUG_DRIVER and rebase.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-04-12 20:57:57 +00:00
|
|
|
|
2015-09-18 17:03:41 +00:00
|
|
|
gen5_assert_iir_is_zero(dev_priv, SDEIIR);
|
2013-02-08 19:35:15 +00:00
|
|
|
I915_WRITE(SDEIMR, ~mask);
|
|
|
|
}
|
|
|
|
|
2013-07-12 20:43:26 +00:00
|
|
|
static void gen5_gt_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-07-12 20:43:26 +00:00
|
|
|
u32 pm_irqs, gt_irqs;
|
|
|
|
|
|
|
|
pm_irqs = gt_irqs = 0;
|
|
|
|
|
|
|
|
dev_priv->gt_irq_mask = ~0;
|
2013-09-19 18:01:40 +00:00
|
|
|
if (HAS_L3_DPF(dev)) {
|
2013-07-12 20:43:26 +00:00
|
|
|
/* L3 parity interrupt is always unmasked. */
|
2013-09-19 18:13:41 +00:00
|
|
|
dev_priv->gt_irq_mask = ~GT_PARITY_ERROR(dev);
|
|
|
|
gt_irqs |= GT_PARITY_ERROR(dev);
|
2013-07-12 20:43:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
gt_irqs |= GT_RENDER_USER_INTERRUPT;
|
|
|
|
if (IS_GEN5(dev)) {
|
2016-07-01 16:23:21 +00:00
|
|
|
gt_irqs |= ILK_BSD_USER_INTERRUPT;
|
2013-07-12 20:43:26 +00:00
|
|
|
} else {
|
|
|
|
gt_irqs |= GT_BLT_USER_INTERRUPT | GT_BSD_USER_INTERRUPT;
|
|
|
|
}
|
|
|
|
|
2014-04-01 18:37:15 +00:00
|
|
|
GEN5_IRQ_INIT(GT, dev_priv->gt_irq_mask, gt_irqs);
|
2013-07-12 20:43:26 +00:00
|
|
|
|
|
|
|
if (INTEL_INFO(dev)->gen >= 6) {
|
2014-12-15 16:59:27 +00:00
|
|
|
/*
|
|
|
|
* RPS interrupts will get enabled/disabled on demand when RPS
|
|
|
|
* itself is enabled/disabled.
|
|
|
|
*/
|
2013-07-12 20:43:26 +00:00
|
|
|
if (HAS_VEBOX(dev))
|
|
|
|
pm_irqs |= PM_VEBOX_USER_INTERRUPT;
|
|
|
|
|
2013-08-06 21:57:15 +00:00
|
|
|
dev_priv->pm_irq_mask = 0xffffffff;
|
2014-04-01 18:37:15 +00:00
|
|
|
GEN5_IRQ_INIT(GEN6_PM, dev_priv->pm_irq_mask, pm_irqs);
|
2013-07-12 20:43:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-06-28 20:00:41 +00:00
|
|
|
static int ironlake_irq_postinstall(struct drm_device *dev)
|
2009-06-08 06:40:19 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2013-07-12 23:01:56 +00:00
|
|
|
u32 display_mask, extra_mask;
|
|
|
|
|
|
|
|
if (INTEL_INFO(dev)->gen >= 7) {
|
|
|
|
display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE_IVB |
|
|
|
|
DE_PCH_EVENT_IVB | DE_PLANEC_FLIP_DONE_IVB |
|
|
|
|
DE_PLANEB_FLIP_DONE_IVB |
|
2014-03-07 19:34:46 +00:00
|
|
|
DE_PLANEA_FLIP_DONE_IVB | DE_AUX_CHANNEL_A_IVB);
|
2013-07-12 23:01:56 +00:00
|
|
|
extra_mask = (DE_PIPEC_VBLANK_IVB | DE_PIPEB_VBLANK_IVB |
|
2015-08-27 20:56:04 +00:00
|
|
|
DE_PIPEA_VBLANK_IVB | DE_ERR_INT_IVB |
|
|
|
|
DE_DP_A_HOTPLUG_IVB);
|
2013-07-12 23:01:56 +00:00
|
|
|
} else {
|
|
|
|
display_mask = (DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |
|
|
|
|
DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE |
|
2013-10-16 20:55:48 +00:00
|
|
|
DE_AUX_CHANNEL_A |
|
|
|
|
DE_PIPEB_CRC_DONE | DE_PIPEA_CRC_DONE |
|
|
|
|
DE_POISON);
|
2015-08-27 20:56:03 +00:00
|
|
|
extra_mask = (DE_PIPEA_VBLANK | DE_PIPEB_VBLANK | DE_PCU_EVENT |
|
|
|
|
DE_PIPEB_FIFO_UNDERRUN | DE_PIPEA_FIFO_UNDERRUN |
|
|
|
|
DE_DP_A_HOTPLUG);
|
2013-07-12 23:01:56 +00:00
|
|
|
}
|
2009-06-08 06:40:19 +00:00
|
|
|
|
2010-12-04 11:30:53 +00:00
|
|
|
dev_priv->irq_mask = ~display_mask;
|
2009-06-08 06:40:19 +00:00
|
|
|
|
2014-04-01 18:37:27 +00:00
|
|
|
I915_WRITE(HWSTAM, 0xeffe);
|
|
|
|
|
2014-04-01 18:37:22 +00:00
|
|
|
ibx_irq_pre_postinstall(dev);
|
|
|
|
|
2014-04-01 18:37:15 +00:00
|
|
|
GEN5_IRQ_INIT(DE, dev_priv->irq_mask, display_mask | extra_mask);
|
2009-06-08 06:40:19 +00:00
|
|
|
|
2013-07-12 20:43:26 +00:00
|
|
|
gen5_gt_irq_postinstall(dev);
|
2009-06-08 06:40:19 +00:00
|
|
|
|
2013-02-08 19:35:15 +00:00
|
|
|
ibx_irq_postinstall(dev);
|
2011-09-19 20:31:02 +00:00
|
|
|
|
2010-01-29 19:27:07 +00:00
|
|
|
if (IS_IRONLAKE_M(dev)) {
|
2013-06-27 11:44:59 +00:00
|
|
|
/* Enable PCU event interrupts
|
|
|
|
*
|
|
|
|
* spinlocking not required here for correctness since interrupt
|
2013-06-27 11:44:58 +00:00
|
|
|
* setup is guaranteed to run in single-threaded context. But we
|
|
|
|
* need it to make the assert_spin_locked happy. */
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2015-11-23 16:06:16 +00:00
|
|
|
ilk_enable_display_irq(dev_priv, DE_PCU_EVENT);
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2010-01-29 19:27:07 +00:00
|
|
|
}
|
|
|
|
|
2009-06-08 06:40:19 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-04 17:23:07 +00:00
|
|
|
void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dev_priv->display_irqs_enabled = true;
|
|
|
|
|
2016-04-11 13:56:27 +00:00
|
|
|
if (intel_irqs_enabled(dev_priv)) {
|
|
|
|
vlv_display_irq_reset(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
vlv_display_irq_postinstall(dev_priv);
|
2016-04-11 13:56:27 +00:00
|
|
|
}
|
2014-03-04 17:23:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
|
|
|
if (!dev_priv->display_irqs_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dev_priv->display_irqs_enabled = false;
|
|
|
|
|
2014-09-08 12:21:09 +00:00
|
|
|
if (intel_irqs_enabled(dev_priv))
|
2016-04-12 15:56:14 +00:00
|
|
|
vlv_display_irq_reset(dev_priv);
|
2014-03-04 17:23:07 +00:00
|
|
|
}
|
|
|
|
|
2014-10-30 17:43:00 +00:00
|
|
|
|
|
|
|
static int valleyview_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-10-30 17:43:00 +00:00
|
|
|
|
2013-07-12 20:43:26 +00:00
|
|
|
gen5_gt_irq_postinstall(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_postinstall(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
I915_WRITE(VLV_MASTER_IER, MASTER_INTERRUPT_ENABLE);
|
2016-04-13 18:19:48 +00:00
|
|
|
POSTING_READ(VLV_MASTER_IER);
|
2012-12-11 13:05:07 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
/* These are interrupts we'll toggle with the ring mask register */
|
|
|
|
uint32_t gt_interrupts[] = {
|
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
|
2014-07-24 16:04:31 +00:00
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
|
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
|
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT,
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT |
|
2014-07-24 16:04:31 +00:00
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS1_IRQ_SHIFT |
|
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_VCS2_IRQ_SHIFT |
|
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VCS2_IRQ_SHIFT,
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
0,
|
2014-07-24 16:04:31 +00:00
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT |
|
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_VECS_IRQ_SHIFT
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
};
|
|
|
|
|
2016-04-19 15:46:08 +00:00
|
|
|
if (HAS_L3_DPF(dev_priv))
|
|
|
|
gt_interrupts[0] |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;
|
|
|
|
|
2014-05-15 17:58:08 +00:00
|
|
|
dev_priv->pm_irq_mask = 0xffffffff;
|
2014-08-22 03:02:40 +00:00
|
|
|
GEN8_IRQ_INIT_NDX(GT, 0, ~gt_interrupts[0], gt_interrupts[0]);
|
|
|
|
GEN8_IRQ_INIT_NDX(GT, 1, ~gt_interrupts[1], gt_interrupts[1]);
|
2014-12-15 16:59:27 +00:00
|
|
|
/*
|
|
|
|
* RPS interrupts will get enabled/disabled on demand when RPS itself
|
|
|
|
* is enabled/disabled.
|
|
|
|
*/
|
|
|
|
GEN8_IRQ_INIT_NDX(GT, 2, dev_priv->pm_irq_mask, 0);
|
2014-08-22 03:02:40 +00:00
|
|
|
GEN8_IRQ_INIT_NDX(GT, 3, ~gt_interrupts[3], gt_interrupts[3]);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
2014-03-20 20:45:01 +00:00
|
|
|
uint32_t de_pipe_masked = GEN8_PIPE_CDCLK_CRC_DONE;
|
|
|
|
uint32_t de_pipe_enables;
|
2015-08-27 20:56:06 +00:00
|
|
|
u32 de_port_masked = GEN8_AUX_CHANNEL_A;
|
|
|
|
u32 de_port_enables;
|
2016-05-19 09:14:43 +00:00
|
|
|
u32 de_misc_masked = GEN8_DE_MISC_GSE;
|
2015-08-27 20:56:06 +00:00
|
|
|
enum pipe pipe;
|
2014-03-20 20:45:01 +00:00
|
|
|
|
2015-09-02 22:19:24 +00:00
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 9) {
|
2014-03-20 20:45:01 +00:00
|
|
|
de_pipe_masked |= GEN9_PIPE_PLANE1_FLIP_DONE |
|
|
|
|
GEN9_DE_PIPE_IRQ_FAULT_ERRORS;
|
2015-08-27 20:56:06 +00:00
|
|
|
de_port_masked |= GEN9_AUX_CHANNEL_B | GEN9_AUX_CHANNEL_C |
|
|
|
|
GEN9_AUX_CHANNEL_D;
|
2014-08-22 12:10:43 +00:00
|
|
|
if (IS_BROXTON(dev_priv))
|
2015-08-27 20:56:06 +00:00
|
|
|
de_port_masked |= BXT_DE_PORT_GMBUS;
|
|
|
|
} else {
|
2014-03-20 20:45:01 +00:00
|
|
|
de_pipe_masked |= GEN8_PIPE_PRIMARY_FLIP_DONE |
|
|
|
|
GEN8_DE_PIPE_IRQ_FAULT_ERRORS;
|
2015-08-27 20:56:06 +00:00
|
|
|
}
|
2014-03-20 20:45:01 +00:00
|
|
|
|
|
|
|
de_pipe_enables = de_pipe_masked | GEN8_PIPE_VBLANK |
|
|
|
|
GEN8_PIPE_FIFO_UNDERRUN;
|
|
|
|
|
2015-08-27 20:56:06 +00:00
|
|
|
de_port_enables = de_port_masked;
|
2015-08-27 20:56:11 +00:00
|
|
|
if (IS_BROXTON(dev_priv))
|
|
|
|
de_port_enables |= BXT_DE_PORT_HOTPLUG_MASK;
|
|
|
|
else if (IS_BROADWELL(dev_priv))
|
2015-08-27 20:56:06 +00:00
|
|
|
de_port_enables |= GEN8_PORT_DP_A_HOTPLUG;
|
|
|
|
|
2013-11-07 14:31:52 +00:00
|
|
|
dev_priv->de_irq_mask[PIPE_A] = ~de_pipe_masked;
|
|
|
|
dev_priv->de_irq_mask[PIPE_B] = ~de_pipe_masked;
|
|
|
|
dev_priv->de_irq_mask[PIPE_C] = ~de_pipe_masked;
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2014-09-30 08:56:39 +00:00
|
|
|
if (intel_display_power_is_enabled(dev_priv,
|
2014-07-04 14:50:29 +00:00
|
|
|
POWER_DOMAIN_PIPE(pipe)))
|
|
|
|
GEN8_IRQ_INIT_NDX(DE_PIPE, pipe,
|
|
|
|
dev_priv->de_irq_mask[pipe],
|
|
|
|
de_pipe_enables);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2015-08-27 20:56:06 +00:00
|
|
|
GEN5_IRQ_INIT(GEN8_DE_PORT_, ~de_port_masked, de_port_enables);
|
2016-05-19 09:14:43 +00:00
|
|
|
GEN5_IRQ_INIT(GEN8_DE_MISC_, ~de_misc_masked, de_misc_masked);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int gen8_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2014-08-22 12:10:42 +00:00
|
|
|
if (HAS_PCH_SPLIT(dev))
|
|
|
|
ibx_irq_pre_postinstall(dev);
|
2014-04-01 18:37:22 +00:00
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
gen8_gt_irq_postinstall(dev_priv);
|
|
|
|
gen8_de_irq_postinstall(dev_priv);
|
|
|
|
|
2014-08-22 12:10:42 +00:00
|
|
|
if (HAS_PCH_SPLIT(dev))
|
|
|
|
ibx_irq_postinstall(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
2016-04-13 18:19:47 +00:00
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-04-09 17:40:52 +00:00
|
|
|
static int cherryview_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
|
|
|
gen8_gt_irq_postinstall(dev_priv);
|
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_postinstall(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
|
|
|
|
2016-04-13 18:19:47 +00:00
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
|
2014-04-09 17:40:52 +00:00
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
static void gen8_irq_uninstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
|
|
|
|
if (!dev_priv)
|
|
|
|
return;
|
|
|
|
|
2014-04-01 18:37:26 +00:00
|
|
|
gen8_irq_reset(dev);
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
}
|
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
static void valleyview_irq_uninstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-03-28 20:39:38 +00:00
|
|
|
|
|
|
|
if (!dev_priv)
|
|
|
|
return;
|
|
|
|
|
2014-04-14 17:24:23 +00:00
|
|
|
I915_WRITE(VLV_MASTER_IER, 0);
|
2016-04-13 18:19:48 +00:00
|
|
|
POSTING_READ(VLV_MASTER_IER);
|
2014-04-14 17:24:23 +00:00
|
|
|
|
2014-10-30 17:42:56 +00:00
|
|
|
gen5_gt_irq_reset(dev);
|
|
|
|
|
2012-03-28 20:39:38 +00:00
|
|
|
I915_WRITE(HWSTAM, 0xffffffff);
|
2014-03-04 17:23:07 +00:00
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_reset(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2012-03-28 20:39:38 +00:00
|
|
|
}
|
|
|
|
|
2014-04-09 17:40:52 +00:00
|
|
|
static void cherryview_irq_uninstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
|
|
|
if (!dev_priv)
|
|
|
|
return;
|
|
|
|
|
|
|
|
I915_WRITE(GEN8_MASTER_IRQ, 0);
|
|
|
|
POSTING_READ(GEN8_MASTER_IRQ);
|
|
|
|
|
2014-10-30 17:42:52 +00:00
|
|
|
gen8_gt_irq_reset(dev_priv);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2014-10-30 17:42:52 +00:00
|
|
|
GEN5_IRQ_RESET(GEN8_PCU_);
|
2014-04-09 17:40:52 +00:00
|
|
|
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2016-04-11 13:56:25 +00:00
|
|
|
if (dev_priv->display_irqs_enabled)
|
|
|
|
vlv_display_irq_reset(dev_priv);
|
2016-04-12 15:56:14 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2014-04-09 17:40:52 +00:00
|
|
|
}
|
|
|
|
|
2011-06-28 20:00:41 +00:00
|
|
|
static void ironlake_irq_uninstall(struct drm_device *dev)
|
2009-06-08 06:40:19 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2011-04-07 20:53:55 +00:00
|
|
|
|
|
|
|
if (!dev_priv)
|
|
|
|
return;
|
|
|
|
|
2014-04-01 18:37:25 +00:00
|
|
|
ironlake_irq_reset(dev);
|
2009-06-08 06:40:19 +00:00
|
|
|
}
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
static void i8xx_irq_preinstall(struct drm_device * dev)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2011-02-07 20:26:52 +00:00
|
|
|
int pipe;
|
2006-02-18 04:17:04 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2011-02-07 20:26:52 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE16(IMR, 0xffff);
|
|
|
|
I915_WRITE16(IER, 0x0);
|
|
|
|
POSTING_READ16(IER);
|
2012-04-22 20:13:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int i8xx_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
|
|
|
I915_WRITE16(EMR,
|
|
|
|
~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH));
|
|
|
|
|
|
|
|
/* Unmask the interrupts that we always want on. */
|
|
|
|
dev_priv->irq_mask =
|
|
|
|
~(I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
2015-04-01 11:43:46 +00:00
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
|
2012-04-22 20:13:57 +00:00
|
|
|
I915_WRITE16(IMR, dev_priv->irq_mask);
|
|
|
|
|
|
|
|
I915_WRITE16(IER,
|
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
|
|
|
I915_USER_INTERRUPT);
|
|
|
|
POSTING_READ16(IER);
|
|
|
|
|
2013-10-16 20:55:56 +00:00
|
|
|
/* Interrupt setup is already guaranteed to be single-threaded, this is
|
|
|
|
* just to make the assert_spin_locked check happy. */
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2014-02-10 16:42:47 +00:00
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
|
|
|
i915_enable_pipestat(dev_priv, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2013-10-16 20:55:56 +00:00
|
|
|
|
2012-04-22 20:13:57 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-24 15:13:53 +00:00
|
|
|
/*
|
|
|
|
* Returns true when a page flip has completed.
|
|
|
|
*/
|
|
|
|
static bool i8xx_handle_vblank(struct drm_i915_private *dev_priv,
|
|
|
|
int plane, int pipe, u32 iir)
|
|
|
|
{
|
|
|
|
u16 flip_pending = DISPLAY_PLANE_FLIP_PENDING(plane);
|
|
|
|
|
|
|
|
if (!intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if ((iir & flip_pending) == 0)
|
|
|
|
goto check_page_flip;
|
|
|
|
|
|
|
|
/* We detect FlipDone by looking for the change in PendingFlip from '1'
|
|
|
|
* to '0' on the following vblank, i.e. IIR has the Pendingflip
|
|
|
|
* asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence
|
|
|
|
* the flip is completed (no longer pending). Since this doesn't raise
|
|
|
|
* an interrupt per se, we watch for the change at vblank.
|
|
|
|
*/
|
|
|
|
if (I915_READ16(ISR) & flip_pending)
|
|
|
|
goto check_page_flip;
|
|
|
|
|
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
|
|
|
return true;
|
|
|
|
|
|
|
|
check_page_flip:
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-10-02 13:10:55 +00:00
|
|
|
static irqreturn_t i8xx_irq_handler(int irq, void *arg)
|
2012-04-22 20:13:57 +00:00
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-22 20:13:57 +00:00
|
|
|
u16 iir, new_iir;
|
|
|
|
u32 pipe_stats[2];
|
|
|
|
int pipe;
|
|
|
|
u16 flip_mask =
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
|
2015-12-16 00:52:19 +00:00
|
|
|
irqreturn_t ret;
|
2012-04-22 20:13:57 +00:00
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
|
|
|
ret = IRQ_NONE;
|
2012-04-22 20:13:57 +00:00
|
|
|
iir = I915_READ16(IIR);
|
|
|
|
if (iir == 0)
|
2015-12-16 00:52:19 +00:00
|
|
|
goto out;
|
2012-04-22 20:13:57 +00:00
|
|
|
|
|
|
|
while (iir & ~flip_mask) {
|
|
|
|
/* Can't rely on pipestat interrupt bit in iir as it might
|
|
|
|
* have been cleared after the pipestat interrupt was received.
|
|
|
|
* It doesn't set the bit in iir again, but it still produces
|
|
|
|
* interrupts (for non-MSI).
|
|
|
|
*/
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2012-04-22 20:13:57 +00:00
|
|
|
if (iir & I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT)
|
2014-11-04 14:52:22 +00:00
|
|
|
DRM_DEBUG("Command parser error, iir 0x%08x\n", iir);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = PIPESTAT(pipe);
|
2012-04-22 20:13:57 +00:00
|
|
|
pipe_stats[pipe] = I915_READ(reg);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the PIPE*STAT regs before the IIR
|
|
|
|
*/
|
2014-01-17 09:44:31 +00:00
|
|
|
if (pipe_stats[pipe] & 0x8000ffff)
|
2012-04-22 20:13:57 +00:00
|
|
|
I915_WRITE(reg, pipe_stats[pipe]);
|
|
|
|
}
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
|
|
|
I915_WRITE16(IIR, iir & ~flip_mask);
|
|
|
|
new_iir = I915_READ16(IIR); /* Flush posted writes */
|
|
|
|
|
|
|
|
if (iir & I915_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[RCS]);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
int plane = pipe;
|
|
|
|
if (HAS_FBC(dev_priv))
|
|
|
|
plane = !plane;
|
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS &&
|
|
|
|
i8xx_handle_vblank(dev_priv, plane, pipe, iir))
|
|
|
|
flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(plane);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
2013-10-16 20:55:55 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_pipe_crc_irq_handler(dev_priv, pipe);
|
2014-01-17 09:44:31 +00:00
|
|
|
|
2014-09-30 08:56:48 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv,
|
|
|
|
pipe);
|
2013-10-16 20:55:55 +00:00
|
|
|
}
|
2012-04-22 20:13:57 +00:00
|
|
|
|
|
|
|
iir = new_iir;
|
|
|
|
}
|
2015-12-16 00:52:19 +00:00
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
|
|
|
|
out:
|
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
2012-04-22 20:13:57 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
return ret;
|
2012-04-22 20:13:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void i8xx_irq_uninstall(struct drm_device * dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-22 20:13:57 +00:00
|
|
|
int pipe;
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2012-04-22 20:13:57 +00:00
|
|
|
/* Clear enable bits; then clear status bits */
|
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
|
|
|
I915_WRITE(PIPESTAT(pipe), I915_READ(PIPESTAT(pipe)));
|
|
|
|
}
|
|
|
|
I915_WRITE16(IMR, 0xffff);
|
|
|
|
I915_WRITE16(IER, 0x0);
|
|
|
|
I915_WRITE16(IIR, I915_READ16(IIR));
|
|
|
|
}
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
static void i915_irq_preinstall(struct drm_device * dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:44 +00:00
|
|
|
int pipe;
|
|
|
|
|
|
|
|
if (I915_HAS_HOTPLUG(dev)) {
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
|
|
|
}
|
|
|
|
|
2012-04-24 21:59:48 +00:00
|
|
|
I915_WRITE16(HWSTAM, 0xeffe);
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
|
|
|
I915_WRITE(IMR, 0xffffffff);
|
|
|
|
I915_WRITE(IER, 0x0);
|
|
|
|
POSTING_READ(IER);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int i915_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:50 +00:00
|
|
|
u32 enable_mask;
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2012-04-24 21:59:50 +00:00
|
|
|
I915_WRITE(EMR, ~(I915_ERROR_PAGE_TABLE | I915_ERROR_MEMORY_REFRESH));
|
|
|
|
|
|
|
|
/* Unmask the interrupts that we always want on. */
|
|
|
|
dev_priv->irq_mask =
|
|
|
|
~(I915_ASLE_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
2015-04-01 11:43:46 +00:00
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
|
2012-04-24 21:59:50 +00:00
|
|
|
|
|
|
|
enable_mask =
|
|
|
|
I915_ASLE_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
|
|
|
I915_USER_INTERRUPT;
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
if (I915_HAS_HOTPLUG(dev)) {
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-12-11 13:05:07 +00:00
|
|
|
POSTING_READ(PORT_HOTPLUG_EN);
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
/* Enable in IER... */
|
|
|
|
enable_mask |= I915_DISPLAY_PORT_INTERRUPT;
|
|
|
|
/* and unmask in IMR */
|
|
|
|
dev_priv->irq_mask &= ~I915_DISPLAY_PORT_INTERRUPT;
|
|
|
|
}
|
|
|
|
|
|
|
|
I915_WRITE(IMR, dev_priv->irq_mask);
|
|
|
|
I915_WRITE(IER, enable_mask);
|
|
|
|
POSTING_READ(IER);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
i915_enable_asle_pipestat(dev_priv);
|
2012-12-11 13:05:07 +00:00
|
|
|
|
2013-10-16 20:55:56 +00:00
|
|
|
/* Interrupt setup is already guaranteed to be single-threaded, this is
|
|
|
|
* just to make the assert_spin_locked check happy. */
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2014-02-10 16:42:47 +00:00
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
|
|
|
i915_enable_pipestat(dev_priv, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2013-10-16 20:55:56 +00:00
|
|
|
|
2012-12-11 13:05:07 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-24 15:13:53 +00:00
|
|
|
/*
|
|
|
|
* Returns true when a page flip has completed.
|
|
|
|
*/
|
|
|
|
static bool i915_handle_vblank(struct drm_i915_private *dev_priv,
|
|
|
|
int plane, int pipe, u32 iir)
|
|
|
|
{
|
|
|
|
u32 flip_pending = DISPLAY_PLANE_FLIP_PENDING(plane);
|
|
|
|
|
|
|
|
if (!intel_pipe_handle_vblank(dev_priv, pipe))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if ((iir & flip_pending) == 0)
|
|
|
|
goto check_page_flip;
|
|
|
|
|
|
|
|
/* We detect FlipDone by looking for the change in PendingFlip from '1'
|
|
|
|
* to '0' on the following vblank, i.e. IIR has the Pendingflip
|
|
|
|
* asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence
|
|
|
|
* the flip is completed (no longer pending). Since this doesn't raise
|
|
|
|
* an interrupt per se, we watch for the change at vblank.
|
|
|
|
*/
|
|
|
|
if (I915_READ(ISR) & flip_pending)
|
|
|
|
goto check_page_flip;
|
|
|
|
|
|
|
|
intel_finish_page_flip_cs(dev_priv, pipe);
|
|
|
|
return true;
|
|
|
|
|
|
|
|
check_page_flip:
|
|
|
|
intel_check_page_flip(dev_priv, pipe);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-10-02 13:10:55 +00:00
|
|
|
static irqreturn_t i915_irq_handler(int irq, void *arg)
|
2012-04-24 21:59:44 +00:00
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:47 +00:00
|
|
|
u32 iir, new_iir, pipe_stats[I915_MAX_PIPES];
|
2012-04-24 21:59:50 +00:00
|
|
|
u32 flip_mask =
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
|
|
|
|
int pipe, ret = IRQ_NONE;
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
iir = I915_READ(IIR);
|
2012-04-24 21:59:50 +00:00
|
|
|
do {
|
|
|
|
bool irq_received = (iir & ~flip_mask) != 0;
|
2012-04-24 21:59:47 +00:00
|
|
|
bool blc_event = false;
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
/* Can't rely on pipestat interrupt bit in iir as it might
|
|
|
|
* have been cleared after the pipestat interrupt was received.
|
|
|
|
* It doesn't set the bit in iir again, but it still produces
|
|
|
|
* interrupts (for non-MSI).
|
|
|
|
*/
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2012-04-24 21:59:44 +00:00
|
|
|
if (iir & I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT)
|
2014-11-04 14:52:22 +00:00
|
|
|
DRM_DEBUG("Command parser error, iir 0x%08x\n", iir);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = PIPESTAT(pipe);
|
2012-04-24 21:59:44 +00:00
|
|
|
pipe_stats[pipe] = I915_READ(reg);
|
|
|
|
|
2012-04-24 21:59:50 +00:00
|
|
|
/* Clear the PIPE*STAT regs before the IIR */
|
2012-04-24 21:59:44 +00:00
|
|
|
if (pipe_stats[pipe] & 0x8000ffff) {
|
|
|
|
I915_WRITE(reg, pipe_stats[pipe]);
|
2012-04-24 21:59:50 +00:00
|
|
|
irq_received = true;
|
2012-04-24 21:59:44 +00:00
|
|
|
}
|
|
|
|
}
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
if (!irq_received)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Consume port. Then clear IIR or we'll miss events */
|
2016-05-06 13:48:28 +00:00
|
|
|
if (I915_HAS_HOTPLUG(dev_priv) &&
|
2016-04-13 18:19:54 +00:00
|
|
|
iir & I915_DISPLAY_PORT_INTERRUPT) {
|
|
|
|
u32 hotplug_status = i9xx_hpd_irq_ack(dev_priv);
|
|
|
|
if (hotplug_status)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
2016-04-13 18:19:54 +00:00
|
|
|
}
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2012-04-24 21:59:50 +00:00
|
|
|
I915_WRITE(IIR, iir & ~flip_mask);
|
2012-04-24 21:59:44 +00:00
|
|
|
new_iir = I915_READ(IIR); /* Flush posted writes */
|
|
|
|
|
|
|
|
if (iir & I915_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[RCS]);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
int plane = pipe;
|
|
|
|
if (HAS_FBC(dev_priv))
|
|
|
|
plane = !plane;
|
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_VBLANK_INTERRUPT_STATUS &&
|
|
|
|
i915_handle_vblank(dev_priv, plane, pipe, iir))
|
|
|
|
flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(plane);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
|
|
|
|
blc_event = true;
|
2013-10-16 20:55:55 +00:00
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_pipe_crc_irq_handler(dev_priv, pipe);
|
2014-01-17 09:44:31 +00:00
|
|
|
|
2014-09-30 08:56:48 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv,
|
|
|
|
pipe);
|
2012-04-24 21:59:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (blc_event || (iir & I915_ASLE_INTERRUPT))
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_opregion_asle_intr(dev_priv);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
/* With MSI, interrupts are only generated when iir
|
|
|
|
* transitions from zero to nonzero. If another bit got
|
|
|
|
* set while we were handling the existing iir bits, then
|
|
|
|
* we would never get another interrupt.
|
|
|
|
*
|
|
|
|
* This is fine on non-MSI as well, as if we hit this path
|
|
|
|
* we avoid exiting the interrupt handler only to generate
|
|
|
|
* another one.
|
|
|
|
*
|
|
|
|
* Note that for MSI this could cause a stray interrupt report
|
|
|
|
* if an interrupt landed in the time between writing IIR and
|
|
|
|
* the posting read. This should be rare enough to never
|
|
|
|
* trigger the 99% of 100,000 interrupts test for disabling
|
|
|
|
* stray interrupts.
|
|
|
|
*/
|
2012-04-24 21:59:50 +00:00
|
|
|
ret = IRQ_HANDLED;
|
2012-04-24 21:59:44 +00:00
|
|
|
iir = new_iir;
|
2012-04-24 21:59:50 +00:00
|
|
|
} while (iir & ~flip_mask);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i915_irq_uninstall(struct drm_device * dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:44 +00:00
|
|
|
int pipe;
|
|
|
|
|
|
|
|
if (I915_HAS_HOTPLUG(dev)) {
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
|
|
|
}
|
|
|
|
|
2012-04-24 21:59:48 +00:00
|
|
|
I915_WRITE16(HWSTAM, 0xffff);
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2012-04-24 21:59:49 +00:00
|
|
|
/* Clear enable bits; then clear status bits */
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
2012-04-24 21:59:49 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), I915_READ(PIPESTAT(pipe)));
|
|
|
|
}
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(IMR, 0xffffffff);
|
|
|
|
I915_WRITE(IER, 0x0);
|
|
|
|
|
|
|
|
I915_WRITE(IIR, I915_READ(IIR));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i965_irq_preinstall(struct drm_device * dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:44 +00:00
|
|
|
int pipe;
|
|
|
|
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-05-11 17:01:31 +00:00
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
I915_WRITE(HWSTAM, 0xeffe);
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
|
|
|
I915_WRITE(IMR, 0xffffffff);
|
|
|
|
I915_WRITE(IER, 0x0);
|
|
|
|
POSTING_READ(IER);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int i965_irq_postinstall(struct drm_device *dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:51 +00:00
|
|
|
u32 enable_mask;
|
2012-04-24 21:59:44 +00:00
|
|
|
u32 error_mask;
|
|
|
|
|
|
|
|
/* Unmask the interrupts that we always want on. */
|
2012-04-24 21:59:51 +00:00
|
|
|
dev_priv->irq_mask = ~(I915_ASLE_INTERRUPT |
|
2012-05-11 17:01:31 +00:00
|
|
|
I915_DISPLAY_PORT_INTERRUPT |
|
2012-04-24 21:59:51 +00:00
|
|
|
I915_DISPLAY_PIPE_A_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PIPE_B_EVENT_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT);
|
|
|
|
|
|
|
|
enable_mask = ~dev_priv->irq_mask;
|
2013-02-19 13:16:39 +00:00
|
|
|
enable_mask &= ~(I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT);
|
2012-04-24 21:59:51 +00:00
|
|
|
enable_mask |= I915_USER_INTERRUPT;
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_G4X(dev_priv))
|
2012-04-24 21:59:51 +00:00
|
|
|
enable_mask |= I915_BSD_USER_INTERRUPT;
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2013-06-27 15:52:10 +00:00
|
|
|
/* Interrupt setup is already guaranteed to be single-threaded, this is
|
|
|
|
* just to make the assert_spin_locked check happy. */
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_lock_irq(&dev_priv->irq_lock);
|
2014-02-10 16:42:47 +00:00
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A, PIPE_GMBUS_INTERRUPT_STATUS);
|
|
|
|
i915_enable_pipestat(dev_priv, PIPE_A, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
|
|
|
i915_enable_pipestat(dev_priv, PIPE_B, PIPE_CRC_DONE_INTERRUPT_STATUS);
|
2014-09-15 12:55:27 +00:00
|
|
|
spin_unlock_irq(&dev_priv->irq_lock);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Enable some error detection, note the instruction error mask
|
|
|
|
* bit is reserved, so we leave it masked.
|
|
|
|
*/
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_G4X(dev_priv)) {
|
2012-04-24 21:59:44 +00:00
|
|
|
error_mask = ~(GM45_ERROR_PAGE_TABLE |
|
|
|
|
GM45_ERROR_MEM_PRIV |
|
|
|
|
GM45_ERROR_CP_PRIV |
|
|
|
|
I915_ERROR_MEMORY_REFRESH);
|
|
|
|
} else {
|
|
|
|
error_mask = ~(I915_ERROR_PAGE_TABLE |
|
|
|
|
I915_ERROR_MEMORY_REFRESH);
|
|
|
|
}
|
|
|
|
I915_WRITE(EMR, error_mask);
|
|
|
|
|
|
|
|
I915_WRITE(IMR, dev_priv->irq_mask);
|
|
|
|
I915_WRITE(IER, enable_mask);
|
|
|
|
POSTING_READ(IER);
|
|
|
|
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-12-11 13:05:07 +00:00
|
|
|
POSTING_READ(PORT_HOTPLUG_EN);
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
i915_enable_asle_pipestat(dev_priv);
|
2012-12-11 13:05:07 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-06 13:48:28 +00:00
|
|
|
static void i915_hpd_irq_setup(struct drm_i915_private *dev_priv)
|
2012-12-11 13:05:07 +00:00
|
|
|
{
|
|
|
|
u32 hotplug_en;
|
|
|
|
|
2013-06-27 15:52:15 +00:00
|
|
|
assert_spin_locked(&dev_priv->irq_lock);
|
|
|
|
|
2015-01-09 12:21:13 +00:00
|
|
|
/* Note HDMI and DP share hotplug bits */
|
|
|
|
/* enable bits are the same for all generations */
|
2016-05-06 13:48:28 +00:00
|
|
|
hotplug_en = intel_hpd_enabled_irqs(dev_priv, hpd_mask_i915);
|
2015-01-09 12:21:13 +00:00
|
|
|
/* Programming the CRT detection parameters tends
|
|
|
|
to generate a spurious hotplug event about three
|
|
|
|
seconds later. So just do it once.
|
|
|
|
*/
|
2016-05-06 13:48:28 +00:00
|
|
|
if (IS_G4X(dev_priv))
|
2015-01-09 12:21:13 +00:00
|
|
|
hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
|
|
|
|
hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
|
|
|
|
|
|
|
|
/* Ignore TV since it's buggy */
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update_locked(dev_priv,
|
2015-10-21 14:22:43 +00:00
|
|
|
HOTPLUG_INT_EN_MASK |
|
|
|
|
CRT_HOTPLUG_VOLTAGE_COMPARE_MASK |
|
|
|
|
CRT_HOTPLUG_ACTIVATION_PERIOD_64,
|
|
|
|
hotplug_en);
|
2012-04-24 21:59:44 +00:00
|
|
|
}
|
|
|
|
|
2012-10-02 13:10:55 +00:00
|
|
|
static irqreturn_t i965_irq_handler(int irq, void *arg)
|
2012-04-24 21:59:44 +00:00
|
|
|
{
|
2014-05-12 17:17:55 +00:00
|
|
|
struct drm_device *dev = arg;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:44 +00:00
|
|
|
u32 iir, new_iir;
|
|
|
|
u32 pipe_stats[I915_MAX_PIPES];
|
|
|
|
int ret = IRQ_NONE, pipe;
|
2013-02-19 13:16:39 +00:00
|
|
|
u32 flip_mask =
|
|
|
|
I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
|
|
|
|
I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2015-02-24 09:14:30 +00:00
|
|
|
if (!intel_irqs_enabled(dev_priv))
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
/* IRQs are synced during runtime_suspend, we don't require a wakeref */
|
|
|
|
disable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
iir = I915_READ(IIR);
|
|
|
|
|
|
|
|
for (;;) {
|
2014-01-17 09:35:15 +00:00
|
|
|
bool irq_received = (iir & ~flip_mask) != 0;
|
2012-04-24 21:59:46 +00:00
|
|
|
bool blc_event = false;
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
/* Can't rely on pipestat interrupt bit in iir as it might
|
|
|
|
* have been cleared after the pipestat interrupt was received.
|
|
|
|
* It doesn't set the bit in iir again, but it still produces
|
|
|
|
* interrupts (for non-MSI).
|
|
|
|
*/
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_lock(&dev_priv->irq_lock);
|
2012-04-24 21:59:44 +00:00
|
|
|
if (iir & I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT)
|
2014-11-04 14:52:22 +00:00
|
|
|
DRM_DEBUG("Command parser error, iir 0x%08x\n", iir);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 13:33:26 +00:00
|
|
|
i915_reg_t reg = PIPESTAT(pipe);
|
2012-04-24 21:59:44 +00:00
|
|
|
pipe_stats[pipe] = I915_READ(reg);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the PIPE*STAT regs before the IIR
|
|
|
|
*/
|
|
|
|
if (pipe_stats[pipe] & 0x8000ffff) {
|
|
|
|
I915_WRITE(reg, pipe_stats[pipe]);
|
2014-01-17 09:35:15 +00:00
|
|
|
irq_received = true;
|
2012-04-24 21:59:44 +00:00
|
|
|
}
|
|
|
|
}
|
2014-09-15 12:55:28 +00:00
|
|
|
spin_unlock(&dev_priv->irq_lock);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
if (!irq_received)
|
|
|
|
break;
|
|
|
|
|
|
|
|
ret = IRQ_HANDLED;
|
|
|
|
|
|
|
|
/* Consume port. Then clear IIR or we'll miss events */
|
2016-04-13 18:19:54 +00:00
|
|
|
if (iir & I915_DISPLAY_PORT_INTERRUPT) {
|
|
|
|
u32 hotplug_status = i9xx_hpd_irq_ack(dev_priv);
|
|
|
|
if (hotplug_status)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
2016-04-13 18:19:54 +00:00
|
|
|
}
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2013-02-19 13:16:39 +00:00
|
|
|
I915_WRITE(IIR, iir & ~flip_mask);
|
2012-04-24 21:59:44 +00:00
|
|
|
new_iir = I915_READ(IIR); /* Flush posted writes */
|
|
|
|
|
|
|
|
if (iir & I915_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[RCS]);
|
2012-04-24 21:59:44 +00:00
|
|
|
if (iir & I915_BSD_USER_INTERRUPT)
|
2016-03-16 11:00:38 +00:00
|
|
|
notify_ring(&dev_priv->engine[VCS]);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
2016-05-24 15:13:53 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_START_VBLANK_INTERRUPT_STATUS &&
|
|
|
|
i915_handle_vblank(dev_priv, pipe, pipe, iir))
|
|
|
|
flip_mask &= ~DISPLAY_PLANE_FLIP_PENDING(pipe);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_LEGACY_BLC_EVENT_STATUS)
|
|
|
|
blc_event = true;
|
2013-10-16 20:55:55 +00:00
|
|
|
|
|
|
|
if (pipe_stats[pipe] & PIPE_CRC_DONE_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
i9xx_pipe_crc_irq_handler(dev_priv, pipe);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2014-09-30 08:56:48 +00:00
|
|
|
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS)
|
|
|
|
intel_cpu_fifo_underrun_irq_handler(dev_priv, pipe);
|
2014-01-17 09:44:31 +00:00
|
|
|
}
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
if (blc_event || (iir & I915_ASLE_INTERRUPT))
|
2016-05-06 13:48:28 +00:00
|
|
|
intel_opregion_asle_intr(dev_priv);
|
2012-04-24 21:59:44 +00:00
|
|
|
|
2012-12-01 12:53:44 +00:00
|
|
|
if (pipe_stats[0] & PIPE_GMBUS_INTERRUPT_STATUS)
|
2016-05-06 13:48:28 +00:00
|
|
|
gmbus_irq_handler(dev_priv);
|
2012-12-01 12:53:44 +00:00
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
/* With MSI, interrupts are only generated when iir
|
|
|
|
* transitions from zero to nonzero. If another bit got
|
|
|
|
* set while we were handling the existing iir bits, then
|
|
|
|
* we would never get another interrupt.
|
|
|
|
*
|
|
|
|
* This is fine on non-MSI as well, as if we hit this path
|
|
|
|
* we avoid exiting the interrupt handler only to generate
|
|
|
|
* another one.
|
|
|
|
*
|
|
|
|
* Note that for MSI this could cause a stray interrupt report
|
|
|
|
* if an interrupt landed in the time between writing IIR and
|
|
|
|
* the posting read. This should be rare enough to never
|
|
|
|
* trigger the 99% of 100,000 interrupts test for disabling
|
|
|
|
* stray interrupts.
|
|
|
|
*/
|
|
|
|
iir = new_iir;
|
|
|
|
}
|
|
|
|
|
2015-12-16 00:52:19 +00:00
|
|
|
enable_rpm_wakeref_asserts(dev_priv);
|
|
|
|
|
2012-04-24 21:59:44 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void i965_irq_uninstall(struct drm_device * dev)
|
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2012-04-24 21:59:44 +00:00
|
|
|
int pipe;
|
|
|
|
|
|
|
|
if (!dev_priv)
|
|
|
|
return;
|
|
|
|
|
2015-09-23 14:15:27 +00:00
|
|
|
i915_hotplug_interrupt_update(dev_priv, 0xffffffff, 0);
|
2012-05-11 17:01:31 +00:00
|
|
|
I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
|
2012-04-24 21:59:44 +00:00
|
|
|
|
|
|
|
I915_WRITE(HWSTAM, 0xffffffff);
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe), 0);
|
|
|
|
I915_WRITE(IMR, 0xffffffff);
|
|
|
|
I915_WRITE(IER, 0x0);
|
|
|
|
|
2014-08-18 12:49:10 +00:00
|
|
|
for_each_pipe(dev_priv, pipe)
|
2012-04-24 21:59:44 +00:00
|
|
|
I915_WRITE(PIPESTAT(pipe),
|
|
|
|
I915_READ(PIPESTAT(pipe)) & 0x8000ffff);
|
|
|
|
I915_WRITE(IIR, I915_READ(IIR));
|
|
|
|
}
|
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* intel_irq_init - initializes irq support
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This function initializes all the irq support including work items, timers
|
|
|
|
* and all the vtables. It does not setup the interrupt itself though.
|
|
|
|
*/
|
2014-09-30 08:56:44 +00:00
|
|
|
void intel_irq_init(struct drm_i915_private *dev_priv)
|
2011-06-28 20:00:41 +00:00
|
|
|
{
|
2016-07-05 09:40:23 +00:00
|
|
|
struct drm_device *dev = &dev_priv->drm;
|
2012-04-24 21:59:41 +00:00
|
|
|
|
2015-06-18 10:06:16 +00:00
|
|
|
intel_hpd_init_work(dev_priv);
|
|
|
|
|
2012-08-08 21:35:35 +00:00
|
|
|
INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work);
|
2012-11-02 18:55:07 +00:00
|
|
|
INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
|
2012-04-24 21:59:41 +00:00
|
|
|
|
2014-03-15 14:53:22 +00:00
|
|
|
/* Let's track the enabled rps events */
|
2015-12-09 20:29:35 +00:00
|
|
|
if (IS_VALLEYVIEW(dev_priv))
|
2014-08-29 11:14:07 +00:00
|
|
|
/* WaGsvRC0ResidencyMethod:vlv */
|
2015-03-18 09:48:23 +00:00
|
|
|
dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
|
2014-07-03 21:33:01 +00:00
|
|
|
else
|
|
|
|
dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
|
2014-03-15 14:53:22 +00:00
|
|
|
|
2016-05-31 08:28:27 +00:00
|
|
|
dev_priv->rps.pm_intr_keep = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SNB,IVB can while VLV,CHV may hard hang on looping batchbuffer
|
|
|
|
* if GEN6_PM_UP_EI_EXPIRED is masked.
|
|
|
|
*
|
|
|
|
* TODO: verify if this can be reproduced on VLV,CHV.
|
|
|
|
*/
|
|
|
|
if (INTEL_INFO(dev_priv)->gen <= 7 && !IS_HASWELL(dev_priv))
|
|
|
|
dev_priv->rps.pm_intr_keep |= GEN6_PM_RP_UP_EI_EXPIRED;
|
|
|
|
|
|
|
|
if (INTEL_INFO(dev_priv)->gen >= 8)
|
|
|
|
dev_priv->rps.pm_intr_keep |= GEN8_PMINTR_REDIRECT_TO_NON_DISP;
|
|
|
|
|
2015-01-26 16:03:03 +00:00
|
|
|
INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
|
|
|
|
i915_hangcheck_elapsed);
|
2012-12-01 20:03:21 +00:00
|
|
|
|
2014-09-30 08:56:44 +00:00
|
|
|
if (IS_GEN2(dev_priv)) {
|
2013-10-11 18:52:44 +00:00
|
|
|
dev->max_vblank_count = 0;
|
|
|
|
dev->driver->get_vblank_counter = i8xx_get_vblank_counter;
|
2014-09-30 08:56:44 +00:00
|
|
|
} else if (IS_G4X(dev_priv) || INTEL_INFO(dev_priv)->gen >= 5) {
|
2011-06-28 20:00:41 +00:00
|
|
|
dev->max_vblank_count = 0xffffffff; /* full 32 bit counter */
|
2015-09-18 17:03:42 +00:00
|
|
|
dev->driver->get_vblank_counter = g4x_get_vblank_counter;
|
2013-09-25 16:55:26 +00:00
|
|
|
} else {
|
|
|
|
dev->driver->get_vblank_counter = i915_get_vblank_counter;
|
|
|
|
dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
|
2011-06-28 20:00:41 +00:00
|
|
|
}
|
|
|
|
|
2014-08-06 11:49:55 +00:00
|
|
|
/*
|
|
|
|
* Opt out of the vblank disable timer on everything except gen2.
|
|
|
|
* Gen2 doesn't have a hardware frame counter and so depends on
|
|
|
|
* vblank interrupts to produce sane vblank seuquence numbers.
|
|
|
|
*/
|
2014-09-30 08:56:44 +00:00
|
|
|
if (!IS_GEN2(dev_priv))
|
2014-08-06 11:49:55 +00:00
|
|
|
dev->vblank_disable_immediate = true;
|
|
|
|
|
2015-02-13 20:03:44 +00:00
|
|
|
dev->driver->get_vblank_timestamp = i915_get_vblank_timestamp;
|
|
|
|
dev->driver->get_scanout_position = i915_get_crtc_scanoutpos;
|
2011-06-28 20:00:41 +00:00
|
|
|
|
2014-09-30 08:56:44 +00:00
|
|
|
if (IS_CHERRYVIEW(dev_priv)) {
|
2014-04-09 17:40:52 +00:00
|
|
|
dev->driver->irq_handler = cherryview_irq_handler;
|
|
|
|
dev->driver->irq_preinstall = cherryview_irq_preinstall;
|
|
|
|
dev->driver->irq_postinstall = cherryview_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = cherryview_irq_uninstall;
|
|
|
|
dev->driver->enable_vblank = valleyview_enable_vblank;
|
|
|
|
dev->driver->disable_vblank = valleyview_disable_vblank;
|
|
|
|
dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;
|
2014-09-30 08:56:44 +00:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv)) {
|
2012-03-28 20:39:38 +00:00
|
|
|
dev->driver->irq_handler = valleyview_irq_handler;
|
|
|
|
dev->driver->irq_preinstall = valleyview_irq_preinstall;
|
|
|
|
dev->driver->irq_postinstall = valleyview_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = valleyview_irq_uninstall;
|
|
|
|
dev->driver->enable_vblank = valleyview_enable_vblank;
|
|
|
|
dev->driver->disable_vblank = valleyview_disable_vblank;
|
2013-02-25 17:06:48 +00:00
|
|
|
dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;
|
2014-09-30 08:56:44 +00:00
|
|
|
} else if (INTEL_INFO(dev_priv)->gen >= 8) {
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
dev->driver->irq_handler = gen8_irq_handler;
|
2014-05-22 15:56:34 +00:00
|
|
|
dev->driver->irq_preinstall = gen8_irq_reset;
|
drm/i915/bdw: Implement interrupt changes
The interrupt handling implementation remains the same as previous
generations with the 4 types of registers, status, identity, mask, and
enable. However the layout of where the bits go have changed entirely.
To address these changes, all of the interrupt vfuncs needed special
gen8 code.
The way it works is there is a top level status register now which
informs the interrupt service routine which unit caused the interrupt,
and therefore which interrupt registers to read to process the
interrupt. For display the division is quite logical, a set of interrupt
registers for each pipe, and in addition to those, a set each for "misc"
and port.
For GT the things get a bit hairy, as seen by the code. Each of the GT
units has it's own bits defined. They all look *very similar* and
resides in 16 bits of a GT register. As an example, RCS and BCS share
register 0. To compact the code a bit, at a slight expense to
complexity, this is exactly how the code works as well. 2 structures are
added to the ring buffer so that our ring buffer interrupt handling code
knows which ring shares the interrupt registers, and a shift value (ie.
the top or bottom 16 bits of the register).
The above allows us to kept the interrupt register caching scheme, the
per interrupt enables, and the code to mask and unmask interrupts
relatively clean (again at the cost of some more complexity).
Most of the GT units mentioned above are command streamers, and so the
symmetry should work quite well for even the yet to be implemented rings
which Broadwell adds.
v2: Fixes up a couple of bugs, and is more verbose about errors in the
Broadwell interrupt handler.
v3: fix DE_MISC IER offset
v4: Simplify interrupts:
I totally misread the docs the first time I implemented interrupts, and
so this should greatly simplify the mess. Unlike GEN6, we never touch
the regular mask registers in irq_get/put.
v5: Rebased on to of recent pch hotplug setup changes.
v6: Fixup on top of moving num_pipes to intel_info.
v7: Rebased on top of Egbert Eich's hpd irq handling rework. Also
wired up ibx_hpd_irq_setup for gen8.
v8: Rebase on top of Jani's asle handling rework.
v9: Rebase on top of Ben's VECS enabling for Haswell, where he
unfortunately went OCD on the gt irq #defines. Not that they're still
not yet fully consistent:
- Used the GT_RENDER_ #defines + bdw shifts.
- Dropped the shift from the L3_PARITY stuff, seemed clearer.
- s/irq_refcount/irq_refcount.gt/
v10: Squash in VECS enabling patches and the gen8_gt_irq_handler
refactoring from Zhao Yakui <yakui.zhao@intel.com>
v11: Rebase on top of the interrupt cleanups in upstream.
v12: Rebase on top of Ben's DPF changes in upstream.
v13: Drop bdw from the HAS_L3_DPF feature flag for now, it's unclear what
exactly needs to be done. Requested by Ben.
v14: Fix the patch.
- Drop the mask of reserved bits and assorted logic, it doesn't match
the spec.
- Do the posting read inconditionally instead of commenting it out.
- Add a GEN8_MASTER_IRQ_CONTROL definition and use it.
- Fix up the GEN8_PIPE interrupt defines and give the GEN8_ prefixes -
we actually will need to use them.
- Enclose macros in do {} while (0) (checkpatch).
- Clear DE_MISC interrupt bits only after having processed them.
- Fix whitespace fail (checkpatch).
- Fix overtly long lines where appropriate (checkpatch).
- Don't use typedef'ed private_t (maintainer-scripts).
- Align the function parameter list correctly.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v4)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
bikeshed
2013-11-03 04:07:09 +00:00
|
|
|
dev->driver->irq_postinstall = gen8_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = gen8_irq_uninstall;
|
|
|
|
dev->driver->enable_vblank = gen8_enable_vblank;
|
|
|
|
dev->driver->disable_vblank = gen8_disable_vblank;
|
2015-08-27 20:56:02 +00:00
|
|
|
if (IS_BROXTON(dev))
|
2015-03-27 12:54:14 +00:00
|
|
|
dev_priv->display.hpd_irq_setup = bxt_hpd_irq_setup;
|
2016-07-02 00:07:12 +00:00
|
|
|
else if (HAS_PCH_SPT(dev) || HAS_PCH_KBP(dev))
|
2015-08-27 20:56:02 +00:00
|
|
|
dev_priv->display.hpd_irq_setup = spt_hpd_irq_setup;
|
|
|
|
else
|
2015-08-27 20:56:06 +00:00
|
|
|
dev_priv->display.hpd_irq_setup = ilk_hpd_irq_setup;
|
2011-06-28 20:00:41 +00:00
|
|
|
} else if (HAS_PCH_SPLIT(dev)) {
|
|
|
|
dev->driver->irq_handler = ironlake_irq_handler;
|
2014-05-22 15:56:34 +00:00
|
|
|
dev->driver->irq_preinstall = ironlake_irq_reset;
|
2011-06-28 20:00:41 +00:00
|
|
|
dev->driver->irq_postinstall = ironlake_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = ironlake_irq_uninstall;
|
|
|
|
dev->driver->enable_vblank = ironlake_enable_vblank;
|
|
|
|
dev->driver->disable_vblank = ironlake_disable_vblank;
|
2015-08-27 20:56:04 +00:00
|
|
|
dev_priv->display.hpd_irq_setup = ilk_hpd_irq_setup;
|
2011-06-28 20:00:41 +00:00
|
|
|
} else {
|
2016-05-10 09:57:06 +00:00
|
|
|
if (IS_GEN2(dev_priv)) {
|
2012-04-22 20:13:57 +00:00
|
|
|
dev->driver->irq_preinstall = i8xx_irq_preinstall;
|
|
|
|
dev->driver->irq_postinstall = i8xx_irq_postinstall;
|
|
|
|
dev->driver->irq_handler = i8xx_irq_handler;
|
|
|
|
dev->driver->irq_uninstall = i8xx_irq_uninstall;
|
2016-05-10 09:57:06 +00:00
|
|
|
} else if (IS_GEN3(dev_priv)) {
|
2012-04-24 21:59:44 +00:00
|
|
|
dev->driver->irq_preinstall = i915_irq_preinstall;
|
|
|
|
dev->driver->irq_postinstall = i915_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = i915_irq_uninstall;
|
|
|
|
dev->driver->irq_handler = i915_irq_handler;
|
2012-04-22 20:13:57 +00:00
|
|
|
} else {
|
2012-04-24 21:59:44 +00:00
|
|
|
dev->driver->irq_preinstall = i965_irq_preinstall;
|
|
|
|
dev->driver->irq_postinstall = i965_irq_postinstall;
|
|
|
|
dev->driver->irq_uninstall = i965_irq_uninstall;
|
|
|
|
dev->driver->irq_handler = i965_irq_handler;
|
2012-04-22 20:13:57 +00:00
|
|
|
}
|
2015-01-09 12:21:13 +00:00
|
|
|
if (I915_HAS_HOTPLUG(dev_priv))
|
|
|
|
dev_priv->display.hpd_irq_setup = i915_hpd_irq_setup;
|
2011-06-28 20:00:41 +00:00
|
|
|
dev->driver->enable_vblank = i915_enable_vblank;
|
|
|
|
dev->driver->disable_vblank = i915_disable_vblank;
|
|
|
|
}
|
|
|
|
}
|
2012-12-11 13:05:07 +00:00
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* intel_irq_install - enables the hardware interrupt
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This function enables the hardware interrupt handling, but leaves the hotplug
|
|
|
|
* handling still disabled. It is called after intel_irq_init().
|
|
|
|
*
|
|
|
|
* In the driver load and resume code we need working interrupts in a few places
|
|
|
|
* but don't want to deal with the hassle of concurrent probe and hotplug
|
|
|
|
* workers. Hence the split into this two-stage approach.
|
|
|
|
*/
|
2014-09-30 08:56:43 +00:00
|
|
|
int intel_irq_install(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We enable some interrupt sources in our postinstall hooks, so mark
|
|
|
|
* interrupts as enabled _before_ actually enabling them to avoid
|
|
|
|
* special cases in our ordering checks.
|
|
|
|
*/
|
|
|
|
dev_priv->pm.irqs_enabled = true;
|
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
return drm_irq_install(&dev_priv->drm, dev_priv->drm.pdev->irq);
|
2014-09-30 08:56:43 +00:00
|
|
|
}
|
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* intel_irq_uninstall - finilizes all irq handling
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This stops interrupt and hotplug handling and unregisters and frees all
|
|
|
|
* resources acquired in the init functions.
|
|
|
|
*/
|
2014-09-30 08:56:43 +00:00
|
|
|
void intel_irq_uninstall(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
2016-07-05 09:40:23 +00:00
|
|
|
drm_irq_uninstall(&dev_priv->drm);
|
2014-09-30 08:56:43 +00:00
|
|
|
intel_hpd_cancel_work(dev_priv);
|
|
|
|
dev_priv->pm.irqs_enabled = false;
|
|
|
|
}
|
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* intel_runtime_pm_disable_interrupts - runtime interrupt disabling
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This function is used to disable interrupts at runtime, both in the runtime
|
|
|
|
* pm and the system suspend/resume code.
|
|
|
|
*/
|
2014-09-30 08:56:44 +00:00
|
|
|
void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)
|
2013-08-19 16:18:09 +00:00
|
|
|
{
|
2016-07-05 09:40:23 +00:00
|
|
|
dev_priv->drm.driver->irq_uninstall(&dev_priv->drm);
|
2014-09-30 08:56:43 +00:00
|
|
|
dev_priv->pm.irqs_enabled = false;
|
2016-07-05 09:40:23 +00:00
|
|
|
synchronize_irq(dev_priv->drm.irq);
|
2013-08-19 16:18:09 +00:00
|
|
|
}
|
|
|
|
|
2014-09-30 08:56:45 +00:00
|
|
|
/**
|
|
|
|
* intel_runtime_pm_enable_interrupts - runtime interrupt enabling
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This function is used to enable interrupts at runtime, both in the runtime
|
|
|
|
* pm and the system suspend/resume code.
|
|
|
|
*/
|
2014-09-30 08:56:44 +00:00
|
|
|
void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv)
|
2013-08-19 16:18:09 +00:00
|
|
|
{
|
2014-09-30 08:56:43 +00:00
|
|
|
dev_priv->pm.irqs_enabled = true;
|
2016-07-05 09:40:23 +00:00
|
|
|
dev_priv->drm.driver->irq_preinstall(&dev_priv->drm);
|
|
|
|
dev_priv->drm.driver->irq_postinstall(&dev_priv->drm);
|
2013-08-19 16:18:09 +00:00
|
|
|
}
|