From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/5] drm/i915: Use drm_crtc_vblank_crtc()
Date: Wed, 08 May 2024 12:12:32 +0300 [thread overview]
Message-ID: <877cg4lla7.fsf@intel.com> (raw)
In-Reply-To: <20240408190611.24914-3-ville.syrjala@linux.intel.com>
On Mon, 08 Apr 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Replace the open coded drm_crtc_vblank_crtc() with the real
> thing.
>
> Cc: intel-gfx@lists.freedesktop.org
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_crtc.c | 3 +--
> drivers/gpu/drm/i915/display/intel_vblank.c | 16 +++++-----------
> 2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index 25593f6aae7d..339010384b86 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -78,8 +78,7 @@ void intel_wait_for_vblank_if_active(struct drm_i915_private *i915,
>
> u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
> {
> - struct drm_device *dev = crtc->base.dev;
> - struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index(&crtc->base)];
> + struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
>
> if (!crtc->active)
> return 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
> index baf7354cb6e2..951190bcbc50 100644
> --- a/drivers/gpu/drm/i915/display/intel_vblank.c
> +++ b/drivers/gpu/drm/i915/display/intel_vblank.c
> @@ -132,8 +132,7 @@ u32 g4x_get_vblank_counter(struct drm_crtc *crtc)
> static u32 intel_crtc_scanlines_since_frame_timestamp(struct intel_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> - struct drm_vblank_crtc *vblank =
> - &crtc->base.dev->vblank[drm_crtc_index(&crtc->base)];
> + struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
> const struct drm_display_mode *mode = &vblank->hwmode;
> u32 htotal = mode->crtc_htotal;
> u32 clock = mode->crtc_clock;
> @@ -178,8 +177,7 @@ static u32 intel_crtc_scanlines_since_frame_timestamp(struct intel_crtc *crtc)
> */
> static u32 __intel_get_crtc_scanline_from_timestamp(struct intel_crtc *crtc)
> {
> - struct drm_vblank_crtc *vblank =
> - &crtc->base.dev->vblank[drm_crtc_index(&crtc->base)];
> + struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
> const struct drm_display_mode *mode = &vblank->hwmode;
> u32 vblank_start = mode->crtc_vblank_start;
> u32 vtotal = mode->crtc_vtotal;
> @@ -200,17 +198,14 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
> {
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = to_i915(dev);
> - const struct drm_display_mode *mode;
> - struct drm_vblank_crtc *vblank;
> + struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
> + const struct drm_display_mode *mode = &vblank->hwmode;
> enum pipe pipe = crtc->pipe;
> int position, vtotal;
>
> if (!crtc->active)
> return 0;
>
> - vblank = &crtc->base.dev->vblank[drm_crtc_index(&crtc->base)];
> - mode = &vblank->hwmode;
> -
> if (crtc->mode_flags & I915_MODE_FLAG_GET_SCANLINE_FROM_TIMESTAMP)
> return __intel_get_crtc_scanline_from_timestamp(crtc);
>
> @@ -254,8 +249,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
>
> int intel_crtc_scanline_to_hw(struct intel_crtc *crtc, int scanline)
> {
> - const struct drm_vblank_crtc *vblank =
> - &crtc->base.dev->vblank[drm_crtc_index(&crtc->base)];
> + const struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(&crtc->base);
> const struct drm_display_mode *mode = &vblank->hwmode;
> int vtotal;
--
Jani Nikula, Intel
next prev parent reply other threads:[~2024-05-08 9:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 19:06 [PATCH 1/5] drm/vblank: Introduce drm_crtc_vblank_crtc() Ville Syrjala
2024-04-08 19:06 ` [PATCH 2/5] drm/amdgpu: Use drm_crtc_vblank_crtc() Ville Syrjala
2024-05-08 9:13 ` Jani Nikula
2024-05-08 13:47 ` Alex Deucher
2024-05-08 19:00 ` Ville Syrjälä
2024-04-08 19:06 ` [PATCH 3/5] drm/i915: " Ville Syrjala
2024-05-08 9:12 ` Jani Nikula [this message]
2024-05-08 19:01 ` Ville Syrjälä
2024-04-08 19:06 ` [PATCH 4/5] drm/nouveau: " Ville Syrjala
2024-04-08 21:19 ` Lyude Paul
2024-04-08 19:06 ` [PATCH 5/5] drm/vkms: " Ville Syrjala
2024-04-09 1:45 ` Maíra Canal
2024-04-09 15:02 ` [PATCH 1/5] drm/vblank: Introduce drm_crtc_vblank_crtc() Dmitry Baryshkov
2024-04-18 10:41 ` Ville Syrjälä
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=877cg4lla7.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--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: 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 read-only IMAP folder(s) and NNTP newsgroup(s).