On Mon, Oct 04, 2021 at 12:41:00PM +0300, Ville Syrjälä wrote:
> On Sat, Oct 02, 2021 at 11:45:41AM -0400, Sean Paul wrote:
> > From: Sean Paul <seanp...@chromium.org>
> >
> > This reverts commit 399190e70816886e2bca1f3f3bc3d9c544af88e7.
> >
> > This patchset breaks on intel platforms and was previously NACK'd by
> > Ville.
> >
> > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
> > Cc: Fernando Ramos <green...@u92.eu>
> > Signed-off-by: Sean Paul <seanp...@chromium.org>
>
> Yeah, best to try again from the start I think.
Pushed the revert set (and left the TODO item out for now). Thanks for raising
the issue.
@Fernando, hopefully you can revise and post again. Thank you for your patches
and your effort!
Sean
>
> For the series
> Acked-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> > ---
> > drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++++++-----
> > 1 file changed, 13 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 2bf01416d656..134a6acbd8fb 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -43,7 +43,6 @@
> > #include <drm/drm_plane_helper.h>
> > #include <drm/drm_probe_helper.h>
> > #include <drm/drm_rect.h>
> > -#include <drm/drm_drv.h>
> >
> > #include "display/intel_audio.h"
> > #include "display/intel_crt.h"
> > @@ -13477,13 +13476,22 @@ void intel_display_resume(struct drm_device *dev)
> > if (state)
> > state->acquire_ctx = &ctx;
> >
> > - DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
> > + drm_modeset_acquire_init(&ctx, 0);
> >
> > - ret = __intel_display_resume(dev, state, &ctx);
> > + while (1) {
> > + ret = drm_modeset_lock_all_ctx(dev, &ctx);
> > + if (ret != -EDEADLK)
> > + break;
> >
> > - intel_enable_ipc(dev_priv);
> > + drm_modeset_backoff(&ctx);
> > + }
> > +
> > + if (!ret)
> > + ret = __intel_display_resume(dev, state, &ctx);
> >
> > - DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
> > + intel_enable_ipc(dev_priv);
> > + drm_modeset_drop_locks(&ctx);
> > + drm_modeset_acquire_fini(&ctx);
> >
> > if (ret)
> > drm_err(&dev_priv->drm,
> > --
> > Sean Paul, Software Engineer, Google / Chromium OS
>
> --
> Ville Syrjälä
> Intel
--
Sean Paul, Software Engineer, Google / Chromium OS
