From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31CEFC433EF for ; Mon, 4 Oct 2021 09:41:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBDE461248 for ; Mon, 4 Oct 2021 09:41:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EBDE461248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D42F6E193; Mon, 4 Oct 2021 09:41:06 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA5E76E193 for ; Mon, 4 Oct 2021 09:41:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10126"; a="311562532" X-IronPort-AV: E=Sophos;i="5.85,345,1624345200"; d="scan'208";a="311562532" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2021 02:41:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,345,1624345200"; d="scan'208";a="566951911" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga002.fm.intel.com with SMTP; 04 Oct 2021 02:41:01 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 04 Oct 2021 12:41:00 +0300 Date: Mon, 4 Oct 2021 12:41:00 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Sean Paul Cc: dri-devel@lists.freedesktop.org, Sean Paul , Fernando Ramos Subject: Re: [PATCH 15/16] Revert "drm/i915: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()" Message-ID: References: <20211002154542.15800-1-sean@poorly.run> <20211002154542.15800-15-sean@poorly.run> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211002154542.15800-15-sean@poorly.run> X-Patchwork-Hint: comment X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sat, Oct 02, 2021 at 11:45:41AM -0400, Sean Paul wrote: > From: Sean Paul > > This reverts commit 399190e70816886e2bca1f3f3bc3d9c544af88e7. > > This patchset breaks on intel platforms and was previously NACK'd by > Ville. > > Cc: Ville Syrjälä > Cc: Fernando Ramos > Signed-off-by: Sean Paul Yeah, best to try again from the start I think. For the series Acked-by: Ville Syrjälä > --- > 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 > #include > #include > -#include > > #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