From patchwork Sat Oct 2 15:45:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12532213 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 398FDC433EF for ; Sat, 2 Oct 2021 15:46:10 +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 0577561B1E for ; Sat, 2 Oct 2021 15:46:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0577561B1E 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 572A26E852; Sat, 2 Oct 2021 15:45:53 +0000 (UTC) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 331C96E84F for ; Sat, 2 Oct 2021 15:45:52 +0000 (UTC) Received: by mail-qt1-x82d.google.com with SMTP id r1so11905636qta.12 for ; Sat, 02 Oct 2021 08:45:52 -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=yfwLzkt6Wj9LVEwuFs8Fztnt2JiRG84Pd19yKEZ5NUI=; b=RCjeOl3uXFKjeT5y8ChtMdFtoc/DemEDcrPtZjyyw3nZp9IvM0ANzEfPHeZ2+7hrde E2W3m+jQsxKA78uoct518AU8q7TcgqEzfsNwGbs1w95du2qCMiTiRHPTTMngFVVKvoIa /HMMWjTOSnTFyWq0cc8Ne2bbt6Vx6YQ3qJHoY9he8a9z6RCfrucHGqcNVv0/CjUf/Npn 3SlhZry9Js4sVqJZDoXp/RhqxbzSElC/pVkAs05zy+9Kh0qP2ql40s8tgxPussID3TGB 1NVHQ7hxMIPKRlT1hEAJoaYyb2OKrqAEQ/B4HnGNHAH/C1uPMkjfy9Au5G7xg6LnK1qE 52mQ== 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=yfwLzkt6Wj9LVEwuFs8Fztnt2JiRG84Pd19yKEZ5NUI=; b=RJbvQKFlQElFN+4Qlk1C8l34X0suXoZNj5vS8SAyj+e2MLxIwsl9lX2gMAL7Cvd3Qi Syar+Iz/QWj9gUgrcwIKk3p54Ex6j3x/BOEJrFljXtJZlUKalrr+XtiR43RFaGUyrUdK KG7WmYKhuuRg/RwpxMnB28um5nxv07JV2lZBWQXbTEiu9KwuM6vGgQ65f237b0y4RFR3 55xfvF/6/gNZyNaPLonaXFEkD4FxB8OTjfLZS2jvH+XiB0Lgu0F9ccGFahsJx0gELI4J O/UpDoldOqvy2BjpNcTOJpdNDtUu0e5wBhgK4U171HAeBWfQduON6DlCrzeX/qOt/3EC R2jQ== X-Gm-Message-State: AOAM533hLiAgBsgcxbJ5pqgD3mFytvu/LXLhcI6S2uaYpUWZ9hSv1hEN DL7cn+11T3pmwItnsbibR2GMjvPWTY2KuQ== X-Google-Smtp-Source: ABdhPJz106eerF7z8gUKBA67+OS+VuQpCvzdGUO3aRd9DlN+U5+r0o9iIJcTO3vlaomxElGm4YZNJg== X-Received: by 2002:ac8:514f:: with SMTP id h15mr2512036qtn.340.1633189551277; Sat, 02 Oct 2021 08:45:51 -0700 (PDT) Received: from localhost ([167.100.64.199]) by smtp.gmail.com with ESMTPSA id f83sm4733612qke.79.2021.10.02.08.45.50 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Oct 2021 08:45:51 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Cc: Sean Paul , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Fernando Ramos Subject: [PATCH 06/16] Revert "drm/msm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()" Date: Sat, 2 Oct 2021 11:45:32 -0400 Message-Id: <20211002154542.15800-6-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 fd49ef52e2db015ce69ad02bab0702489d141a41. 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/msm/disp/dpu1/dpu_crtc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index b89687074890..768012243b44 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "dpu_kms.h" #include "dpu_hw_lm.h" @@ -1173,15 +1172,14 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) struct drm_display_mode *mode; struct drm_framebuffer *fb; struct drm_plane_state *state; - struct drm_modeset_acquire_ctx ctx; struct dpu_crtc_state *cstate; - int i, out_width, ret; + int i, out_width; dpu_crtc = s->private; crtc = &dpu_crtc->base; - DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret); + drm_modeset_lock_all(crtc->dev); cstate = to_dpu_crtc_state(crtc->state); mode = &crtc->state->adjusted_mode; @@ -1265,9 +1263,9 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data) dpu_crtc->vblank_cb_time = ktime_set(0, 0); } - DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret); + drm_modeset_unlock_all(crtc->dev); - return ret; + return 0; } DEFINE_SHOW_ATTRIBUTE(_dpu_debugfs_status);