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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 A78ECC1975A for ; Wed, 18 Mar 2020 00:43:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75ED520752 for ; Wed, 18 Mar 2020 00:43:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PF4mT3sQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727543AbgCRAm7 (ORCPT ); Tue, 17 Mar 2020 20:42:59 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:44113 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727262AbgCRAm6 (ORCPT ); Tue, 17 Mar 2020 20:42:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584492177; 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=wQTZZg5BF/ZOQ9Sq3qNr3RLAR/qHM2KbjZ04R3iVkgc=; b=PF4mT3sQlTmgHS9euN9PveHFaZiISYqhBXK0n1bpZtqWbNmSIv/dLW46NU7Ew3Bp54JZUH jQBxekYP8k24AwiVgSPXmhQMcDF7ZbDTlfEgMPBbJmAYgG71Ld7uNl0D80tx8zoJ0We/LP 1srvY30YJnUoeEmms7D8e2e6XkkowHI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-389-Urmcq1SkOWWVFowX5bVtEg-1; Tue, 17 Mar 2020 20:42:53 -0400 X-MC-Unique: Urmcq1SkOWWVFowX5bVtEg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBCE2800D50; Wed, 18 Mar 2020 00:42:51 +0000 (UTC) Received: from whitewolf.redhat.com (ovpn-113-173.rdu2.redhat.com [10.10.113.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7325160BE0; Wed, 18 Mar 2020 00:42:50 +0000 (UTC) From: Lyude Paul To: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Ben Skeggs , David Airlie , Daniel Vetter , Pankaj Bharadiya , Sean Paul , Alex Deucher , Takashi Iwai , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Jani Nikula , linux-kernel@vger.kernel.org Subject: [PATCH 7/9] drm/nouveau/kms/nv50-: Expose nv50_outp_atom in disp.h Date: Tue, 17 Mar 2020 20:41:04 -0400 Message-Id: <20200318004159.235623-8-lyude@redhat.com> In-Reply-To: <20200318004159.235623-1-lyude@redhat.com> References: <20200318004159.235623-1-lyude@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to make sure that we flush disable updates at the right time when disabling CRCs, we'll need to be able to look at the outp state to see if we're changing it at the same time that we're disabling CRCs. So, expose the struct in disp.h. Signed-off-by: Lyude Paul --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 18 ------------------ drivers/gpu/drm/nouveau/dispnv50/disp.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/no= uveau/dispnv50/disp.c index f510eeafca4b..ef01f2473947 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -56,24 +56,6 @@ =20 #include =20 -/***********************************************************************= ******* - * Atomic state - ***********************************************************************= ******/ - -struct nv50_outp_atom { - struct list_head head; - - struct drm_encoder *encoder; - bool flush_disable; - - union nv50_outp_atom_mask { - struct { - bool ctrl:1; - }; - u8 mask; - } set, clr; -}; - /***********************************************************************= ******* * EVO channel ***********************************************************************= ******/ diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/no= uveau/dispnv50/disp.h index d54fe00ac3a3..8935ebce8ab0 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -70,6 +70,20 @@ struct nv50_dmac { struct mutex lock; }; =20 +struct nv50_outp_atom { + struct list_head head; + + struct drm_encoder *encoder; + bool flush_disable; + + union nv50_outp_atom_mask { + struct { + bool ctrl:1; + }; + u8 mask; + } set, clr; +}; + int nv50_dmac_create(struct nvif_device *device, struct nvif_object *dis= p, const s32 *oclass, u8 head, void *data, u32 size, u64 syncbuf, struct nv50_dmac *dmac); --=20 2.24.1