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 03CA3C433F5 for ; Mon, 4 Oct 2021 15:56:46 +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 9945060241 for ; Mon, 4 Oct 2021 15:56:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9945060241 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run 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 966BA6EA49; Mon, 4 Oct 2021 15:56:44 +0000 (UTC) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5898A6EA43 for ; Mon, 4 Oct 2021 15:56:43 +0000 (UTC) Received: by mail-qt1-x829.google.com with SMTP id t2so5211qtx.8 for ; Mon, 04 Oct 2021 08:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=+1s8xcFt52yy248Zz8xic/U2dw69RfIY9HdKDO7ZV6Q=; b=B1Np5WmWhg1UMjA/m3ybH4tGdQhZRLV9CJy3StiTL/r9OAu18ABRCvGBtzzZnsXL3s Nbt/LoOC881ZQSWx+0lauMi4P9epUr+0zd5b72R9H9eObF58msbTwTkaMVvDzxSaSgN8 pOXjruE3AqFA6Ad90PqPBWJuhTM+gsSCfFPPfjNatLihzNe19jt3JysW6JAo6IsiD7bK 9X1IgLnob5Uu39T6HtX4laDj7Ky4DMvxH+5Geo0R/OFQmc7XK0LTZGoxO/pwQtJBZm1n h5InGNYoaBEFj8pW3+Q+SK9Q5WxAokKRSNfC3sY1aA48HAPxSMQtOSulX122setlO9XC K3iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=+1s8xcFt52yy248Zz8xic/U2dw69RfIY9HdKDO7ZV6Q=; b=o2DVWujzThL7l/bzZqvaNKLOrTA5yfeLm7YPa7OFvve4ArTWQwu4gz3VHmZtjJjqoq jWXdxglZdyEeYiX8yGoA2F4apz4o9FNmfbJcvF2iA/TkiRCZXawsmMYKRBaOuI/e3Nh+ r5Od9NYA41IbE8YCgdw9p8eR+S8EQt4+WSKh2pf4YeyYYC/ub409JoENsOp5ipdawheM 5P/KuB+Upwg8dEYmmEo254pTqCbV7f/gqGZFNERT+C4VH2hN4F86w222C9i2HvCEeHYU HGay+QdS5gCHAfV4rl1hxi+K6TFX940RturfMCjsJ8rNonJobQN+kzJZrJNPY/f1YMmW Ofwg== X-Gm-Message-State: AOAM533DZeh51Dl2QLZ91Wkzp8mU/DrSkZU/wAYEeculSzq8FbYO6fV5 Ls2tD9+yuOILWc0jtYzx6ZxdKA== X-Google-Smtp-Source: ABdhPJzwT6kLqUcuNUbghjgNdxuvoUthnPAt+/gIE2rLyWnxVM/HaubzkBvq5//MZ9QtvjcZ5qwBZQ== X-Received: by 2002:ac8:18c:: with SMTP id x12mr13970971qtf.378.1633363002266; Mon, 04 Oct 2021 08:56:42 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id b65sm7850990qkc.46.2021.10.04.08.56.41 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Oct 2021 08:56:41 -0700 (PDT) Date: Mon, 4 Oct 2021 11:56:37 -0400 From: Sean Paul To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: Sean Paul , 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: <20211004155637.GC2515@art_vandelay> 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: User-Agent: Mutt/1.9.4 (2018-02-28) 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 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 > > > > 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. 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ä > > > --- > > 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 -- Sean Paul, Software Engineer, Google / Chromium OS