From patchwork Sun Aug  4 09:41:29 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sam Ravnborg <sam@ravnborg.org>
X-Patchwork-Id: 1141694
Return-Path: <linux-tegra-owner@vger.kernel.org>
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=<UNKNOWN>)
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="VJKKuspP"; dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by ozlabs.org (Postfix) with ESMTP id 461bX33nhSz9sMr
	for <incoming@patchwork.ozlabs.org>;
	Sun,  4 Aug 2019 19:41:55 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1726050AbfHDJlz (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
	Sun, 4 Aug 2019 05:41:55 -0400
Received: from mail-lj1-f196.google.com ([209.85.208.196]:35013 "EHLO
	mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1726037AbfHDJlz (ORCPT
	<rfc822; linux-tegra@vger.kernel.org>); Sun, 4 Aug 2019 05:41:55 -0400
Received: by mail-lj1-f196.google.com with SMTP id x25so76764633ljh.2
	for <linux-tegra@vger.kernel.org>;
	Sun, 04 Aug 2019 02:41:53 -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:in-reply-to:references
	:mime-version:content-transfer-encoding;
	bh=dafJ51pWjlSMMKmje8uyWBSzlpRZ3vlrMRQDfaXXm+I=;
	b=VJKKuspPkJ/iptGVaAIoL945E1CzQwsN5G4ksjAZNP8PXf2Ff3dv+gS/FLoY9VWU05
	w8q3mWa/IuxNK47fbQt2rYa73+ocaMbglQIKs1eqXhDFXafeznzGsR4vzux/6sUs20cD
	QjFlISCWneiUfF/0n368zWU8jpTJViwhxlySi37hox1yoPBK1PakzLZMcLniiNyUUAUC
	eOpmBnh7ej7+c/ZGjO1NUUNb4yvPp83pOztqSDOCfPjub7MbSJtYi2qbl1MNb9j2Qh1i
	3uT8JZ0BBiAxUZPdS6iwJpVZXJ3441zFnjxXTFiKqzfecyfHwQWuKq6C4KSnDoXI92Mo
	99Bw==
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=dafJ51pWjlSMMKmje8uyWBSzlpRZ3vlrMRQDfaXXm+I=;
	b=iBljMGixUb/rwmfM/5QuCZo5//9c+CoTIKTwl5iTl05VyV+6/Bbk77398h2agK1q0a
	s0JGbsljOiEJg/ShYhz/F8dPdWU8ykSp7BIlNRGOZo2QWQP1rDoSFW0kZAJdMvJZOF/z
	pJj+FpKrhLLpXKlLkvbjlXfaVFHnjYR2hF5pOvg/fFPdr/Qo9Q+dobC5Un4YKZL2fHHm
	eiS1nWNcUDzv4HkZGWQCJ527MGPi2gbijnrzuK+BaueG5sE/fr0+voPxdFFu4mZx1Iq1
	gbQObe2NLmQ5Qo5rarMGrYZaa1snwBr2AKl+1T4uAMoqrunsToG6mYCibRbfCDxLAPRi
	r8NA==
X-Gm-Message-State: APjAAAWhnDxksWX9FD/pAQ/Bol+eQqoiA8f5QUh3Yqa7LdAM+FlZcvi0
	liYeiEt0Tb71gBymtPTvLTk=
X-Google-Smtp-Source: 
 APXvYqxKvDIXNk5hC0HOtNDMbpuXDXA801J8FRJXWqD4g6qi8xlCjntuFwmXiY7iKqOVHtMV0EPP5g==
X-Received: by 2002:a2e:9b48:: with SMTP id
	o8mr75925007ljj.122.1564911713008;
	Sun, 04 Aug 2019 02:41: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
	25sm16230194ljn.62.2019.08.04.02.41.51
	(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
	Sun, 04 Aug 2019 02:41:52 -0700 (PDT)
From: Sam Ravnborg <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Cc: Brian Starkey <brian.starkey@arm.com>, Daniel Vetter <daniel@ffwll.ch>,
	David Airlie <airlied@linux.ie>, Jonathan Hunter <jonathanh@nvidia.com>,
	linux-tegra@vger.kernel.org, Liviu Dudau <liviu.dudau@arm.com>,
	malidp@foss.arm.com, Russell King <linux@armlinux.org.uk>,
	Thierry Reding <thierry.reding@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH v2 1/4] drm/i2c/tda998x: drop use of drmP.h
Date: Sun,  4 Aug 2019 11:41:29 +0200
Message-Id: <20190804094132.29463-2-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
Sender: linux-tegra-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-tegra.vger.kernel.org>
X-Mailing-List: linux-tegra@vger.kernel.org

Drop use of the deprecated drmP.h header file.
Fix fallout.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 61e042918a7f..84c6d4c91c65 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -13,10 +13,10 @@
 #include <sound/asoundef.h>
 #include <sound/hdmi-codec.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_of.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/i2c/tda998x.h>
 

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 <sam@ravnborg.org>
X-Patchwork-Id: 1141695
Return-Path: <linux-tegra-owner@vger.kernel.org>
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=<UNKNOWN>)
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="vW7zSAJT"; dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by ozlabs.org (Postfix) with ESMTP id 461bX66ZHGz9sMr
	for <incoming@patchwork.ozlabs.org>;
	Sun,  4 Aug 2019 19:41:58 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1726065AbfHDJl6 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
	Sun, 4 Aug 2019 05:41:58 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:35013 "EHLO
	mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1726037AbfHDJl6 (ORCPT
	<rfc822; linux-tegra@vger.kernel.org>); Sun, 4 Aug 2019 05:41:58 -0400
Received: by mail-lj1-f194.google.com with SMTP id x25so76764681ljh.2
	for <linux-tegra@vger.kernel.org>;
	Sun, 04 Aug 2019 02:41:55 -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: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-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=PXV1DNGeJCa6gDFktwlom7jU3E0Feesf4HatILJ3hWpuniA8o8ti2Dp/cXcsPdmaeZ
	E/H8q8gZ3HGeBRVaQ+onCLF8Aw2oPQqxpuPKRNG+/wz+mLOGV80iRGK1FIibdL/GI8c1
	jlsfgBEB+ZmnyJNRhazySPQE1Mogn6o77cMOMFFPQTE97g3gVLU6SuqDT/3A3I3Gp8u2
	QI2pnKAps93YFwystMMyi0yVGncKcm+C5g/vuKnMQ9wscGsxR5vcBJk8OTRQ3c/4ZJSO
	oV2CoQbMni1ukucVFcYPvoRK3hgsFxzsuc2aT2O9PJwd0cHGeig/fUCt9pyav8yobxef
	qxAw==
X-Gm-Message-State: APjAAAUNWVgTbDeBYmtCCObdlqxMd7eynU9Ma6lhS38h6dex02XHCK+U
	GLqzboE3omlt1/pH6+xfdEs=
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 <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Cc: Brian Starkey <brian.starkey@arm.com>, Daniel Vetter <daniel@ffwll.ch>,
	David Airlie <airlied@linux.ie>, Jonathan Hunter <jonathanh@nvidia.com>,
	linux-tegra@vger.kernel.org, Liviu Dudau <liviu.dudau@arm.com>,
	malidp@foss.arm.com, Russell King <linux@armlinux.org.uk>,
	Thierry Reding <thierry.reding@gmail.com>,
	Sam Ravnborg <sam@ravnborg.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
Sender: linux-tegra-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-tegra.vger.kernel.org>
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 <sam@ravnborg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
Reviewed-by: Thierry Reding <treding@nvidia.com>
---
 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 <linux/clk.h>
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/iommu.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
 
 #include <soc/tegra/pmc.h>
 
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
 #include "dc.h"
 #include "drm.h"
 #include "gem.h"
 #include "hub.h"
 #include "plane.h"
 
-#include <drm/drm_atomic.h>
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_plane_helper.h>
-
 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 <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/of_gpio.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
-#include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
-#include <linux/reset.h>
+#include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
+#include <linux/reset.h>
 #include <linux/workqueue.h>
 
 #include <drm/drm_dp_helper.h>
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 <linux/host1x.h>
 #include <linux/idr.h>
 #include <linux/iommu.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_prime.h>
+#include <drm/drm_vblank.h>
 
 #if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
 #include <asm/dma-iommu.h>
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 <uapi/drm/tegra_drm.h>
 #include <linux/host1x.h>
 #include <linux/iova.h>
 #include <linux/of_gpio.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fixed.h>
 #include <drm/drm_probe_helper.h>
+#include <uapi/drm/tegra_drm.h>
 
 #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 <linux/clk.h>
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/host1x.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 
-#include <linux/regulator/consumer.h>
+#include <video/mipi_display.h>
 
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_file.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_panel.h>
 
-#include <video/mipi_display.h>
-
 #include "dc.h"
 #include "drm.h"
 #include "dsi.h"
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index 888ed0d74ccd..e34325c83d28 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -9,11 +9,13 @@
 
 #include <linux/console.h>
 
-#include "drm.h"
-#include "gem.h"
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
 
+#include "drm.h"
+#include "gem.h"
+
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper)
 {
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 0a3d925d5284..fb7667c8dd4c 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -12,6 +12,9 @@
 
 #include <linux/dma-buf.h>
 #include <linux/iommu.h>
+
+#include <drm/drm_drv.h>
+#include <drm/drm_prime.h>
 #include <drm/tegra_drm.h>
 
 #include "drm.h"
diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
index f1f758b25886..83ffb1e14ca3 100644
--- a/drivers/gpu/drm/tegra/gem.h
+++ b/drivers/gpu/drm/tegra/gem.h
@@ -11,7 +11,6 @@
 #include <linux/host1x.h>
 
 #include <drm/drm.h>
-#include <drm/drmP.h>
 #include <drm/drm_gem.h>
 
 #define TEGRA_BO_BOTTOM_UP (1 << 0)
diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index 8dbfb30344e7..641299cc85b8 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -5,6 +5,7 @@
 
 #include <linux/clk.h>
 #include <linux/iommu.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 
 #include "drm.h"
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 334c4d7d238b..50269ffbcb6b 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -6,9 +6,11 @@
 
 #include <linux/clk.h>
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/hdmi.h>
 #include <linux/math64.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
@@ -16,6 +18,9 @@
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_file.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
 
 #include "hda.h"
diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c
index 92f202ec0577..839b49c40e51 100644
--- a/drivers/gpu/drm/tegra/hub.c
+++ b/drivers/gpu/drm/tegra/hub.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/host1x.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -13,9 +14,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/reset.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
 
 #include "drm.h"
diff --git a/drivers/gpu/drm/tegra/hub.h b/drivers/gpu/drm/tegra/hub.h
index 41541e261c91..767a60d9313c 100644
--- a/drivers/gpu/drm/tegra/hub.h
+++ b/drivers/gpu/drm/tegra/hub.h
@@ -6,7 +6,6 @@
 #ifndef TEGRA_HUB_H
 #define TEGRA_HUB_H 1
 
-#include <drm/drmP.h>
 #include <drm/drm_plane.h>
 
 #include "plane.h"
diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
index df80ca07e46e..6bab71d6e81d 100644
--- a/drivers/gpu/drm/tegra/plane.c
+++ b/drivers/gpu/drm/tegra/plane.c
@@ -5,6 +5,7 @@
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
 
 #include "dc.h"
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 4ffe3794e6d3..e1669ada0a40 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -8,6 +8,7 @@
 #include <linux/debugfs.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
@@ -17,7 +18,9 @@
 #include <soc/tegra/pmc.h>
 
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_debugfs.h>
 #include <drm/drm_dp_helper.h>
+#include <drm/drm_file.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_scdc_helper.h>
 
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index 958548ef69e7..cd0399fd8c63 100644
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/host1x.h>
 #include <linux/iommu.h>
 #include <linux/module.h>

From patchwork Sun Aug  4 09:41:31 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sam Ravnborg <sam@ravnborg.org>
X-Patchwork-Id: 1141696
Return-Path: <linux-tegra-owner@vger.kernel.org>
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=<UNKNOWN>)
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="Sq69kzi+"; dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by ozlabs.org (Postfix) with ESMTP id 461bX858bxz9sMr
	for <incoming@patchwork.ozlabs.org>;
	Sun,  4 Aug 2019 19:42:00 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1726081AbfHDJmA (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
	Sun, 4 Aug 2019 05:42:00 -0400
Received: from mail-lj1-f194.google.com ([209.85.208.194]:39291 "EHLO
	mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1726063AbfHDJmA (ORCPT
	<rfc822; linux-tegra@vger.kernel.org>); Sun, 4 Aug 2019 05:42:00 -0400
Received: by mail-lj1-f194.google.com with SMTP id v18so76631135ljh.6
	for <linux-tegra@vger.kernel.org>;
	Sun, 04 Aug 2019 02:41:57 -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:in-reply-to:references
	:mime-version:content-transfer-encoding;
	bh=daZ+8GYd85VY52LllX4iDnTzgSTfoxzZTMIYWdMxynY=;
	b=Sq69kzi+Sw5HJNPo2qm9BeQDcaq0OZmHGtW21PlmcFzimDGky83ojQzYEJMl3+nc8C
	gXn3yF9ecQFUI5o46a3yiwEppJQZe5Sd/zvL2tFv2Fnrm/hVW6oeHqz/YGgalC7c4HdI
	+I+VLy+RCe+CMyv3wAP2JSnGBZ2+Yw+eROuTIFgAtVHB7sp7F7TUmDBqPC4WPq0WHhXk
	SGTDNFoFdu2j80/GNuBe82dgfxXtFKkhZm17TgTAwM9BnpIaXcXnGpA4i1t6YZJ+q91A
	jANng1FNlc0xSBQMwBK83dhyqVkXdjvEvhrBvS6/bDpkp++cLIzjcjBD6/d81ytC5xTn
	P2Pg==
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=daZ+8GYd85VY52LllX4iDnTzgSTfoxzZTMIYWdMxynY=;
	b=JWtjSQr9xVxvJU8LIHuqdQYeOThxsVunA6VM28ii2BriasfTGF1ndgIf9AnFEKqgdm
	HSd4q5XT3qW9Tb4/LDSDwGfhUVgNuo7fVqkExgFDzn4Ho8ZwMkG9fm2yry5m0uKcvR3K
	mTBh74nsMsRWG9lb3RhOkELPT0UWwla85K96TNAiWM6Dv8YEic5pw+/set+qhehxPwDR
	JCx2+JwoF36jGhUG0Rtdj/bICUHudmRKkDpX9T9+2xQJbDjVy89qXq2zPxyJBEnsmpqS
	7muTr9bGVgN2pvl7NyW1IRjEcU1Y4/qxes6CxNPDeyDhw8kGIowha0SdRwEz4tH9TW4y
	E6JQ==
X-Gm-Message-State: APjAAAWfyBkw7uHNz5SUBAjeSOV3AsE16lF/Dr6ouiozm/HdAdLTDtlU
	CUpq8yU0pdM3TvMu6rzRd4M=
X-Google-Smtp-Source: 
 APXvYqzrjtDqsUIQ3WsJJIafZtVasgNOrabKlG2C5Nxnq4bwi38Uxx7qPZ9SxZMCo+ShNgeItH4n0g==
X-Received: by 2002:a2e:a16c:: with SMTP id u12mr5408093ljl.59.1564911717144;
	Sun, 04 Aug 2019 02:41:57 -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.56
	(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
	Sun, 04 Aug 2019 02:41:56 -0700 (PDT)
From: Sam Ravnborg <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Cc: Brian Starkey <brian.starkey@arm.com>, Daniel Vetter <daniel@ffwll.ch>,
	David Airlie <airlied@linux.ie>, Jonathan Hunter <jonathanh@nvidia.com>,
	linux-tegra@vger.kernel.org, Liviu Dudau <liviu.dudau@arm.com>,
	malidp@foss.arm.com, Russell King <linux@armlinux.org.uk>,
	Thierry Reding <thierry.reding@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH v2 3/4] drm/armada: drop use of drmP.h
Date: Sun,  4 Aug 2019 11:41:31 +0200
Message-Id: <20190804094132.29463-4-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
Sender: linux-tegra-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-tegra.vger.kernel.org>
X-Mailing-List: linux-tegra@vger.kernel.org

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 <sam@ravnborg.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Thierry Reding <treding@nvidia.com>
---
 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 d44fca4e1655..c2b92acd1e9a 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -3,15 +3,19 @@
  * Copyright (C) 2012 Russell King
  *  Rewritten from the dovefb driver, and Armada510 manuals.
  */
+
 #include <linux/clk.h>
 #include <linux/component.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_plane_helper.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
 #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 dc3716dbb2c0..c6fc2f1d58e9 100644
--- a/drivers/gpu/drm/armada/armada_debugfs.c
+++ b/drivers/gpu/drm/armada/armada_debugfs.c
@@ -3,11 +3,15 @@
  * Copyright (C) 2012 Russell King
  *  Rewritten from the dovefb driver, and Armada510 manuals.
  */
+
 #include <linux/ctype.h>
-#include <linux/debugfs.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_debugfs.h>
+#include <drm/drm_file.h>
+
 #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 c7794c8bdd90..a11bdaccbb33 100644
--- a/drivers/gpu/drm/armada/armada_drm.h
+++ b/drivers/gpu/drm/armada/armada_drm.h
@@ -8,11 +8,14 @@
 #include <linux/kfifo.h>
 #include <linux/io.h>
 #include <linux/workqueue.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_device.h>
+#include <drm/drm_mm.h>
 
 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 055c92bc88bf..197dca3fc84c 100644
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -2,14 +2,22 @@
 /*
  * Copyright (C) 2012 Russell King
  */
+
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
+#include <linux/platform_device.h>
+
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_prime.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_of.h>
+#include <drm/drm_vblank.h>
+
 #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 de030cb0aa90..426ca383d696 100644
--- a/drivers/gpu/drm/armada/armada_fb.c
+++ b/drivers/gpu/drm/armada/armada_fb.c
@@ -2,9 +2,12 @@
 /*
  * Copyright (C) 2012 Russell King
  */
+
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+
 #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 096aff530b01..090cc0d699ae 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -3,11 +3,14 @@
  * Copyright (C) 2012 Russell King
  *  Written from the i915 driver.
  */
+
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+
 #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 60c509784fa3..93cf8b8bfcff 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -2,12 +2,17 @@
 /*
  * Copyright (C) 2012 Russell King
  */
+
 #include <linux/dma-buf.h>
 #include <linux/dma-mapping.h>
+#include <linux/mman.h>
 #include <linux/shmem_fs.h>
+
+#include <drm/armada_drm.h>
+#include <drm/drm_prime.h>
+
 #include "armada_drm.h"
 #include "armada_gem.h"
-#include <drm/armada_drm.h>
 #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 e8060216b389..07f0da4d9ba1 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -3,12 +3,14 @@
  * Copyright (C) 2012 Russell King
  *  Rewritten from the dovefb driver, and Armada510 manuals.
  */
-#include <drm/drmP.h>
+
+#include <drm/armada_drm.h>
 #include <drm/drm_atomic.h>
-#include <drm/drm_atomic_uapi.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic_uapi.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
-#include <drm/armada_drm.h>
+
 #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 f08b4f37816d..e7cc2b343bcb 100644
--- a/drivers/gpu/drm/armada/armada_plane.c
+++ b/drivers/gpu/drm/armada/armada_plane.c
@@ -3,10 +3,12 @@
  * Copyright (C) 2012 Russell King
  *  Rewritten from the dovefb driver, and Armada510 manuals.
  */
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
+
 #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 <linux/tracepoint.h>
-#include <drm/drmP.h>
+
+struct drm_crtc;
+struct drm_framebuffer;
+struct drm_plane;
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM armada

From patchwork Sun Aug  4 09:41:32 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sam Ravnborg <sam@ravnborg.org>
X-Patchwork-Id: 1141697
Return-Path: <linux-tegra-owner@vger.kernel.org>
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=<UNKNOWN>)
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="s/JCN7BS"; dkim-atps=neutral
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by ozlabs.org (Postfix) with ESMTP id 461bXB5c5jz9sMr
	for <incoming@patchwork.ozlabs.org>;
	Sun,  4 Aug 2019 19:42:02 +1000 (AEST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1726063AbfHDJmC (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
	Sun, 4 Aug 2019 05:42:02 -0400
Received: from mail-lf1-f45.google.com ([209.85.167.45]:40705 "EHLO
	mail-lf1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1726037AbfHDJmC (ORCPT
	<rfc822; linux-tegra@vger.kernel.org>); Sun, 4 Aug 2019 05:42:02 -0400
Received: by mail-lf1-f45.google.com with SMTP id b17so55823678lff.7
	for <linux-tegra@vger.kernel.org>;
	Sun, 04 Aug 2019 02:42:00 -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:in-reply-to:references
	:mime-version:content-transfer-encoding;
	bh=g8VFdl4NrmMqhYlVqhuuVpQOLXX+7zTYYJFix8/wDxU=;
	b=s/JCN7BSuSUN2KSb3VrDZf/1iFTScwSoxSSHV9rrv3SU0sZdZzoyR7c2J4OVRIs8KC
	BT74PvMP+wSV+vgUdLC3H7Rke8ja03kY+zwp18PRbV1h697+aoqn5gm5fTwy308A5BH0
	nQddSltVl4A5g/yVbfbqmptt6L25tnX5wzEadaydzmoIq78cxkamjIq2lOW9mcn5QMXD
	4MOk7CS5U0js06QJxYSR6J6sh2C8OR7YzOHegt0YXTrV+eIINuQJOZhAT/2o2CdMjolq
	lYxOFBQg3WZDzIIwXJaAuKuFC7AG3cn4Iv99QvrEKKcHmFB5aS3fRA4fyMVkssO6fQRl
	lhZA==
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=g8VFdl4NrmMqhYlVqhuuVpQOLXX+7zTYYJFix8/wDxU=;
	b=Y6tUemda2srD6mc34xZB0N23YA/aAhT3hOVJ0BTc1ZZBisN1y9kxACEBDUvnFv8LKE
	1rjYGaSeW83WT13a665wzZPImqT2T+Pfc5aiBhOSFj9/oR9oEpb4xziO1K8e7oeBkzRl
	C9eKJptoZicxSxPHEJJVfzI9skx7vl0srB/ifFxsY04hIJt5aTtQtn3fKbGHGgNJcPU3
	+qxvDCNrTLSG06jjH20eWK0Zh/Y/tFocnGDBDzkBObEmt70iQSlowsA+8pkHpIN4E5cO
	VzoK2RDb3R3QPtjJImx0BOPK0F3JDqBYZjCoGadx2x6exK9EIjQCgO0PygJjujG+11Ig
	N4yw==
X-Gm-Message-State: APjAAAVPpAOUG5yQP7aYajt4rxFFufVt7uH5bO3e3AIpjdOZdPWXiJBF
	secZWODH4IFjGUq4MlR1qc0=
X-Google-Smtp-Source: 
 APXvYqwPAzzhmYmR4+o9MiRMTw+v/jo8frl0yK0IlRNd2nEYzRI6WfSz2T/Mi3i2Bq4OeuJ/71FuRw==
X-Received: by 2002:a19:ca4b:: with SMTP id
	h11mr64873529lfj.162.1564911719187;
	Sun, 04 Aug 2019 02:41:59 -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.58
	(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
	Sun, 04 Aug 2019 02:41:58 -0700 (PDT)
From: Sam Ravnborg <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Cc: Brian Starkey <brian.starkey@arm.com>, Daniel Vetter <daniel@ffwll.ch>,
	David Airlie <airlied@linux.ie>, Jonathan Hunter <jonathanh@nvidia.com>,
	linux-tegra@vger.kernel.org, Liviu Dudau <liviu.dudau@arm.com>,
	malidp@foss.arm.com, Russell King <linux@armlinux.org.uk>,
	Thierry Reding <thierry.reding@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH v2 4/4] drm/arm: drop use of drmP.h
Date: Sun,  4 Aug 2019 11:41:32 +0200
Message-Id: <20190804094132.29463-5-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
Sender: linux-tegra-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-tegra.vger.kernel.org>
X-Mailing-List: linux-tegra@vger.kernel.org

Drop use of the deprecated drmP.h header file.

While touching the list of include files divide them
into blocks and sort within each block.
Fix fallout.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: malidp@foss.arm.com
Reviewed-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/arm/hdlcd_crtc.c    | 12 +++++++-----
 drivers/gpu/drm/arm/hdlcd_drv.c     |  7 ++++++-
 drivers/gpu/drm/arm/malidp_crtc.c   | 11 +++++++----
 drivers/gpu/drm/arm/malidp_drv.c    |  8 +++++---
 drivers/gpu/drm/arm/malidp_drv.h    |  7 ++++---
 drivers/gpu/drm/arm/malidp_hw.c     |  7 ++++++-
 drivers/gpu/drm/arm/malidp_mw.c     |  5 +++--
 drivers/gpu/drm/arm/malidp_planes.c |  4 +++-
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index a3efa28436ea..af67fefed38d 100644
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -9,7 +9,12 @@
  *  Implementation of a CRTC class for the HDLCD driver.
  */
 
-#include <drm/drmP.h>
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
@@ -19,10 +24,7 @@
 #include <drm/drm_of.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
-#include <linux/clk.h>
-#include <linux/of_graph.h>
-#include <linux/platform_data/simplefb.h>
-#include <video/videomode.h>
+#include <drm/drm_vblank.h>
 
 #include "hdlcd_drv.h"
 #include "hdlcd_regs.h"
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 27c46a2838c5..2e053815b54a 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -14,21 +14,26 @@
 #include <linux/clk.h>
 #include <linux/component.h>
 #include <linux/console.h>
+#include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/of_graph.h>
 #include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_irq.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_of.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "hdlcd_drv.h"
 #include "hdlcd_regs.h"
diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c
index db4451260fff..587d94798f5c 100644
--- a/drivers/gpu/drm/arm/malidp_crtc.c
+++ b/drivers/gpu/drm/arm/malidp_crtc.c
@@ -6,14 +6,17 @@
  * ARM Mali DP500/DP550/DP650 driver (crtc operations)
  */
 
-#include <drm/drmP.h>
+#include <linux/clk.h>
+#include <linux/pm_runtime.h>
+
+#include <video/videomode.h>
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
+#include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
-#include <linux/clk.h>
-#include <linux/pm_runtime.h>
-#include <video/videomode.h>
+#include <drm/drm_vblank.h>
 
 #include "malidp_drv.h"
 #include "malidp_hw.h"
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index c27ff456eddc..333b88a5efb0 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -15,17 +15,19 @@
 #include <linux/pm_runtime.h>
 #include <linux/debugfs.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_fb_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_modeset_helper.h>
 #include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
 
 #include "malidp_drv.h"
 #include "malidp_mw.h"
diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
index 0a639af8337e..cdfddfabf2d1 100644
--- a/drivers/gpu/drm/arm/malidp_drv.h
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -9,12 +9,13 @@
 #ifndef __MALIDP_DRV_H__
 #define __MALIDP_DRV_H__
 
-#include <drm/drm_writeback.h>
-#include <drm/drm_encoder.h>
 #include <linux/mutex.h>
 #include <linux/wait.h>
 #include <linux/spinlock.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_writeback.h>
+#include <drm/drm_encoder.h>
+
 #include "malidp_hw.h"
 
 #define MALIDP_CONFIG_VALID_INIT	0
diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c
index 380be66d4c6e..bd8265f02e0b 100644
--- a/drivers/gpu/drm/arm/malidp_hw.c
+++ b/drivers/gpu/drm/arm/malidp_hw.c
@@ -9,12 +9,17 @@
  */
 
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/types.h>
 #include <linux/io.h>
-#include <drm/drmP.h>
+
 #include <video/videomode.h>
 #include <video/display_timing.h>
 
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+#include <drm/drm_print.h>
+
 #include "malidp_drv.h"
 #include "malidp_hw.h"
 #include "malidp_mw.h"
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index 2e812525025d..22c0847986df 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -5,13 +5,14 @@
  *
  * ARM Mali DP Writeback connector implementation
  */
+
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
-#include <drm/drm_probe_helper.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
-#include <drm/drmP.h>
+#include <drm/drm_probe_helper.h>
 #include <drm/drm_writeback.h>
 
 #include "malidp_drv.h"
diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 488375bd133d..3c70a53813bf 100644
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -7,11 +7,13 @@
  */
 
 #include <linux/iommu.h>
+#include <linux/platform_device.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_cma_helper.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>