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