From patchwork Sat May 25 20:43:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10961135 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 7B7F81395 for ; Sat, 25 May 2019 20:43:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BABA28AA2 for ; Sat, 25 May 2019 20:43:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B13528A97; Sat, 25 May 2019 20:43:57 +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=unavailable 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 DFBA328A93 for ; Sat, 25 May 2019 20:43:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 682FC6E180; Sat, 25 May 2019 20:43:48 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42F506E179; Sat, 25 May 2019 20:43:44 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id c17so9471142lfi.2; Sat, 25 May 2019 13:43:44 -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=2vXgxeWxPSXXY/Yp3LoieyzJIcrI51NFKllyZgxdi9A=; b=YcGey5nXfEiBf5X0x1uekqW6ALTKx0odiyJ1r6SlEQx2vfdR8K85pfwsXq6NjAPqNd p/1n3EKth9ejM/fk1THCPBOuStYFb/rDYEo9v3qkyclqifPDHfMWaBANAtjzOD+3qiqO Zb1V+aJk4wJfszEGiQsVmnCDPSDzig/R39z9ILsMdJ7rj1yeTIThBmOmeoL0FqhnC7mH kT7K8vxXU04LSrCPSs0oV1Zwe8AYWFyTngqg1YArFhofmKtALsCRtM1bBX6aEHr/RBV4 I4Lw0/ZkPaLQi/HZHr+A5fWdcmpOyrTCWmxRNRKLwbzSL1+SUfr+Cs0RMHSn+Ow53A/U pIFQ== X-Gm-Message-State: APjAAAWU+lm99Hs7wAVdKyhgb4BSCbqIIBLTmILprp+jdPZnf2xs9sJB lY7lhZhMrGoZpzsSrdsrDRzBmClk X-Google-Smtp-Source: APXvYqwPnQsFuRvQLCyCOa40RHp8oLz3QIOUb8lPMlfmqbCOGB28z7/WYg86VXzdMaY56A//sBzV6A== X-Received: by 2002:ac2:4990:: with SMTP id f16mr2276319lfl.93.1558817021847; Sat, 25 May 2019 13:43:41 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id i187sm1328569lfe.64.2019.05.25.13.43.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 May 2019 13:43:41 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Date: Sat, 25 May 2019 22:43:19 +0200 Message-Id: <20190525204319.28977-6-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190525204319.28977-1-sam@ravnborg.org> References: <20190525204319.28977-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=2vXgxeWxPSXXY/Yp3LoieyzJIcrI51NFKllyZgxdi9A=; b=FY2pGCIHMi5pZwP0ZMCuXpRleP3tLhU8tJldva6M4aUiwpM+EBCeVwhRNMC1SylskJ vkKHY8Uzm91dS1mfb1pn9OgHuSvLTobDns5qmthnbXxGUSlQMzIdZ73VQIxuUrq+hf5T E/1KMwFb2g9glNMxPipnfsQ7txYMXVk9y+dPz6EcZPaMERHckPiJUDB2ptBL2gqFZow7 DHoZv8lFu1Mu+d3Li44Cn3EpBy6lE7MDsvgr8sS5WLE09/UfDHMSEFx8YgafXKN3rvO4 ftfOQryU1HevKyCAkDT2+gTBC8H0zJ2Msj3mkmk78xpx6MZElhKlnkyMRWEOdKPJ5ItU SsOg== Subject: [Intel-gfx] [PATCH v3 5/5] drm/gma500: drop drmP.h include from all .c files X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, Sam Ravnborg Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Drop remaining uses of the deprecated drmP.h header file in drm/gma500. Replaced drmp.h with forward declarations and/or include files as relevant. Moved all include files to blocks in following order: \#include \#include \#include \#include "" And within each block sort the include files alphabetically. Signed-off-by: Sam Ravnborg Acked-by: Daniel Vetter Acked-by: Patrik Jakobsson Cc: David Airlie --- drivers/gpu/drm/gma500/accel_2d.c | 18 +++++----- drivers/gpu/drm/gma500/cdv_device.c | 11 ++++--- drivers/gpu/drm/gma500/cdv_intel_crt.c | 8 ++--- drivers/gpu/drm/gma500/cdv_intel_display.c | 10 +++--- drivers/gpu/drm/gma500/cdv_intel_dp.c | 9 ++--- drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 9 ++--- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +++-- drivers/gpu/drm/gma500/framebuffer.c | 24 +++++++------- drivers/gpu/drm/gma500/gem.c | 3 +- drivers/gpu/drm/gma500/gma_device.c | 1 - drivers/gpu/drm/gma500/gma_display.c | 12 +++++-- drivers/gpu/drm/gma500/gtt.c | 5 +-- drivers/gpu/drm/gma500/intel_bios.c | 3 +- drivers/gpu/drm/gma500/intel_gmbus.c | 9 ++--- drivers/gpu/drm/gma500/intel_i2c.c | 1 + drivers/gpu/drm/gma500/mdfld_device.c | 10 +++--- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +- drivers/gpu/drm/gma500/mdfld_dsi_output.c | 7 ++-- drivers/gpu/drm/gma500/mdfld_dsi_output.h | 6 ++-- drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 +- drivers/gpu/drm/gma500/mdfld_intel_display.c | 11 ++++--- drivers/gpu/drm/gma500/mid_bios.c | 3 +- drivers/gpu/drm/gma500/mmu.c | 6 ++-- drivers/gpu/drm/gma500/oaktrail_crtc.c | 8 +++-- drivers/gpu/drm/gma500/oaktrail_device.c | 16 +++++---- drivers/gpu/drm/gma500/oaktrail_hdmi.c | 6 ++-- drivers/gpu/drm/gma500/oaktrail_lvds.c | 6 ++-- drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 11 +++---- drivers/gpu/drm/gma500/psb_device.c | 10 +++--- drivers/gpu/drm/gma500/psb_drv.c | 33 ++++++++++++------- drivers/gpu/drm/gma500/psb_drv.h | 12 +++---- drivers/gpu/drm/gma500/psb_intel_display.c | 7 ++-- drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 ++- drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 13 ++++---- drivers/gpu/drm/gma500/psb_irq.c | 9 ++--- drivers/gpu/drm/gma500/psb_lid.c | 6 ++-- drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 5 +-- 38 files changed, 181 insertions(+), 147 deletions(-) diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c index 204c8e452eb7..6536ed5552fa 100644 --- a/drivers/gpu/drm/gma500/accel_2d.c +++ b/drivers/gpu/drm/gma500/accel_2d.c @@ -20,24 +20,24 @@ * **************************************************************************/ -#include -#include +#include +#include #include -#include +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include -#include #include #include +#include +#include "framebuffer.h" #include "psb_drv.h" #include "psb_reg.h" -#include "framebuffer.h" /** * psb_spank - reset the 2D engine diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c index 6ba605ac7123..31b931941c2b 100644 --- a/drivers/gpu/drm/gma500/cdv_device.c +++ b/drivers/gpu/drm/gma500/cdv_device.c @@ -18,15 +18,16 @@ **************************************************************************/ #include -#include +#include + #include -#include "psb_drv.h" -#include "psb_reg.h" -#include "psb_intel_reg.h" -#include "intel_bios.h" #include "cdv_device.h" #include "gma_device.h" +#include "intel_bios.h" +#include "psb_drv.h" +#include "psb_intel_reg.h" +#include "psb_reg.h" #define VGA_SR_INDEX 0x3c4 #define VGA_SR_DATA 0x3c5 diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c index cb5a14b7ec7f..29c36d63b20e 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_crt.c +++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c @@ -24,16 +24,16 @@ * Eric Anholt */ +#include #include -#include +#include +#include "cdv_device.h" #include "intel_bios.h" +#include "power.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "power.h" -#include "cdv_device.h" -#include static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode) diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c index 17db4b4749d5..9be7c375b55c 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_display.c +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c @@ -18,16 +18,18 @@ * Eric Anholt */ +#include #include -#include +#include + +#include "cdv_device.h" #include "framebuffer.h" +#include "gma_display.h" +#include "power.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "gma_display.h" -#include "power.h" -#include "cdv_device.h" static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit, struct drm_crtc *crtc, int target, diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c index 90ed20083009..570b59520fd1 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c @@ -26,16 +26,17 @@ */ #include -#include #include -#include +#include + #include #include +#include + +#include "gma_display.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "gma_display.h" -#include /** * struct i2c_algo_dp_aux_data - driver interface structure for i2c over dp diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c index 4e4e4a66eaee..1711a41acc16 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c @@ -27,15 +27,16 @@ * We should probably make this generic and share it with Medfield */ -#include +#include + #include #include #include -#include "psb_intel_drv.h" + +#include "cdv_device.h" #include "psb_drv.h" +#include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "cdv_device.h" -#include /* hdmi control bits */ #define HDMI_NULL_PACKETS_DURING_VSYNC (1 << 9) diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c index de9531caaca0..f9b0c1c8221f 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c @@ -20,17 +20,16 @@ * Jesse Barnes */ -#include #include -#include +#include +#include +#include "cdv_device.h" #include "intel_bios.h" +#include "power.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "power.h" -#include -#include "cdv_device.h" /** * LVDS I2C backlight control macros diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index a9d3a4a30ab8..6919fd5cb7a1 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -17,29 +17,29 @@ * **************************************************************************/ -#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 -#include "psb_drv.h" -#include "psb_intel_reg.h" -#include "psb_intel_drv.h" #include "framebuffer.h" #include "gtt.h" +#include "psb_drv.h" +#include "psb_intel_drv.h" +#include "psb_intel_reg.h" static const struct drm_framebuffer_funcs psb_fb_funcs = { .destroy = drm_gem_fb_destroy, diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index cfc5b559c77b..49c8aa6bdfd0 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -23,7 +23,8 @@ * accelerated operations on a GEM object) */ -#include +#include + #include #include diff --git a/drivers/gpu/drm/gma500/gma_device.c b/drivers/gpu/drm/gma500/gma_device.c index a7fb6de4dd15..7d5287122030 100644 --- a/drivers/gpu/drm/gma500/gma_device.c +++ b/drivers/gpu/drm/gma500/gma_device.c @@ -13,7 +13,6 @@ * **************************************************************************/ -#include #include "psb_drv.h" void gma_get_core_freq(struct drm_device *dev) diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c index 09c1161a7ac6..af75ba8ddee7 100644 --- a/drivers/gpu/drm/gma500/gma_display.c +++ b/drivers/gpu/drm/gma500/gma_display.c @@ -19,12 +19,18 @@ * Patrik Jakobsson */ -#include +#include +#include + +#include +#include +#include + +#include "framebuffer.h" #include "gma_display.h" +#include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_drv.h" -#include "framebuffer.h" /** * Returns whether any output on the specified pipe is of the specified type diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c index 3949b0990916..0ac89c50d23a 100644 --- a/drivers/gpu/drm/gma500/gtt.c +++ b/drivers/gpu/drm/gma500/gtt.c @@ -19,11 +19,12 @@ * Alan Cox */ -#include #include + #include -#include "psb_drv.h" + #include "blitter.h" +#include "psb_drv.h" /* diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c index 9c67d08a55ea..4954881d0a1a 100644 --- a/drivers/gpu/drm/gma500/intel_bios.c +++ b/drivers/gpu/drm/gma500/intel_bios.c @@ -18,14 +18,13 @@ * Eric Anholt * */ -#include #include #include +#include "intel_bios.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "intel_bios.h" #define SLAVE_ADDR1 0x70 #define SLAVE_ADDR2 0x72 diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c index b1bf314ab150..a083fbfe35b8 100644 --- a/drivers/gpu/drm/gma500/intel_gmbus.c +++ b/drivers/gpu/drm/gma500/intel_gmbus.c @@ -26,13 +26,14 @@ * Eric Anholt * Chris Wilson */ -#include -#include + +#include #include -#include +#include +#include -#include "psb_intel_drv.h" #include "psb_drv.h" +#include "psb_intel_drv.h" #include "psb_intel_reg.h" #define _wait_for(COND, MS, W) ({ \ diff --git a/drivers/gpu/drm/gma500/intel_i2c.c b/drivers/gpu/drm/gma500/intel_i2c.c index 147b556deeb0..29451c579f2f 100644 --- a/drivers/gpu/drm/gma500/intel_i2c.c +++ b/drivers/gpu/drm/gma500/intel_i2c.c @@ -17,6 +17,7 @@ * Authors: * Eric Anholt */ + #include #include #include diff --git a/drivers/gpu/drm/gma500/mdfld_device.c b/drivers/gpu/drm/gma500/mdfld_device.c index edb9b1bbd6c6..7450908b8e1e 100644 --- a/drivers/gpu/drm/gma500/mdfld_device.c +++ b/drivers/gpu/drm/gma500/mdfld_device.c @@ -19,14 +19,14 @@ #include -#include "psb_drv.h" -#include "mid_bios.h" -#include "mdfld_output.h" +#include + #include "mdfld_dsi_output.h" +#include "mdfld_output.h" +#include "mid_bios.h" +#include "psb_drv.h" #include "tc35876x-dsi-lvds.h" -#include - #ifdef CONFIG_BACKLIGHT_CLASS_DEVICE #define MRST_BLC_MAX_PWM_REG_FREQ 0xFFFF diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c index 832bae24fd72..d4c65f268922 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c @@ -28,8 +28,8 @@ #include #include "mdfld_dsi_dpi.h" -#include "mdfld_output.h" #include "mdfld_dsi_pkg_sender.h" +#include "mdfld_output.h" #include "psb_drv.h" #include "tc35876x-dsi-lvds.h" diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c index 9ca982e77fa5..03023fa0fb6f 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c @@ -29,12 +29,13 @@ #include #include -#include "mdfld_dsi_output.h" +#include + #include "mdfld_dsi_dpi.h" -#include "mdfld_output.h" +#include "mdfld_dsi_output.h" #include "mdfld_dsi_pkg_sender.h" +#include "mdfld_output.h" #include "tc35876x-dsi-lvds.h" -#include /* get the LABC from command line. */ static int LABC_control = 1; diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h index 68d14451e303..0cccfe400a98 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h +++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h @@ -30,16 +30,16 @@ #include +#include + #include #include #include +#include "mdfld_output.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "mdfld_output.h" - -#include #define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end)) #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end)) diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c index 003e96a20139..6e0de83e9f7d 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c @@ -29,9 +29,9 @@ #include