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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36B39C433ED for ; Sat, 17 Apr 2021 19:12:38 +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 DBBBE60FE6 for ; Sat, 17 Apr 2021 19:12:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBBBE60FE6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A54C26ED1E; Sat, 17 Apr 2021 19:12:36 +0000 (UTC) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by gabe.freedesktop.org (Postfix) with ESMTPS id E48326ED1E for ; Sat, 17 Apr 2021 19:12:34 +0000 (UTC) Received: by mail-ej1-x633.google.com with SMTP id v6so45607378ejo.6 for ; Sat, 17 Apr 2021 12:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4EeE/jEG+BwS2yLzax1oxoe1YlEFDe9IUirRYoBxddY=; b=c7+kaWC9DjKkxn882whe6mMcd7HxFJ1bFx6boT52Kt5Na7Hsz74IweAgpdXTr9Hdqb cHm600tCOzfepihXRSKoRjr6P6Y7eHYHOVaJM4nU41WthSVcIRCiEcASb4fNULWj5dHK 8cAGqT78I0dG6DkmvQFXelgrGqLF+iR5FO8Q83Llwb9dq3d6fRcivo0AMZoeFtu61O8u gaJNhW5PcY9WXX5H/Xp07n41hirN7EnlshoAtZsKOU7mQMSw9zqmt6z11qzqVDZJSCXg CwEkFYy4nhHJSDaTd8rYJP9LREtzHDp2MWoE4IMYRiJdzeIGdOPaL5AqlbeWNOwB38e7 ZonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4EeE/jEG+BwS2yLzax1oxoe1YlEFDe9IUirRYoBxddY=; b=flVySZB+2g4gBd3EWOeuafTvVe/GfrgjI8hdlIOU52duMqbUYMa8W0obzuIe7jIy2v PxOSE6oblVZQ0swXCaeIQJrO3PVNPqyCWC6PX6zKT5npHI6rnITVigmKGMCXwdlS4oLa QXM0HvkmFmVZRcqQ0I3mYxWdqnqzwdX79EEC1IwkSmRKxYgK9TJfZntyGPmEm8AX+HlS OabS0cOb/4QBGQAUtkMA+hNLkK54mluQGzujEJXEKzd6qxtEKPKoMz5u9kSKqTsdJBGF OtT3sSq9O1w91Jm7sKcbCog41+tUs6b6PUQ9BcQi4nwXXkYdfr0Wno4m9/t7UX1y9nMX qeag== X-Gm-Message-State: AOAM5304H2FmZ8XB5kbO9epmQSXE4Q4DYgTeqBwi+Kgq26lhocPrgwZK TqaV7S4xzRaUafdg0RNWtb+XpMqXjWoiXAur X-Google-Smtp-Source: ABdhPJyGYSdAqu7p2msp8dZbH+4TtUnNXsdN6d5lTefqsUv+w53QsA3buofHXcR1ZmmLg6pI3vpMDg== X-Received: by 2002:a17:906:3509:: with SMTP id r9mr14193077eja.490.1618686753304; Sat, 17 Apr 2021 12:12:33 -0700 (PDT) Received: from linux.local (host-95-237-55-30.retail.telecomitalia.it. [95.237.55.30]) by smtp.gmail.com with ESMTPSA id g11sm8330120edy.9.2021.04.17.12.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 12:12:32 -0700 (PDT) From: "Fabio M. De Francesco" To: dri-devel@lists.freedesktop.org, outreachy-kernel@googlegroups.com, Ben Skeggs , David Airlie , Daniel Vetter Subject: [PATCH] drm/nouveau/dispnv50: disp.c: Replace drm_modeset_*_all with DRM_MODESET_LOCK_ALL_* Date: Sat, 17 Apr 2021 21:12:28 +0200 Message-Id: <20210417191228.2980-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.31.1 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: , Cc: "Fabio M. De Francesco" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Replace the deprecated API with DRM_MODESET_LOCK_ALL_* helpers (according to the TODO list of the DRM subsystem). Signed-off-by: Fabio M. De Francesco --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 828f48d5bdd4..e167bf96ff12 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -666,16 +666,19 @@ nv50_audio_component_bind(struct device *kdev, struct device *hda_kdev, struct drm_device *drm_dev = dev_get_drvdata(kdev); struct nouveau_drm *drm = nouveau_drm(drm_dev); struct drm_audio_component *acomp = data; + struct drm_modeset_acquire_ctx ctx; + int ret = 0; if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS))) return -ENOMEM; - drm_modeset_lock_all(drm_dev); + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); acomp->ops = &nv50_audio_component_ops; acomp->dev = kdev; drm->audio.component = acomp; - drm_modeset_unlock_all(drm_dev); - return 0; + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); + + return ret; } static void @@ -685,12 +688,14 @@ nv50_audio_component_unbind(struct device *kdev, struct device *hda_kdev, struct drm_device *drm_dev = dev_get_drvdata(kdev); struct nouveau_drm *drm = nouveau_drm(drm_dev); struct drm_audio_component *acomp = data; + struct drm_modeset_acquire_ctx ctx; + int ret = 0; - drm_modeset_lock_all(drm_dev); + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); drm->audio.component = NULL; acomp->ops = NULL; acomp->dev = NULL; - drm_modeset_unlock_all(drm_dev); + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); } static const struct component_ops nv50_audio_component_bind_ops = { -- 2.31.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6952206676913029120 X-Received: by 2002:a2e:5445:: with SMTP id y5mr6247386ljd.381.1618686755476; Sat, 17 Apr 2021 12:12:35 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 2002:a05:6512:3b95:: with SMTP id g21ls3945163lfv.1.gmail; Sat, 17 Apr 2021 12:12:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ObZPk/VY5uinKWE+DbYYjMBdiTBtFXQY6UeAFaNZaM3/Cum+DCqs+lW9hOkGV6KP84AM X-Received: by 2002:a05:6512:38c9:: with SMTP id p9mr6917541lft.572.1618686753798; Sat, 17 Apr 2021 12:12:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618686753; cv=none; d=google.com; s=arc-20160816; b=y81lvpF70rC46AQMEhH1u5ZDSLE+ENOHG5+cAA0xW9nAKy0MiIT/WCAOXfGvmtT94D fpLVAqf/zZnO1vxvJQFGR8pLSu96RGhORJoRSXm8++3AewX41boZOS14YRUrqWA39qnm iFijIiGwj5Vi3U9NuoEPjzpAc7KIUr9FPF/TpO2YNBhSonS8lcqcMXjwgNIllMLHshTg 2SuJ8zscxaYn98qWsX4h+snmBYgjhvW6NvG6IuNABmjQic46rk6psgDnkoj7L7qOSrZz pO3CRR5F4ld8Rmmjo6jfNaXpG2sbG5uLPOrd7eHU3GOr8DukDuxGnFxHzYI/g1VqzR9a XEzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=4EeE/jEG+BwS2yLzax1oxoe1YlEFDe9IUirRYoBxddY=; b=d3TH6pNUk5Ak/VZL/6TnMwxFt5GmxSrPjvwf99zhc5wy3JZM6TxHRugOST+NUXfZ9x afd6GmbxqyvP1S7bhif3TskH1uTkyTYXtXu3SIyFu/GK/UdAG2NqePZkgEqyk9gunvex gMfEkh/Wn84pBKLzOepbgjflC35bru57hG1yn3hBiPhtxutIwAdGM1Q+K88Hfkk5CrzM qFveufUUP4yq1FUQtPvUZoAE8Ac+ZTWvUHcfYHbcZE2w3cHcl4AiQBW27h/RYPhmDkPM HIMkql/UDrTTFm3R0PWpeqq6cTB3soDEutrVZboTsCHlii2Wf7+D736i8Bp1ncFFbWFf BLdQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=c7+kaWC9; spf=pass (google.com: domain of fmdefrancesco@gmail.com designates 2a00:1450:4864:20::62b as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com. [2a00:1450:4864:20::62b]) by gmr-mx.google.com with ESMTPS id a36si290498ljq.5.2021.04.17.12.12.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 17 Apr 2021 12:12:33 -0700 (PDT) Received-SPF: pass (google.com: domain of fmdefrancesco@gmail.com designates 2a00:1450:4864:20::62b as permitted sender) client-ip=2a00:1450:4864:20::62b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=c7+kaWC9; spf=pass (google.com: domain of fmdefrancesco@gmail.com designates 2a00:1450:4864:20::62b as permitted sender) smtp.mailfrom=fmdefrancesco@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-ej1-x62b.google.com with SMTP id e14so46866727ejz.11 for ; Sat, 17 Apr 2021 12:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4EeE/jEG+BwS2yLzax1oxoe1YlEFDe9IUirRYoBxddY=; b=c7+kaWC9DjKkxn882whe6mMcd7HxFJ1bFx6boT52Kt5Na7Hsz74IweAgpdXTr9Hdqb cHm600tCOzfepihXRSKoRjr6P6Y7eHYHOVaJM4nU41WthSVcIRCiEcASb4fNULWj5dHK 8cAGqT78I0dG6DkmvQFXelgrGqLF+iR5FO8Q83Llwb9dq3d6fRcivo0AMZoeFtu61O8u gaJNhW5PcY9WXX5H/Xp07n41hirN7EnlshoAtZsKOU7mQMSw9zqmt6z11qzqVDZJSCXg CwEkFYy4nhHJSDaTd8rYJP9LREtzHDp2MWoE4IMYRiJdzeIGdOPaL5AqlbeWNOwB38e7 ZonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4EeE/jEG+BwS2yLzax1oxoe1YlEFDe9IUirRYoBxddY=; b=idJMCeeLzh9sXafsRbCAHmF2O+OUWCJZNQYCwRb6A5KF1gXyexC91o6h6rBd/HNJCe 9uYuK6vEqm7ACd+k3pIq7TTYEvz/ZP8WXGfXVzcMnAxhXAk7J+3o8doSsapt8HdOhgKK JLBUon2yfqEkM+SYDdTzOT9RugK8rrtrXmYalA3c7M25uRzGMyyS6w1LNLVKCZyF+Fkt /l67+cX4oec91q80xUYRVolI3IUrz0v05AuqHNIKpyns+eRfunwOmMg04WYlJW2oeUcb XFnJ9RHr2WLWoXL/GPOWB7uVSaQpyeLexlNqKe5wkRj8XQbJBf1GG8qS0fUDQy9552cX eiCA== X-Gm-Message-State: AOAM531ic5r9mLcCDJMPofSJrHbA2YjnkspTAoKfHn2ayZ59/Fp1FIDi 30Ae2Ny6JANwv7MWCyCte54= X-Received: by 2002:a17:906:3509:: with SMTP id r9mr14193077eja.490.1618686753304; Sat, 17 Apr 2021 12:12:33 -0700 (PDT) Return-Path: Received: from linux.local (host-95-237-55-30.retail.telecomitalia.it. [95.237.55.30]) by smtp.gmail.com with ESMTPSA id g11sm8330120edy.9.2021.04.17.12.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 12:12:32 -0700 (PDT) From: "Fabio M. De Francesco" To: dri-devel@lists.freedesktop.org, outreachy-kernel@googlegroups.com, Ben Skeggs , David Airlie , Daniel Vetter Cc: "Fabio M. De Francesco" Subject: [PATCH] drm/nouveau/dispnv50: disp.c: Replace drm_modeset_*_all with DRM_MODESET_LOCK_ALL_* Date: Sat, 17 Apr 2021 21:12:28 +0200 Message-Id: <20210417191228.2980-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the deprecated API with DRM_MODESET_LOCK_ALL_* helpers (according to the TODO list of the DRM subsystem). Signed-off-by: Fabio M. De Francesco --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 828f48d5bdd4..e167bf96ff12 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -666,16 +666,19 @@ nv50_audio_component_bind(struct device *kdev, struct device *hda_kdev, struct drm_device *drm_dev = dev_get_drvdata(kdev); struct nouveau_drm *drm = nouveau_drm(drm_dev); struct drm_audio_component *acomp = data; + struct drm_modeset_acquire_ctx ctx; + int ret = 0; if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS))) return -ENOMEM; - drm_modeset_lock_all(drm_dev); + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); acomp->ops = &nv50_audio_component_ops; acomp->dev = kdev; drm->audio.component = acomp; - drm_modeset_unlock_all(drm_dev); - return 0; + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); + + return ret; } static void @@ -685,12 +688,14 @@ nv50_audio_component_unbind(struct device *kdev, struct device *hda_kdev, struct drm_device *drm_dev = dev_get_drvdata(kdev); struct nouveau_drm *drm = nouveau_drm(drm_dev); struct drm_audio_component *acomp = data; + struct drm_modeset_acquire_ctx ctx; + int ret = 0; - drm_modeset_lock_all(drm_dev); + DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret); drm->audio.component = NULL; acomp->ops = NULL; acomp->dev = NULL; - drm_modeset_unlock_all(drm_dev); + DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret); } static const struct component_ops nv50_audio_component_bind_ops = { -- 2.31.1