From: Jani Nikula <jani.nikula@linux.intel.com> To: "Hans de Goede" <hdegoede@redhat.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Hans de Goede <hdegoede@redhat.com>, intel-gfx <intel-gfx@lists.freedesktop.org>, dri-devel@lists.freedesktop.org Subject: Re: [PATCH resend 1/2] drm/i915/display: Add a intel_pipe_is_enabled() helper Date: Tue, 02 Mar 2021 14:46:51 +0200 [thread overview] Message-ID: <87a6rlpvt0.fsf@intel.com> (raw) In-Reply-To: <20210302120040.94435-2-hdegoede@redhat.com> On Tue, 02 Mar 2021, Hans de Goede <hdegoede@redhat.com> wrote: > Factor the code to check if a pipe is currently enabled out of > assert_pipe() and put it in a new intel_pipe_is_enabled() helper, > so that it can be re-used without copy-pasting it. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Does what it says on the box. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 20 ++++++++++++++------ > drivers/gpu/drm/i915/display/intel_display.h | 2 ++ > 2 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index e1060076ac83..9cb304aee285 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -442,17 +442,13 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe) > pipe_name(pipe)); > } > > -void assert_pipe(struct drm_i915_private *dev_priv, > - enum transcoder cpu_transcoder, bool state) > +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder) > { > bool cur_state; > enum intel_display_power_domain power_domain; > intel_wakeref_t wakeref; > > - /* we keep both pipes enabled on 830 */ > - if (IS_I830(dev_priv)) > - state = true; > - > power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder); > wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain); > if (wakeref) { > @@ -464,6 +460,18 @@ void assert_pipe(struct drm_i915_private *dev_priv, > cur_state = false; > } > > + return cur_state; > +} > + > +void assert_pipe(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder, bool state) > +{ > + bool cur_state = intel_pipe_is_enabled(dev_priv, cpu_transcoder); > + > + /* we keep both pipes enabled on 830 */ > + if (IS_I830(dev_priv)) > + state = true; > + > I915_STATE_WARN(cur_state != state, > "transcoder %s assertion failure (expected %s, current %s)\n", > transcoder_name(cpu_transcoder), > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index 0e4c1481fa00..642cc87f3e38 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -533,6 +533,8 @@ void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state); > void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state); > void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); > void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); > +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder); > enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc); > int vlv_get_hpll_vco(struct drm_i915_private *dev_priv); > int vlv_get_cck_clock(struct drm_i915_private *dev_priv, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com> To: "Hans de Goede" <hdegoede@redhat.com>, "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: intel-gfx <intel-gfx@lists.freedesktop.org>, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH resend 1/2] drm/i915/display: Add a intel_pipe_is_enabled() helper Date: Tue, 02 Mar 2021 14:46:51 +0200 [thread overview] Message-ID: <87a6rlpvt0.fsf@intel.com> (raw) In-Reply-To: <20210302120040.94435-2-hdegoede@redhat.com> On Tue, 02 Mar 2021, Hans de Goede <hdegoede@redhat.com> wrote: > Factor the code to check if a pipe is currently enabled out of > assert_pipe() and put it in a new intel_pipe_is_enabled() helper, > so that it can be re-used without copy-pasting it. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Does what it says on the box. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 20 ++++++++++++++------ > drivers/gpu/drm/i915/display/intel_display.h | 2 ++ > 2 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index e1060076ac83..9cb304aee285 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -442,17 +442,13 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe) > pipe_name(pipe)); > } > > -void assert_pipe(struct drm_i915_private *dev_priv, > - enum transcoder cpu_transcoder, bool state) > +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder) > { > bool cur_state; > enum intel_display_power_domain power_domain; > intel_wakeref_t wakeref; > > - /* we keep both pipes enabled on 830 */ > - if (IS_I830(dev_priv)) > - state = true; > - > power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder); > wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain); > if (wakeref) { > @@ -464,6 +460,18 @@ void assert_pipe(struct drm_i915_private *dev_priv, > cur_state = false; > } > > + return cur_state; > +} > + > +void assert_pipe(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder, bool state) > +{ > + bool cur_state = intel_pipe_is_enabled(dev_priv, cpu_transcoder); > + > + /* we keep both pipes enabled on 830 */ > + if (IS_I830(dev_priv)) > + state = true; > + > I915_STATE_WARN(cur_state != state, > "transcoder %s assertion failure (expected %s, current %s)\n", > transcoder_name(cpu_transcoder), > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index 0e4c1481fa00..642cc87f3e38 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -533,6 +533,8 @@ void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state); > void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state); > void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); > void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); > +bool intel_pipe_is_enabled(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder); > enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc); > int vlv_get_hpll_vco(struct drm_i915_private *dev_priv); > int vlv_get_cck_clock(struct drm_i915_private *dev_priv, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-03-02 12:47 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-02 12:00 [PATCH resend 0/2] drm/i915/display: Make vlv_find_free_pps() skip pipes which are in use for non DP purposes Hans de Goede 2021-03-02 12:00 ` [Intel-gfx] " Hans de Goede 2021-03-02 12:00 ` [PATCH resend 1/2] drm/i915/display: Add a intel_pipe_is_enabled() helper Hans de Goede 2021-03-02 12:00 ` [Intel-gfx] " Hans de Goede 2021-03-02 12:46 ` Jani Nikula [this message] 2021-03-02 12:46 ` Jani Nikula 2021-03-02 12:00 ` [PATCH resend 2/2] drm/i915/display: Make vlv_find_free_pps() skip pipes which are in use for non DP purposes Hans de Goede 2021-03-02 12:00 ` [Intel-gfx] " Hans de Goede 2021-03-02 12:54 ` Jani Nikula 2021-03-02 12:54 ` [Intel-gfx] " Jani Nikula 2021-03-02 14:51 ` Ville Syrjälä 2021-03-02 14:51 ` [Intel-gfx] " Ville Syrjälä 2021-03-23 10:39 ` Hans de Goede 2021-03-23 10:39 ` Hans de Goede 2021-03-24 14:02 ` Ville Syrjälä 2021-03-24 14:02 ` Ville Syrjälä 2021-03-24 14:10 ` Hans de Goede 2021-03-24 14:10 ` Hans de Goede 2021-03-24 14:37 ` Ville Syrjälä 2021-03-24 14:37 ` Ville Syrjälä 2021-05-04 10:52 ` Ville Syrjälä 2021-05-04 10:52 ` Ville Syrjälä 2021-03-02 13:08 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork 2021-03-02 13:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
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=87a6rlpvt0.fsf@intel.com \ --to=jani.nikula@linux.intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=hdegoede@redhat.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=joonas.lahtinen@linux.intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=ville.syrjala@linux.intel.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.