From: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Karthik B S <karthik.b.s@intel.com> Cc: paulo.r.zanoni@intel.com, michel@daenzer.net, dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com, vandita.kulkarni@intel.com, uma.shankar@intel.com, daniel.vetter@intel.com, intel-gfx@lists.freedesktop.org Subject: Re: [PATCH v10 5/8] drm/i915: Add dedicated plane hook for async flip case Date: Fri, 18 Sep 2020 14:53:17 +0300 [thread overview] Message-ID: <20200918115317.GJ6112@intel.com> (raw) In-Reply-To: <20200918070045.9703-1-karthik.b.s@intel.com> On Fri, Sep 18, 2020 at 12:30:45PM +0530, Karthik B S wrote: > This hook is added to avoid writing other plane registers in case of > async flips, so that we do not write the double buffered registers > during async surface address update. > > v7: -Plane ctl needs bits from skl_plane_ctl_crtc as well. (Ville) > -Add a vfunc for skl_program_async_surface_address > and call it from intel_update_plane. (Ville) > > v8: -Rebased. > > v9: -Use if-else instead of return in intel_update_plane(). (Ville) > -Rename 'program_async_surface_address' to 'async_flip'. (Ville) > > v10: -Check if async_flip hook is present before calling it. > Otherwise it will OOPS during legacy cursor updates. (Ville) > > Signed-off-by: Karthik B S <karthik.b.s@intel.com> > Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> > --- > .../gpu/drm/i915/display/intel_atomic_plane.c | 6 ++++- > .../drm/i915/display/intel_display_types.h | 3 +++ > drivers/gpu/drm/i915/display/intel_sprite.c | 24 +++++++++++++++++++ > 3 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > index 79032701873a..6bd8e6cdd477 100644 > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > @@ -408,7 +408,11 @@ void intel_update_plane(struct intel_plane *plane, > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > > trace_intel_update_plane(&plane->base, crtc); > - plane->update_plane(plane, crtc_state, plane_state); > + > + if (crtc_state->uapi.async_flip && plane->async_flip) > + plane->async_flip(plane, crtc_state, plane_state); > + else > + plane->update_plane(plane, crtc_state, plane_state); > } > > void intel_disable_plane(struct intel_plane *plane, > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 3d4bf9b6a0a2..e3339e41ddf7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1183,6 +1183,9 @@ struct intel_plane { > struct intel_plane_state *plane_state); > int (*min_cdclk)(const struct intel_crtc_state *crtc_state, > const struct intel_plane_state *plane_state); > + void (*async_flip)(struct intel_plane *plane, > + const struct intel_crtc_state *crtc_state, > + const struct intel_plane_state *plane_state); > }; > > struct intel_watermark_params { > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c > index 76a3d9bfe0de..3634e98b04c1 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -609,6 +609,29 @@ icl_program_input_csc(struct intel_plane *plane, > PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0); > } > > +static void > +skl_program_async_surface_address(struct intel_plane *plane, > + const struct intel_crtc_state *crtc_state, > + const struct intel_plane_state *plane_state) Pls rename this to skl_plane_async_flip() as well. With that Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > +{ > + struct drm_i915_private *dev_priv = to_i915(plane->base.dev); > + unsigned long irqflags; > + enum plane_id plane_id = plane->id; > + enum pipe pipe = plane->pipe; > + u32 surf_addr = plane_state->color_plane[0].offset; > + u32 plane_ctl = plane_state->ctl; > + > + plane_ctl |= skl_plane_ctl_crtc(crtc_state); > + > + spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); > + > + intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl); > + intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), > + intel_plane_ggtt_offset(plane_state) + surf_addr); > + > + spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); > +} > + > static void > skl_program_plane(struct intel_plane *plane, > const struct intel_crtc_state *crtc_state, > @@ -3095,6 +3118,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, > plane->get_hw_state = skl_plane_get_hw_state; > plane->check_plane = skl_plane_check; > plane->min_cdclk = skl_plane_min_cdclk; > + plane->async_flip = skl_program_async_surface_address; > > if (INTEL_GEN(dev_priv) >= 11) > formats = icl_get_plane_formats(dev_priv, pipe, > -- > 2.22.0 -- Ville Syrjälä Intel _______________________________________________ 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: "Ville Syrjälä" <ville.syrjala@linux.intel.com> To: Karthik B S <karthik.b.s@intel.com> Cc: paulo.r.zanoni@intel.com, michel@daenzer.net, dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com, daniel.vetter@intel.com, harry.wentland@amd.com, intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH v10 5/8] drm/i915: Add dedicated plane hook for async flip case Date: Fri, 18 Sep 2020 14:53:17 +0300 [thread overview] Message-ID: <20200918115317.GJ6112@intel.com> (raw) In-Reply-To: <20200918070045.9703-1-karthik.b.s@intel.com> On Fri, Sep 18, 2020 at 12:30:45PM +0530, Karthik B S wrote: > This hook is added to avoid writing other plane registers in case of > async flips, so that we do not write the double buffered registers > during async surface address update. > > v7: -Plane ctl needs bits from skl_plane_ctl_crtc as well. (Ville) > -Add a vfunc for skl_program_async_surface_address > and call it from intel_update_plane. (Ville) > > v8: -Rebased. > > v9: -Use if-else instead of return in intel_update_plane(). (Ville) > -Rename 'program_async_surface_address' to 'async_flip'. (Ville) > > v10: -Check if async_flip hook is present before calling it. > Otherwise it will OOPS during legacy cursor updates. (Ville) > > Signed-off-by: Karthik B S <karthik.b.s@intel.com> > Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> > --- > .../gpu/drm/i915/display/intel_atomic_plane.c | 6 ++++- > .../drm/i915/display/intel_display_types.h | 3 +++ > drivers/gpu/drm/i915/display/intel_sprite.c | 24 +++++++++++++++++++ > 3 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > index 79032701873a..6bd8e6cdd477 100644 > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > @@ -408,7 +408,11 @@ void intel_update_plane(struct intel_plane *plane, > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > > trace_intel_update_plane(&plane->base, crtc); > - plane->update_plane(plane, crtc_state, plane_state); > + > + if (crtc_state->uapi.async_flip && plane->async_flip) > + plane->async_flip(plane, crtc_state, plane_state); > + else > + plane->update_plane(plane, crtc_state, plane_state); > } > > void intel_disable_plane(struct intel_plane *plane, > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 3d4bf9b6a0a2..e3339e41ddf7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1183,6 +1183,9 @@ struct intel_plane { > struct intel_plane_state *plane_state); > int (*min_cdclk)(const struct intel_crtc_state *crtc_state, > const struct intel_plane_state *plane_state); > + void (*async_flip)(struct intel_plane *plane, > + const struct intel_crtc_state *crtc_state, > + const struct intel_plane_state *plane_state); > }; > > struct intel_watermark_params { > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c > index 76a3d9bfe0de..3634e98b04c1 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > @@ -609,6 +609,29 @@ icl_program_input_csc(struct intel_plane *plane, > PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0); > } > > +static void > +skl_program_async_surface_address(struct intel_plane *plane, > + const struct intel_crtc_state *crtc_state, > + const struct intel_plane_state *plane_state) Pls rename this to skl_plane_async_flip() as well. With that Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > +{ > + struct drm_i915_private *dev_priv = to_i915(plane->base.dev); > + unsigned long irqflags; > + enum plane_id plane_id = plane->id; > + enum pipe pipe = plane->pipe; > + u32 surf_addr = plane_state->color_plane[0].offset; > + u32 plane_ctl = plane_state->ctl; > + > + plane_ctl |= skl_plane_ctl_crtc(crtc_state); > + > + spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); > + > + intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl); > + intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), > + intel_plane_ggtt_offset(plane_state) + surf_addr); > + > + spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); > +} > + > static void > skl_program_plane(struct intel_plane *plane, > const struct intel_crtc_state *crtc_state, > @@ -3095,6 +3118,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, > plane->get_hw_state = skl_plane_get_hw_state; > plane->check_plane = skl_plane_check; > plane->min_cdclk = skl_plane_min_cdclk; > + plane->async_flip = skl_program_async_surface_address; > > if (INTEL_GEN(dev_priv) >= 11) > formats = icl_get_plane_formats(dev_priv, pipe, > -- > 2.22.0 -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-09-18 11:53 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-16 15:08 [PATCH v9 0/8] Asynchronous flip implementation for i915 Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 1/8] drm/i915: Add enable/disable flip done and flip done handler Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 2/8] drm/i915: Add support for async flips in I915 Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 3/8] drm/i915: Add checks specific to async flips Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-18 9:02 ` [PATCH v10 " Karthik B S 2020-09-18 9:02 ` [Intel-gfx] " Karthik B S 2020-09-18 11:51 ` Ville Syrjälä 2020-09-18 11:51 ` [Intel-gfx] " Ville Syrjälä 2020-09-21 10:49 ` Karthik B S 2020-09-21 10:49 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 4/8] drm/i915: Do not call drm_crtc_arm_vblank_event in " Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 5/8] drm/i915: Add dedicated plane hook for async flip case Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-18 7:00 ` [PATCH v10 " Karthik B S 2020-09-18 7:00 ` [Intel-gfx] " Karthik B S 2020-09-18 11:53 ` Ville Syrjälä [this message] 2020-09-18 11:53 ` Ville Syrjälä 2020-09-21 10:52 ` Karthik B S 2020-09-21 10:52 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 6/8] drm/i915: WA for platforms with double buffered address update enable bit Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-18 11:54 ` Ville Syrjälä 2020-09-18 11:54 ` [Intel-gfx] " Ville Syrjälä 2020-09-21 10:53 ` Karthik B S 2020-09-21 10:53 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 7/8] Documentation/gpu: Add asynchronous flip documentation for i915 Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-18 11:58 ` Ville Syrjälä 2020-09-18 11:58 ` [Intel-gfx] " Ville Syrjälä 2020-09-21 10:55 ` Karthik B S 2020-09-21 10:55 ` [Intel-gfx] " Karthik B S 2020-09-16 15:08 ` [PATCH v9 8/8] drm/i915: Enable async flips in i915 Karthik B S 2020-09-16 15:08 ` [Intel-gfx] " Karthik B S 2020-09-18 12:03 ` Ville Syrjälä 2020-09-18 12:03 ` [Intel-gfx] " Ville Syrjälä 2020-09-21 10:59 ` Karthik B S 2020-09-21 10:59 ` [Intel-gfx] " Karthik B S 2020-09-16 15:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Asynchronous flip implementation for i915 (rev9) Patchwork 2020-09-16 15:48 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2020-09-16 16:11 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-09-16 21:27 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2020-09-18 7:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Asynchronous flip implementation for i915 (rev10) Patchwork 2020-09-18 7:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2020-09-18 8:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-09-18 9:26 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2020-09-18 9:58 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Asynchronous flip implementation for i915 (rev11) Patchwork 2020-09-18 10:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-09-18 12:17 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=20200918115317.GJ6112@intel.com \ --to=ville.syrjala@linux.intel.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=karthik.b.s@intel.com \ --cc=michel@daenzer.net \ --cc=nicholas.kazlauskas@amd.com \ --cc=paulo.r.zanoni@intel.com \ --cc=uma.shankar@intel.com \ --cc=vandita.kulkarni@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.