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: 11045293 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 8C88C13A4 for ; Tue, 16 Jul 2019 06:44:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 792A9284ED for ; Tue, 16 Jul 2019 06:44:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B84B2857E; Tue, 16 Jul 2019 06:44:07 +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 738D6284ED for ; Tue, 16 Jul 2019 06:44:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D1216E0A1; Tue, 16 Jul 2019 06:44:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2EEEE6E0A0 for ; Tue, 16 Jul 2019 06:44:03 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id m23so18706820lje.12 for ; Mon, 15 Jul 2019 23:44:03 -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=tXnVfqQrao+tt76BO8pYymLa2fme49ujWAZnSVLIB7c=; b=MjabXp2nWiuccBuotMgZI0C/p0fSBbBvaCiGNXEJ/9k2uarrifX27TC31PTKT8Ooqr 2ke1ACZM7lsExl9uIcejQAGW5a01t7A1Ek8GqQ9frbjjJt/6yb+x6fa4aKQEFigkuJMi fQIxWRXNR11bRcaVH6A5dJ2kq2zWyFYKeCUGqQsGT/IVWOFHHVwcm2usVeG2Srb3pQNz vq69MI3wbMMte9v5oWQG8E5zociimeYOh+JCCfg5OgrYDt4IagbYkjtr8h4N2j/LOwGb xwoPNHPEIJmgeDazyvztouM/l6sFmhbIPywNP5Tukbcg47ilrk135PJtUPOADgJYDHWl 8/qw== X-Gm-Message-State: APjAAAW2i/Pxyv4Jg9XrNcfGZ6Z0kujZPKru4GH24IVC0BreR8uvRq6w 7g6yxObQS28eevX4UtG04eu9bl6sL7k= 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-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=tXnVfqQrao+tt76BO8pYymLa2fme49ujWAZnSVLIB7c=; b=h3TcAt1yC/7A9uSBsN8020Rym0dJtJYWMU8QuEZzJ+c7PyO2pm52ZF/Cx8N9l/JVjz JtqWmYWqR/6dGF8eyLcGG5U8Nt8R7GGLU4B7GbAxyrTCUbJHd8OuIb/lAasCwTf/zrM+ wLJt3GcseV9BS2YXucq1tBxT892GKUkiHPrFdSsKwxJGGmNQiZL6IVW8miYjNf8axYCH 2O2uZz2Tg1y9kTDJ8tur1mjHLcqh5Z7FPqTcRcjfYZa3Cwt+s6EF0Wv6/WIh7ED0NITF 5hpMdlp61MhMXxfIiHDza98SA5BT9Xlk85bFHgi+GMl8id4VdPpgyYdwto+y0PVIre47 qG0w== 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: Maxime Jourdan , Neil Armstrong , Kevin Hilman , linux-amlogic@lists.infradead.org, Emil Velikov , Sam Ravnborg , linux-arm-kernel@lists.infradead.org, Jerome Brunet 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. 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; /** From patchwork Tue Jul 16 06:42:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045299 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 5B08513BD for ; Tue, 16 Jul 2019 06:44:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B9AB284ED for ; Tue, 16 Jul 2019 06:44:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D0F42857E; Tue, 16 Jul 2019 06:44:19 +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 98F48284ED for ; Tue, 16 Jul 2019 06:44:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04C6C6E0A8; Tue, 16 Jul 2019 06:44:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCC7D6E0A8 for ; Tue, 16 Jul 2019 06:44:16 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id t28so18737367lje.9 for ; Mon, 15 Jul 2019 23:44:16 -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=QzoJXiDW1P9TJf9UHhfxxG1dKejevyW9LWRSq+RVRaM=; b=uPzg9SmOnPdyLSYdOdDhwqQmBqAkItvIjy+6XgCjKpDwEpYua7yFJFlp864gg95D7u MH3/sg+76rY0VoNRpj6lr3qJYnDB8RkSb4pt3A8Z+qrRinbcINf/LpwJKMU8TD8EwuHr 47ELEwPSaxYKUlY1AVsxlMW+p2RotKwOKKfM5Lad13gfLXtTGF7qqrkT/NCQ/ymPY5+3 r6oh2h7bcoAKEoYh9ZSg6CbvPQAUgHUsRBSNE7y573SavkKSY4NJNgpjCnJdqM2FztBV DfW7nqcCjzqU8AjthMnayzmKNCf4szI1niGfuR+0fF5N0IF95mFqIrilbaHvtyq2Y84U o8Ew== X-Gm-Message-State: APjAAAVqSeHzI4BH13pCgAEVZWX6Joj0s2hKDMjrqZI/DsmFOjXzAvWX KFS+smbkrPswfu9EeXpyEHOjWtzim2U= X-Google-Smtp-Source: APXvYqycXRCWm5EFo8QmWKhTg82pcndOygDVI6zMWVI/JCRfopReCrXJpwdc/pefA7IJHt/QtBbG1g== X-Received: by 2002:a2e:824f:: with SMTP id j15mr16831050ljh.117.1563259455056; Mon, 15 Jul 2019 23:44:15 -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.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:14 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 02/19] drm/v3d: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:03 +0200 Message-Id: <20190716064220.18157-3-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-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=QzoJXiDW1P9TJf9UHhfxxG1dKejevyW9LWRSq+RVRaM=; b=uPsA6uXvJ/DwEUSy9FJ7+Ayz8nAeMGOjgigueR6WKNMLj6LgogLyBTYOIz9yxtAjM9 98Y1NDAs2KvtN0dVs9GeLaTZhdvNZPWHRttx1mh+fhoE6pWZNr05DWaBwEopaFnrzNpn SmE1kxDwZYzqmMjYgP8uX2GJkYBrnGx8P64AJPe/vpjC0fozGTRm0Szb0LrLdLWyZzTk GTn9sluutTq0lPqlHbu3FABSJ39F7hVrRa7nLisVB4UFVO/I5KGF7SwnCIqtV9YQkEHV nAcTITub73ONs4hxCSz7Wveoqo/yWy0g+ebv2Km3Bc25n9AVmaCWfw8yNMn/JU9EC7Tc nbrg== 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 , Emil Velikov 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. Made v3d_drv.h self-contained with only sufficient include files. Fixed fallout in remaining files. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Eric Anholt Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 ++++- drivers/gpu/drm/v3d/v3d_drv.h | 13 +++++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++++----- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index 78a78938e81f..9e953ce64ef7 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -6,7 +6,8 @@ #include #include #include -#include + +#include #include "v3d_drv.h" #include "v3d_regs.h" diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index a1604705faee..3506ae2723ae 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -14,16 +14,19 @@ #include #include +#include #include #include #include #include #include #include + +#include #include #include +#include -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index 9aad9da1eb11..9a35c555ec52 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -1,14 +1,23 @@ // SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2015-2018 Broadcom */ -#include -#include +#include +#include +#include +#include + #include #include #include #include + #include "uapi/drm/v3d_drm.h" +struct clk; +struct device; +struct platform_device; +struct reset_control; + #define GMP_GRANULARITY (128 * 1024) /* Enum for each of the V3D queues. */ diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 27e0f87075d9..79744137d89f 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -1,17 +1,19 @@ // SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2014-2018 Broadcom */ -#include -#include +#include +#include +#include #include #include #include #include -#include -#include #include +#include + +#include +#include -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h" diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c index 268d8a889ac5..662e67279a7b 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -13,6 +13,8 @@ * current job can make progress. */ +#include + #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h" From patchwork Tue Jul 16 06:42:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045301 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 92FA913A4 for ; Tue, 16 Jul 2019 06:44:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 835AD284ED for ; Tue, 16 Jul 2019 06:44:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76BD82857E; Tue, 16 Jul 2019 06:44:27 +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 F407E284ED for ; Tue, 16 Jul 2019 06:44:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F6F989F6D; Tue, 16 Jul 2019 06:44:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 401C689F6D for ; Tue, 16 Jul 2019 06:44:24 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id v18so18741746ljh.6 for ; Mon, 15 Jul 2019 23:44:24 -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=yvPlZSNyRe3Ae4HoiS1RsrT4/hO6RAdXb6h7Z6qsl5E=; b=HH/wCbeaJzI7YJBBD15PrDgUUlU6CJrowBK94Fk68viF1tiQL3pTvLlVXQRgaKlZne lxHVqZo+1LkHPHWtGwnCceatjBWbSHtyzzcmfgCo5eN9u5JC6hgXQEyEOV7Rod+Q2j90 RTLIZWHO2SQ/AyAMmn7p6yda+7Qpay//cqnCxR6A+O2Kyk7paI+i1J37MHKaLZeByeMg ddrmpbQDq+Khoe4xhhzyZUDJQtq6SWUif63DheWAvpdHF4HCn3sxX9ru7qRg0D9B36J6 97ll3eBYrZmtqR9FLT5LSBoqehWMt12jf1kAmFTfp7b/dAbaCgEZYjROhNmG1tID6XoU 75Fg== X-Gm-Message-State: APjAAAWnJuoFsv5Q4atQ2DFACfppnjVbk1x5btc65RdVhAyXKdHxrdAM RiAHF7SpqOhKOk3G9M1HYYVD3A8+pMo= X-Google-Smtp-Source: APXvYqxP/XEjCCR6zW4dAGz4njFh2qzzZdecaaefeOeDb7vj0CAXXm5JLn6T6jq1MnzdarMfSAL+HQ== X-Received: by 2002:a2e:85d7:: with SMTP id h23mr16711180ljj.53.1563259462412; Mon, 15 Jul 2019 23:44:22 -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.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:22 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 03/19] drm/pl111: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:04 +0200 Message-Id: <20190716064220.18157-4-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-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=yvPlZSNyRe3Ae4HoiS1RsrT4/hO6RAdXb6h7Z6qsl5E=; b=eBHALOgaU71rDzuIYBUk8C2gMeMlwPU+ieqNcVfwYph7vngoj5LIoT6EqjgvwFUm6P YZBOeh9qEV5WCtZ0uXCvNN4lWCQfPKNDAK+YnqSQT/j9HjY1rRjeScS1LYsMt1hKBXYE rdHJ3lpNEKAm1WL4sORzPRutmuk8b3Sr3fcIVythMiLc+pgFycUikj1QZQC4xVz3nrTG KAXV58atLa1hJT34q5dD/qjO/Tm0T1S16XaoWdyJPAD+7G00Ygf6tPM9cb/z3r5/NMIc 9wj1xZ0Hr5l/bwl6TCJDJtdvQfVkFpbQ5gQOw16pjUcOlEFxULNg3evNTQEbSfYPdKZI o1QA== 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 , Emil Velikov 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. Sort includes in blocks while touching the files. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Eric Anholt Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/pl111/pl111_debugfs.c | 4 +++- drivers/gpu/drm/pl111/pl111_display.c | 6 ++++-- drivers/gpu/drm/pl111/pl111_drm.h | 11 ++++++----- drivers/gpu/drm/pl111/pl111_drv.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_nomadik.h | 3 ++- drivers/gpu/drm/pl111/pl111_versatile.c | 9 +++++---- drivers/gpu/drm/pl111/pl111_versatile.h | 3 +++ 7 files changed, 28 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_debugfs.c b/drivers/gpu/drm/pl111/pl111_debugfs.c index 7ddc7e3b9e7d..7accfd6f7bde 100644 --- a/drivers/gpu/drm/pl111/pl111_debugfs.c +++ b/drivers/gpu/drm/pl111/pl111_debugfs.c @@ -8,8 +8,10 @@ #include #include + #include -#include +#include + #include "pl111_drm.h" #define REGDEF(reg) { reg, #reg } diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c index 15d2755fdba4..a246195dc606 100644 --- a/drivers/gpu/drm/pl111/pl111_display.c +++ b/drivers/gpu/drm/pl111/pl111_display.c @@ -11,14 +11,16 @@ #include #include +#include #include #include #include -#include +#include +#include #include #include -#include +#include #include "pl111_drm.h" diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h index b2c5e9f34051..77d2da9a8a7c 100644 --- a/drivers/gpu/drm/pl111/pl111_drm.h +++ b/drivers/gpu/drm/pl111/pl111_drm.h @@ -13,14 +13,15 @@ #ifndef _PL111_DRM_H_ #define _PL111_DRM_H_ -#include -#include +#include +#include + +#include #include #include +#include #include -#include -#include -#include +#include #define CLCD_IRQ_NEXTBASE_UPDATE BIT(2) diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 90fa99a7dfa9..276b53473a84 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -48,18 +48,18 @@ #include #include -#include -#include #include #include -#include #include #include #include +#include +#include +#include -#include #include #include +#include #include #include #include @@ -67,6 +67,7 @@ #include #include #include +#include #include "pl111_drm.h" #include "pl111_versatile.h" diff --git a/drivers/gpu/drm/pl111/pl111_nomadik.h b/drivers/gpu/drm/pl111/pl111_nomadik.h index 19d663d46353..47ccf5c839fc 100644 --- a/drivers/gpu/drm/pl111/pl111_nomadik.h +++ b/drivers/gpu/drm/pl111/pl111_nomadik.h @@ -1,10 +1,11 @@ // SPDX-License-Identifier: GPL-2.0+ -#include #ifndef PL111_NOMADIK_H #define PL111_NOMADIK_H #endif +struct device; + #ifdef CONFIG_ARCH_NOMADIK void pl111_nomadik_init(struct device *dev); diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c index 38f4ee05285e..09aeaffb7660 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.c +++ b/drivers/gpu/drm/pl111/pl111_versatile.c @@ -1,13 +1,14 @@ // SPDX-License-Identifier: GPL-2.0-only + #include +#include #include +#include +#include #include #include #include -#include -#include -#include -#include + #include "pl111_versatile.h" #include "pl111_vexpress.h" #include "pl111_drm.h" diff --git a/drivers/gpu/drm/pl111/pl111_versatile.h b/drivers/gpu/drm/pl111/pl111_versatile.h index 41aa6d969dc6..143877010042 100644 --- a/drivers/gpu/drm/pl111/pl111_versatile.h +++ b/drivers/gpu/drm/pl111/pl111_versatile.h @@ -4,6 +4,9 @@ #ifndef PL111_VERSATILE_H #define PL111_VERSATILE_H +struct device; +struct pl111_drm_dev_private; + int pl111_versatile_init(struct device *dev, struct pl111_drm_dev_private *priv); #endif From patchwork Tue Jul 16 06:42:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045303 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 CAABE13A4 for ; Tue, 16 Jul 2019 06:44:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB04C284ED for ; Tue, 16 Jul 2019 06:44:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF27A2857E; Tue, 16 Jul 2019 06:44:30 +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 45115284ED for ; Tue, 16 Jul 2019 06:44:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F3F989FEA; Tue, 16 Jul 2019 06:44:29 +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 954AA89FEA for ; Tue, 16 Jul 2019 06:44:27 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id t28so18737878lje.9 for ; Mon, 15 Jul 2019 23:44:27 -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=lVX+Cj84XFGkZ0Wkgy23eN7jY0vZA826Hy8IWfZIHNM=; b=Q54y7QheR1K9rqS2pMQNcXSfME0InMkskUGEfSTO+J68VK6yZmhOiKTPNWUEsOjuE2 fJcPsX05ErlrZwzzlep/bHaNcBy3NhNYaoElL4DSGKj2aZTpNacfUYzfBAclmLmFWGnJ W1Vf2sBEvlaulVKjPab2I9A+CyUtddyV0ENT9WMD4/OgRfNpU6Y7diSN8nfJ521dBsY2 W6gCwnLCj/ttTv9Q2CeEjJnalY1Sgbfb9qD4X3WAnlw6fM65dhNozDAkpojfEbC1RnZm n6mYhsItgMe8MV+UKakWKpFVUVf2n19xOg1DPQhM9tnOENzPNu/0l5i9q2Cm8Bu/gcjw TzXg== X-Gm-Message-State: APjAAAXMa5hHfNB/VGLmqmzCgIpAKndo2BEzXOqqSwvKWi93QqCahkgC qZ9k+WS2+zJmcJsyBygfYu93Asj4Ou4= X-Google-Smtp-Source: APXvYqyZ2LR0jx7QDuIB8zQBXYF+SSlzxwbyZaQprq/+ElTOfd7a+WNsOkrqnNkypzifvxAWbwhkYg== X-Received: by 2002:a2e:814e:: with SMTP id t14mr16947901ljg.167.1563259465676; Mon, 15 Jul 2019 23:44:25 -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.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:25 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 04/19] drm/zte: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:05 +0200 Message-Id: <20190716064220.18157-5-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-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=lVX+Cj84XFGkZ0Wkgy23eN7jY0vZA826Hy8IWfZIHNM=; b=mH3TZluCKeUyHJ+wP6SDJIwJaRdzkamJ7tJKN/Wh+sOMLSVXSMFld+6pcFdzM92ggS woMgsgP7YfnED4HsqlByTENUoGzAClWY9WQ9hRqqO3DrTmMp13Kcswwoj0X+3zCRj9Ve w+gn+ZKicwaZnF1qZOxymPbt9dHy46xWqICI3zsLwcrqExRfVcuXH44iU2zNZbuo/g4s kKay9+puHQPTXmNXJqpKIVDxNiTYpw317UIjKM2eafYCSYz2adutUUHoD4ZEau0DxACp Z1QQgp2WPy3PaN1wJi0yoLx1EMrXfLr7URNJiPcch56He0blXxUn+6hOYBNy6YeH01Bt BExw== 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 , Shawn Guo , Sam Ravnborg , Emil Velikov 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. Fix fallout. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Shawn Guo Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/zte/zx_drm_drv.c | 3 ++- drivers/gpu/drm/zte/zx_hdmi.c | 2 +- drivers/gpu/drm/zte/zx_plane.c | 2 +- drivers/gpu/drm/zte/zx_tvenc.c | 4 +++- drivers/gpu/drm/zte/zx_vga.c | 4 +++- drivers/gpu/drm/zte/zx_vou.c | 5 ++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c index ef019cad7e81..7caccb6b702d 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.c +++ b/drivers/gpu/drm/zte/zx_drm_drv.c @@ -18,13 +18,14 @@ #include #include +#include #include #include #include #include #include #include -#include +#include #include "zx_drm_drv.h" #include "zx_vou.h" diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c index df522d74bebf..2a3413a1d0db 100644 --- a/drivers/gpu/drm/zte/zx_hdmi.c +++ b/drivers/gpu/drm/zte/zx_hdmi.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c index 706452f9b276..f1d7d04b853c 100644 --- a/drivers/gpu/drm/zte/zx_plane.c +++ b/drivers/gpu/drm/zte/zx_plane.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include #include -#include #include "zx_common_regs.h" #include "zx_drm_drv.h" diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c index 87b5d86413d2..b404a1c799b2 100644 --- a/drivers/gpu/drm/zte/zx_tvenc.c +++ b/drivers/gpu/drm/zte/zx_tvenc.c @@ -11,11 +11,13 @@ #include #include #include +#include +#include #include #include +#include #include -#include #include "zx_drm_drv.h" #include "zx_tvenc_regs.h" diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c index e14c1d709740..6b718593e37d 100644 --- a/drivers/gpu/drm/zte/zx_vga.c +++ b/drivers/gpu/drm/zte/zx_vga.c @@ -10,11 +10,13 @@ #include #include #include +#include +#include #include #include +#include #include -#include #include "zx_drm_drv.h" #include "zx_vga_regs.h" diff --git a/drivers/gpu/drm/zte/zx_vou.c b/drivers/gpu/drm/zte/zx_vou.c index 15400ffb1d22..752635bec4e2 100644 --- a/drivers/gpu/drm/zte/zx_vou.c +++ b/drivers/gpu/drm/zte/zx_vou.c @@ -10,7 +10,10 @@ #include #include +#include #include +#include + #include