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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 8A807C282C8 for ; Mon, 28 Jan 2019 11:39:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 619E621738 for ; Mon, 28 Jan 2019 11:39:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726885AbfA1Ljs (ORCPT ); Mon, 28 Jan 2019 06:39:48 -0500 Received: from mga05.intel.com ([192.55.52.43]:56363 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726415AbfA1Ljs (ORCPT ); Mon, 28 Jan 2019 06:39:48 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2019 03:39:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,534,1539673200"; d="scan'208";a="141978751" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.172]) by fmsmga001.fm.intel.com with ESMTP; 28 Jan 2019 03:39:41 -0800 From: Jani Nikula To: Sam Ravnborg , dri-devel@lists.freedesktop.org Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Joonas Lahtinen , Kieran Bingham , Laurent Pinchart , Maarten Lankhorst , Maxime Ripard , Rodrigo Vivi , Sean Paul , intel-gfx@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Sam Ravnborg Subject: Re: [PATCH v6 2/5] drm/i915: prepare for drmP.h removal from drm_modeset_helper.h In-Reply-To: <20190126122527.11647-3-sam@ravnborg.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20190126122527.11647-1-sam@ravnborg.org> <20190126122527.11647-3-sam@ravnborg.org> Date: Mon, 28 Jan 2019 13:41:20 +0200 Message-ID: <8736pd102n.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 26 Jan 2019, Sam Ravnborg wrote: > The use of drmP.h is discouraged and removal of it from > drm_modeset_helper.h caused i915 to fail to build. > > This patch introduce the necessary fixes to prepare for the > drmP.h removal from drm_modeset_helper.h. > > In the files touched the lists of include files was grouped > and sorted. > > Build tested on x86 and arm allmodconfig / allyesconfig. > > Signed-off-by: Sam Ravnborg > Cc: Jani Nikula > Cc: Joonas Lahtinen > Cc: Rodrigo Vivi > Cc: David Airlie > Cc: Daniel Vetter > Cc: intel-gfx@lists.freedesktop.org Not going to second-guess the compiler, looks good to me, Acked-by: Jani Nikula and good to merge via whichever tree you see fit. > --- > drivers/gpu/drm/i915/i915_drv.c | 4 +++- > drivers/gpu/drm/i915/intel_atomic.c | 2 ++ > drivers/gpu/drm/i915/intel_atomic_plane.c | 2 ++ > drivers/gpu/drm/i915/intel_display.c | 29 ++++++++++++++++------------- > drivers/gpu/drm/i915/intel_pm.c | 7 +++++-- > 5 files changed, 28 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 9883921013b1..8c8f36a91e7e 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -41,8 +41,10 @@ > #include > #include > > -#include > #include > +#include > +#include > +#include > #include > > #include "i915_drv.h" > diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c > index d8dbc9980281..f415ed239184 100644 > --- a/drivers/gpu/drm/i915/intel_atomic.c > +++ b/drivers/gpu/drm/i915/intel_atomic.c > @@ -31,7 +31,9 @@ > > #include > #include > +#include > #include > + > #include "intel_drv.h" > > /** > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c > index 683a75dad4fb..79139d496c78 100644 > --- a/drivers/gpu/drm/i915/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c > @@ -32,7 +32,9 @@ > */ > > #include > +#include > #include > + > #include "intel_drv.h" > > struct intel_plane *intel_plane_alloc(void) > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 15d758cd0c1b..e0f40be07131 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -24,29 +24,32 @@ > * Eric Anholt > */ > > -#include > -#include > #include > +#include > +#include > #include > +#include > +#include > #include > #include > -#include > -#include "intel_drv.h" > -#include "intel_frontbuffer.h" > -#include > -#include "i915_drv.h" > -#include "i915_gem_clflush.h" > -#include "intel_dsi.h" > -#include "i915_trace.h" > + > #include > #include > +#include > #include > +#include > +#include > #include > #include > #include > -#include > -#include > -#include > +#include > + > +#include "i915_drv.h" > +#include "i915_gem_clflush.h" > +#include "i915_trace.h" > +#include "intel_drv.h" > +#include "intel_dsi.h" > +#include "intel_frontbuffer.h" > > /* Primary plane formats for gen <= 3 */ > static const uint32_t i8xx_primary_formats[] = { > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 83b01cde8113..48c755dc895b 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -26,13 +26,16 @@ > */ > > #include > +#include > #include > + > +#include > +#include > #include > + > #include "i915_drv.h" > #include "intel_drv.h" > #include "../../../platform/x86/intel_ips.h" > -#include > -#include > > /** > * DOC: RC6 -- Jani Nikula, Intel Open Source Graphics Center