From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE83C76188 for ; Tue, 16 Jul 2019 06:44:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 59436206C2 for ; Tue, 16 Jul 2019 06:44:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WTvVnHm2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h3TcAt1y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59436206C2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=o1q/AaILMrc3EFL/usUuny8BceM6MMAbik3AKp/EVHc=; b=WTvVnHm2V92ShA 0YZk3hSCi6AfC7a0iROxq0pckXoeb14FjXTJIiZX4jdy7g6DQbas6Q/0v7goiQCTZRqbU1ZcEwYjn DmCiywxV1tI7PvWpQTfzffrdJf9Me/9CaqdBJkP3wDvMUhXQpC1eTc3LzmpbKX3xZMqivWEJ+XCot BufHAAu63evJnR7Yirdv2BnqgCUZ7BIczR/OKIHg8TdnF6Uk+jISpNNuJ0onFSsdO5WK3ftisDgb/ /XaPgjUESFXZJEK08fsgHdmEpijJkHD/mSTdOfNR5S+KC4DHG4XASjTRTubjSfMyLYChUZysXflR0 e8W8DUbOCDktfjA4UMhQ==; 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 1hnHC7-0000Sd-4k; Tue, 16 Jul 2019 06:44:11 +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-arm-kernel@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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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; /** -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg 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> References: <20190716064220.18157-1-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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) In-Reply-To: <20190716064220.18157-1-sam@ravnborg.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Maxime Jourdan , Neil Armstrong , Kevin Hilman , linux-amlogic@lists.infradead.org, Emil Velikov , Sam Ravnborg , linux-arm-kernel@lists.infradead.org, Jerome Brunet List-Id: dri-devel@lists.freedesktop.org RHJvcCB1c2Ugb2YgdGhlIGRlcHJlY2F0ZWQgZHJtUC5oIGhlYWRlci4KV2hpbGUgZG9pbmcgc28g dXNlZCB0aGUgb3Bwb3J0dW5pdHkKdG8gY2xlYW4gdXAgYSBsaXR0bGUgc28gaW5jbHVkZXMgYXJl IG5vdwpzb3J0ZWQgYW5kIHJlbW92ZWQgdW51c2VkIGluY2x1ZGUgZmlsZXMuCkluIGEgZmV3IGNh c2VzIGFkZGVkIHNvbWUgZm9yd2FyZHMgdG8gYWxsb3cgaGVhZGVyCmZpbGVzIHRvIGJ1aWx0IGlu IGRpZmZlcmVudCBpbmNsdWRlIG9yZGVyLgoKU2lnbmVkLW9mZi1ieTogU2FtIFJhdm5ib3JnIDxz YW1AcmF2bmJvcmcub3JnPgpBY2tlZC1ieTogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29s bGFib3JhLmNvbT4KQ2M6IE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT4K Q2M6IEtldmluIEhpbG1hbiA8a2hpbG1hbkBiYXlsaWJyZS5jb20+CkNjOiBNYXhpbWUgSm91cmRh biA8bWpvdXJkYW5AYmF5bGlicmUuY29tPgpDYzogSmVyb21lIEJydW5ldCA8amJydW5ldEBiYXls aWJyZS5jb20+CkNjOiBsaW51eC1hbWxvZ2ljQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IGxpbnV4 LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZXNv bi9tZXNvbl9jcnRjLmMgICAgICAgfCAxNiArKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L21lc29uL21lc29uX2Rydi5jICAgICAgICB8IDI3ICsrKysrKysrKystLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5oICAgICAgICB8IDExICsrKysrKy0tLS0K IGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kd19oZG1pLmMgICAgfCAxOSArKysrKysrKyst LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX292ZXJsYXkuYyAgICB8IDEzICsr KysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3BsYW5lLmMgICAgICB8IDE2 ICsrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fcmVnaXN0ZXJzLmgg IHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmMgICAgICAgfCAgNyAr KystLS0KIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmggICAgICAgfCAgNCArKysr CiBkcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuYy5jICAgICAgIHwgMTAgKysrKy0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuYy5oICAgICAgIHwgIDIgKysKIGRyaXZl cnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jX2N2YnMuYyAgfCAxMSArKysrKy0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdml1LmMgICAgICAgIHwgIDcgKystLS0tCiBkcml2ZXJz L2dwdS9kcm0vbWVzb24vbWVzb25fdnBwLmMgICAgICAgIHwgIDcgKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vbWVzb24vbWVzb25fdnBwLmggICAgICAgIHwgIDMgKysrCiBpbmNsdWRlL2xpbnV4L3Nv Yy9hbWxvZ2ljL21lc29uLWNhbnZhcy5oIHwgIDEgKwogMTYgZmlsZXMgY2hhbmdlZCwgNzcgaW5z ZXJ0aW9ucygrKSwgNzkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L21lc29uL21lc29uX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9jcnRjLmMK aW5kZXggYWE4ZWExMDc1MjRlLi4zMzIwYTc0ZTY3ZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9tZXNvbi9tZXNvbl9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29u X2NydGMuYwpAQCAtOSwyMyArOSwyMSBAQAogICogICAgIEphc3BlciBTdC4gUGllcnJlIDxqc3Rw aWVycmVAbWVjaGV5ZS5uZXQ+CiAgKi8KIAotI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgotI2lu Y2x1ZGUgPGxpbnV4L21vZHVsZS5oPgotI2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+Ci0jaW5jbHVk ZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+CiAjaW5jbHVkZSA8bGludXgvYml0ZmllbGQuaD4K LSNpbmNsdWRlIDxkcm0vZHJtUC5oPgotI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+CisjaW5j bHVkZSA8bGludXgvc29jL2FtbG9naWMvbWVzb24tY2FudmFzLmg+CisKICNpbmNsdWRlIDxkcm0v ZHJtX2F0b21pY19oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX2ZsaXBfd29yay5oPgorI2lu Y2x1ZGUgPGRybS9kcm1fZGV2aWNlLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wcmludC5oPgogI2lu Y2x1ZGUgPGRybS9kcm1fcHJvYmVfaGVscGVyLmg+CisjaW5jbHVkZSA8ZHJtL2RybV92Ymxhbmsu aD4KIAogI2luY2x1ZGUgIm1lc29uX2NydGMuaCIKICNpbmNsdWRlICJtZXNvbl9wbGFuZS5oIgor I2luY2x1ZGUgIm1lc29uX3JlZ2lzdGVycy5oIgogI2luY2x1ZGUgIm1lc29uX3ZlbmMuaCIKLSNp bmNsdWRlICJtZXNvbl92cHAuaCIKICNpbmNsdWRlICJtZXNvbl92aXUuaCIKLSNpbmNsdWRlICJt ZXNvbl9yZWdpc3RlcnMuaCIKKyNpbmNsdWRlICJtZXNvbl92cHAuaCIKIAogI2RlZmluZSBNRVNP Tl9HMTJBX1ZJVV9PRkZTRVQJMHg1ZWMwCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9t ZXNvbi9tZXNvbl9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYuYwppbmRl eCAzN2RjYTgzZDZlYjEuLjQyYWY0OWFmZGQ3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21lc29uL21lc29uX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYu YwpAQCAtOCwzNSArOCwzMCBAQAogICogICAgIEphc3BlciBTdC4gUGllcnJlIDxqc3RwaWVycmVA bWVjaGV5ZS5uZXQ+CiAgKi8KIAotI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgotI2luY2x1ZGUg PGxpbnV4L21vZHVsZS5oPgotI2luY2x1ZGUgPGxpbnV4L211dGV4Lmg+Ci0jaW5jbHVkZSA8bGlu dXgvcGxhdGZvcm1fZGV2aWNlLmg+CiAjaW5jbHVkZSA8bGludXgvY29tcG9uZW50Lmg+CisjaW5j bHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfZ3JhcGguaD4KKyNpbmNs dWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4KKyNpbmNsdWRlIDxsaW51eC9zb2MvYW1sb2dp Yy9tZXNvbi1jYW52YXMuaD4KIAotI2luY2x1ZGUgPGRybS9kcm1QLmg+Ci0jaW5jbHVkZSA8ZHJt L2RybV9hdG9taWMuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2F0b21pY19oZWxwZXIuaD4KLSNpbmNs dWRlIDxkcm0vZHJtX2ZiX2NtYV9oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2Rydi5oPgog I2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9mbGlwX3dv cmsuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2dlbV9jbWFfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJt L2RybV9nZW1fZnJhbWVidWZmZXJfaGVscGVyLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9o ZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2lycS5oPgorI2luY2x1ZGUgPGRybS9kcm1fbW9k ZXNldF9oZWxwZXJfdnRhYmxlcy5oPgogI2luY2x1ZGUgPGRybS9kcm1fcHJvYmVfaGVscGVyLmg+ Ci0jaW5jbHVkZSA8ZHJtL2RybV9yZWN0Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV92YmxhbmsuaD4K IAorI2luY2x1ZGUgIm1lc29uX2NydGMuaCIKICNpbmNsdWRlICJtZXNvbl9kcnYuaCIKLSNpbmNs dWRlICJtZXNvbl9wbGFuZS5oIgogI2luY2x1ZGUgIm1lc29uX292ZXJsYXkuaCIKLSNpbmNsdWRl ICJtZXNvbl9jcnRjLmgiCisjaW5jbHVkZSAibWVzb25fcGxhbmUuaCIKKyNpbmNsdWRlICJtZXNv bl9yZWdpc3RlcnMuaCIKICNpbmNsdWRlICJtZXNvbl92ZW5jX2N2YnMuaCIKLQotI2luY2x1ZGUg Im1lc29uX3ZwcC5oIgogI2luY2x1ZGUgIm1lc29uX3ZpdS5oIgotI2luY2x1ZGUgIm1lc29uX3Zl bmMuaCIKLSNpbmNsdWRlICJtZXNvbl9yZWdpc3RlcnMuaCIKKyNpbmNsdWRlICJtZXNvbl92cHAu aCIKIAogI2RlZmluZSBEUklWRVJfTkFNRSAibWVzb24iCiAjZGVmaW5lIERSSVZFUl9ERVNDICJB bWxvZ2ljIE1lc29uIERSTSBkcml2ZXIiCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVz b24vbWVzb25fZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fZHJ2LmgKaW5kZXgg N2I2NTkzZjMzZGZlLi5jOWFhZWMxYTg0NmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9t ZXNvbi9tZXNvbl9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fZHJ2LmgK QEAgLTcsMTEgKzcsMTQgQEAKICNpZm5kZWYgX19NRVNPTl9EUlZfSAogI2RlZmluZSBfX01FU09O X0RSVl9ICiAKLSNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4KLSNpbmNsdWRlIDxs aW51eC9yZWdtYXAuaD4KKyNpbmNsdWRlIDxsaW51eC9kZXZpY2UuaD4KICNpbmNsdWRlIDxsaW51 eC9vZi5oPgotI2luY2x1ZGUgPGxpbnV4L3NvYy9hbWxvZ2ljL21lc29uLWNhbnZhcy5oPgotI2lu Y2x1ZGUgPGRybS9kcm1QLmg+CisjaW5jbHVkZSA8bGludXgvcmVnbWFwLmg+CisKK3N0cnVjdCBk cm1fY3J0YzsKK3N0cnVjdCBkcm1fZGV2aWNlOworc3RydWN0IGRybV9wbGFuZTsKK3N0cnVjdCBt ZXNvbl9kcm07CiAKIHN0cnVjdCBtZXNvbl9kcm0gewogCXN0cnVjdCBkZXZpY2UgKmRldjsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kd19oZG1pLmMgYi9kcml2ZXJz L2dwdS9kcm0vbWVzb24vbWVzb25fZHdfaGRtaS5jCmluZGV4IGRmM2Y5ZGRkMjIzNC4uOWYwYjA4 ZWFmMDAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fZHdfaGRtaS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kd19oZG1pLmMKQEAgLTUsMjkgKzUs MzAgQEAKICAqIENvcHlyaWdodCAoQykgMjAxNSBBbWxvZ2ljLCBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKi8KIAorI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgorI2luY2x1ZGUgPGxpbnV4L2Nv bXBvbmVudC5oPgogI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgogI2luY2x1ZGUgPGxpbnV4L21v ZHVsZS5oPgotI2luY2x1ZGUgPGxpbnV4L2NvbXBvbmVudC5oPgogI2luY2x1ZGUgPGxpbnV4L29m X2RldmljZS5oPgogI2luY2x1ZGUgPGxpbnV4L29mX2dyYXBoLmg+Ci0jaW5jbHVkZSA8bGludXgv cmVzZXQuaD4KLSNpbmNsdWRlIDxsaW51eC9jbGsuaD4KICNpbmNsdWRlIDxsaW51eC9yZWd1bGF0 b3IvY29uc3VtZXIuaD4KKyNpbmNsdWRlIDxsaW51eC9yZXNldC5oPgogCi0jaW5jbHVkZSA8ZHJt L2RybVAuaD4KKyNpbmNsdWRlIDxkcm0vYnJpZGdlL2R3X2hkbWkuaD4KICNpbmNsdWRlIDxkcm0v ZHJtX2F0b21pY19oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2RldmljZS5oPgogI2luY2x1 ZGUgPGRybS9kcm1fZWRpZC5oPgogI2luY2x1ZGUgPGRybS9kcm1fcHJvYmVfaGVscGVyLmg+Ci0j aW5jbHVkZSA8ZHJtL2JyaWRnZS9kd19oZG1pLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9wcmludC5o PgogCi0jaW5jbHVkZSA8dWFwaS9saW51eC9tZWRpYS1idXMtZm9ybWF0Lmg+Ci0jaW5jbHVkZSA8 dWFwaS9saW51eC92aWRlb2RldjIuaD4KKyNpbmNsdWRlIDxsaW51eC9tZWRpYS1idXMtZm9ybWF0 Lmg+CisjaW5jbHVkZSA8bGludXgvdmlkZW9kZXYyLmg+CiAKICNpbmNsdWRlICJtZXNvbl9kcnYu aCIKLSNpbmNsdWRlICJtZXNvbl92ZW5jLmgiCi0jaW5jbHVkZSAibWVzb25fdmNsay5oIgogI2lu Y2x1ZGUgIm1lc29uX2R3X2hkbWkuaCIKICNpbmNsdWRlICJtZXNvbl9yZWdpc3RlcnMuaCIKKyNp bmNsdWRlICJtZXNvbl92Y2xrLmgiCisjaW5jbHVkZSAibWVzb25fdmVuYy5oIgogCiAjZGVmaW5l IERSSVZFUl9OQU1FICJtZXNvbi1kdy1oZG1pIgogI2RlZmluZSBEUklWRVJfREVTQyAiQW1sb2dp YyBNZXNvbiBIRE1JLVRYIERSTSBkcml2ZXIiCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bWVzb24vbWVzb25fb3ZlcmxheS5jIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX292ZXJs YXkuYwppbmRleCBjYzdjNmFlMzAxM2QuLjVhYTlkY2I0YjM1ZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL21lc29uL21lc29uX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVz b24vbWVzb25fb3ZlcmxheS5jCkBAIC01LDI0ICs1LDIxIEBACiAgKiBDb3B5cmlnaHQgKEMpIDIw MTUgQW1sb2dpYywgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICovCiAKLSNpbmNsdWRlIDxs aW51eC9rZXJuZWwuaD4KLSNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KLSNpbmNsdWRlIDxsaW51 eC9tdXRleC5oPgogI2luY2x1ZGUgPGxpbnV4L2JpdGZpZWxkLmg+Ci0jaW5jbHVkZSA8bGludXgv cGxhdGZvcm1fZGV2aWNlLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybVAuaD4KKwogI2luY2x1ZGUgPGRy bS9kcm1fYXRvbWljLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+CisjaW5j bHVkZSA8ZHJtL2RybV9kZXZpY2UuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgogI2lu Y2x1ZGUgPGRybS9kcm1fcGxhbmVfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21h X2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZmJfY21hX2hlbHBlci5oPgogI2luY2x1ZGUg PGRybS9kcm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgotI2luY2x1ZGUgPGRybS9kcm1fcmVj dC5oPgogCiAjaW5jbHVkZSAibWVzb25fb3ZlcmxheS5oIgotI2luY2x1ZGUgIm1lc29uX3ZwcC5o IgotI2luY2x1ZGUgIm1lc29uX3ZpdS5oIgogI2luY2x1ZGUgIm1lc29uX3JlZ2lzdGVycy5oIgor I2luY2x1ZGUgIm1lc29uX3ZpdS5oIgorI2luY2x1ZGUgIm1lc29uX3ZwcC5oIgogCiAvKiBWRDFf SUYwX0dFTl9SRUcgKi8KICNkZWZpbmUgVkRfVVJHRU5UX0NIUk9NQQkJQklUKDI4KQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3BsYW5lLmMgYi9kcml2ZXJzL2dwdS9k cm0vbWVzb24vbWVzb25fcGxhbmUuYwppbmRleCA3YTdlODhkYWRkMGIuLjgwYjhkNzBjNGQ3NSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3BsYW5lLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL21lc29uL21lc29uX3BsYW5lLmMKQEAgLTksMjQgKzksMjAgQEAKICAqICAg ICBKYXNwZXIgU3QuIFBpZXJyZSA8anN0cGllcnJlQG1lY2hleWUubmV0PgogICovCiAKLSNpbmNs dWRlIDxsaW51eC9rZXJuZWwuaD4KLSNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4KLSNpbmNsdWRl IDxsaW51eC9tdXRleC5oPgogI2luY2x1ZGUgPGxpbnV4L2JpdGZpZWxkLmg+Ci0jaW5jbHVkZSA8 bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybVAuaD4KKwogI2luY2x1 ZGUgPGRybS9kcm1fYXRvbWljLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+ Ci0jaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX2dl bV9jbWFfaGVscGVyLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9kZXZpY2UuaD4KICNpbmNsdWRlIDxk cm0vZHJtX2ZiX2NtYV9oZWxwZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgorI2lu Y2x1ZGUgPGRybS9kcm1fZ2VtX2NtYV9oZWxwZXIuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2dlbV9m cmFtZWJ1ZmZlcl9oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX3JlY3QuaD4KKyNpbmNsdWRl IDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgogCiAjaW5jbHVkZSAibWVzb25fcGxhbmUuaCIKLSNp bmNsdWRlICJtZXNvbl92cHAuaCIKLSNpbmNsdWRlICJtZXNvbl92aXUuaCIKICNpbmNsdWRlICJt ZXNvbl9yZWdpc3RlcnMuaCIKKyNpbmNsdWRlICJtZXNvbl92aXUuaCIKIAogLyogT1NEX1NDSV9X SF9NMSAqLwogI2RlZmluZSBTQ0lfV0hfTTFfVyh3KQkJCUZJRUxEX1BSRVAoR0VOTUFTSygyOCwg MTYpLCB3KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3JlZ2lzdGVy cy5oIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3JlZ2lzdGVycy5oCmluZGV4IDQxMGUz MjRkNmY5My4uMDU3NDUzY2UwMjdjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24v bWVzb25fcmVnaXN0ZXJzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3JlZ2lz dGVycy5oCkBAIC02LDYgKzYsOCBAQAogI2lmbmRlZiBfX01FU09OX1JFR0lTVEVSU19ICiAjZGVm aW5lIF9fTUVTT05fUkVHSVNURVJTX0gKIAorI2luY2x1ZGUgPGxpbnV4L2lvLmg+CisKIC8qIFNo aWZ0IGFsbCByZWdpc3RlcnMgYnkgMiAqLwogI2RlZmluZSBfUkVHKHJlZykJKChyZWcpIDw8IDIp CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmMgYi9kcml2 ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmNsay5jCmluZGV4IDI2NzMyZjAzOGQxOS4uOGFiZmY1 MWY5MzdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmNsay5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmMKQEAgLTUsOSArNSwxMCBAQAog ICogQ29weXJpZ2h0IChDKSAyMDE1IEFtbG9naWMsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqLwogCi0jaW5jbHVkZSA8bGludXgva2VybmVsLmg+Ci0jaW5jbHVkZSA8bGludXgvbW9kdWxl Lmg+Ci0jaW5jbHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4KKwor I2luY2x1ZGUgPGRybS9kcm1fcHJpbnQuaD4KKwogI2luY2x1ZGUgIm1lc29uX2Rydi5oIgogI2lu Y2x1ZGUgIm1lc29uX3ZjbGsuaCIKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29u L21lc29uX3ZjbGsuaCBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmgKaW5kZXgg ZWQ5OTNkMjBhYmRhLi5iNjIxMjU1NDBhZWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9t ZXNvbi9tZXNvbl92Y2xrLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZjbGsu aApAQCAtOSw2ICs5LDEwIEBACiAjaWZuZGVmIF9fTUVTT05fVkNMS19ICiAjZGVmaW5lIF9fTUVT T05fVkNMS19ICiAKKyNpbmNsdWRlIDxkcm0vZHJtX21vZGVzLmg+CisKK3N0cnVjdCBtZXNvbl9k cm07CisKIGVudW0gewogCU1FU09OX1ZDTEtfVEFSR0VUX0NWQlMgPSAwLAogCU1FU09OX1ZDTEtf VEFSR0VUX0hETUkgPSAxLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29u X3ZlbmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jLmMKaW5kZXggN2I3YTBk OGQ3MzdjLi4zZDQ3OTE3OThhZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9t ZXNvbl92ZW5jLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuYwpAQCAt NSwxNCArNSwxNCBAQAogICogQ29weXJpZ2h0IChDKSAyMDE1IEFtbG9naWMsIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqLwogCi0jaW5jbHVkZSA8bGludXgva2VybmVsLmg+Ci0jaW5jbHVk ZSA8bGludXgvbW9kdWxlLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxsaW51 eC9leHBvcnQuaD4KKworI2luY2x1ZGUgPGRybS9kcm1fbW9kZXMuaD4KKwogI2luY2x1ZGUgIm1l c29uX2Rydi5oIgorI2luY2x1ZGUgIm1lc29uX3JlZ2lzdGVycy5oIgogI2luY2x1ZGUgIm1lc29u X3ZlbmMuaCIKICNpbmNsdWRlICJtZXNvbl92cHAuaCIKLSNpbmNsdWRlICJtZXNvbl92Y2xrLmgi Ci0jaW5jbHVkZSAibWVzb25fcmVnaXN0ZXJzLmgiCiAKIC8qKgogICogRE9DOiBWaWRlbyBFbmNv ZGVyCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuYy5oIGIvZHJp dmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuaAppbmRleCA5ODU2NDJhMTY3OGUuLjU3Njc2 OGJkZDA4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuYy5oCkBAIC0xNCw2ICsxNCw4IEBA CiAjaWZuZGVmIF9fTUVTT05fVkVOQ19ICiAjZGVmaW5lIF9fTUVTT05fVkVOQ19ICiAKK3N0cnVj dCBkcm1fZGlzcGxheV9tb2RlOworCiBlbnVtIHsKIAlNRVNPTl9WRU5DX01PREVfTk9ORSA9IDAs CiAJTUVTT05fVkVOQ19NT0RFX0NWQlNfUEFMLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L21lc29uL21lc29uX3ZlbmNfY3Zicy5jIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3Zl bmNfY3Zicy5jCmluZGV4IDYzMTNhNTE5ZjI1Ny4uNDVhNDY3ZjEwYjliIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuY19jdmJzLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL21lc29uL21lc29uX3ZlbmNfY3Zicy5jCkBAIC05LDE5ICs5LDE4IEBACiAgKiAgICAgSmFz cGVyIFN0LiBQaWVycmUgPGpzdHBpZXJyZUBtZWNoZXllLm5ldD4KICAqLwogCi0jaW5jbHVkZSA8 bGludXgva2VybmVsLmg+Ci0jaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CisjaW5jbHVkZSA8bGlu dXgvZXhwb3J0Lmg+CiAjaW5jbHVkZSA8bGludXgvb2ZfZ3JhcGguaD4KIAotI2luY2x1ZGUgPGRy bS9kcm1QLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+CisjaW5jbHVkZSA8 ZHJtL2RybV9kZXZpY2UuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2VkaWQuaD4KICNpbmNsdWRlIDxk cm0vZHJtX3Byb2JlX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1fcHJpbnQuaD4KIAotI2lu Y2x1ZGUgIm1lc29uX3ZlbmNfY3Zicy5oIgotI2luY2x1ZGUgIm1lc29uX3ZlbmMuaCIKLSNpbmNs dWRlICJtZXNvbl92Y2xrLmgiCiAjaW5jbHVkZSAibWVzb25fcmVnaXN0ZXJzLmgiCisjaW5jbHVk ZSAibWVzb25fdmNsay5oIgorI2luY2x1ZGUgIm1lc29uX3ZlbmNfY3Zicy5oIgogCiAvKiBISEkg VkRBQyBSZWdpc3RlcnMgKi8KICNkZWZpbmUgSEhJX1ZEQUNfQ05UTDAJCTB4MkY0IC8qIDB4YmQg b2Zmc2V0IGluIGRhdGEgc2hlZXQgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZXNv bi9tZXNvbl92aXUuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92aXUuYwppbmRleCA0 YjJiMzAyNGQzNzEuLjlmOGE0NTBkNTBkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21l c29uL21lc29uX3ZpdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92aXUuYwpA QCAtNiwxMyArNiwxMCBAQAogICogQ29weXJpZ2h0IChDKSAyMDE0IEVuZGxlc3MgTW9iaWxlCiAg Ki8KIAotI2luY2x1ZGUgPGxpbnV4L2tlcm5lbC5oPgotI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5o PgotI2luY2x1ZGUgPGRybS9kcm1QLmg+CisjaW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+CisKICNp bmNsdWRlICJtZXNvbl9kcnYuaCIKICNpbmNsdWRlICJtZXNvbl92aXUuaCIKLSNpbmNsdWRlICJt ZXNvbl92cHAuaCIKLSNpbmNsdWRlICJtZXNvbl92ZW5jLmgiCiAjaW5jbHVkZSAibWVzb25fcmVn aXN0ZXJzLmgiCiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29u X3ZwcC5jIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZwcC5jCmluZGV4IGJmZWUzMGZh NmUzNC4uY2JlNmNmNDZlNTQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVz b25fdnBwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZwcC5jCkBAIC02LDEy ICs2LDExIEBACiAgKiBDb3B5cmlnaHQgKEMpIDIwMTQgRW5kbGVzcyBNb2JpbGUKICAqLwogCi0j aW5jbHVkZSA8bGludXgva2VybmVsLmg+Ci0jaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+Ci0jaW5j bHVkZSA8ZHJtL2RybVAuaD4KKyNpbmNsdWRlIDxsaW51eC9leHBvcnQuaD4KKwogI2luY2x1ZGUg Im1lc29uX2Rydi5oIgotI2luY2x1ZGUgIm1lc29uX3ZwcC5oIgogI2luY2x1ZGUgIm1lc29uX3Jl Z2lzdGVycy5oIgorI2luY2x1ZGUgIm1lc29uX3ZwcC5oIgogCiAvKioKICAqIERPQzogVmlkZW8g UG9zdCBQcm9jZXNzaW5nCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25f dnBwLmggYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdnBwLmgKaW5kZXggOWZjODJkYjhh MTJkLi5hZmM5NTUzZWQ4ZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNv bl92cHAuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdnBwLmgKQEAgLTksNiAr OSw5IEBACiAjaWZuZGVmIF9fTUVTT05fVlBQX0gKICNkZWZpbmUgX19NRVNPTl9WUFBfSAogCitz dHJ1Y3QgZHJtX3JlY3Q7CitzdHJ1Y3QgbWVzb25fZHJtOworCiAvKiBNdXggVklVL1ZQUCB0byBF TkNJICovCiAjZGVmaW5lIE1FU09OX1ZJVV9WUFBfTVVYX0VOQ0kJMHg1CiAvKiBNdXggVklVL1ZQ UCB0byBFTkNQICovCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L3NvYy9hbWxvZ2ljL21lc29u LWNhbnZhcy5oIGIvaW5jbHVkZS9saW51eC9zb2MvYW1sb2dpYy9tZXNvbi1jYW52YXMuaAppbmRl eCBiNGRkZTJmYmViM2YuLjBjYjJhNjA1MGQxZiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9z b2MvYW1sb2dpYy9tZXNvbi1jYW52YXMuaAorKysgYi9pbmNsdWRlL2xpbnV4L3NvYy9hbWxvZ2lj L21lc29uLWNhbnZhcy5oCkBAIC0yMCw2ICsyMCw3IEBACiAjZGVmaW5lIE1FU09OX0NBTlZBU19F TkRJQU5fU1dBUDY0CTB4NwogI2RlZmluZSBNRVNPTl9DQU5WQVNfRU5ESUFOX1NXQVAxMjgJMHhm CiAKK3N0cnVjdCBkZXZpY2U7CiBzdHJ1Y3QgbWVzb25fY2FudmFzOwogCiAvKioKLS0gCjIuMjAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E25FEC76188 for ; Tue, 16 Jul 2019 06:44:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5403206C2 for ; Tue, 16 Jul 2019 06:44:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ViWDD7aY"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h3TcAt1y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5403206C2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org 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-9B; 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org 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 --- 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; /** -- 2.20.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic