From patchwork Thu Jul 18 15:37:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A42C13A4 for ; Thu, 18 Jul 2019 15:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C5C728833 for ; Thu, 18 Jul 2019 15:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6090F286D4; Thu, 18 Jul 2019 15:38:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C59912887A for ; Thu, 18 Jul 2019 15:38:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EE8B6E416; Thu, 18 Jul 2019 15:38:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26D976E413; Thu, 18 Jul 2019 15:37:55 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id x25so27844917ljh.2; Thu, 18 Jul 2019 08:37:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=abKr8U1s26zaXGUSgB//T3ReRdjCy7lXyFiU/pL3ZEw=; b=VxO7tKzYM22CSvm0RGhXAJ4758W6fGYmE9s8zwL/dvXjwkBpdXmJ/mgvRCVkE1oKLT dPliejx4xuqm2ML+ZQTRMCzkQMlJ9aAQkNb/8hvIRmdxgp492jMflhS2IUwjgOaq2L8n ssUA06LfVax49JwS9pC8LLufY4uOAMmT2sGg6KYad9kH4uwWr7Lzxc7GuC69UW/AzW5F 3fqRyjGcd4GgaYoiyONzb1c2mrQw/KBQhHmOmKbGJERFvTJ/dNbGEkQ4cGC2rTGDq8iY OFcYpgMPWPYEjZJshbSx0QB4OmO8bYqo7oSZ16sTbMcWRHApcZOkvYMzB8EBSLNQmbLH 89oA== X-Gm-Message-State: APjAAAXUzf8N6iYdx2wQ4HrMwaj0qpUqmyaBYDYF7G0eChVtCoUPDpGF WMMYEl+Ip6DN5GMlm6UBI4hs8HXlwro= X-Google-Smtp-Source: APXvYqwqEqct5AdufUBnsQ3hmvU1UBswNF3Y7f3JP2PUnwRWzCwj+7m69jtRYQNfLctLQLmbl/HbEw== X-Received: by 2002:a2e:86cc:: with SMTP id n12mr609046ljj.146.1563464273195; Thu, 18 Jul 2019 08:37:53 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c30sm4062388lfp.70.2019.07.18.08.37.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:52 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 3/6] drm/via: drop use of drmP.h Date: Thu, 18 Jul 2019 17:37:34 +0200 Message-Id: <20190718153737.28657-4-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190718153737.28657-1-sam@ravnborg.org> References: <20190718153737.28657-1-sam@ravnborg.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=abKr8U1s26zaXGUSgB//T3ReRdjCy7lXyFiU/pL3ZEw=; b=IJDwkskybjs7DJyTAZGzlcNnaRllDYFqoGaSa4kt/N6ONay30Kl4yK2ex2D39CtF49 oa9y7k9gyHvkT6IeeBIdwFz//T+8Nv7i9CrCy5aKhWvJUeFUZUDb4VGywcd+QRWFn0Rs 1kajwNzC2RkxQkhmXSAJvnX6ZXSXeNK1wtLhBek9DwyIFGXTgnmXbGc1VQ9nkjYyWRIA q8gckHqWljx2RCMhchyVcQONuJe4V218XuXzxogPetlhUAQ7taJ3JGxoKkLESVoM2AiX ALUm62cd59kxud9NiBo9JqTPSoaF7e4GZSKSy/RTFu+ZExSfTw3XY3LL5cDee9U2JQrm f4lw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , Sam Ravnborg , "Gustavo A. R. Silva" , David Airlie , Daniel Vetter , Kevin Brace , Mike Marshall , Ira Weiny , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop use of the deprecated drmP.h header. While touching the files divide include files in blocks and sort the files alphabetically. Signed-off-by: Sam Ravnborg Cc: Kevin Brace Cc: Thomas Hellstrom Cc: "Gustavo A. R. Silva" Cc: Mike Marshall Cc: Ira Weiny Cc: Daniel Vetter Cc: Emil Velikov --- drivers/gpu/drm/via/via_dma.c | 9 ++++++++- drivers/gpu/drm/via/via_dmablit.c | 14 +++++++++----- drivers/gpu/drm/via/via_drv.c | 7 +++++-- drivers/gpu/drm/via/via_irq.c | 5 ++++- drivers/gpu/drm/via/via_map.c | 6 +++++- drivers/gpu/drm/via/via_mm.c | 7 ++++++- drivers/gpu/drm/via/via_verifier.c | 10 +++++----- drivers/gpu/drm/via/via_video.c | 4 +++- 8 files changed, 45 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c index d17d8f245c1a..4e50834dd222 100644 --- a/drivers/gpu/drm/via/via_dma.c +++ b/drivers/gpu/drm/via/via_dma.c @@ -34,8 +34,15 @@ * Thomas Hellstrom. */ -#include +#include +#include + +#include +#include +#include +#include #include + #include "via_drv.h" #include "via_3d_reg.h" diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 062067438f1d..87d88bdd20c6 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -34,13 +34,17 @@ * the same DMA mappings? */ -#include -#include -#include "via_drv.h" -#include "via_dmablit.h" - #include #include +#include + +#include +#include +#include +#include + +#include "via_dmablit.h" +#include "via_drv.h" #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index af6a12d3c058..666a16de84f9 100644 --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c @@ -24,11 +24,14 @@ #include -#include +#include +#include +#include +#include #include + #include "via_drv.h" -#include static int via_driver_open(struct drm_device *dev, struct drm_file *file) { diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index c96830ccc0ec..9d47feb367d8 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c @@ -35,8 +35,11 @@ * The refresh rate is also calculated for video playback sync purposes. */ -#include +#include +#include +#include #include + #include "via_drv.h" #define VIA_REG_INTERRUPT 0x200 diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index 2ad865870372..431c150df014 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c @@ -21,8 +21,12 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include + +#include +#include +#include #include + #include "via_drv.h" static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init) diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c index 4217d66a5cc6..45cc9e900260 100644 --- a/drivers/gpu/drm/via/via_mm.c +++ b/drivers/gpu/drm/via/via_mm.c @@ -25,8 +25,13 @@ * Authors: Thomas Hellström */ -#include +#include + +#include +#include +#include #include + #include "via_drv.h" #define VIA_MM_ALIGN_SHIFT 4 diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c index fb2609434df7..361a450058f2 100644 --- a/drivers/gpu/drm/via/via_verifier.c +++ b/drivers/gpu/drm/via/via_verifier.c @@ -28,13 +28,13 @@ * be very slow. */ -#include "via_3d_reg.h" -#include -#include +#include #include -#include "via_verifier.h" +#include + +#include "via_3d_reg.h" #include "via_drv.h" -#include +#include "via_verifier.h" typedef enum { state_command, diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index a9ffbad1cfdd..4e165b1b0b18 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c @@ -25,8 +25,10 @@ * Video and XvMC related functions. */ -#include +#include +#include #include + #include "via_drv.h" void via_init_futex(drm_via_private_t *dev_priv)