On Fri, 2021-10-29 at 09:24 +0300, Ville Syrjälä wrote:
> On Thu, Oct 28, 2021 at 01:34:18PM -0700, José Roberto de Souza wrote:
> > For every crtc in state, intel_atomic_check_async() was checking all
> > the crtc and plane states again.
> >
> > Cc: Karthik B S <[email protected]>
> > Cc: Vandita Kulkarni <[email protected]>
> > Cc: Ville Syrjälä <[email protected]>
> > Signed-off-by: José Roberto de Souza <[email protected]>
> > ---
> > drivers/gpu/drm/i915/display/intel_display.c | 38 ++++++++++----------
> > 1 file changed, 20 insertions(+), 18 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 79cd158503b37..3b5a8e971343f 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -7707,35 +7707,37 @@ static void kill_bigjoiner_slave(struct
> > intel_atomic_state *state,
> > * correspond to the last vblank and have no relation to the actual time
> > when
> > * the flip done event was sent.
> > */
> > -static int intel_atomic_check_async(struct intel_atomic_state *state)
> > +static int intel_atomic_check_async(struct intel_atomic_state *state,
> > struct intel_crtc *crtc)
> > {
> > struct drm_i915_private *i915 = to_i915(state->base.dev);
> > const struct intel_crtc_state *old_crtc_state, *new_crtc_state;
> > const struct intel_plane_state *new_plane_state, *old_plane_state;
> > - struct intel_crtc *crtc;
> > struct intel_plane *plane;
> > int i;
> >
> > - for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> > - new_crtc_state, i) {
> > - if (intel_crtc_needs_modeset(new_crtc_state)) {
> > - drm_dbg_kms(&i915->drm, "Modeset Required. Async flip
> > not supported\n");
> > - return -EINVAL;
> > - }
> > + old_crtc_state = intel_atomic_get_old_crtc_state(state, crtc);
> > + new_crtc_state = intel_atomic_get_new_crtc_state(state, crtc);
> >
> > - if (!new_crtc_state->hw.active) {
> > - drm_dbg_kms(&i915->drm, "CRTC inactive\n");
> > - return -EINVAL;
> > - }
> > - if (old_crtc_state->active_planes !=
> > new_crtc_state->active_planes) {
> > - drm_dbg_kms(&i915->drm,
> > - "Active planes cannot be changed during
> > async flip\n");
> > - return -EINVAL;
> > - }
> > + if (intel_crtc_needs_modeset(new_crtc_state)) {
> > + drm_dbg_kms(&i915->drm, "Modeset Required. Async flip not
> > supported\n");
> > + return -EINVAL;
> > + }
> > +
> > + if (!new_crtc_state->hw.active) {
> > + drm_dbg_kms(&i915->drm, "CRTC inactive\n");
> > + return -EINVAL;
> > + }
> > + if (old_crtc_state->active_planes != new_crtc_state->active_planes) {
> > + drm_dbg_kms(&i915->drm,
> > + "Active planes cannot be changed during async
> > flip\n");
> > + return -EINVAL;
> > }
> >
> > for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state,
> > new_plane_state, i) {
> > + if (plane->base.crtc != &crtc->base)
> > + continue;
>
> Not the pointer you want to be looking at.
new_plane_state->hw.crtc?
>
> > +
> > /*
> > * TODO: Async flip is only supported through the page flip
> > IOCTL
> > * as of now. So support currently added for primary plane only.
> > @@ -8054,7 +8056,7 @@ static int intel_atomic_check(struct drm_device *dev,
> > for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> > new_crtc_state, i) {
> > if (new_crtc_state->uapi.async_flip) {
> > - ret = intel_atomic_check_async(state);
> > + ret = intel_atomic_check_async(state, crtc);
> > if (ret)
> > goto fail;
> > }
> > --
> > 2.33.1
>
