From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 7/8] drm/i915: move display-related to the end of intel_irq_init()
Date: Fri, 6 Nov 2020 14:55:30 -0800 [thread overview]
Message-ID: <20201106225531.920641-7-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20201106225531.920641-1-lucas.demarchi@intel.com>
In intel_irq_init() move what's display/hpd related after what is gt and
guc. This makes it easier to support !HAS_DISPLAY() in future.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 2ab4edf7f25c..4faf7cb9c158 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -4204,10 +4204,6 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
struct drm_device *dev = &dev_priv->drm;
int i;
- intel_hpd_init_pins(dev_priv);
-
- intel_hpd_init_work(dev_priv);
-
INIT_WORK(&dev_priv->l3_parity.error_work, ivb_parity_work);
for (i = 0; i < MAX_L3_SLICES; ++i)
dev_priv->l3_parity.remap_info[i] = NULL;
@@ -4216,6 +4212,10 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
if (HAS_GT_UC(dev_priv) && INTEL_GEN(dev_priv) < 11)
dev_priv->gt.pm_guc_events = GUC_INTR_GUC2HOST << 16;
+ intel_hpd_init_pins(dev_priv);
+
+ intel_hpd_init_work(dev_priv);
+
dev->vblank_disable_immediate = true;
/* Most platforms treat the display irq block as an always-on
--
2.29.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-11-06 22:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 22:55 [Intel-gfx] [PATCH 1/8] drm/i915/display: add namespace to intel_prepare_reset Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 2/8] drm/i915/display: add namespace to intel_finish_reset Lucas De Marchi
2020-11-09 9:00 ` Jani Nikula
2020-11-06 22:55 ` [Intel-gfx] [PATCH 3/8] drm/i915/display: Do not reset display when there is none Lucas De Marchi
2020-11-09 9:00 ` Jani Nikula
2020-11-06 22:55 ` [Intel-gfx] [PATCH 4/8] drm/i915/display: return earlier from intel_modeset_init() without display Lucas De Marchi
2020-11-09 20:46 ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 5/8] drm/i915/display: Do not set any power wells when there is no display Lucas De Marchi
2020-11-06 23:18 ` Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 6/8] drm/i915: re-order if/else ladder for hpd_irq_setup Lucas De Marchi
2020-11-09 20:47 ` Souza, Jose
2020-11-06 22:55 ` Lucas De Marchi [this message]
2020-11-09 20:48 ` [Intel-gfx] [PATCH 7/8] drm/i915: move display-related to the end of intel_irq_init() Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 8/8] drm/i915: Do not setup hpd without display Lucas De Marchi
2020-11-09 20:48 ` Souza, Jose
2020-11-06 23:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/8] drm/i915/display: add namespace to intel_prepare_reset Patchwork
2020-11-06 23:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-07 1:22 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-09 8:59 ` [Intel-gfx] [PATCH 1/8] " 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=20201106225531.920641-7-lucas.demarchi@intel.com \
--to=lucas.demarchi@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