From patchwork Sun Jun 30 05:21:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11024167 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 9F87914E5 for ; Sun, 30 Jun 2019 05:21:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EB8B2832D for ; Sun, 30 Jun 2019 05:21:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82E0C287BE; Sun, 30 Jun 2019 05:21:45 +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 296072832D for ; Sun, 30 Jun 2019 05:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EBBF26E9C4; Sun, 30 Jun 2019 05:21:40 +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 A6CCA6E9C2; Sun, 30 Jun 2019 05:21:38 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id a21so9743899ljh.7; Sat, 29 Jun 2019 22:21:38 -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 :mime-version:content-transfer-encoding; bh=vB+Ab+/zx2KMVgeIY6GviNQx1amH8o0i7J8UqHGDv6E=; b=CgQDisFG1ywmt+1H3sfoArB0rQvnIvyVijeh8zsPqdBg+nFC3JUcnxeLsSYkGyXk9F /6YkuNfIUMY6asSjdVH30pThuj7NyPzrmDlllI/F5kTd7hwSCHP+ASr0+DND4ENznPL9 auis+c8EtKxe8sMHtgKoqevSL2dWhAt7wd6axYsEr5sP2RqTu2KZcOpttCoiZ9werQh9 D+gmo+377vKLuws1CQDDWgfSsFC7SZ4teOE0ILoBTRTT/WWCmh/eS668nuSipPwPkIsz 7VjGIKXSzVRg6BxdW/ZHMdC82f8eXUyTG2cwXAyEnVxfmYxEO3zouUdDpECc5pOk2dy3 SgNA== X-Gm-Message-State: APjAAAWhhmPI6vMYz4v1Dmi9ksmzyKgQiUuhTmNB8+9UGc8MIOt0CGCR +D+TEr4peialRJsMsUAGFw4ycb0kmUAXVQ== X-Google-Smtp-Source: APXvYqzcElcxesn2eK9+H/IowWRkcLOKDOe/R37Nqin3f5H0s8FZ6YwPboNEAC1wv2fGxTNW+klZoQ== X-Received: by 2002:a2e:98d7:: with SMTP id s23mr10411691ljj.179.1561872096647; Sat, 29 Jun 2019 22:21:36 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id r84sm2670480lja.54.2019.06.29.22.21.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 22:21:36 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v1] drm/msm: drop use of drmP.h Date: Sun, 30 Jun 2019 07:21:33 +0200 Message-Id: <20190630052133.6175-1-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 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:mime-version :content-transfer-encoding; bh=vB+Ab+/zx2KMVgeIY6GviNQx1amH8o0i7J8UqHGDv6E=; b=L/7PQadULEEkMQR8RrZPeRpF/5w/MfhdjBTechjylNXod2zuZXBBU0rnnulN7tA0RU 42Aei9+c3tKvVHOCtdUQR8wA0XWN45ERWVuWO2MxIMmaQUpsL3PtVMdPyifDJxiIxxQJ t3M+shpiK0csBmKEBlLGvXUJtismuPyNhcDDbTMSZW6/1VaxojigCKaz0mvNifxg75te gNndKfzTKAu5tGTYmiwuDeZIfi4QM4SccjbcQsQVzGUcMWP3474V0xIlsd7NaRVon+L1 gx2nMCPre5yWr0kXYFrrmez3ZCbeUUhMRXGOUDn9e32zyhmhr6zbTJ2RBrLwzE13mQ16 3XMg== 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: Paul Kocialkowski , Maxime Ripard , freedreno@lists.freedesktop.org, Carsten Behling , Jonathan Marek , David Airlie , Sam Ravnborg , Mamta Shukla , Bruce Wang , Shayenne Moura , Sibi Sankar , linux-arm-msm@vger.kernel.org, Todor Tomov , Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop the deprecated drmP.h header file, and trim msm_drv.h to the relevant include files. This resulted in a suprisingly many edits as many files relied on headers included via msm_drv.h. But msm_drv.h is not supposed to carry include files it do not need, so the individual files have to include what extra they needs. Signed-off-by: Sam Ravnborg Cc: Rob Clark Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Jordan Crouse Cc: Jeykumar Sankaran Cc: Bruce Wang Cc: Shayenne Moura Cc: Mamta Shukla Cc: Jonathan Marek Cc: Carsten Behling Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Paul Kocialkowski Cc: Sibi Sankar Cc: Todor Tomov Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org --- The patch is build tested using several configs and several architectures (including arm, arm64, x86). The patch is based on drm-misc. If patch is OK, please apply to your tree as this driver is maintained outside drm-misc. I am happy to rebase on another tree, just let me know. Sam drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +++- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +++++--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 ++++-- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +++ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 2 ++ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 3 +++ drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 1 + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 6 ++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 2 ++ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 1 + drivers/gpu/drm/msm/dsi/dsi_host.c | 8 +++++--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 ++ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 ++ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 2 +- drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 1 + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 2 ++ drivers/gpu/drm/msm/msm_atomic.c | 1 + drivers/gpu/drm/msm/msm_debugfs.c | 5 +++++ drivers/gpu/drm/msm/msm_drv.c | 10 +++++++++- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_fb.c | 2 ++ drivers/gpu/drm/msm/msm_fbdev.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 2 ++ drivers/gpu/drm/msm/msm_gem_prime.c | 6 ++++-- drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++++ drivers/gpu/drm/msm/msm_gpummu.c | 2 ++ drivers/gpu/drm/msm/msm_perf.c | 3 +++ drivers/gpu/drm/msm/msm_rd.c | 7 +++++-- drivers/gpu/drm/msm/msm_submitqueue.c | 2 ++ 40 files changed, 98 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c index 3041c500c5cd..2eafad831226 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c @@ -2,9 +2,11 @@ /* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. */ - #include #include + +#include +#include #include #include "a5xx_gpu.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 3772f745589d..053ad94a12c6 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -20,11 +20,13 @@ #include #include #include + #include #include #include #include #include +#include #include "dpu_kms.h" #include "dpu_hw_lm.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 82bf16d61a45..57c5f9443a4a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -17,14 +17,16 @@ */ #define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ -#include #include +#include #include -#include "msm_drv.h" -#include "dpu_kms.h" #include +#include #include + +#include "msm_drv.h" +#include "dpu_kms.h" #include "dpu_hwio.h" #include "dpu_hw_catalog.h" #include "dpu_hw_intf.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index 90f439812088..ec76b8687a98 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -9,7 +9,6 @@ #include #include #include -#include /** * Max hardware block count: For ex: max 12 SSPP pipes or diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 885bf88afa3e..57f33bc26916 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -18,10 +18,12 @@ #define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ -#include #include -#include #include +#include + +#include +#include #include "msm_drv.h" #include "msm_mmu.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index 31e9ef96ca5d..297fbef8e5d7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -19,6 +19,8 @@ #ifndef __DPU_KMS_H__ #define __DPU_KMS_H__ +#include + #include "msm_drv.h" #include "msm_kms.h" #include "msm_mmu.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index a4d7ab97bb8e..f5f312d41853 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@ -22,6 +22,7 @@ #include #include +#include #include #include "msm_drv.h" diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c index 3c9236bb291c..0ae820e20b40 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -5,6 +5,7 @@ #define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ #include +#include #include "dpu_vbif.h" #include "dpu_hw_vbif.h" diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c index 0cfd4c06b610..a8a58ea826d6 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "mdp4_kms.h" diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c index b764d7f10312..8b284b2d9489 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c @@ -16,6 +16,7 @@ */ #include +#include #include "msm_drv.h" #include "mdp4_kms.h" diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index e437aa806f7b..7e7c03936af0 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -15,6 +15,9 @@ * this program. If not, see . */ +#include + +#include #include "msm_drv.h" #include "msm_gem.h" diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c index df6f9803a1d7..f6062fe15bd0 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c @@ -16,6 +16,8 @@ * this program. If not, see . */ +#include + #include #include diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c index 005066f7154d..b202faee2492 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c @@ -15,6 +15,8 @@ * this program. If not, see . */ +#include + #include "mdp4_kms.h" #define DOWN_SCALE_MAX 8 diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c index c3751c95b452..1017246bc3db 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -17,10 +17,13 @@ */ #include + #include #include #include +#include #include +#include #include "mdp5_kms.h" diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c index 280e368bc9bb..a62f9c06d3c1 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c @@ -18,6 +18,7 @@ #include #include +#include #include "msm_drv.h" #include "mdp5_kms.h" diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 97179bec8902..ff000b3d39c3 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -16,8 +16,14 @@ * this program. If not, see . */ +#include #include +#include +#include +#include +#include + #include "msm_drv.h" #include "msm_gem.h" #include "msm_mmu.h" diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index 1105c2433f14..55b0b60893dc 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -16,7 +16,9 @@ * this program. If not, see . */ +#include #include + #include "mdp5_kms.h" struct mdp5_plane { diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c index 2834837f4d3e..620413f9367f 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c @@ -16,6 +16,7 @@ * this program. If not, see . */ +#include #include #include "mdp5_kms.h" diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index dbf490176c2c..95b32f167a79 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -5,19 +5,21 @@ #include #include +#include #include #include #include #include +#include #include #include +#include #include #include -#include +#include #include #include -#include -#include + #include