From patchwork Tue Sep 19 21:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lyude Paul X-Patchwork-Id: 142215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3867864vqi; Tue, 19 Sep 2023 21:24:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHj629KZt7sTjyCrK6dxbtKh41pt5omV+dF2mmiSA1+xtx2rGd158eadiVqsuVcRYBiWnOA X-Received: by 2002:a05:6a21:3291:b0:12e:98a3:77b7 with SMTP id yt17-20020a056a21329100b0012e98a377b7mr1675591pzb.59.1695183849875; Tue, 19 Sep 2023 21:24:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695183849; cv=none; d=google.com; s=arc-20160816; b=dbgpNkT87uTPwARut+/8M+GsrQmDWdWlB0twPtUELvHQmvPqwU+/TCLyLL+pSfwk3v jmulI0h5kT/jK9mlZhw+8qkZPp/w7lahKaJkMtvbxHkPs+cTMqqU18c/fGRumdFjBmDD /4xUiCzT5TOaMpAQoL0pVYnqUODnEPAiGJuL/LJPWknkP2O9XyOzqM7Xe7iGzN9urFfy e0NwaDgkEzPVqWnlD1r2JjmmMfydWhtu0vGbCmvcdFeBC6ASl12g8WALapBR++soYsr2 s9n+msg9OZRx4iFz7yfAHFpGUIhPihAjAtDuaavkRvz9+QsIXUo3t5WkYEAf+vuBPj4H UDGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zXKW/3wujMQKniDN1UFIV26pXsP566Lzxl/Vfmrm4zE=; fh=2SXWb2ts99eE+OYESnujeGpShOsteg1KtZEhV4aGij8=; b=L00JX9TtEYH8+z8HZhrRWK2Y/oTnzRVFazPIbwsHlfsJcCZDolaYyR3jb+gM+M24wL FpUUNfucRMM2BwuB97mYw6eN2LC6C2+JhXJl64drkqXbpfhGW8BLv9puW+uS2Vl9NFvK t7k16+tYVyJc8D1pfhSFieDkrIgJ7r3ZQvVDRfJyTPA8lGMkARh2GOaCy2D2d20mYtVB Y6Vm8i3qBQjSPnEU/3Wq+kFsozTSzC2P4Bjn3aZBdbZqtzepVCIU0RIjT6ol3gVq+POT QrN/Jzbeua/2D0UzkOHD1eDqLb09hNg9dNsfegWnPJTq6Mh6e7ZpqNX73rgSxxe27iew Yolw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Xz1bPasX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id s21-20020a63e815000000b005775a0cd009si10954794pgh.331.2023.09.19.21.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 21:24:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Xz1bPasX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id DC2D48310D2A; Tue, 19 Sep 2023 15:08:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233463AbjISWIe (ORCPT + 26 others); Tue, 19 Sep 2023 18:08:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233535AbjISWIS (ORCPT ); Tue, 19 Sep 2023 18:08:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B43810D7 for ; Tue, 19 Sep 2023 15:06:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695161211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zXKW/3wujMQKniDN1UFIV26pXsP566Lzxl/Vfmrm4zE=; b=Xz1bPasXFy5d6dcJZXYI1O/KZgnEAcLhcuNrBH9qMIvMwrHFI/orea558TQSyu0GhQzxP2 mgTuCsLaBsvkc6t6+s9HjJsBUM6WFPWsvnZDpxCXi0GHgo57oB6vGBI5ZZFp1kHS8fdq/0 pplWO1OCcqoTpgf4v0hHwuvFcvudrQM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-48-HvcUmgBSOoiuIaxd9mKIMQ-1; Tue, 19 Sep 2023 18:06:47 -0400 X-MC-Unique: HvcUmgBSOoiuIaxd9mKIMQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B967F8001EA; Tue, 19 Sep 2023 22:06:46 +0000 (UTC) Received: from emerald.lyude.net (unknown [10.22.18.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58C2240C2064; Tue, 19 Sep 2023 22:06:46 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Cc: Ben Skeggs , Danilo Krummrich , Karol Herbst , David Airlie , Daniel Vetter , Kees Cook , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 26/44] drm/nouveau/disp: move dp aux pwr method to HAL Date: Tue, 19 Sep 2023 17:56:21 -0400 Message-ID: <20230919220442.202488-27-lyude@redhat.com> In-Reply-To: <20230919220442.202488-1-lyude@redhat.com> References: <20230919220442.202488-1-lyude@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 19 Sep 2023 15:08:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777529100539266660 X-GMAIL-MSGID: 1777529100539266660 From: Ben Skeggs - preparation for GSP-RM Signed-off-by: Ben Skeggs Reviewed-by: Lyude Paul Acked-by: Danilo Krummrich Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 9 +++++++++ drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 4 ++++ drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 6 +++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c index 0e6e388003765..99fe7ef07a443 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c @@ -41,6 +41,14 @@ */ #define AMPERE_IED_HACK(disp) ((disp)->engine.subdev.device->card_type >= GA100) +static int +nvkm_dp_aux_pwr(struct nvkm_outp *outp, bool pu) +{ + outp->dp.enabled = pu; + nvkm_dp_enable(outp, outp->dp.enabled); + return 0; +} + struct lt_state { struct nvkm_outp *outp; @@ -814,6 +822,7 @@ nvkm_dp_func = { .disable = nvkm_dp_disable, .bl.get = nvkm_outp_bl_get, .bl.set = nvkm_outp_bl_set, + .dp.aux_pwr = nvkm_dp_aux_pwr, }; int diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h index 38b6b43a9f200..513794a278a91 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h @@ -104,6 +104,10 @@ struct nvkm_outp_func { int (*get)(struct nvkm_outp *); int (*set)(struct nvkm_outp *, int level); } bl; + + struct { + int (*aux_pwr)(struct nvkm_outp *, bool pu); + } dp; }; #define OUTP_MSG(o,l,f,a...) do { \ diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c index 7574f22006441..6ca364e953bd7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c @@ -75,10 +75,10 @@ nvkm_uoutp_mthd_dp_aux_pwr(struct nvkm_outp *outp, void *argv, u32 argc) if (argc != sizeof(args->v0) || args->v0.version != 0) return -ENOSYS; + if (!outp->func->dp.aux_pwr) + return -EINVAL; - outp->dp.enabled = !!args->v0.state; - nvkm_dp_enable(outp, outp->dp.enabled); - return 0; + return outp->func->dp.aux_pwr(outp, !!args->v0.state); } static int