From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [Intel-gfx] [PATCH 5/9] drm/i915/ddi: Track power reference taken for encoder main lane AUX use
Date: Mon, 30 Nov 2020 23:21:56 +0200 [thread overview]
Message-ID: <20201130212200.2811939-6-imre.deak@intel.com> (raw)
In-Reply-To: <20201130212200.2811939-1-imre.deak@intel.com>
Add wakeref tracking for the DDI encoders' main lane AUX display power
domain references.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 23 ++++++++++++-------
.../drm/i915/display/intel_display_types.h | 1 +
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 9518d298b0f7..bfcfe8c3567e 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2296,9 +2296,12 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
* ports.
*/
if (intel_crtc_has_dp_encoder(crtc_state) ||
- intel_phy_is_tc(dev_priv, phy))
- intel_display_power_get(dev_priv,
- intel_ddi_main_link_aux_domain(dig_port));
+ intel_phy_is_tc(dev_priv, phy)) {
+ drm_WARN_ON(&dev_priv->drm, dig_port->aux_wakeref);
+ dig_port->aux_wakeref =
+ intel_display_power_get(dev_priv,
+ intel_ddi_main_link_aux_domain(dig_port));
+ }
}
void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder,
@@ -4042,8 +4045,9 @@ static void intel_ddi_post_disable(struct intel_atomic_state *state,
icl_unmap_plls_to_ports(encoder);
if (intel_crtc_has_dp_encoder(old_crtc_state) || is_tc_port)
- intel_display_power_put_unchecked(dev_priv,
- intel_ddi_main_link_aux_domain(dig_port));
+ intel_display_power_put(dev_priv,
+ intel_ddi_main_link_aux_domain(dig_port),
+ fetch_and_zero(&dig_port->aux_wakeref));
if (is_tc_port)
intel_tc_port_put_link(dig_port);
@@ -4378,9 +4382,12 @@ intel_ddi_pre_pll_enable(struct intel_atomic_state *state,
if (is_tc_port)
intel_tc_port_get_link(dig_port, crtc_state->lane_count);
- if (intel_crtc_has_dp_encoder(crtc_state) || is_tc_port)
- intel_display_power_get(dev_priv,
- intel_ddi_main_link_aux_domain(dig_port));
+ if (intel_crtc_has_dp_encoder(crtc_state) || is_tc_port) {
+ drm_WARN_ON(&dev_priv->drm, dig_port->aux_wakeref);
+ dig_port->aux_wakeref =
+ intel_display_power_get(dev_priv,
+ intel_ddi_main_link_aux_domain(dig_port));
+ }
if (is_tc_port && dig_port->tc_mode != TC_PORT_TBT_ALT)
/*
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 91ed5c445150..22f7328023a0 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1467,6 +1467,7 @@ struct intel_digital_port {
enum aux_ch aux_ch;
enum intel_display_power_domain ddi_io_power_domain;
intel_wakeref_t ddi_io_wakeref;
+ intel_wakeref_t aux_wakeref;
struct mutex tc_lock; /* protects the TypeC port mode */
intel_wakeref_t tc_lock_wakeref;
int tc_link_refcount;
--
2.25.1
_______________________________________________
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-30 21:22 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 21:21 [Intel-gfx] [PATCH 0/9] drm/i915: Add the missing wakeref tracking for display power references Imre Deak
2020-11-30 21:21 ` [Intel-gfx] [PATCH 1/9] drm/i915: Use CRTC index consistently during getting/putting CRTC power domains Imre Deak
2020-11-30 21:50 ` Chris Wilson
2020-11-30 21:21 ` [Intel-gfx] [PATCH 2/9] drm/i915: Factor out helpers to get/put a set of tracked " Imre Deak
2020-11-30 21:48 ` Chris Wilson
2020-12-01 16:13 ` [Intel-gfx] [PATCH v2 " Imre Deak
2020-11-30 21:21 ` [Intel-gfx] [PATCH 3/9] drm/i915: Track power references taken for enabled CRTCs Imre Deak
2020-11-30 21:57 ` Chris Wilson
2020-11-30 21:21 ` [Intel-gfx] [PATCH 4/9] drm/i915/ddi: Track power reference taken for encoder DDI IO use Imre Deak
2020-11-30 22:00 ` Chris Wilson
2020-11-30 22:07 ` Imre Deak
2020-11-30 23:39 ` Imre Deak
2020-12-01 11:08 ` Chris Wilson
2020-11-30 21:21 ` Imre Deak [this message]
2020-11-30 21:21 ` [Intel-gfx] [PATCH 6/9] drm/i915: Track power reference taken for eDP VDD Imre Deak
2020-11-30 21:21 ` [Intel-gfx] [PATCH 7/9] drm/i915: Rename power_domains.wakeref to init_wakeref Imre Deak
2020-11-30 22:01 ` Chris Wilson
2020-11-30 21:21 ` [Intel-gfx] [PATCH 8/9] drm/i915: Track power reference taken to disable power well functionality Imre Deak
2020-12-01 16:13 ` [Intel-gfx] [PATCH v2 " Imre Deak
2020-11-30 21:22 ` [Intel-gfx] [PATCH 9/9] drm/i915: Make intel_display_power_put_unchecked() an internal-only function Imre Deak
2020-11-30 22:07 ` Chris Wilson
2020-11-30 22:47 ` Imre Deak
2020-12-01 8:14 ` Chris Wilson
2020-12-01 10:52 ` Imre Deak
2020-12-01 11:13 ` Chris Wilson
2020-12-01 11:32 ` Imre Deak
2020-12-01 2:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add the missing wakeref tracking for display power references Patchwork
2020-12-01 2:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-12-01 15:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-12-01 18:54 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add the missing wakeref tracking for display power references (rev3) Patchwork
2020-12-01 19:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-12-02 15:33 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add the missing wakeref tracking for display power references (rev4) Patchwork
2020-12-02 19:57 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork
2020-12-03 10:44 ` [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Add the missing wakeref tracking for display power references (rev3) Patchwork
2020-12-03 13:41 ` Imre Deak
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=20201130212200.2811939-6-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=chris@chris-wilson.co.uk \
--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