From: Wang Elaine <elaine.wang@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Elaine Wang <elaine.wang@intel.com>
Subject: [PATCH v3] drm/i915: Check HAS_PCH_NOP when install or reset dispaly IRQ
Date: Mon, 12 Dec 2016 14:57:44 +0800 [thread overview]
Message-ID: <1481525864-27673-1-git-send-email-elaine.wang@intel.com> (raw)
From: Elaine Wang <elaine.wang@intel.com>
Some platforms don't have display. To avoid accessing the
non-existent registers, check HAS_PCH_NOP before invoking
display IRQ install or reset function.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 0b119b9..369a038 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2990,8 +2990,10 @@ static void gen8_irq_reset(struct drm_device *dev)
POWER_DOMAIN_PIPE(pipe)))
GEN8_IRQ_RESET_NDX(DE_PIPE, pipe);
- GEN5_IRQ_RESET(GEN8_DE_PORT_);
- GEN5_IRQ_RESET(GEN8_DE_MISC_);
+ if (!HAS_PCH_NOP(dev_priv)) {
+ GEN5_IRQ_RESET(GEN8_DE_PORT_);
+ GEN5_IRQ_RESET(GEN8_DE_MISC_);
+ }
GEN5_IRQ_RESET(GEN8_PCU_);
if (HAS_PCH_SPLIT(dev_priv))
@@ -3414,7 +3416,9 @@ static int gen8_irq_postinstall(struct drm_device *dev)
ibx_irq_pre_postinstall(dev);
gen8_gt_irq_postinstall(dev_priv);
- gen8_de_irq_postinstall(dev_priv);
+
+ if (!HAS_PCH_NOP(dev_priv))
+ gen8_de_irq_postinstall(dev_priv);
if (HAS_PCH_SPLIT(dev_priv))
ibx_irq_postinstall(dev);
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-12-12 7:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 6:57 Wang Elaine [this message]
2016-12-12 7:52 ` ✗ Fi.CI.BAT: failure for drm/i915: Check HAS_PCH_NOP when install or reset dispaly IRQ Patchwork
2016-12-15 10:18 ` Wang, Elaine
2016-12-15 12:37 ` [PATCH v3] " Joonas Lahtinen
2016-12-15 12:58 ` Ville Syrjälä
2016-12-15 14:49 ` Jani Nikula
2016-12-16 1:40 ` Wang, Elaine
2016-12-22 7:01 ` Wang, Elaine
2016-12-22 8:09 ` Jani Nikula
2016-12-22 8:34 ` Wang, Elaine
2016-12-22 8:52 ` Jani Nikula
2016-12-22 11:18 ` David Weinehall
2016-12-27 14:41 ` Daniel Vetter
2016-12-27 14:46 ` Jani Nikula
2016-12-27 15:04 ` Daniel Vetter
2016-12-27 15:49 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1481525864-27673-1-git-send-email-elaine.wang@intel.com \
--to=elaine.wang@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).