From patchwork Sun Aug 4 09:41:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11074719 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 D1C711398 for ; Sun, 4 Aug 2019 09:42:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0CA1287A0 for ; Sun, 4 Aug 2019 09:42:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B505E2887B; Sun, 4 Aug 2019 09:42:00 +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 07ACA28869 for ; Sun, 4 Aug 2019 09:42:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC74C89FAC; Sun, 4 Aug 2019 09:41:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C23F89FAC for ; Sun, 4 Aug 2019 09:41:57 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id m23so76605450lje.12 for ; Sun, 04 Aug 2019 02:41:57 -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=DePQxNh8T47RVSWFEa9Q4aY3dls33KQZkKt6LAaKyh0=; b=fXNEBO5tEpRFSIlyIziB/OZSvy8Yal799KR5KcwCyD97szmjHTW7s0EqY1QxWPkTah wT4wdG+ta5Ku1yDr3K50HVwKcB62hAz36yx12K7XD2geNAwg24CjVxicz7E9+OShDr7n qe8C+/vwBHENsWWrU46VXOgLMpBZ/gGFHBCK8H6eIuwimet3PXym0KcTb7m/6tmeV/zt RLPeFEhqQR48pQlXxA2qQhE9t8dwQTupRl9g4mcnRVLrhFMJqobwLsc3gUI6oOLdkv3H dYJYUDjpkOnhSbpVxf+NVD7i3rxJyADQOXrsUBZo547rvf+bN7uN7HntBrFahgcI5xTu frtg== X-Gm-Message-State: APjAAAXQpkDz4O71npGDPMBwQZuApAMIiIB+lAxZeYTfM53LWyo9MAtX QvCi5CHgUpUmlsH+qgmNPGK1Bm0Ya8o= X-Google-Smtp-Source: APXvYqxkzQYang37I0j5GpRhLZVtxy73fOIwd7CT4giJfidOeGCRDny47w9stJcTRmKNM8rx28/Lpw== X-Received: by 2002:a2e:8183:: with SMTP id e3mr26667561ljg.97.1564911715238; Sun, 04 Aug 2019 02:41:55 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id 25sm16230194ljn.62.2019.08.04.02.41.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 02:41:54 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/4] drm/tegra: drop use of drmP.h Date: Sun, 4 Aug 2019 11:41:30 +0200 Message-Id: <20190804094132.29463-3-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190804094132.29463-1-sam@ravnborg.org> References: <20190804094132.29463-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=DePQxNh8T47RVSWFEa9Q4aY3dls33KQZkKt6LAaKyh0=; b=vW7zSAJTmmPRh3B+v8IMuCzH/CxOrOOFS4M0Ts03o8VCz89/kvz5l5SfaJ9JUWgK7a rkNnn7qnojwYCL8IjiBTlCWKyaLKdU4RitqBu3k9De1PyG2x00OQtACpvDq2kiwdAkfe aL4a9CpfZTHuiL+m+Sa76aKQ5uB2I2rOeRjghIZ0cH9ynHC3XJlxuhO7lhw/zt7uhsAA 2nWKfFaJagV91t8yKCTg95gA+tkIEq0aalmG4zGApZoF2se6SETISV8vSrJxdNc3xwKi 0FgUzlzhdt8MYdXOo3jK1QYqSz3Jp7mcu/SSEwfVy0txmjJBO1VZrqy5wBoWf8BAYjgY b7jw== 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 , Liviu Dudau , Russell King , Jonathan Hunter , Thierry Reding , malidp@foss.arm.com, linux-tegra@vger.kernel.org, Sam Ravnborg 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. 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 Reviewed-by: Thierry Reding --- 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 4a75d149e368..fbf57bc3cdab 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -6,23 +6,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 2d94da225e51..a0f6f9b0d258 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -8,14 +8,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 870904bfad78..6fb7d74ff553 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -8,9 +8,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 86daa19fcf24..29911eff9ceb 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -7,18 +7,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 2fbfefe9cb42..a5d47e301c5f 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -5,22 +5,24 @@ #include #include +#include #include #include #include #include #include #include +#include #include -#include +#include