| Message ID | 20201130212200.2811939-5-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Add the missing wakeref tracking for display power references | expand |
Quoting Imre Deak (2020-11-30 21:21:55) > Add wakeref tracking for the DDI encoders' DDI_IO 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 | 38 ++++++++++++------- > .../drm/i915/display/intel_display_types.h | 1 + > 2 files changed, 25 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 92940a0c5ef8..9518d298b0f7 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -2285,9 +2285,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, > dig_port = enc_to_dig_port(encoder); > > if (!intel_phy_is_tc(dev_priv, phy) || > - dig_port->tc_mode != TC_PORT_TBT_ALT) > - intel_display_power_get(dev_priv, > - dig_port->ddi_io_power_domain); > + dig_port->tc_mode != TC_PORT_TBT_ALT) { > + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); > + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, > + dig_port->ddi_io_power_domain); > + } > @@ -3958,8 +3967,9 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, > > intel_disable_ddi_buf(encoder, old_crtc_state); > > - intel_display_power_put_unchecked(dev_priv, > - dig_port->ddi_io_power_domain); > + intel_display_power_put(dev_priv, > + dig_port->ddi_io_power_domain, > + fetch_and_zero(&dig_port->ddi_io_wakeref)); I remember that once we had trouble with this being a macro and not evaluating the fetch_and_zero() when used as an argument. Looks like we still have the same trouble with #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) static inline void intel_display_power_put(struct drm_i915_private *i915, enum intel_display_power_domain domain, intel_wakeref_t wakeref) { intel_display_power_put_unchecked(i915, domain); } #endif will cause the ddi_io_wakeref to not be cleared, and the warn on to be hit in non-debug builds. -Chris
On Mon, Nov 30, 2020 at 10:00:33PM +0000, Chris Wilson wrote: > Quoting Imre Deak (2020-11-30 21:21:55) > > Add wakeref tracking for the DDI encoders' DDI_IO 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 | 38 ++++++++++++------- > > .../drm/i915/display/intel_display_types.h | 1 + > > 2 files changed, 25 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > > index 92940a0c5ef8..9518d298b0f7 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -2285,9 +2285,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, > > dig_port = enc_to_dig_port(encoder); > > > > if (!intel_phy_is_tc(dev_priv, phy) || > > - dig_port->tc_mode != TC_PORT_TBT_ALT) > > - intel_display_power_get(dev_priv, > > - dig_port->ddi_io_power_domain); > > + dig_port->tc_mode != TC_PORT_TBT_ALT) { > > + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); > > + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, > > + dig_port->ddi_io_power_domain); > > + } > > > @@ -3958,8 +3967,9 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, > > > > intel_disable_ddi_buf(encoder, old_crtc_state); > > > > - intel_display_power_put_unchecked(dev_priv, > > - dig_port->ddi_io_power_domain); > > + intel_display_power_put(dev_priv, > > + dig_port->ddi_io_power_domain, > > + fetch_and_zero(&dig_port->ddi_io_wakeref)); > > I remember that once we had trouble with this being a macro and not > evaluating the fetch_and_zero() when used as an argument. > > Looks like we still have the same trouble with > > #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > static inline void > intel_display_power_put(struct drm_i915_private *i915, > enum intel_display_power_domain domain, > intel_wakeref_t wakeref) > { > intel_display_power_put_unchecked(i915, domain); > } > #endif > > will cause the ddi_io_wakeref to not be cleared, and the warn on to be > hit in non-debug builds. Arg, screwed it again. > -Chris
On Tue, Dec 01, 2020 at 12:07:21AM +0200, Imre Deak wrote: > On Mon, Nov 30, 2020 at 10:00:33PM +0000, Chris Wilson wrote: > > Quoting Imre Deak (2020-11-30 21:21:55) > > > Add wakeref tracking for the DDI encoders' DDI_IO 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 | 38 ++++++++++++------- > > > .../drm/i915/display/intel_display_types.h | 1 + > > > 2 files changed, 25 insertions(+), 14 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > > > index 92940a0c5ef8..9518d298b0f7 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > > @@ -2285,9 +2285,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, > > > dig_port = enc_to_dig_port(encoder); > > > > > > if (!intel_phy_is_tc(dev_priv, phy) || > > > - dig_port->tc_mode != TC_PORT_TBT_ALT) > > > - intel_display_power_get(dev_priv, > > > - dig_port->ddi_io_power_domain); > > > + dig_port->tc_mode != TC_PORT_TBT_ALT) { > > > + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); > > > + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, > > > + dig_port->ddi_io_power_domain); > > > + } > > > > > @@ -3958,8 +3967,9 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, > > > > > > intel_disable_ddi_buf(encoder, old_crtc_state); > > > > > > - intel_display_power_put_unchecked(dev_priv, > > > - dig_port->ddi_io_power_domain); > > > + intel_display_power_put(dev_priv, > > > + dig_port->ddi_io_power_domain, > > > + fetch_and_zero(&dig_port->ddi_io_wakeref)); > > > > I remember that once we had trouble with this being a macro and not > > evaluating the fetch_and_zero() when used as an argument. > > > > Looks like we still have the same trouble with > > > > #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > static inline void > > intel_display_power_put(struct drm_i915_private *i915, > > enum intel_display_power_domain domain, > > intel_wakeref_t wakeref) > > { > > intel_display_power_put_unchecked(i915, domain); > > } > > #endif > > > > will cause the ddi_io_wakeref to not be cleared, and the warn on to be > > hit in non-debug builds. Actually, this would be the case only if intel_display_power_put() was a macro (which it was at one point, but we've changed it to be an inline function just to avoid the same issue). So I think the wakeref zeroing is still ok. > > Arg, screwed it again. > > > -Chris
Quoting Imre Deak (2020-11-30 23:39:02) > On Tue, Dec 01, 2020 at 12:07:21AM +0200, Imre Deak wrote: > > On Mon, Nov 30, 2020 at 10:00:33PM +0000, Chris Wilson wrote: > > > Quoting Imre Deak (2020-11-30 21:21:55) > > > > Add wakeref tracking for the DDI encoders' DDI_IO 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 | 38 ++++++++++++------- > > > > .../drm/i915/display/intel_display_types.h | 1 + > > > > 2 files changed, 25 insertions(+), 14 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > > > > index 92940a0c5ef8..9518d298b0f7 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > > > @@ -2285,9 +2285,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, > > > > dig_port = enc_to_dig_port(encoder); > > > > > > > > if (!intel_phy_is_tc(dev_priv, phy) || > > > > - dig_port->tc_mode != TC_PORT_TBT_ALT) > > > > - intel_display_power_get(dev_priv, > > > > - dig_port->ddi_io_power_domain); > > > > + dig_port->tc_mode != TC_PORT_TBT_ALT) { > > > > + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); > > > > + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, > > > > + dig_port->ddi_io_power_domain); > > > > + } > > > > > > > @@ -3958,8 +3967,9 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, > > > > > > > > intel_disable_ddi_buf(encoder, old_crtc_state); > > > > > > > > - intel_display_power_put_unchecked(dev_priv, > > > > - dig_port->ddi_io_power_domain); > > > > + intel_display_power_put(dev_priv, > > > > + dig_port->ddi_io_power_domain, > > > > + fetch_and_zero(&dig_port->ddi_io_wakeref)); > > > > > > I remember that once we had trouble with this being a macro and not > > > evaluating the fetch_and_zero() when used as an argument. > > > > > > Looks like we still have the same trouble with > > > > > > #if !IS_ENABLED(CONFIG_DRM_I915_DEBUG_RUNTIME_PM) > > > static inline void > > > intel_display_power_put(struct drm_i915_private *i915, > > > enum intel_display_power_domain domain, > > > intel_wakeref_t wakeref) > > > { > > > intel_display_power_put_unchecked(i915, domain); > > > } > > > #endif > > > > > > will cause the ddi_io_wakeref to not be cleared, and the warn on to be > > > hit in non-debug builds. > > Actually, this would be the case only if intel_display_power_put() was a > macro (which it was at one point, but we've changed it to be an inline > function just to avoid the same issue). > > So I think the wakeref zeroing is still ok. Yeah, I think it was previously broken by being a macro whereas the inline function should be ok. A pair of non-debug modesets would bery quickly confirm whether or not there is an issue :) -Chris
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 92940a0c5ef8..9518d298b0f7 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2285,9 +2285,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder, dig_port = enc_to_dig_port(encoder); if (!intel_phy_is_tc(dev_priv, phy) || - dig_port->tc_mode != TC_PORT_TBT_ALT) - intel_display_power_get(dev_priv, - dig_port->ddi_io_power_domain); + dig_port->tc_mode != TC_PORT_TBT_ALT) { + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, + dig_port->ddi_io_power_domain); + } /* * AUX power is only needed for (e)DP mode, and for HDMI mode on TC @@ -3577,9 +3579,11 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, /* 5. If IO power is controlled through PWR_WELL_CTL, Enable IO Power */ if (!intel_phy_is_tc(dev_priv, phy) || - dig_port->tc_mode != TC_PORT_TBT_ALT) - intel_display_power_get(dev_priv, - dig_port->ddi_io_power_domain); + dig_port->tc_mode != TC_PORT_TBT_ALT) { + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, + dig_port->ddi_io_power_domain); + } /* 6. Program DP_MODE */ icl_program_mg_dp_mode(dig_port, crtc_state); @@ -3698,9 +3702,11 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, intel_ddi_clk_select(encoder, crtc_state); if (!intel_phy_is_tc(dev_priv, phy) || - dig_port->tc_mode != TC_PORT_TBT_ALT) - intel_display_power_get(dev_priv, - dig_port->ddi_io_power_domain); + dig_port->tc_mode != TC_PORT_TBT_ALT) { + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, + dig_port->ddi_io_power_domain); + } icl_program_mg_dp_mode(dig_port, crtc_state); @@ -3778,7 +3784,9 @@ static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state, intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); intel_ddi_clk_select(encoder, crtc_state); - intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain); + drm_WARN_ON(&dev_priv->drm, dig_port->ddi_io_wakeref); + dig_port->ddi_io_wakeref = intel_display_power_get(dev_priv, + dig_port->ddi_io_power_domain); icl_program_mg_dp_mode(dig_port, crtc_state); @@ -3936,8 +3944,9 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state, if (!intel_phy_is_tc(dev_priv, phy) || dig_port->tc_mode != TC_PORT_TBT_ALT) - intel_display_power_put_unchecked(dev_priv, - dig_port->ddi_io_power_domain); + intel_display_power_put(dev_priv, + dig_port->ddi_io_power_domain, + fetch_and_zero(&dig_port->ddi_io_wakeref)); intel_ddi_clk_disable(encoder); } @@ -3958,8 +3967,9 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, intel_disable_ddi_buf(encoder, old_crtc_state); - intel_display_power_put_unchecked(dev_priv, - dig_port->ddi_io_power_domain); + intel_display_power_put(dev_priv, + dig_port->ddi_io_power_domain, + fetch_and_zero(&dig_port->ddi_io_wakeref)); intel_ddi_clk_disable(encoder); diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 2dcda480b714..91ed5c445150 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1466,6 +1466,7 @@ struct intel_digital_port { /* Used for DP and ICL+ TypeC/DP and TypeC/HDMI ports. */ enum aux_ch aux_ch; enum intel_display_power_domain ddi_io_power_domain; + intel_wakeref_t ddi_io_wakeref; struct mutex tc_lock; /* protects the TypeC port mode */ intel_wakeref_t tc_lock_wakeref; int tc_link_refcount;
Add wakeref tracking for the DDI encoders' DDI_IO 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 | 38 ++++++++++++------- .../drm/i915/display/intel_display_types.h | 1 + 2 files changed, 25 insertions(+), 14 deletions(-)