From patchwork Sat Oct 2 15:45:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12532221 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 1060EC433FE for ; Sat, 2 Oct 2021 15:46:18 +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 D7DC761B23 for ; Sat, 2 Oct 2021 15:46:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D7DC761B23 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 51F106F4AD; Sat, 2 Oct 2021 15:45:59 +0000 (UTC) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by gabe.freedesktop.org (Postfix) with ESMTPS id D81946E850 for ; Sat, 2 Oct 2021 15:45:57 +0000 (UTC) Received: by mail-qk1-x733.google.com with SMTP id 138so12178881qko.10 for ; Sat, 02 Oct 2021 08:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ft6d6TMpNghlCJqgeb5VMMaDDzmyvnIfsVFHrJe8ieI=; b=VE3LB29Jv917YOIrir+uSFIoUQYweZbx+g6iuzFqzIc6HJU54ZhSsMK+6hQXodB24H HSVgbE3dTKtF62Mw3p4h8uqAWuzsOyyz84o1CIzDVnn1tC5OILku/oiB7b04JTB8Mxf/ eWgp2u88nFOWcfJf9UfiIHbb3S48TzkT4gwXuFdmoLSylg/qadpPbLR/bspWNJ4TC+9x Ujy/6NVD/RyMXj/xmu8OfyGcy/Mgoif9lRwKFzDgx1Lf2dGbdQFHinqKqAvAKP5wEHjh +fcIIKhOxe+axUuW+YNIU8qs/p2C8IpfZJaOmlUOjvEGEuvPIrqjAPB8wozwCkyw5ZzT 3qJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ft6d6TMpNghlCJqgeb5VMMaDDzmyvnIfsVFHrJe8ieI=; b=GP+3b3q8ytCxBMru+k18xeDUqkHR1Qrk2vzD8K7eBkcsGNead88ADpy77j688XhuUG ldQ14LVH4y/pWKR7xm74Bqe1KF7WTE/8q96e6x7Rb1AV1geC3Fz5i7mujrXWuWDXl5qY 6nvOgzbTIJzRGMEY8rwMrR8JrSZq1faNMuMGPmXw8F7V0bLDf0VQ01qeDf+AOO5MDzVe da9HCOcp72hZVYRQ7psWvfOSNznZUIkALn1FBXqEQUxcpFh768n9QPL/CiktMf2mDfK8 LsYCjY6gHXxJb+JxwUFIm70HgI5bOd5aaAphgPVfQQxNAhqMRbjX0oqsm//1inlVaEOI SWBQ== X-Gm-Message-State: AOAM533SdB2YqrJr6zQE5og6PIfWcEPgjgvMidbfYLGXvoT6TnyQaKdH mIf0t4uIW0GawX245yikhFnxNP4ftUDL3Q== X-Google-Smtp-Source: ABdhPJx5qn0blFTLrM3hcIwWgN6llR7cc8WaLkq61gRr8i/kieYWvcSI+mx3Txa761R0JiHcUJ3roQ== X-Received: by 2002:a05:620a:22e:: with SMTP id u14mr2970233qkm.101.1633189556898; Sat, 02 Oct 2021 08:45:56 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id d17sm6401870qte.0.2021.10.02.08.45.56 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Oct 2021 08:45:56 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Cc: Sean Paul , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Fernando Ramos Subject: [PATCH 10/16] Revert "drm/shmobile: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" Date: Sat, 2 Oct 2021 11:45:36 -0400 Message-Id: <20211002154542.15800-10-sean@poorly.run> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20211002154542.15800-1-sean@poorly.run> References: <20211002154542.15800-1-sean@poorly.run> MIME-Version: 1.0 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" From: Sean Paul This reverts commit 9b8c437ef1a5f34686fc96b391c201a80f1a2ea0. 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 --- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 8ee215ab614e..7db01904d18d 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -156,12 +156,10 @@ static int shmob_drm_pm_suspend(struct device *dev) static int shmob_drm_pm_resume(struct device *dev) { struct shmob_drm_device *sdev = dev_get_drvdata(dev); - struct drm_modeset_acquire_ctx ctx; - int ret; - DRM_MODESET_LOCK_ALL_BEGIN(sdev->ddev, ctx, 0, ret); + drm_modeset_lock_all(sdev->ddev); shmob_drm_crtc_resume(&sdev->crtc); - DRM_MODESET_LOCK_ALL_END(sdev->ddev, ctx, ret); + drm_modeset_unlock_all(sdev->ddev); drm_kms_helper_poll_enable(sdev->ddev); return 0;