From patchwork Tue Jul 16 06:42:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11045311 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 85E2B13A4 for ; Tue, 16 Jul 2019 06:44:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 720C8284ED for ; Tue, 16 Jul 2019 06:44:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65AA02857E; Tue, 16 Jul 2019 06:44:58 +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 97A19284ED for ; Tue, 16 Jul 2019 06:44:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC0956E0A0; Tue, 16 Jul 2019 06:44:55 +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 1024D6E0A0 for ; Tue, 16 Jul 2019 06:44:54 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id v18so18743068ljh.6 for ; Mon, 15 Jul 2019 23:44:54 -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=rVQIyGObDe+BrY7Eg1xXzFaxPTfYiK9WS1wEUSsJljk=; b=bughqByfata10TuvtkLRereFN2gWxndojNzrD0FG3cfFdjDNlkT4qMs78vjoG+vELv wJigbrsJegn4ph5ZOTFHp5boNNKLWGpIx5giHjufLApvQ8nBiCkc8vIjSIwa7kfJEUDC xQphQGrInt/KUwt+8apkX27qNZde6HqfvzH3cGFefRpSoYIkkloMEz7XrhGS7L01taUo 0FUBuJK8bAnNDc+5hrusLrTsmHf6AwtfCh4vJO0yUukiGPgUxd3XUNguKnrwMia7Vrg6 LdtSnheyHf3ityiX/k8cVcOQDYFtbgsns4bqAZOh8tJp18vqPRaNvIjkiY2cN2xfTFkU jJmw== X-Gm-Message-State: APjAAAUKnUakJWQvK3nlCywq7iLUGFxsoQNMXwvcR/3lrM0l/NeDj2eZ mYUPxgHl5OTBNn+jx71EgjYYZnb0HuH/Lg== X-Google-Smtp-Source: APXvYqyWMozRoWBqhhFkQK+sncFAbU+0RTQGAzuDa6fjcyepvOEL9fWKi1KO96UK5+yNOIWDWCDFpg== X-Received: by 2002:a2e:b047:: with SMTP id d7mr16942701ljl.8.1563259493160; Mon, 15 Jul 2019 23:44:53 -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.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 23:44:52 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 08/19] drm/udl: drop use of drmP.h Date: Tue, 16 Jul 2019 08:42:09 +0200 Message-Id: <20190716064220.18157-9-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=rVQIyGObDe+BrY7Eg1xXzFaxPTfYiK9WS1wEUSsJljk=; b=jEhIzSQmBTXVDFltcdz6O1V5VMP3okq9WrYIyxemv5BKIQ1rw7wygYBORE2Yu60KFV U6QMcd8nuIov5ZU6e06BCMEdR9+U161QZ+O093h3L+KU6JxLaF37UBJX1hqwCJ7WbALm 6OeYXkVxoYNaKK8LTKqlq+hGvnshwokJkuOTGIl8Dcxk6JhnyuYpPShwf0nWWgWSLMSF GOO/qbK0Is3ZHiwHF7PBDK/flDd8FuHXBvYfAGPRoNbncAO0cOjzo84t2TVjFf88EW3d IBl7AtYAXZAfv58JZzQtDzshouTO0GHVeurhLi+prYB2K9bpdDuqooNRlojpwp5eg4kq lvOw== 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: Robert Tarasov , Thomas Zimmermann , Oleksandr Andrushchenko , David Airlie , Sam Ravnborg , Emil Lundmark , Eugeniy Paltsev , Jani Nikula , Mikulas Patocka , Alex Deucher , Sean Paul , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The drmP.h header file is deprecated. Drop it from all files in the udl driver. Made the header files self contained, which then made it simpler to update the .c files. Signed-off-by: Sam Ravnborg Acked-by: Emil Velikov Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Robert Tarasov Cc: Oleksandr Andrushchenko Cc: Alex Deucher Cc: Thomas Zimmermann Cc: "Noralf Trønnes" Cc: Eric Anholt Cc: Mikulas Patocka Cc: Emil Lundmark Cc: Eugeniy Paltsev Reviewed-by: Alex Deucher --- drivers/gpu/drm/udl/udl_connector.c | 4 +--- drivers/gpu/drm/udl/udl_connector.h | 2 ++ drivers/gpu/drm/udl/udl_dmabuf.c | 6 ++++-- drivers/gpu/drm/udl/udl_drv.c | 7 ++++++- drivers/gpu/drm/udl/udl_drv.h | 8 +++++++- drivers/gpu/drm/udl/udl_encoder.c | 6 +++--- drivers/gpu/drm/udl/udl_fb.c | 15 +++++++-------- drivers/gpu/drm/udl/udl_gem.c | 9 ++++++--- drivers/gpu/drm/udl/udl_main.c | 6 ++++-- drivers/gpu/drm/udl/udl_modeset.c | 6 +++--- drivers/gpu/drm/udl/udl_transfer.c | 4 ---- 11 files changed, 43 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 921561875d7f..ddb61a60c610 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c @@ -7,11 +7,9 @@ * Copyright (C) 2009 Bernie Thompson */ -#include -#include -#include #include #include + #include "udl_connector.h" #include "udl_drv.h" diff --git a/drivers/gpu/drm/udl/udl_connector.h b/drivers/gpu/drm/udl/udl_connector.h index 0fb0db5c4612..7f2d392df173 100644 --- a/drivers/gpu/drm/udl/udl_connector.h +++ b/drivers/gpu/drm/udl/udl_connector.h @@ -3,6 +3,8 @@ #include +struct edid; + struct udl_drm_connector { struct drm_connector connector; /* last udl_detect edid */ diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c index 10a60e7e93d6..3108e9a9234b 100644 --- a/drivers/gpu/drm/udl/udl_dmabuf.c +++ b/drivers/gpu/drm/udl/udl_dmabuf.c @@ -5,11 +5,13 @@ * Copyright (c) 2014 The Chromium OS Authors */ -#include -#include "udl_drv.h" #include #include +#include + +#include "udl_drv.h" + struct udl_drm_dmabuf_attachment { struct sg_table sgt; enum dma_data_direction dir; diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index ae53bf75c1d6..8426669433e4 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -4,9 +4,14 @@ */ #include -#include + #include +#include +#include +#include #include +#include + #include "udl_drv.h" static int udl_usb_suspend(struct usb_interface *interface, diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 9d0790be544f..12a970fd9a87 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -11,9 +11,15 @@ #ifndef UDL_DRV_H #define UDL_DRV_H +#include #include + +#include +#include #include -#include + +struct drm_encoder; +struct drm_mode_create_dumb; #define DRIVER_NAME "udl" #define DRIVER_DESC "DisplayLink" diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c index f87989e6ee51..203f041e737c 100644 --- a/drivers/gpu/drm/udl/udl_encoder.c +++ b/drivers/gpu/drm/udl/udl_encoder.c @@ -7,9 +7,9 @@ * Copyright (C) 2009 Bernie Thompson */ -#include -#include -#include +#include +#include + #include "udl_drv.h" /* dummy encoder */ diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index e1116bf7b9d7..ef3504d06343 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -7,18 +7,17 @@ * Copyright (C) 2009 Jaya Kumar * Copyright (C) 2009 Bernie Thompson */ -#include -#include -#include + +#include #include -#include -#include -#include #include -#include "udl_drv.h" - +#include #include +#include +#include + +#include "udl_drv.h" #define DL_DEFIO_WRITE_DELAY (HZ/20) /* fb_deferred_io.delay in jiffies */ diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index c6ca2c09bc97..b23a5c2fcd80 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c @@ -3,10 +3,13 @@ * Copyright (C) 2012 Red Hat */ -#include -#include "udl_drv.h" -#include #include +#include + +#include +#include + +#include "udl_drv.h" struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, size_t size) diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 1a99c7647444..4e854e017390 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -7,9 +7,11 @@ * Copyright (C) 2009 Jaya Kumar * Copyright (C) 2009 Bernie Thompson */ -#include -#include + +#include +#include #include + #include "udl_drv.h" /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 793722d0c8cd..bc1ab6060dc6 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c @@ -9,10 +9,10 @@ */ -#include -#include #include -#include +#include +#include + #include "udl_drv.h" /* diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c index 6837f592f6ba..1973a4c1e358 100644 --- a/drivers/gpu/drm/udl/udl_transfer.c +++ b/drivers/gpu/drm/udl/udl_transfer.c @@ -7,12 +7,8 @@ * Copyright (C) 2009 Bernie Thompson */ -#include -#include -#include #include -#include #include "udl_drv.h" #define MAX_CMD_PIXELS 255