From patchwork Sun Jun 30 05:21:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 1124854 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NKNyPmAP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45bzPl2gW6z9s3l for ; Sun, 30 Jun 2019 15:21:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726467AbfF3FVa (ORCPT ); Sun, 30 Jun 2019 01:21:30 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:46723 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725976AbfF3FV3 (ORCPT ); Sun, 30 Jun 2019 01:21:29 -0400 Received: by mail-lf1-f67.google.com with SMTP id z15so6515915lfh.13 for ; Sat, 29 Jun 2019 22:21:27 -0700 (PDT) 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=L7U3DctHkIQV4kklZ2cPuGz4FfGaj1NuNfRxS2griz4=; b=NKNyPmAPVUzj9Ovgr6om2t8Qv4BtRVQVWR/8nZ5D2IuQq2wC6oUvTNyJHvV57satac OLFP075azspIUyFJCvBMMqYu1Qls7S4Z+knWY045YqTk5qvl8eWxUFz4FXFaS6fg8m5b E8McNjKCFv0Q43GOkb+OLfqCB57dDqNz9emyzl1u2D1D1WM8gwfFuzQw7G1TbEaFcVoA fzA23pcJnc1y7fwfoPoGVcXWygkxQnED5RSXIX/Tw+F50LZjI8WRdOH/jqHa166S0RjK DbV09ibKehBOITqA5HNskBP+TMvVthLRm3lt18OtfnfrEBKEjxzE7vbVqxZJJP+epaEk JlyA== 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=L7U3DctHkIQV4kklZ2cPuGz4FfGaj1NuNfRxS2griz4=; b=VedXYiLo57i3N4igsa6y6o1sJme2m/GUicAmTWm5ARbg8kTvrjSh56y5wX2X0uWfOM OEWXI6Iz9pqo+syVfFZp7LYWiwXdRkzq24L3pdg2MoU1DX6RpRL3o9Ex/SMRjPnpiSSK ipP3Fsw/oB87U0fMQhdCvIdRoAPdOkxe5ZS4wW4Br/rxuFJjFmZb30ipnGWPzOlQ8mJU QcBvkwXkF2zAVM8Z0H4Q31RYd5zueuABnrMCOudNMZWxEwEt/V+YTklEA5QcnZRoZnCF L3htbBxRRIatGYrEuiEjJmCELopzxdH6SJ3ak7IF5Hi9jqf7rnBOBtLE4jv+TuFEDC7z xVVA== X-Gm-Message-State: APjAAAVxYhgalRy5uXI/6Y17GDek6rWmU32gHXqjKz5D0Lf4HpaGZyAS 7+guFA+S9/4ayfOCOBkJ0Vw= X-Google-Smtp-Source: APXvYqxdiEfjltHa2rvK1YK4xWl2B+LHXk7pq6M/10cPEe+p5Y56gdiG5pTWgt94NR/N+DW8jwcmMA== X-Received: by 2002:a19:d5:: with SMTP id 204mr9287214lfa.66.1561872086265; Sat, 29 Jun 2019 22:21:26 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id i2sm2308413ljc.96.2019.06.29.22.21.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 22:21:25 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Cc: Sam Ravnborg , Thierry Reding , Jonathan Hunter , linux-tegra@vger.kernel.org Subject: [PATCH v1] drm/tegra: drop use of drmP.h Date: Sun, 30 Jun 2019 07:21:23 +0200 Message-Id: <20190630052123.6009-1-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Drop use of the deprecated drmP.h header file. For all touched files divide include files into blocks, and sort them within the blocks. Fix fallout. Signed-off-by: Sam Ravnborg Cc: Thierry Reding Cc: Jonathan Hunter Cc: linux-tegra@vger.kernel.org --- 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/tegra/dc.c | 13 +++++++++---- drivers/gpu/drm/tegra/dpaux.c | 5 +++-- drivers/gpu/drm/tegra/drm.c | 8 ++++++++ drivers/gpu/drm/tegra/drm.h | 3 +-- drivers/gpu/drm/tegra/dsi.c | 8 +++++--- drivers/gpu/drm/tegra/fb.c | 6 ++++-- drivers/gpu/drm/tegra/gem.c | 3 +++ drivers/gpu/drm/tegra/gem.h | 1 - drivers/gpu/drm/tegra/gr2d.c | 1 + drivers/gpu/drm/tegra/hdmi.c | 5 +++++ drivers/gpu/drm/tegra/hub.c | 3 ++- drivers/gpu/drm/tegra/hub.h | 1 - drivers/gpu/drm/tegra/plane.c | 1 + drivers/gpu/drm/tegra/sor.c | 3 +++ drivers/gpu/drm/tegra/vic.c | 1 + 15 files changed, 46 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 079250c85733..4f08159817ca 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -9,23 +9,28 @@ #include #include +#include #include +#include #include #include #include #include +#include +#include +#include +#include +#include +#include + #include "dc.h" #include "drm.h" #include "gem.h" #include "hub.h" #include "plane.h" -#include -#include -#include - static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state); diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index ee4180d8db14..8d9266fa464a 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -11,14 +11,15 @@ #include #include #include +#include #include #include #include #include -#include #include -#include +#include #include +#include #include #include diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 6dc326679915..ad0828b5672f 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -11,9 +11,17 @@ #include #include #include +#include +#include #include #include +#include +#include +#include +#include +#include +#include #if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) #include diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 70154c253d45..e86fdbe0f704 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -10,18 +10,17 @@ #ifndef HOST1X_DRM_H #define HOST1X_DRM_H 1 -#include #include #include #include -#include #include #include #include #include #include #include +#include #include "gem.h" #include "hub.h" diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index ee6ca8fa1c65..7461471a1738 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -8,22 +8,24 @@ #include #include +#include #include #include #include #include #include #include +#include #include -#include +#include