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 92289C433F5 for ; Tue, 12 Oct 2021 07:46:30 +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 28B1860D43 for ; Tue, 12 Oct 2021 07:46:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 28B1860D43 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 089816E5D3; Tue, 12 Oct 2021 07:46:23 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A5DC89F01; Tue, 12 Oct 2021 07:46:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="250466779" X-IronPort-AV: E=Sophos;i="5.85,367,1624345200"; d="scan'208";a="250466779" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2021 00:45:57 -0700 X-IronPort-AV: E=Sophos;i="5.85,367,1624345200"; d="scan'208";a="490845240" Received: from pakumpul-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.40.207]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2021 00:45:56 -0700 From: Jani Nikula To: =?utf-8?Q?Ma=C3=ADra?= Canal , dri-devel@lists.freedesktop.org Cc: Fernando Ramos , intel-gfx@lists.freedesktop.org In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: Date: Tue, 12 Oct 2021 10:45:53 +0300 Message-ID: <87v922znwu.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH] drm/i915: replacing drm_modeset_lock_all for DRM_MODESET_LOCK_ALL_* X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Sun, 10 Oct 2021, Ma=C3=ADra Canal wrote: > As requested in GPU Driver Developers Guide TODO list, replaces all > drm_lock boilerplates for DRM_MODESET_LOCK_ALL_* helpers. Please see [1]. Also, all i915 patches must be Cc'd to intel-gfx mailing list. Please see MAINTAINERS file. BR, Jani. [1] https://lore.kernel.org/r/20211007193755.29579-1-greenfoo@u92.eu > > Signed-off-by: Ma=C3=ADra Canal > --- > drivers/gpu/drm/i915/display/intel_display.c | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 17f44ffea586..71b7ff7b7dea 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -13466,22 +13466,13 @@ void intel_display_resume(struct drm_device *de= v) > if (state) > state->acquire_ctx =3D &ctx; >=20=20 > - drm_modeset_acquire_init(&ctx, 0); > - > - while (1) { > - ret =3D drm_modeset_lock_all_ctx(dev, &ctx); > - if (ret !=3D -EDEADLK) > - break; > - > - drm_modeset_backoff(&ctx); > - } > + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); >=20=20 > if (!ret) > ret =3D __intel_display_resume(dev, state, &ctx); >=20=20 > intel_enable_ipc(dev_priv); > - drm_modeset_drop_locks(&ctx); > - drm_modeset_acquire_fini(&ctx); > + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); >=20=20 > if (ret) > drm_err(&dev_priv->drm, --=20 Jani Nikula, Intel Open Source Graphics Center