From patchwork Mon Nov 14 09:02:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9426897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 964206047D for ; Mon, 14 Nov 2016 09:03:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F743286DE for ; Mon, 14 Nov 2016 09:03:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7458128772; Mon, 14 Nov 2016 09:03:23 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 1DE15286DE for ; Mon, 14 Nov 2016 09:03:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5061E6E378; Mon, 14 Nov 2016 09:03:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25EC16E36D for ; Mon, 14 Nov 2016 09:03:10 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so13383824wme.2 for ; Mon, 14 Nov 2016 01:03:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B6Kok0tfq8G1pRDdSJinVvlh/Nd+YCEJrdzCaeP66yQ=; b=dyrtAcbX2nh/rhSf6f53K1jR6FK+xg9HU5/c+tR0hCAIvZrbfIgmviXCv38x0/EwZC lEfFnLg/C2O/7s/UJrza7/ThRiKMVayG2ISAHtBB1j/apKPm5o5ltjBTc3F04sk176g0 tYwddCf7t8cUHcAnaHv4zCE1EirZ6O1G+wQnw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B6Kok0tfq8G1pRDdSJinVvlh/Nd+YCEJrdzCaeP66yQ=; b=DjFzLIzcbEN5OpAkrZ8oxStYc2CwWc6O7nyoqY6fy2IyAhQA25b8Mnsw8b0eRRFmup Yw3EOhJP9l5JFfhZMWmHBF8CZuM40Yry2ZIf0IFoOMdDl5uGX2g6ALJtsuIi2YyFgek6 KrzEvlTVAVgcbmRY6StRarPkGW0SY1R7QmludvVFFvr6QMs6so2sx5GTP8zoTmEFswz9 Qw9b6GrXsRp1i2wOFDVRAuwqS2O7k39/ISyDQ5RbEUCoxv/WY+P1rFlV0D0FqgLA245q kCymTqKjO10kMr8Ww4kp4Af/ejz+dEUiqWSBnqpYzlZnFp3Unbf90uTNbNFxmwuiVAFO OGfA== X-Gm-Message-State: ABUngvcz16Wf+z3prd3htm0EueD5wW6sswCzGFzPc0y4ImrTBpvGIf4vELJN217+uzEE3Q== X-Received: by 10.194.187.103 with SMTP id fr7mr17569958wjc.99.1479114188658; Mon, 14 Nov 2016 01:03:08 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id hy10sm27393012wjb.10.2016.11.14.01.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 01:03:08 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 6/6] drm: drm_irq.h header cleanup Date: Mon, 14 Nov 2016 10:02:55 +0100 Message-Id: <20161114090255.31595-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161114090255.31595-1-daniel.vetter@ffwll.ch> References: <20161114090255.31595-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP - Drop extern for functions, it's noise. - Move&consolidate drm.ko internal parts into drm-internal.h. Signed-off-by: Daniel Vetter Reviewed-by: Alex Deucher --- drivers/gpu/drm/drm_internal.h | 8 +++--- include/drm/drm_irq.h | 60 ++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index abd209863ef4..1e29cbc556d5 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -24,9 +24,6 @@ #define DRM_IF_MAJOR 1 #define DRM_IF_MINOR 4 -/* drm_irq.c */ -extern unsigned int drm_timestamp_monotonic; - /* drm_fops.c */ extern struct mutex drm_global_mutex; void drm_lastclose(struct drm_device *dev); @@ -52,6 +49,11 @@ int drm_clients_info(struct seq_file *m, void* data); int drm_gem_name_info(struct seq_file *m, void *data); /* drm_irq.c */ +extern unsigned int drm_timestamp_monotonic; + +/* IOCTLS */ +int drm_wait_vblank(struct drm_device *dev, void *data, + struct drm_file *filp); int drm_control(struct drm_device *dev, void *data, struct drm_file *file_priv); int drm_modeset_ctl(struct drm_device *dev, void *data, diff --git a/include/drm/drm_irq.h b/include/drm/drm_irq.h index 92e59d0a5ddb..293d08caab60 100644 --- a/include/drm/drm_irq.h +++ b/include/drm/drm_irq.h @@ -130,39 +130,37 @@ struct drm_vblank_crtc { bool enabled; }; -extern int drm_irq_install(struct drm_device *dev, int irq); -extern int drm_irq_uninstall(struct drm_device *dev); +int drm_irq_install(struct drm_device *dev, int irq); +int drm_irq_uninstall(struct drm_device *dev); -extern int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs); -extern int drm_wait_vblank(struct drm_device *dev, void *data, - struct drm_file *filp); -extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc); -extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc, - struct timeval *vblanktime); -extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc, - struct drm_pending_vblank_event *e); -extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, - struct drm_pending_vblank_event *e); -extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe); -extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc); -extern int drm_crtc_vblank_get(struct drm_crtc *crtc); -extern void drm_crtc_vblank_put(struct drm_crtc *crtc); -extern void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe); -extern void drm_crtc_wait_one_vblank(struct drm_crtc *crtc); -extern void drm_crtc_vblank_off(struct drm_crtc *crtc); -extern void drm_crtc_vblank_reset(struct drm_crtc *crtc); -extern void drm_crtc_vblank_on(struct drm_crtc *crtc); -extern void drm_vblank_cleanup(struct drm_device *dev); -extern u32 drm_accurate_vblank_count(struct drm_crtc *crtc); -extern u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe); +int drm_vblank_init(struct drm_device *dev, unsigned int num_crtcs); +u32 drm_crtc_vblank_count(struct drm_crtc *crtc); +u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc, + struct timeval *vblanktime); +void drm_crtc_send_vblank_event(struct drm_crtc *crtc, + struct drm_pending_vblank_event *e); +void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, + struct drm_pending_vblank_event *e); +bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe); +bool drm_crtc_handle_vblank(struct drm_crtc *crtc); +int drm_crtc_vblank_get(struct drm_crtc *crtc); +void drm_crtc_vblank_put(struct drm_crtc *crtc); +void drm_wait_one_vblank(struct drm_device *dev, unsigned int pipe); +void drm_crtc_wait_one_vblank(struct drm_crtc *crtc); +void drm_crtc_vblank_off(struct drm_crtc *crtc); +void drm_crtc_vblank_reset(struct drm_crtc *crtc); +void drm_crtc_vblank_on(struct drm_crtc *crtc); +void drm_vblank_cleanup(struct drm_device *dev); +u32 drm_accurate_vblank_count(struct drm_crtc *crtc); +u32 drm_vblank_no_hw_counter(struct drm_device *dev, unsigned int pipe); -extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, - unsigned int pipe, int *max_error, - struct timeval *vblank_time, - unsigned flags, - const struct drm_display_mode *mode); -extern void drm_calc_timestamping_constants(struct drm_crtc *crtc, - const struct drm_display_mode *mode); +int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, + unsigned int pipe, int *max_error, + struct timeval *vblank_time, + unsigned flags, + const struct drm_display_mode *mode); +void drm_calc_timestamping_constants(struct drm_crtc *crtc, + const struct drm_display_mode *mode); /** * drm_crtc_vblank_waitqueue - get vblank waitqueue for the CRTC