From patchwork Sun Jun 30 05:21:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11024163 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 C86CB14E5 for ; Sun, 30 Jun 2019 05:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA7C2287B6 for ; Sun, 30 Jun 2019 05:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACFFB287E0; Sun, 30 Jun 2019 05:21:42 +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 03E30287B6 for ; Sun, 30 Jun 2019 05:21:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F19066E9C5; Sun, 30 Jun 2019 05:21:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E37C6E9C3 for ; Sun, 30 Jun 2019 05:21:33 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id 16so9707806ljv.10 for ; Sat, 29 Jun 2019 22:21:33 -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 :mime-version:content-transfer-encoding; bh=ko4CDK9341TyKXx04ssRlosVsYyE5IzVM43PF2G/Sq0=; b=Mc/ATYghT/6PxKXrANK635tT1xuDE/acPnSHbBk/7sIHnz3fObX5Km4RFsc7vAiqJM iRk08HYWBk4JGYvmW/DT0JKh6sOJMNd/i+o8uPwHKYORaAAVu4rgaljtPXX7hGbOMdix sHTswktj2MVwTxhIojAin5XkWaFBQM0g3zTj8JHtymBiyLbmQxID1NZ+qnbcnjYf0ctv Ga3N0EkDxS0xFLFD0HFHq7i8hTg/WoZvUAkvvfPcZ9t32tUj752UiMhudXI6g1x2yPgU tKMxxKGJRXPDlcThIB5jyRIgjWEJZDIlZynXlk5pS+nATyXn0slg08IkVy9im1N2RvIf 89hA== X-Gm-Message-State: APjAAAVSVu0nWd8Y32dTlngNR2MQkt7s3bMHgVOFXlMBY56xixsEjc7R NJSghGdzt0rqAHB3ZbZ2LJEDG71wNwY= X-Google-Smtp-Source: APXvYqxbgsTOJYC7fFKJsctVKzym4w5fKVGfwK4dxN3dewj+QRrjPO4hPD161d0IUkHk7f+QNRA5OA== X-Received: by 2002:a2e:658e:: with SMTP id e14mr10360108ljf.147.1561872091255; Sat, 29 Jun 2019 22:21:31 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id p12sm2275488lja.23.2019.06.29.22.21.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 22:21:30 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1] drm/armada: drop use of drmP.h Date: Sun, 30 Jun 2019 07:21:29 +0200 Message-Id: <20190630052129.6091-1-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 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:mime-version :content-transfer-encoding; bh=ko4CDK9341TyKXx04ssRlosVsYyE5IzVM43PF2G/Sq0=; b=MmCC1zahkDdNvzuneUepSaQUXUR77qgtfw0wsWts/S77yb0HkGvv5f+W76Rqq9LiAX OLxusw5IkRzOxtLEzGyupToc++rUwUWWjHo9UvMNtgHgApS3xs1zwgvywwBsMD7NC0jT j6PoCU3ZKJ/WOm659d3zaHSa4oZaBwpE3WmYIJKTNDzVMG509s1psERm1sie60YYFWcp 5yWLnFiHHR0Vsaw0+gXv1jRIXVQBjWNc3d46iLTw8z3L5BGhcvb8csgJlgB/fJtD3XSJ CfXkqp4arGqD7dYFfRyyIhHnG0iZvStvnGt2tIJMFhICARiDm9HjVXtn7L4/+GXKvgUl z4BA== 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: David Airlie , Sam Ravnborg , Russell King 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 file. While touching the list of include files group them and sort them. Fix fallout from the header file removal. Signed-off-by: Sam Ravnborg Cc: Russell King Cc: David Airlie Cc: Daniel Vetter --- The patch is build tested using several configs and several architectures (including arm, arm64, x86). The patch is based on drm-misc. If patch is OK, please apply to your tree as this driver is maintained outside drm-misc. I am happy to rebase on another tree, just let me know. Sam drivers/gpu/drm/armada/armada_crtc.c | 10 +++++++--- drivers/gpu/drm/armada/armada_debugfs.c | 8 ++++++-- drivers/gpu/drm/armada/armada_drm.h | 5 ++++- drivers/gpu/drm/armada/armada_drv.c | 8 ++++++++ drivers/gpu/drm/armada/armada_fb.c | 3 +++ drivers/gpu/drm/armada/armada_fbdev.c | 3 +++ drivers/gpu/drm/armada/armada_gem.c | 7 ++++++- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- drivers/gpu/drm/armada/armada_plane.c | 4 +++- drivers/gpu/drm/armada/armada_trace.h | 5 ++++- 10 files changed, 49 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index ba4a3fab7745..5b15d5497a2a 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -6,15 +6,19 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include #include +#include #include #include -#include + #include -#include -#include #include +#include +#include +#include + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c index 6758c3a83de2..7ec99b5236eb 100644 --- a/drivers/gpu/drm/armada/armada_debugfs.c +++ b/drivers/gpu/drm/armada/armada_debugfs.c @@ -6,11 +6,15 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include -#include #include #include -#include +#include + +#include +#include + #include "armada_crtc.h" #include "armada_drm.h" diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h index f09083ff15d3..90ce977a30df 100644 --- a/drivers/gpu/drm/armada/armada_drm.h +++ b/drivers/gpu/drm/armada/armada_drm.h @@ -11,11 +11,14 @@ #include #include #include -#include + +#include +#include struct armada_crtc; struct armada_gem_object; struct clk; +struct drm_display_mode; struct drm_fb_helper; static inline void diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index 78c8ad73ae1e..37f2b4be7ba0 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -5,14 +5,22 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include #include #include #include +#include + #include +#include +#include +#include #include #include #include +#include + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_gem.h" diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c index a2f6472eb482..21808d374e8b 100644 --- a/drivers/gpu/drm/armada/armada_fb.c +++ b/drivers/gpu/drm/armada/armada_fb.c @@ -5,9 +5,12 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include #include +#include #include + #include "armada_drm.h" #include "armada_fb.h" #include "armada_gem.h" diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 1e7140f005a5..9581310cafb4 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -6,11 +6,14 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include #include #include #include +#include + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 7e7fcc3f1f7f..3c3e700e5323 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -5,12 +5,17 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #include #include +#include #include + +#include +#include + #include "armada_drm.h" #include "armada_gem.h" -#include #include "armada_ioctlP.h" static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf) diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c index 8d770641fcc4..cfa0f02a461d 100644 --- a/drivers/gpu/drm/armada/armada_overlay.c +++ b/drivers/gpu/drm/armada/armada_overlay.c @@ -6,12 +6,14 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include + +#include #include -#include #include +#include +#include #include -#include + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_plane.c b/drivers/gpu/drm/armada/armada_plane.c index 9f36423dd394..48e5e5d9faef 100644 --- a/drivers/gpu/drm/armada/armada_plane.c +++ b/drivers/gpu/drm/armada/armada_plane.c @@ -6,10 +6,12 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include + #include #include +#include #include + #include "armada_crtc.h" #include "armada_drm.h" #include "armada_fb.h" diff --git a/drivers/gpu/drm/armada/armada_trace.h b/drivers/gpu/drm/armada/armada_trace.h index f03a56bda596..528f20fe3147 100644 --- a/drivers/gpu/drm/armada/armada_trace.h +++ b/drivers/gpu/drm/armada/armada_trace.h @@ -3,7 +3,10 @@ #define ARMADA_TRACE_H #include -#include + +struct drm_crtc; +struct drm_framebuffer; +struct drm_plane; #undef TRACE_SYSTEM #define TRACE_SYSTEM armada