From patchwork Tue Jul 16 06:42:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045299 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 5B08513BD for ; Tue, 16 Jul 2019 06:44:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B9AB284ED for ; Tue, 16 Jul 2019 06:44:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D0F42857E; Tue, 16 Jul 2019 06:44:19 +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 98F48284ED for ; Tue, 16 Jul 2019 06:44:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04C6C6E0A8; Tue, 16 Jul 2019 06:44:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCC7D6E0A8 for ; Tue, 16 Jul 2019 06:44:16 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id t28so18737367lje.9 for ; Mon, 15 Jul 2019 23:44:16 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=QzoJXiDW1P9TJf9UHhfxxG1dKejevyW9LWRSq+RVRaM=; b=uPzg9SmOnPdyLSYdOdDhwqQmBqAkItvIjy+6XgCjKpDwEpYua7yFJFlp864gg95D7u MH3/sg+76rY0VoNRpj6lr3qJYnDB8RkSb4pt3A8Z+qrRinbcINf/LpwJKMU8TD8EwuHr 47ELEwPSaxYKUlY1AVsxlMW+p2RotKwOKKfM5Lad13gfLXtTGF7qqrkT/NCQ/ymPY5+3 r6oh2h7bcoAKEoYh9ZSg6CbvPQAUgHUsRBSNE7y573SavkKSY4NJNgpjCnJdqM2FztBV DfW7nqcCjzqU8AjthMnayzmKNCf4szI1niGfuR+0fF5N0IF95mFqIrilbaHvtyq2Y84U o8Ew== X-Gm-Message-State: APjAAAVqSeHzI4BH13pCgAEVZWX6Joj0s2hKDMjrqZI/DsmFOjXzAvWX KFS+smbkrPswfu9EeXpyEHOjWtzim2U= X-Google-Smtp-Source: APXvYqycXRCWm5EFo8QmWKhTg82pcndOygDVI6zMWVI/JCRfopReCrXJpwdc/pefA7IJHt/QtBbG1g== X-Received: by 2002:a2e:824f:: with SMTP id j15mr16831050ljh.117.1563259455056; Mon, 15 Jul 2019 23:44:15 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id 27sm3529993ljw.97.2019.07.15.23.44.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:14 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 02/19] drm/v3d: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:03 +0200 Message-Id: <20190716064220.18157-3-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190716064220.18157-1-sam@ravnborg.org> References: <20190716064220.18157-1-sam@ravnborg.org> MIME-Version: 1.0 X-Mailman-Original-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 :mime-version:content-transfer-encoding; bh=QzoJXiDW1P9TJf9UHhfxxG1dKejevyW9LWRSq+RVRaM=; b=uPsA6uXvJ/DwEUSy9FJ7+Ayz8nAeMGOjgigueR6WKNMLj6LgogLyBTYOIz9yxtAjM9 98Y1NDAs2KvtN0dVs9GeLaTZhdvNZPWHRttx1mh+fhoE6pWZNr05DWaBwEopaFnrzNpn SmE1kxDwZYzqmMjYgP8uX2GJkYBrnGx8P64AJPe/vpjC0fozGTRm0Szb0LrLdLWyZzTk GTn9sluutTq0lPqlHbu3FABSJ39F7hVrRa7nLisVB4UFVO/I5KGF7SwnCIqtV9YQkEHV nAcTITub73ONs4hxCSz7Wveoqo/yWy0g+ebv2Km3Bc25n9AVmaCWfw8yNMn/JU9EC7Tc nbrg== 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: David Airlie , Sam Ravnborg , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop use of the deprecated drmP.h header file. Made v3d_drv.h self-contained with only sufficient include files. Fixed fallout in remaining files. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Eric Anholt Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- drivers/gpu/drm/v3d/v3d_drv.c | 5 ++++- drivers/gpu/drm/v3d/v3d_drv.h | 13 +++++++++++-- drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++++----- drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index 78a78938e81f..9e953ce64ef7 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -6,7 +6,8 @@ #include #include #include -#include + +#include #include "v3d_drv.h" #include "v3d_regs.h" diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index a1604705faee..3506ae2723ae 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -14,16 +14,19 @@ #include #include +#include #include #include #include #include #include #include + +#include #include #include +#include -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index 9aad9da1eb11..9a35c555ec52 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -1,14 +1,23 @@ // SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2015-2018 Broadcom */ -#include -#include +#include +#include +#include +#include + #include #include #include #include + #include "uapi/drm/v3d_drm.h" +struct clk; +struct device; +struct platform_device; +struct reset_control; + #define GMP_GRANULARITY (128 * 1024) /* Enum for each of the V3D queues. */ diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 27e0f87075d9..79744137d89f 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -1,17 +1,19 @@ // SPDX-License-Identifier: GPL-2.0+ /* Copyright (C) 2014-2018 Broadcom */ -#include -#include +#include +#include +#include #include #include #include #include -#include -#include #include +#include + +#include +#include -#include "uapi/drm/v3d_drm.h" #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h" diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c index 268d8a889ac5..662e67279a7b 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -13,6 +13,8 @@ * current job can make progress. */ +#include + #include "v3d_drv.h" #include "v3d_regs.h" #include "v3d_trace.h"