From patchwork Tue Jul 16 06:42:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045295 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 D231D13A4 for ; Tue, 16 Jul 2019 06:44:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE0AB284ED for ; Tue, 16 Jul 2019 06:44:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1F532857E; Tue, 16 Jul 2019 06:44:10 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CB635284ED for ; Tue, 16 Jul 2019 06:44:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vPK2033GJhqB5PSczNx0bvgVk+hv+yO0NTUcdKDxpLE=; b=ViWDD7aY83AdMo RUjkkG9Nhx+8beXQocFupXnNd9ND6gubty+GqRKmWEayCLZP41L3h+2zSx8qYiRtkJjjAoUN9Qu71 m0hczQ7sZuMr+BcUyTGQdSzAWABrdcaqNC8MuZCdQNGgWzDDQXfmOyXCpL7m88z8EwvUiuDbzHYSJ mpwQH0AeJc5FylXbJhOtxOukpoNoFl4On0NE5yPfC6tLOOasLfefyO5MwTjl3eq+9RVApGPwKICfO dil4gqolmAC6DN/wlxLq4pufrSSE9pBqaem8O6AA6qYHH5MgIvcZfhxkwbAnP64+HGMqECjEyhbzI UZa6nMlrMdCQwDeaNsGQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnHC4-0000Rm-3d; Tue, 16 Jul 2019 06:44:08 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnHBz-0000RC-LT; Tue, 16 Jul 2019 06:44:06 +0000 Received: by mail-lj1-x244.google.com with SMTP id h10so18762380ljg.0; Mon, 15 Jul 2019 23:44:02 -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=tXnVfqQrao+tt76BO8pYymLa2fme49ujWAZnSVLIB7c=; b=h3TcAt1yC/7A9uSBsN8020Rym0dJtJYWMU8QuEZzJ+c7PyO2pm52ZF/Cx8N9l/JVjz JtqWmYWqR/6dGF8eyLcGG5U8Nt8R7GGLU4B7GbAxyrTCUbJHd8OuIb/lAasCwTf/zrM+ wLJt3GcseV9BS2YXucq1tBxT892GKUkiHPrFdSsKwxJGGmNQiZL6IVW8miYjNf8axYCH 2O2uZz2Tg1y9kTDJ8tur1mjHLcqh5Z7FPqTcRcjfYZa3Cwt+s6EF0Wv6/WIh7ED0NITF 5hpMdlp61MhMXxfIiHDza98SA5BT9Xlk85bFHgi+GMl8id4VdPpgyYdwto+y0PVIre47 qG0w== 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=tXnVfqQrao+tt76BO8pYymLa2fme49ujWAZnSVLIB7c=; b=gkXEcn5paP1E5mSYMHalbm1DeYN7ftvgthBswsJJDbhfwiV58rc1dfaifptqSbXuYO NOECPNZyI/aZQyyUxPDQln5LpK2AjYXphyR5W8CvGs/LHayzSll45NoX0HKisadlO3On vzTnt3eG+Ov3iGYAZrYOPz2V8MkJTd5yDVrQAGucyeDqdhPc7XtUBNMGDLLnjf2d0tds 1zBZ88GudJoOuiXKG6b9ScgyXVso7rKUT91zZ1d5dEwuoAjO18PkHtrJdOsC1tgeCkin KespkpDJo1oJB4V31xUQsfv4Qp6/cg7S5jsTJ4cGtX/5DQEsyleivOImzIqUSl8qLgKn vkFA== X-Gm-Message-State: APjAAAXMheHp2MQ+Hr1wEfZ/yUx4NGzewWWeZSbSXGAuuyTctQk6Iz8y Cw31NSDrFMVN3ZEZ7cEU7DU= X-Google-Smtp-Source: APXvYqxImr+ZmDJow7WJD0gKiPUHylqMWpiF6lPSWK29LJTWE/6UKZmluCF/GurneWgdrKkTpg1jNQ== X-Received: by 2002:a2e:9155:: with SMTP id q21mr16197012ljg.198.1563259441170; Mon, 15 Jul 2019 23:44:01 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id 27sm3529993ljw.97.2019.07.15.23.44.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:00 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 01/19] drm/meson: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:02 +0200 Message-Id: <20190716064220.18157-2-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716064220.18157-1-sam@ravnborg.org> References: <20190716064220.18157-1-sam@ravnborg.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_234403_735621_3709B0F6 X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Jourdan , Neil Armstrong , Kevin Hilman , linux-amlogic@lists.infradead.org, Emil Velikov , Sam Ravnborg , linux-arm-kernel@lists.infradead.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Drop use of the deprecated drmP.h header. While doing so used the opportunity to clean up a little so includes are now sorted and removed unused include files. In a few cases added some forwards to allow header files to built in different include order. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Neil Armstrong Cc: Kevin Hilman Cc: Maxime Jourdan Cc: Jerome Brunet Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Alex Deucher --- drivers/gpu/drm/meson/meson_crtc.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_drv.c | 27 ++++++++++-------------- drivers/gpu/drm/meson/meson_drv.h | 11 ++++++---- drivers/gpu/drm/meson/meson_dw_hdmi.c | 19 +++++++++-------- drivers/gpu/drm/meson/meson_overlay.c | 13 +++++------- drivers/gpu/drm/meson/meson_plane.c | 16 ++++++-------- drivers/gpu/drm/meson/meson_registers.h | 2 ++ drivers/gpu/drm/meson/meson_vclk.c | 7 +++--- drivers/gpu/drm/meson/meson_vclk.h | 4 ++++ drivers/gpu/drm/meson/meson_venc.c | 10 ++++----- drivers/gpu/drm/meson/meson_venc.h | 2 ++ drivers/gpu/drm/meson/meson_venc_cvbs.c | 11 +++++----- drivers/gpu/drm/meson/meson_viu.c | 7 ++---- drivers/gpu/drm/meson/meson_vpp.c | 7 +++--- drivers/gpu/drm/meson/meson_vpp.h | 3 +++ include/linux/soc/amlogic/meson-canvas.h | 1 + 16 files changed, 77 insertions(+), 79 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c index aa8ea107524e..3320a74e67fa 100644 --- a/drivers/gpu/drm/meson/meson_crtc.c +++ b/drivers/gpu/drm/meson/meson_crtc.c @@ -9,23 +9,21 @@ * Jasper St. Pierre */ -#include -#include -#include -#include #include -#include -#include +#include + #include -#include +#include +#include #include +#include #include "meson_crtc.h" #include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc.h" -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define MESON_G12A_VIU_OFFSET 0x5ec0 diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 37dca83d6eb1..42af49afdd75 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -8,35 +8,30 @@ * Jasper St. Pierre */ -#include -#include -#include -#include #include +#include #include +#include +#include -#include -#include #include -#include +#include #include -#include #include #include -#include +#include +#include #include -#include +#include +#include "meson_crtc.h" #include "meson_drv.h" -#include "meson_plane.h" #include "meson_overlay.h" -#include "meson_crtc.h" +#include "meson_plane.h" +#include "meson_registers.h" #include "meson_venc_cvbs.h" - -#include "meson_vpp.h" #include "meson_viu.h" -#include "meson_venc.h" -#include "meson_registers.h" +#include "meson_vpp.h" #define DRIVER_NAME "meson" #define DRIVER_DESC "Amlogic Meson DRM driver" diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h index 7b6593f33dfe..c9aaec1a846e 100644 --- a/drivers/gpu/drm/meson/meson_drv.h +++ b/drivers/gpu/drm/meson/meson_drv.h @@ -7,11 +7,14 @@ #ifndef __MESON_DRV_H #define __MESON_DRV_H -#include -#include +#include #include -#include -#include +#include + +struct drm_crtc; +struct drm_device; +struct drm_plane; +struct meson_drm; struct meson_drm { struct device *dev; diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index df3f9ddd2234..9f0b08eaf003 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -5,29 +5,30 @@ * Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ +#include +#include #include #include -#include #include #include -#include -#include #include +#include -#include +#include #include +#include #include #include -#include +#include -#include -#include +#include +#include #include "meson_drv.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_dw_hdmi.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc.h" #define DRIVER_NAME "meson-dw-hdmi" #define DRIVER_DESC "Amlogic Meson HDMI-TX DRM driver" diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c index cc7c6ae3013d..5aa9dcb4b35e 100644 --- a/drivers/gpu/drm/meson/meson_overlay.c +++ b/drivers/gpu/drm/meson/meson_overlay.c @@ -5,24 +5,21 @@ * Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include -#include -#include #include -#include -#include + #include #include +#include +#include #include #include #include #include -#include #include "meson_overlay.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" +#include "meson_vpp.h" /* VD1_IF0_GEN_REG */ #define VD_URGENT_CHROMA BIT(28) diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c index 7a7e88dadd0b..80b8d70c4d75 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -9,24 +9,20 @@ * Jasper St. Pierre */ -#include -#include -#include #include -#include -#include + #include #include -#include -#include +#include #include +#include +#include #include -#include +#include #include "meson_plane.h" -#include "meson_vpp.h" -#include "meson_viu.h" #include "meson_registers.h" +#include "meson_viu.h" /* OSD_SCI_WH_M1 */ #define SCI_WH_M1_W(w) FIELD_PREP(GENMASK(28, 16), w) diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h index 410e324d6f93..057453ce027c 100644 --- a/drivers/gpu/drm/meson/meson_registers.h +++ b/drivers/gpu/drm/meson/meson_registers.h @@ -6,6 +6,8 @@ #ifndef __MESON_REGISTERS_H #define __MESON_REGISTERS_H +#include + /* Shift all registers by 2 */ #define _REG(reg) ((reg) << 2) diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c index 26732f038d19..8abff51f937d 100644 --- a/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c @@ -5,9 +5,10 @@ * Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include -#include -#include +#include + +#include + #include "meson_drv.h" #include "meson_vclk.h" diff --git a/drivers/gpu/drm/meson/meson_vclk.h b/drivers/gpu/drm/meson/meson_vclk.h index ed993d20abda..b62125540aef 100644 --- a/drivers/gpu/drm/meson/meson_vclk.h +++ b/drivers/gpu/drm/meson/meson_vclk.h @@ -9,6 +9,10 @@ #ifndef __MESON_VCLK_H #define __MESON_VCLK_H +#include + +struct meson_drm; + enum { MESON_VCLK_TARGET_CVBS = 0, MESON_VCLK_TARGET_HDMI = 1, diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c index 7b7a0d8d737c..3d4791798ae0 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -5,14 +5,14 @@ * Copyright (C) 2015 Amlogic, Inc. All rights reserved. */ -#include -#include -#include +#include + +#include + #include "meson_drv.h" +#include "meson_registers.h" #include "meson_venc.h" #include "meson_vpp.h" -#include "meson_vclk.h" -#include "meson_registers.h" /** * DOC: Video Encoder diff --git a/drivers/gpu/drm/meson/meson_venc.h b/drivers/gpu/drm/meson/meson_venc.h index 985642a1678e..576768bdd08d 100644 --- a/drivers/gpu/drm/meson/meson_venc.h +++ b/drivers/gpu/drm/meson/meson_venc.h @@ -14,6 +14,8 @@ #ifndef __MESON_VENC_H #define __MESON_VENC_H +struct drm_display_mode; + enum { MESON_VENC_MODE_NONE = 0, MESON_VENC_MODE_CVBS_PAL, diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c index 6313a519f257..45a467f10b9b 100644 --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c @@ -9,19 +9,18 @@ * Jasper St. Pierre */ -#include -#include +#include #include -#include #include +#include #include #include +#include -#include "meson_venc_cvbs.h" -#include "meson_venc.h" -#include "meson_vclk.h" #include "meson_registers.h" +#include "meson_vclk.h" +#include "meson_venc_cvbs.h" /* HHI VDAC Registers */ #define HHI_VDAC_CNTL0 0x2F4 /* 0xbd offset in data sheet */ diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c index 4b2b3024d371..9f8a450d50d5 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -6,13 +6,10 @@ * Copyright (C) 2014 Endless Mobile */ -#include -#include -#include +#include + #include "meson_drv.h" #include "meson_viu.h" -#include "meson_vpp.h" -#include "meson_venc.h" #include "meson_registers.h" /** diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c index bfee30fa6e34..cbe6cf46e541 100644 --- a/drivers/gpu/drm/meson/meson_vpp.c +++ b/drivers/gpu/drm/meson/meson_vpp.c @@ -6,12 +6,11 @@ * Copyright (C) 2014 Endless Mobile */ -#include -#include -#include +#include + #include "meson_drv.h" -#include "meson_vpp.h" #include "meson_registers.h" +#include "meson_vpp.h" /** * DOC: Video Post Processing diff --git a/drivers/gpu/drm/meson/meson_vpp.h b/drivers/gpu/drm/meson/meson_vpp.h index 9fc82db8a12d..afc9553ed8d3 100644 --- a/drivers/gpu/drm/meson/meson_vpp.h +++ b/drivers/gpu/drm/meson/meson_vpp.h @@ -9,6 +9,9 @@ #ifndef __MESON_VPP_H #define __MESON_VPP_H +struct drm_rect; +struct meson_drm; + /* Mux VIU/VPP to ENCI */ #define MESON_VIU_VPP_MUX_ENCI 0x5 /* Mux VIU/VPP to ENCP */ diff --git a/include/linux/soc/amlogic/meson-canvas.h b/include/linux/soc/amlogic/meson-canvas.h index b4dde2fbeb3f..0cb2a6050d1f 100644 --- a/include/linux/soc/amlogic/meson-canvas.h +++ b/include/linux/soc/amlogic/meson-canvas.h @@ -20,6 +20,7 @@ #define MESON_CANVAS_ENDIAN_SWAP64 0x7 #define MESON_CANVAS_ENDIAN_SWAP128 0xf +struct device; struct meson_canvas; /**