From patchwork Wed Mar 8 14:12:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9611203 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 716DF6046A for ; Wed, 8 Mar 2017 14:13:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B517C2853E for ; Wed, 8 Mar 2017 14:13:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA20428552; Wed, 8 Mar 2017 14:13:17 +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=unavailable 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 549292853E for ; Wed, 8 Mar 2017 14:13:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D68606E936; Wed, 8 Mar 2017 14:13:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A343D6E92C for ; Wed, 8 Mar 2017 14:13:07 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id g10so4316720wrg.0 for ; Wed, 08 Mar 2017 06:13:07 -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=gXjAhrbcaaIcUjeuzzaoI8k3OykiBidzBHw1E+vZEGs=; b=Lmx4s0FnHEMf+c9BTVFH3DEpYYoAJMRGJ1TKJIujbUkOov3FBqp9vnUsBrUnAQzQnv G/bBgPYf6XCrOq3hGmdUHCGjcRAKF4L8/WAyTONXujzslDHv9+B9+5OlNJ1wRIl97q0q 5Bjktkup0k1ci7HuukhtvtmdhAPPJF+j7r3Rk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gXjAhrbcaaIcUjeuzzaoI8k3OykiBidzBHw1E+vZEGs=; b=WFkMZBwfAeWQnhgDLj0Vsv0GniEbQJ0DRF+vwDlX6eeY90qQ4J5zTmFpzYq4L1jjbA cTp0Hnvvwq1JQAXTdsdhCPPQLZLpC+q0O4JzX6pktdPcUrkOexUHFycDriDSKuW5yO2J 2+LP/ipBGl23/kxIa/ze9Kii45lBjbJ5DyuiFEhEvy3KEaxy/kUA8ydjOvAENbqMfQS3 O0oUTIz/ciTwaQue2kmTb51Ul7A20yVzihz+FgUdhDUjdt0Z7vHOhHFtxq21UmMc96ZR daUpCMHbRuEk3zSBriKdxeJoKiZX1eJXvvcq/Q8XDeylcVv1lDcIriD3Jkc1lt+hdpIs 0Mow== X-Gm-Message-State: AMke39kDAf1ABXOx5tNz/wA2gf6Spsys9CilDRM88QQezcdcccC8XCrVo1rOBjubgROYpQ== X-Received: by 10.223.171.78 with SMTP id r14mr5174774wrc.113.1488982386215; Wed, 08 Mar 2017 06:13:06 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56c9:0:decc:6e78:7e96:b452]) by smtp.gmail.com with ESMTPSA id m186sm17012515wmd.21.2017.03.08.06.13.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 06:13:05 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Wed, 8 Mar 2017 15:12:36 +0100 Message-Id: <20170308141257.12119-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170308141257.12119-1-daniel.vetter@ffwll.ch> References: <20170308141257.12119-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 03/24] drm: Move drm_lock_data out of drmP.h X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP And remove the semi-kernel-doc stuff, to make sure no one uses this. Signed-off-by: Daniel Vetter Reviewed-by: Gustavo Padovan --- include/drm/drmP.h | 15 --------------- include/drm/drm_auth.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 5f829d2372da..22b6f6f45b07 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -428,21 +428,6 @@ struct drm_file { struct drm_prime_file_private prime; }; -/** - * Lock data. - */ -struct drm_lock_data { - struct drm_hw_lock *hw_lock; /**< Hardware lock */ - /** Private of lock holder's file (NULL=kernel) */ - struct drm_file *file_priv; - wait_queue_head_t lock_queue; /**< Queue of blocked processes */ - unsigned long lock_time; /**< Time of last lock in jiffies */ - spinlock_t spinlock; - uint32_t kernel_waiters; - uint32_t user_waiters; - int idle_has_lock; -}; - /* Flags and return codes for get_vblank_timestamp() driver function. */ #define DRM_CALLED_FROM_VBLIRQ 1 #define DRM_VBLANKTIME_SCANOUTPOS_METHOD (1 << 0) diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h index 1eb4a52cad8d..81a40c2a9a3e 100644 --- a/include/drm/drm_auth.h +++ b/include/drm/drm_auth.h @@ -28,6 +28,23 @@ #ifndef _DRM_AUTH_H_ #define _DRM_AUTH_H_ +/* + * Legacy DRI1 locking data structure. Only here instead of in drm_legacy.h for + * include ordering reasons. + * + * DO NOT USE. + */ +struct drm_lock_data { + struct drm_hw_lock *hw_lock; + struct drm_file *file_priv; + wait_queue_head_t lock_queue; + unsigned long lock_time; + spinlock_t spinlock; + uint32_t kernel_waiters; + uint32_t user_waiters; + int idle_has_lock; +}; + /** * struct drm_master - drm master structure *