From patchwork Tue Jul 16 06:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045319 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 D1F3D13A4 for ; Tue, 16 Jul 2019 06:45:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2166284ED for ; Tue, 16 Jul 2019 06:45:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B60C12857E; Tue, 16 Jul 2019 06:45:07 +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 603FE284ED for ; Tue, 16 Jul 2019 06:45:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02F6C6E0AE; Tue, 16 Jul 2019 06:45:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6988F6E0AE for ; Tue, 16 Jul 2019 06:45:00 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id i21so18764780ljj.3 for ; Mon, 15 Jul 2019 23:45:00 -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=3aLy+sLkd878hI0e68qPAv+UAsAwEduUsrDn+6PipWE=; b=Nv/fv5wQdc8rx6lwbJiSwaqkMliiUK79OZUxR6kMGv+iv9x08Ie0RMtbc3VQrkHpNE tadOWMNyG3titepqn89pgxZ+yNTHij4MOPoTu0pGM74+kte7f6CMzoVMCsICcT1NdQE5 bqxck/OBuukx7TLF6AD0KVRB1GcK/flFIauY0vzmCRinwoSgmVjmOHC0it3cyZwEhQqL v2Lh3XcF1DrmZu/sI8U8SwluNO5XK4hcyhkEGo9avQBQrsLCsco6sC6P2Vups3blXxjH UUQWTBdRU4Ncq8N+kp5k3nyX+dWH9s4pKCvz5zh2SkhpAiTWPNChgdTiHd/by9XitjgD LzLw== X-Gm-Message-State: APjAAAWps9+MN8b1uMEb50FWOYC89/rjsLxvc18vOpZ07Qj5/IS0C842 2Pqmp+5EI1Fah3+S2blNqPMql5+nLOxoJg== X-Google-Smtp-Source: APXvYqwDY87O446RsZttrV+kCuWK4Ptm+Qt1CKQIYZjtGKNejv0Z5/L8rZZYCgEn50TdsPcwGe0t6A== X-Received: by 2002:a2e:9155:: with SMTP id q21mr16199525ljg.198.1563259498584; Mon, 15 Jul 2019 23:44:58 -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.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:58 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 13/19] drm/i810: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:14 +0200 Message-Id: <20190716064220.18157-14-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=3aLy+sLkd878hI0e68qPAv+UAsAwEduUsrDn+6PipWE=; b=vAG1HCalAubUhCn422YRDZ86JLZrrTq5JjxPc0469LSVD2varjp06w7qCSNO3LfUyQ qoB8HtBkHf1VBMCw3RbPc/u+m2mqZ7M6u5NPrglPjp/OIlMihutTGsJ4W/bX3gJRMdyf Ng+sEuUMvDExQvHBXq7cNWAols71pLTBnmuTTbaYUB3cl9nH0mDJid18stFEjsG2zsSE YsPu2u/jW4H2HB7WAQX2ZO8R+y7zYi51BzfC3/EUXVh5+sIgOU7mzTYwpyR51/mRt98s 4clAnvUdLahECRaQrIIOLMeirAqepLV3BqAG8qff0T2JWSaxDRPUtIRF6xnNGAPmPsry ZFMg== 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 , Dan Carpenter , 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. Replace with necessary includes. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: David Airlie Cc: Daniel Vetter Cc: Dan Carpenter --- drivers/gpu/drm/i810/i810_dma.c | 17 ++++++++++++----- drivers/gpu/drm/i810/i810_drv.c | 8 +++++--- drivers/gpu/drm/i810/i810_drv.h | 2 ++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 3b378936f575..2a77823b8e9a 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -30,13 +30,20 @@ * */ -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include + #include "i810_drv.h" -#include /* For task queue support */ -#include -#include -#include #define I810_BUF_FREE 2 #define I810_BUF_CLIENT 1 diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index c69d5c487f51..5dd26a06ee0e 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c @@ -30,13 +30,15 @@ * Gareth Hughes */ +#include "i810_drv.h" #include -#include +#include +#include +#include +#include #include -#include "i810_drv.h" -#include static struct pci_device_id pciidlist[] = { i810_PCI_IDS diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h index c73d2f2da57b..9df3981ffc66 100644 --- a/drivers/gpu/drm/i810/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h @@ -32,7 +32,9 @@ #ifndef _I810_DRV_H_ #define _I810_DRV_H_ +#include #include +#include /* General customization: */