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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 ED841C31E40 for ; Mon, 12 Aug 2019 19:40:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C2BB20663 for ; Mon, 12 Aug 2019 19:40:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="IyMGb5FO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726749AbfHLTkE (ORCPT ); Mon, 12 Aug 2019 15:40:04 -0400 Received: from mail-yb1-f193.google.com ([209.85.219.193]:34232 "EHLO mail-yb1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726549AbfHLTkD (ORCPT ); Mon, 12 Aug 2019 15:40:03 -0400 Received: by mail-yb1-f193.google.com with SMTP id q5so27100232ybp.1 for ; Mon, 12 Aug 2019 12:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=uIy3EJezT7w8TLZt2wjj8HfrGpjK1DdVFaiNyi7YtA0=; b=IyMGb5FOojwSjSWYw8rzYM2qVDwV6usC+l6OUwgjtYG4Pgte6SOUF4LiSP8go8cFRS TWCFkd0NZAZg4Dne0pgTdK8R2nMTFuo3o24AHA4R2boMjdM2gOX/ddIchq3Lra8oDjuW h277hKG+C7X4FE8YBD5U6CrnIKteI6dBeiBWV0mmDoYHLCpWjBYnX/AHekDhAWjOIii1 T2u1zVgWnEdqOOrscCL6JiXPhn7+7tR4twHnU7RjDoAdKtepFuaI6xDWZzDl7ZPcp/1i Ux4WNmjhkxL20MEx+OfSOB1jG9jvb8ON7CB8UeLUwYMZHhSP0O4N2vkJiDmtFMvXVLJ8 Js+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=uIy3EJezT7w8TLZt2wjj8HfrGpjK1DdVFaiNyi7YtA0=; b=LAZQPTEKqKefj4Q1DOb3jpuuBJhjJd5Qcd5CHwhz1aRnyaX6d+f+Q9VJdgkdYGWhZK 5SMQf07OLSNZanRetSvs1gI8eTVlw8ctdQiF51eFEhcbVBzKjzIlg538NOWVKOPRMUwi vqU8uBjBbBDlt5G/9QXcMhtzA17jHdj3PYbkPn3IisXFtwX7y34AyQZ8XTF9kSKUXGi9 FHu4xOYK3iKGn2pHvWzjxPXxCihMsRhCm4zw6twXyHjlojcK7jb/EwjBcKuop7ZPw7g0 2/IC6XU4tTqKMusu/DFcmF/HWu+9jFxHnmDS2Ap09ZtxKqpqZvLWkosSAQFYqcYeroee QyKg== X-Gm-Message-State: APjAAAXRM/kjXvmXX3dPfWQfXOMOl9G/BZYzYGe/CoiL9lk1DUUBbB3y jdW3j9D6rSD7ufV5ub+u5DqWBg== X-Google-Smtp-Source: APXvYqxuGgQXpJqePLNZugJOgMPtoKOgkL3XYHCj5R1YjCiikMl6ICPUyNdoHYftyFJ4OX3Ut9t3Ww== X-Received: by 2002:a25:9203:: with SMTP id b3mr18024992ybo.14.1565638802118; Mon, 12 Aug 2019 12:40:02 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id n29sm498601ywh.77.2019.08.12.12.40.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 12:40:01 -0700 (PDT) Date: Mon, 12 Aug 2019 15:40:01 -0400 From: Sean Paul To: Sam Ravnborg Cc: dri-devel@lists.freedesktop.org, Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Jeykumar Sankaran , Bruce Wang , Shayenne Moura , Mamta Shukla , Jonathan Marek , Carsten Behling , Maarten Lankhorst , Maxime Ripard , Paul Kocialkowski , Sibi Sankar , Todor Tomov , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Subject: Re: [PATCH v2 1/1] drm/msm: drop use of drmP.h Message-ID: <20190812194001.GF104440@art_vandelay> References: <20190804065551.GA5211@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190804065551.GA5211@ravnborg.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Sun, Aug 04, 2019 at 08:55:51AM +0200, Sam Ravnborg wrote: > 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. > > v2: > - Rebased on top of https://gitlab.freedesktop.org/drm/msm.git msm-next > > Signed-off-by: Sam Ravnborg Acked-by: Sean Paul > 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 > --- > 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 | 3 ++- > 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, 99 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c > index 9f2dd76bd67a..075ecce4b5e0 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 40ea6286eac1..db6c9ccf3be2 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 1cf4e306fccf..445389065417 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 435b846f9f52..e393a423d7d7 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 e9f998344838..f8ec5988302e 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 1858b40b18d8..cd6e9bb1fedf 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -21,8 +21,9 @@ > #include > #include > > -#include > #include > +#include > +#include > > #include "msm_drv.h" > #include "dpu_kms.h" > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c > index 8bc3aea7cd86..6a30c4fd24da 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 2d46d1126283..d8c2d9e8d575 100644 > --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c > +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c > @@ -16,6 +16,8 @@ > */ > > #include > +#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 1c55401956c4..52ec2977c566 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > @@ -16,9 +16,15 @@ > * this program. If not, see . > */ > > +#include > #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 91609bde033a..61e0eec54f3f 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > @@ -17,7 +17,9 @@ > */ > > #include > +#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 aa35d18ab43c..ab934070f0e1 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