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: 10782423 X-Patchwork-Delegate: kieran@bingham.xyz 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 5545D13B4 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 43AF92E306 for ; Sat, 26 Jan 2019 12:25:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3773C2E307; 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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD3052E304 for ; Sat, 26 Jan 2019 12:25:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729383AbfAZMZx (ORCPT ); Sat, 26 Jan 2019 07:25:53 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:46050 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbfAZMZw (ORCPT ); Sat, 26 Jan 2019 07:25:52 -0500 Received: by mail-lf1-f68.google.com with SMTP id b20so8758567lfa.12; Sat, 26 Jan 2019 04:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=RQJNFNIjmYLP71EGQCtMn4dHFGn+z8AinizUQEi5mZo=; b=jnUgTU7onaMY3nIv6qEAfinaja3izr12rGlTKuCWTZ/ke4zB4UiIoaoTKlxsuOxgeA Qklp/z1ILoJN8BUBeAx4O2kP2+DYFSgJBGBgBQAnq8u5nE9elpBy452tic5qsAWwBMpZ uvNLFXmKcBi0ktDjj38yJ6Wy+5dEJK2xpG1q1g+yABQr5Nr5JJ2c+wcTg/eEMRO2sIEl A4Ep7AtSRBLFv5Tbu7Bi+IDaPEYsVHwr9tue0QvALDclzGNwEMKb0dIR2wxQ6at9pCZf aNZY7MdlojhevTb1mYEpXKaUlMxvkAUeFb2tSmop/ITK5aISEMnBXSmBUBuBzqJJyCZP ToQQ== 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=UM2XeJsRw4s+ca/ldSVhZiVtvNaMJl9Ho3J+t+oVUB7Jh2491dgHHbyMFX3gxNBI6T 3AjpTOEioaZ/zIpKB2vNgZ9MSlsfPo9AtHM03+yvQiUO77gfbtwptem3v9kQjRjOqOP4 LymXLMH8OJImpvaasmTucPRF3p4qXYU+DWqoyBR1fgeNRsutyorr72Kg9bNaWpwEP26S bD5EsBhQpr4SehPN2W1trOJdPHbZfS5VsCUQj96C+pnaWvnLbSX7Ql3cYauz8Dbxce+c phyW0HLWgcX6/D1JGA4SegtE40Vj8FxXb7mGVPhtWpTuJeN13HbPsiCzpXKlAQBJTQr2 8+/Q== X-Gm-Message-State: AJcUukc5zXmZpGlY5ywdbv4/v+bR+TjsCPENQ1SsujDmgiIBkis0QZoG TDyI+jScCJ4B7jRtIBLLWag= 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 Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Jani Nikula , 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 , Daniel Vetter 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> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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: 10782433 X-Patchwork-Delegate: kieran@bingham.xyz 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 123C01515 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 F41E72E306 for ; Sat, 26 Jan 2019 12:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E89F12E30F; Sat, 26 Jan 2019 12:25:59 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA4E2E306 for ; Sat, 26 Jan 2019 12:25:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729732AbfAZMZ6 (ORCPT ); Sat, 26 Jan 2019 07:25:58 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:46049 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726335AbfAZMZy (ORCPT ); Sat, 26 Jan 2019 07:25:54 -0500 Received: by mail-lf1-f66.google.com with SMTP id b20so8758587lfa.12; Sat, 26 Jan 2019 04:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BFaqgSrf9pfRKYLk0qxg5bh43bwOLeJ6IhgTX2pxQ9Y=; b=UsoBzoZ6A0WY08b2FrDhcq597W8x1Z4swx18Ilsd+RoZKO+8xDQKaI6O+YcRk1I0A2 30k5UxPhV0v9hWkMuhlVk6D1ei8l8m6Hb3inagZ9rdI2DWQ4TZ6gMwchGdNDNI2+G5iG i0dCj8+L5fqiqTn5bwMdOpifoTo4P6FpsX/Zwo9QmLTjh6vxdXGepXIPRoTVdKihnUCw P9PupLPy9IT3jbQqyp8W5mLBo6c17u2aK1whEgJ5/RnDB4lr/aNsN+X/K3lJ6PNrp93U xlRho97Cjydc5rXPMarYThOdT6pAL1fzCADJXrUXn2LqWgyL8cr65+eoVvCp+80ykJyw aVSQ== 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=P4Vmj6NOY9Lwotsb0YGd11hDD92WVKombLBJuKpP1JQNC04ysmxIcn+TiizriGF/vU iAy8la02RMhOHwLcFM8XyHLrC5pEjGzr6VIeBYecAHHsJlR39i2igBmD8yTRcAz4ZunJ VfW3yvVtcJPN4llGmwmogHLdVE5uY6PDTj1Lt9v5lwc8YSHxUTFriE4p7mZaUKxi+soO VOgERgMtR35S19t7Tqi+A4pIG2BSfgh2fEaeUMpIINw6rzDqSlB6SdQsYpl4jpHbMg7e UzxVLRXSK022NkWYCpyg/WdiuaPAU61g/gtIhBHWUH7Jx7U69KvCGXEjVoIV5DLqiNoa p6Zw== X-Gm-Message-State: AJcUukdg6mMyFJqj4asze6Uni5zEQpulCuTtSvxID4w9NiUxZT7kqNj0 8jx9EZ9Ca+Pn9g6YZfuKVZ8= 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 Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Jani Nikula , 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: [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> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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: 10782451 X-Patchwork-Delegate: kieran@bingham.xyz 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 786D413B4 for ; Sat, 26 Jan 2019 12:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 669BD2E304 for ; Sat, 26 Jan 2019 12:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A29D2E307; Sat, 26 Jan 2019 12:26:18 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D817F2E306 for ; Sat, 26 Jan 2019 12:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729712AbfAZMZ6 (ORCPT ); Sat, 26 Jan 2019 07:25:58 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:41701 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbfAZMZz (ORCPT ); Sat, 26 Jan 2019 07:25:55 -0500 Received: by mail-lj1-f194.google.com with SMTP id k15-v6so10512630ljc.8; Sat, 26 Jan 2019 04:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=OuJSbOXVxBR4EMcEW399DVMD4C+VWU5NXdUH5dxGtKU=; b=bECp7QHQYVrzWVWCLpUXidTEDzXWK0h2xfWulSxAUqDTdwrq9TzVgxnmFqgosN43ai pdKUsJblSDUxVyflROnmuwuaqAJAd9RKX6iZgnOPNv/vWa1QnKW9+/FLGw0gVNQVQFe7 A9w6miYmyBJxKQkpW/+LF/egDG0SQ1mKvrwUdHHrgfVcArQk/Mmg1avsnix1NPwxCBFb 4nJE7z0ZF5S1iqJ0lAHXS4LwAkp8AyMOZpx9sh6gSU7MAni9D3j+gunmxGJLz4qdfTaL eha9AKWvi6BXQ9raxRrn4padWbckxBkS+PzfCON/dw31gMTz8RU7XBTjIDHoljMQ8Cqr 3gjw== 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=ry8CJo04iFk9rqzvtCtvtpzMKX+DCYNH4kD5KUaexTDXuMuPMoyOxWl712cqqHci2+ u7hdAg1KNz45kUUOWZQeDak6dyOeqEMl2CYd60J18DPdlleaalzLGYSIWj9Qe53Q95RF kdfcugW5RZU/3dc0LXRSISHis2ZUwAYJls4+H8v4D54CH+wmqiXiGPnPFw2hnfcVQRFK FJD2zUCmnD629JbaENP0VgzMAOomIivxwrH2EANV8ybNPkXueWumhJTwQuyAQp5Te93m oigxTfoYLJzb9NfoBgSPAqVUaRaZgf8dehDcoZqAbA6nGgS3OJkwqiW2bwruvQz7UeUn ijSg== X-Gm-Message-State: AJcUukfI5BN6O89duSmLavqDavvWibvT5aeaOcGuKLLZfOTEHYKy9iq3 5RKN7mADpeBT4rNqjF3WYhY= 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 Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Jani Nikula , 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: [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> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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: 10782449 X-Patchwork-Delegate: kieran@bingham.xyz 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 49A2C91E for ; Sat, 26 Jan 2019 12:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39BC62E304 for ; Sat, 26 Jan 2019 12:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E2C42E30F; Sat, 26 Jan 2019 12:26:18 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7EFF2E304 for ; Sat, 26 Jan 2019 12:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729726AbfAZMZ6 (ORCPT ); Sat, 26 Jan 2019 07:25:58 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:46050 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726262AbfAZMZ4 (ORCPT ); Sat, 26 Jan 2019 07:25:56 -0500 Received: by mail-lf1-f65.google.com with SMTP id b20so8758620lfa.12; Sat, 26 Jan 2019 04:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9twS2QoSt8OMiLUBo9Uw/6B13OKa/JTRtA6RHr+fMq0=; b=ow7kLqyY+x5tFrWeDc4f0GyWZDf4mggYO24/ctRMb4vLMkXDSsxJcreAk5xX7UFoCi gNHDtPpk+N4vyMKBexCv9shyG3tAnTrqL++w4Dcs7V48aS3/zEnZ+oGuJVhyDxeD/oPB qE2T+HbEk7z59OBZ1vrAvPxwwFklf3+ul3+tOD4sKXS8D6hmcb+iIoZCeyI8zbsjc70Z Ri8ETEBBW03DgWC8FLade1Lp145ea6tUXbJ3yWiZYmfGBAH+zH+4Kj9UE/n3Ar5/OnDc z3N71Fm+DE9xKnISdFERY3V2bSCYc6GXIl0tUg8p4Brn7lSKQnrYQ830A7Iu5WERJPcJ Bfsw== 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=JXWrXv1md8KS4Ko1ll9X9cnL6zjOi+9nWgmO4eMfRcKq/kV6cnng0RTC7t0bBKc6Z4 RKNi24NE1HAi8vBj8gamAa8i1rGT8+ogwZ00h2M7wQS2pqMIpWSX2WEqmCDMlMVMc02W b12AA2svt7s5931jTwQjkpAJ00MSyO5M/5Od4/O8oyZnqtllpZmp1BJZAfXX9ff9Gw1G no8FMaCRQJQXsKv5GZuXtpT4zF0FXOIvMoH7WbmA8whNxgoHN55ZIehN/8XLVWgy8+gJ LJZtkay930jmFheopPx0heICrgsyVzfgIL0gHcvPHPzXXNCOZPFLOX3HEoWPuRBTIBT4 pRSw== X-Gm-Message-State: AJcUukdE873k6JC3anmSo6CCdoCw9LF6WFnlB496vqlxA56HHgJv+8BZ USCXm0vlD0z/TYY1fw69XdY= 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 Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Jani Nikula , 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: [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> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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: 10782431 X-Patchwork-Delegate: kieran@bingham.xyz 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 91ACE13B4 for ; Sat, 26 Jan 2019 12:25:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80E362E304 for ; Sat, 26 Jan 2019 12:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 744102E30F; Sat, 26 Jan 2019 12:25:59 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AE2C2E304 for ; Sat, 26 Jan 2019 12:25:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729695AbfAZMZ6 (ORCPT ); Sat, 26 Jan 2019 07:25:58 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:36632 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729694AbfAZMZ5 (ORCPT ); Sat, 26 Jan 2019 07:25:57 -0500 Received: by mail-lj1-f194.google.com with SMTP id g11-v6so10551156ljk.3; Sat, 26 Jan 2019 04:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iHGpzzDxSY24Z16cE/9INPchFaLmbUq/b31/6GBzQF8=; b=kvNhZmIKxhn5DhEkhi4IJ0EClP4jKtuxAxkD8Q6QOC9tENceM+3tF/Yq59gT/MwQSm RVp+i4KBh2AOxyJ/KTpFhU7sljZvIaOrS+12hMV3f/DEErWfvnZfPOgn5rgx58NW/52Q 4GLxcXl46i9UHRKS+/6HSSJ7RSILmRtBQ2eVELAY/mwQnEuM1u58fO7y2NXlALcqIBlH 6FiiZRQ2peT59FkboLJEQpug70SFAWExHM9r8IlcPPxwZ9j+2+jcJO9vJ6f/ELHWbwGO 0JU9OoAiGrAjAWCSzWigoF9909L/3sJHkHkW9hF+PE8Mhp1yMoksJK77XdaSU8W7gWpM SZIg== 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=Y49f1jzZ83hj5xpZrQTI2s8iCc7BncLuOSF/gkgytDorO1BHSFFo/0EUTgPp1/xg5b C23vqjbCOrIaYmHa58I14fDUq1XE6xlPMGmmmtKKqUAHCCkMaYlZQgqrXFhfq+9UOA1V 0/xGkEOhdmNuirkAUaXJsc5sMjdAPfWzxoGhOgM3+gRBNj+COibXMXefcN1v/nYvBJPo sYAfVC07AWasS5HqjLx+KNUM8yu/i56T10cFbxDKF0ad4Y78j2E+j6fxssxYqUjSFnPW zG5CifY6pLGWYcmTaz6eTzgdttZjAbCgJmVOaKcuyO5iVZi5P4zh4VBhL0V3Z42oH44m ZLnA== X-Gm-Message-State: AJcUukf7K6iYJ46FspdUqv/ZGNVGUiQV0L6/iCzKoFFKoVFBp2ZufXbu UwSESaU/i3QMAPVZiPT8+2Q= 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 Cc: Greg Kroah-Hartman , Daniel Vetter , David Airlie , Hans de Goede , Jani Nikula , 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: [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> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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 *);