From patchwork Sun Jun 30 06:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11024251 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 A6E08746 for ; Sun, 30 Jun 2019 06:20:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93E72286FF for ; Sun, 30 Jun 2019 06:20:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 886D828714; Sun, 30 Jun 2019 06:20:42 +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 CFB91286FF for ; Sun, 30 Jun 2019 06:20:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F1406E9E9; Sun, 30 Jun 2019 06:20:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0BCF6E9DF for ; Sun, 30 Jun 2019 06:20:04 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id 136so6568832lfa.8 for ; Sat, 29 Jun 2019 23:20:04 -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=mZIaoTYwCGtZBMhdIRERs/y6ZUBSiQ+Vm7tKaMJAb4s=; b=lEwGz2GS7P4a2/DDoeZ977PLlV7nN9EqPh88a5Aij7crE/gOvRSyCFjC+6K8rdLfqi 5ZYLtVNQ/5q8oqjniP4WXY1nBC/Sqma6pcLspg6CqBpJhAepFKb/KTBu8MDIB29v4gdB Gk66w5+9bGohDduNN0gNk9ouRfqwgAPYB07kgbopx+Hz8xZnICa4LH7lFLKr07zotLDM bw/i/yVPLRaQnT2KYHtprsvruVWcl1Zp+axoaFcYJoEijsHXcG087/UbcE3y/OErjmEB IypDxiIGXJn5FkNEX67wa6XNLwI3mRil2v3LXR6kGrtTbCLxp9xE8DtW8FY7pEZf6vHW 0sMw== X-Gm-Message-State: APjAAAXLnFP/4oT0PNDXMaWqSNFVNSoWmKFPtjE1XzmmyR7vGK6RCO8E vxsJsfzLHacW8jB5OxXjynVQJvx6QVtuBQ== X-Google-Smtp-Source: APXvYqwK16edoCLtLoVxxbzPEPll83ecDjZZZ9TG2dL284B90VF+sGacsS8aSjBL0Pu0J8NvSExe9A== X-Received: by 2002:ac2:4109:: with SMTP id b9mr8042566lfi.31.1561875600292; Sat, 29 Jun 2019 23:20:00 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id o74sm1794024lff.46.2019.06.29.23.19.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 23:19:59 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1 32/33] drm/ast: drop use of drmP.h Date: Sun, 30 Jun 2019 08:19:21 +0200 Message-Id: <20190630061922.7254-33-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190630061922.7254-1-sam@ravnborg.org> References: <20190630061922.7254-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=mZIaoTYwCGtZBMhdIRERs/y6ZUBSiQ+Vm7tKaMJAb4s=; b=RST5tYQngtH5tXEXPWzmfwSDwaqZQOsi+2UA0FHipvrJNLtc5bEIVQhz6PvD5AKitI Q1mgyOMJhX0/ndiz9I0/KC39TgclL26AzYb1rrDNlP34RY4uG7Xaud0PeTuy66dAQyrZ F7lPmqwRkOKEQaROfjfRzYzRS0SCXTg61i5h2IrM8MelATTQDHEPIOvFqlKScs8sCcRU z1oebzmNHD0+HvrZg+jF5Zc8NLuMjCljAr+L4TtD1h6X5+XRlV587GKdf1Gt5J/qJbU9 e4Lr0Q6ip/F+draLza8AFP5MU51LeRh/3T5D74VU2lJpCEhn6njB/J/6jS6JCPQhiT12 qQDg== 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: Sam Bobroff , Daniel Vetter , YueHaibing , Hans de Goede , Huang Rui , Gerd Hoffmann , Thomas Zimmermann , Alex Deucher , Dave Airlie , Sam Ravnborg , =?utf-8?q?Christian_K=C3=B6nig?= 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. While touching the files divide include files in blocks and sort the include files in the individual blocks. Signed-off-by: Sam Ravnborg Cc: Dave Airlie Cc: Sam Ravnborg Cc: Thomas Zimmermann Cc: Gerd Hoffmann Cc: Alex Deucher Cc: Daniel Vetter Cc: "Christian König" Cc: Sam Bobroff Cc: YueHaibing Cc: Huang Rui Cc: "Y.C. Chen" Cc: Hans de Goede Acked-by: Thomas Zimmermann --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam drivers/gpu/drm/ast/ast_dp501.c | 5 ++++- drivers/gpu/drm/ast/ast_drv.c | 9 +++++++-- drivers/gpu/drm/ast/ast_drv.h | 17 +++++++++-------- drivers/gpu/drm/ast/ast_fb.c | 20 ++++++++++++-------- drivers/gpu/drm/ast/ast_main.c | 9 +++++++-- drivers/gpu/drm/ast/ast_mode.c | 8 ++++++-- drivers/gpu/drm/ast/ast_post.c | 7 +++++-- drivers/gpu/drm/ast/ast_ttm.c | 7 ++++++- 8 files changed, 56 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_dp501.c b/drivers/gpu/drm/ast/ast_dp501.c index 4c7375b45281..98cd69269263 100644 --- a/drivers/gpu/drm/ast/ast_dp501.c +++ b/drivers/gpu/drm/ast/ast_dp501.c @@ -1,8 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include -#include +#include + #include "ast_drv.h" + MODULE_FIRMWARE("ast_dp501_fw.bin"); static int ast_load_dp501_microcode(struct drm_device *dev) diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 3811997e78c4..dd120e2d61e9 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -25,12 +25,17 @@ /* * Authors: Dave Airlie */ -#include + #include +#include +#include -#include #include +#include +#include +#include #include +#include #include "ast_drv.h" diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index ca794a3fcf8f..c0f76aef460b 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -28,17 +28,18 @@ #ifndef __AST_DRV_H__ #define __AST_DRV_H__ -#include -#include - -#include -#include - -#include - +#include +#include #include #include +#include +#include +#include +#include +#include +#include + #define DRIVER_AUTHOR "Dave Airlie" #define DRIVER_NAME "ast" diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index a849e58b40bc..6343aa92f237 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c @@ -25,22 +25,26 @@ /* * Authors: Dave Airlie */ -#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 #include "ast_drv.h" diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 1bd61696e509..b6f8dd040ae7 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -25,12 +25,17 @@ /* * Authors: Dave Airlie */ -#include -#include "ast_drv.h" + +#include #include #include +#include #include +#include +#include + +#include "ast_drv.h" void ast_set_index_reg_mask(struct ast_private *ast, uint32_t base, uint8_t index, diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index c48249df758e..9d2789040edb 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -27,14 +27,18 @@ /* * Authors: Dave Airlie */ + #include -#include +#include + #include #include +#include +#include #include #include -#include "ast_drv.h" +#include "ast_drv.h" #include "ast_tables.h" static struct ast_i2c_chan *ast_i2c_create(struct drm_device *dev); diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index f7d421359d56..e1d9cdf6ec1d 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -26,10 +26,13 @@ * Authors: Dave Airlie */ -#include -#include "ast_drv.h" +#include +#include + +#include #include "ast_dram_tables.h" +#include "ast_drv.h" static void ast_post_chip_2300(struct drm_device *dev); static void ast_post_chip_2500(struct drm_device *dev); diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index 779c53efee8e..c52d92294171 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c @@ -25,7 +25,12 @@ /* * Authors: Dave Airlie */ -#include + +#include + +#include +#include +#include #include "ast_drv.h"