From patchwork Sat Jan 26 12:25:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10782425 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 BAFE11515 for ; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9E9F2E304 for ; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B6982E307; Sat, 26 Jan 2019 12:25:54 +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 422CF2E304 for ; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6733C6E69D; Sat, 26 Jan 2019 12:25:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 57EC96E128; Sat, 26 Jan 2019 12:25:52 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id a8so8773993lfk.5; Sat, 26 Jan 2019 04:25:52 -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=RQJNFNIjmYLP71EGQCtMn4dHFGn+z8AinizUQEi5mZo=; b=Z+u/nnkDOd/vsU522Z1J6S3/L1c2N2wze+oUHiU5cEaSlOOvk9XzzavgZ0dnK9nbov Mqo9LXUAN6rbabIhDELNek8PKuKhrVyz/pFqbyJO3g4gg0BNE0tvF9hqYkwe2GrZ6pXW OiEYyTk4sATKy5+GqU9acip4SIDNzHPm0W438M+5vSnEna2NBeVRzvQM13Ka0hMikIip syRLJnE65GbWs3C7cr7f9LwuJkEgqU48/NnnZKFgqlRrn4Sf06zTy7qiEDRYdqO+/2ur hdeL2Lv7lQxDnkmpwgl8aJvVHg8sC46BSEKznrs6cNAXLqOGZFFJy/P3FCREBtlDjsMD IdZg== X-Gm-Message-State: AJcUukeTtAEKQXkzvEqeSgVRt6FhCW2sNfaBGvbfPhHLbXVJ9b6e1dlF ODEFYL2qT0ayKM2rTaJ5cJAW6c7ftpM= X-Google-Smtp-Source: ALg8bN5a3JLSFqmOFbqLGbjjaaVQLSQpeiLYq3xKVORqEICV3ttg5F5SeKk7vwmPjC34l6Huw4N7uw== X-Received: by 2002:a19:5a05:: with SMTP id o5mr12080603lfb.140.1548505550404; Sat, 26 Jan 2019 04:25:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 04:25:49 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 1/5] staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h Date: Sat, 26 Jan 2019 13:25:23 +0100 Message-Id: <20190126122527.11647-2-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> 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: Maxime Ripard , Sam Ravnborg , Daniel Vetter , David Airlie , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Hans de Goede , Kieran Bingham , Laurent Pinchart , Rodrigo Vivi , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The use of drmP.h is discouraged and removal of it from drm_modeset_helper.h caused vboxvideo 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 sort the include files Build tested on x86 and arm allmodconfig / allyesconfig. Signed-off-by: Sam Ravnborg Cc: Greg Kroah-Hartman Cc: Hans de Goede Cc: Daniel Vetter Acked-by: Greg Kroah-Hartman --- drivers/staging/vboxvideo/vbox_drv.c | 6 +++++- drivers/staging/vboxvideo/vbox_fb.c | 18 ++++++++++-------- drivers/staging/vboxvideo/vbox_mode.c | 5 ++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c index cc6532d8c2fa..d1b0d7b4886a 100644 --- a/drivers/staging/vboxvideo/vbox_drv.c +++ b/drivers/staging/vboxvideo/vbox_drv.c @@ -7,11 +7,15 @@ * Michael Thayer */ -#include #include +#include +#include #include #include +#include +#include +#include #include "vbox_drv.h" diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c index 397496cf0bdf..83a04afd1766 100644 --- a/drivers/staging/vboxvideo/vbox_fb.c +++ b/drivers/staging/vboxvideo/vbox_fb.c @@ -6,20 +6,22 @@ * Authors: Dave Airlie * Michael Thayer -#include -#include -#include -#include -#include -#include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include -#include #include +#include +#include #include "vbox_drv.h" #include "vboxvideo.h" diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c index 1aaff02c07ff..213551394495 100644 --- a/drivers/staging/vboxvideo/vbox_mode.c +++ b/drivers/staging/vboxvideo/vbox_mode.c @@ -10,14 +10,17 @@ * Hans de Goede */ #include + #include #include +#include #include #include +#include +#include "hgsmi_channels.h" #include "vbox_drv.h" #include "vboxvideo.h" -#include "hgsmi_channels.h" /* * Set a graphics mode. Poke any required values into registers, do an HGSMI 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: 10782435 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 2F67791E for ; Sat, 26 Jan 2019 12:26:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E08C2E304 for ; Sat, 26 Jan 2019 12:26:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 091422E318; Sat, 26 Jan 2019 12:26:00 +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=unavailable 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 A1EC32E304 for ; Sat, 26 Jan 2019 12:25:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B52656E6A0; Sat, 26 Jan 2019 12:25:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 Subject: [PATCH v6 2/5] drm/i915: prepare for drmP.h removal from drm_modeset_helper.h 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> 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: 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, Hans de Goede , Kieran Bingham , Laurent Pinchart , Rodrigo Vivi , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 From patchwork Sat Jan 26 12:25:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10782437 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 1989313B4 for ; Sat, 26 Jan 2019 12:26:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0769D2E304 for ; Sat, 26 Jan 2019 12:26:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77CB2E307; Sat, 26 Jan 2019 12:26:01 +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 8028A2E304 for ; Sat, 26 Jan 2019 12:26:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE2606E6A2; Sat, 26 Jan 2019 12:25:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2787A6E69F; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id c19-v6so10532367lja.5; Sat, 26 Jan 2019 04:25:54 -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=OuJSbOXVxBR4EMcEW399DVMD4C+VWU5NXdUH5dxGtKU=; b=RM3fUtmzWdt4rKYj3g5BOwqbCxE+x00S+FVtbrFrxgY7WuA2hVdv32u/xx9y32bUdE zB6gf8eAe+r5xmjTsU7aB+2LX7LB6y6BdxXSY7hmDyGCXjveiE9ZOgq/buLMT2UxLg7i HH2f0OHnnOuPMv/A4FBHXbEqAgwr/lcCUVMr/6M2/Zw6QUi9i/yd1mFU8nnwB/2JN29Q 9Vv0NdekTKVJMJXarLopn5mBqtkId4rd8zv7DlxkL+wesLclyRBSRTsEpNuuh5+KxGn9 kkLXbJRqIKVe1HJZgENgnzcN8C+QwMuF2DpqQX9ZfsMDEiwzF2qEbPsBt+RxP2YdWrOP 65sw== X-Gm-Message-State: AJcUukeYuxl53bp89SDnrSpi0VcTsozRnJfUFJ29FYfUpcw+a60d1sqw Li5nrEw12s9jqQUoRz2Z325Fm4c/Hdo= X-Google-Smtp-Source: ALg8bN40wNTz/L8BElvNZspOcsuY34MED5uo2glnS1CcaCswRLgIeui/xIqQIwMmNCGEyRweabKFBA== X-Received: by 2002:a2e:8808:: with SMTP id x8-v6mr11445410ljh.190.1548505552730; Sat, 26 Jan 2019 04:25:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 04:25:52 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 3/5] drm/rcar-du: prepare for drmP.h removal from drm_modeset_helper.h Date: Sat, 26 Jan 2019 13:25:25 +0100 Message-Id: <20190126122527.11647-4-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> 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: 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, Hans de Goede , Kieran Bingham , Laurent Pinchart , Rodrigo Vivi , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The use of drmP.h is discouraged and removal of it from drm_modeset_helper.h caused rcar-du to fail to build. This patch introduce the necessary fixes to prepare for the drmP.h removal from drm_modeset_helper.h. Build tested on arm allmodconfig/allyesconfig. v2: - new patch. Changes like drm_probe_helper and other required several updates Signed-off-by: Sam Ravnborg Cc: Laurent Pinchart Cc: Kieran Bingham Cc: David Airlie Cc: Daniel Vetter Cc: linux-renesas-soc@vger.kernel.org --- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 3 +++ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 + 5 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 93ee0020c9b1..4d1e5098b70e 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -9,14 +9,17 @@ #include #include +#include #include #include #include #include +#include #include #include #include +#include #include "rcar_du_crtc.h" #include "rcar_du_drv.h" diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index abd70d2931b0..75ab17af13a9 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index 663ab98d1f97..18d21bc1d265 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -10,10 +10,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 321ac80b48d3..c6430027169f 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -10,7 +10,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 76a39eee7c9c..0878accbd134 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include From patchwork Sat Jan 26 12:25:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10782443 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 9369E91E for ; Sat, 26 Jan 2019 12:26:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 821ED2E304 for ; Sat, 26 Jan 2019 12:26:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 763682E307; Sat, 26 Jan 2019 12:26:06 +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 2A7392E304 for ; Sat, 26 Jan 2019 12:26:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C61326E6A5; Sat, 26 Jan 2019 12:26:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 556546E6A1; Sat, 26 Jan 2019 12:25:56 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id u18so8764129lff.10; Sat, 26 Jan 2019 04:25:56 -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=9twS2QoSt8OMiLUBo9Uw/6B13OKa/JTRtA6RHr+fMq0=; b=Pggn347JUz5rezeKdMhe+1d4mpuTpBeeALPZBdwttOHkUkOJK/V7PeVjYGeIo/82QM NrLIv+hUuSDJMUBsn1fuXB3TmXt1cqnmOxmaVn8EMQUYyONs7dJGuqy+pBt9eYMA88/B wXh4EWI6g51qM0Y6p0mUPWMLOisgyDFhfYax3xbt6nFcYXNUJ4N0P0oBcZJ6WDfgSpxT i2EzVOUsQzHjE7xtxbsKrrpwtTZyPy1ZuR6ay/EoOPvAbrXkCOm20NNQ9ooLBLfcGd55 Y2+1XYAx9D7nHPjMp0Omjz2+aYhd/M7nMLuYw+BxGBgdQixumJoe1JRszm3dPD+LWJ3m Wb5g== X-Gm-Message-State: AJcUukd+/p0nLzSZLW/EN/UJyWDDZZTqPXcFsXNBoSP/Rw6LCm6EvC8d EqFSKZRXfD1VDJmRQkB68uVX28QryS0= X-Google-Smtp-Source: ALg8bN41JPeqErlxqq72LNy4AT/nf5VWpQfe4/qZZbpOn53Qs0emFQMJP9tsat4oaZutMtvXGR/F7g== X-Received: by 2002:a19:5402:: with SMTP id i2mr11129889lfb.128.1548505553968; Sat, 26 Jan 2019 04:25:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 04:25:53 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 4/5] drm: prepare for drmP.h removal from drm_modeset_helper.h Date: Sat, 26 Jan 2019 13:25:26 +0100 Message-Id: <20190126122527.11647-5-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> 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: 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, Hans de Goede , Kieran Bingham , Laurent Pinchart , Rodrigo Vivi , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The use of drmP.h is discouraged and removal of it from drm_modeset_helper.h caused drm/ to fail to build. This patch introduce the necessary fixes to prepare for the drmP.h removal from drm_modeset_helper.h. Build tested on x86, arm, alpha, ia64 allmodconfig/allyesconfig. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter --- drivers/gpu/drm/drm_damage_helper.c | 1 + drivers/gpu/drm/drm_modeset_helper.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_damage_helper.c b/drivers/gpu/drm/drm_damage_helper.c index e16aa5ae00b4..ee67c96841fa 100644 --- a/drivers/gpu/drm/drm_damage_helper.c +++ b/drivers/gpu/drm/drm_damage_helper.c @@ -32,6 +32,7 @@ #include #include +#include /** * DOC: overview diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c index 890eee07892d..da483125e063 100644 --- a/drivers/gpu/drm/drm_modeset_helper.c +++ b/drivers/gpu/drm/drm_modeset_helper.c @@ -22,8 +22,10 @@ #include #include +#include #include #include +#include #include /** From patchwork Sat Jan 26 12:25:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10782445 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 258C713B4 for ; Sat, 26 Jan 2019 12:26:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14FC62E304 for ; Sat, 26 Jan 2019 12:26:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08DCC2E307; Sat, 26 Jan 2019 12:26:08 +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=unavailable 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 BA46C2E304 for ; Sat, 26 Jan 2019 12:26:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E3376E6A9; Sat, 26 Jan 2019 12:26:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A3AD6E69F; Sat, 26 Jan 2019 12:25:57 +0000 (UTC) Received: by mail-lj1-x241.google.com with SMTP id s5-v6so10496709ljd.12; Sat, 26 Jan 2019 04:25:56 -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=iHGpzzDxSY24Z16cE/9INPchFaLmbUq/b31/6GBzQF8=; b=UYNehVsN3EyDZUzjlk/GIl5bn41pSRwVn5hprpgCzmRQeOvm5HRqlMGecqBDvy0zOV 8UVDwxNW0WLDKvksbQ3gGFz6z6nz1x+e6QHyjjrkj2tpzKQqxFauWXJ65590eVxUCOG7 ltcqdbV3iYuDavmiOF3O0UmxwvM4T+j90Qmf7G1V8iI/cwFCAfAVKcRpBU+T2vuRpdZz jktnNcWcKzhzL2/ioa85z/aMC65zLQ80+eI9Mxm1JlA2yod2lwq9zb2jGfVSxVrbsutc q260/iy3J+hQ57tPqGweNfU3WJaazS3gz9vjdgJXB7DoxbRxiV0C4oRjKjj08MVcG1RL aOMw== X-Gm-Message-State: AJcUukdTG/TQTrTRT4GH/57PkVN3rzguLLOWY5QUjh20l4KFMZl8/Re1 mJiwRrJw3dRnkhLrcJIwqeulgP+TNsQ= X-Google-Smtp-Source: ALg8bN53vK7VZK4Lti14nTln8OCjVFipOAdFvOWpzQ8jDJkr15Ole5zHsVxVdl5hSxYxUZLY+sDV9g== X-Received: by 2002:a2e:5d12:: with SMTP id r18-v6mr11601191ljb.89.1548505555189; Sat, 26 Jan 2019 04:25:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Jan 2019 04:25:54 -0800 (PST) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 5/5] drm: remove drmP.h from drm_modeset_helper.h Date: Sat, 26 Jan 2019 13:25:27 +0100 Message-Id: <20190126122527.11647-6-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> 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: 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, Hans de Goede , Kieran Bingham , Laurent Pinchart , Rodrigo Vivi , Sean Paul MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP With the removal of drmP.h from drm_modeset_helper.h the drmP.h are no longer included by any include files in include/drm. The drmP.h file is thus only included explicit either in .c files or in local .h files. This makes the process of deleting the drmP.h includes easier as we have a more local dependency chain. v2: - moved updates of .c files in drm/ to a dedicated patch. This allows the updates to the *.c files to be committed without the removal part. So this patch can wait if it causes build failures due to pending changes Signed-off-by: Sam Ravnborg Reviewed-by: Laurent Pinchart Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter --- include/drm/drm_modeset_helper.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/drm/drm_modeset_helper.h b/include/drm/drm_modeset_helper.h index efa337f03129..995fd981cab0 100644 --- a/include/drm/drm_modeset_helper.h +++ b/include/drm/drm_modeset_helper.h @@ -23,7 +23,11 @@ #ifndef __DRM_KMS_HELPER_H__ #define __DRM_KMS_HELPER_H__ -#include +struct drm_crtc; +struct drm_crtc_funcs; +struct drm_device; +struct drm_framebuffer; +struct drm_mode_fb_cmd2; void drm_helper_move_panel_connectors_to_head(struct drm_device *);