From patchwork Sat Jan 26 12:25:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10782429 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 29C9691E for ; Sat, 26 Jan 2019 12:25:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 177082E304 for ; Sat, 26 Jan 2019 12:25:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B54A2E307; Sat, 26 Jan 2019 12:25:58 +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 8C6F92E304 for ; Sat, 26 Jan 2019 12:25:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B57D96E69E; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F5BD6E128; Sat, 26 Jan 2019 12:25:53 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id c16so8772096lfj.8; Sat, 26 Jan 2019 04:25:53 -0800 (PST) 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; bh=BFaqgSrf9pfRKYLk0qxg5bh43bwOLeJ6IhgTX2pxQ9Y=; b=MjYED7MruNBhY3ZGA2l25JGWDI4qGlTOiwTT+OxNJHTbQzlMQPWX9XCmZeVko+7T4n ap/lYCjJITlCC9joAZDThto68+4//YSUEYQXRSpWNKevlvKicjUtSqzUFmJindnApxYF dekONAWz0nnwxru3AvuQuI00HPZCe7YnmBQCT1JcZPmDgnS98krTz2iOobp8t70jE1SY Stm2yyeJgrBHTCLemodXRj6MkhNE29vAA6O+kExr1SYRf1G+NsYH5b1kFbp4lt6TFEUi VC1Pc/Ph60v51XrHDSWPspjs/BRk71WMgId7Je/VyExEFL8rwloj6hPdcTM0OV4fq/iI lzHg== X-Gm-Message-State: AJcUukfvr9v1beSMqme+eMZyOj8QT0n2TlI7ujMU/PPQAQGiRPSeK3bV uuQZItOjxH1hvRIWzsfUrLbbTGjDAqc= X-Google-Smtp-Source: ALg8bN4F6uCtBEGQ6hs82I0SdG6RtSZbTnLM3p0QPyFJSmJxzIrWud7uSwLYoUej+/71rinOsgwh0g== X-Received: by 2002:ac2:5382:: with SMTP id g2mr10899286lfh.159.1548505551576; Sat, 26 Jan 2019 04:25:51 -0800 (PST) Received: from jupiter.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id j138sm2070288lfg.64.2019.01.26.04.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 04:25:51 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Date: Sat, 26 Jan 2019 13:25:24 +0100 Message-Id: <20190126122527.11647-3-sam@ravnborg.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20190126122527.11647-1-sam@ravnborg.org> References: <20190126122527.11647-1-sam@ravnborg.org> Subject: [Intel-gfx] [PATCH v6 2/5] drm/i915: prepare for drmP.h removal from drm_modeset_helper.h 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: Maxime Ripard , Sam Ravnborg , David Airlie , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham , Laurent Pinchart MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Jani Nikula --- 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