From patchwork Sat Dec 12 16:42:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicolai_H=C3=A4hnle?= X-Patchwork-Id: 7835181 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 43E63BEEE1 for ; Sat, 12 Dec 2015 16:42:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46ADF203AB for ; Sat, 12 Dec 2015 16:42:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7F57220398 for ; Sat, 12 Dec 2015 16:42:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E5FB46E38A; Sat, 12 Dec 2015 08:42:55 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f175.google.com (mail-qk0-f175.google.com [209.85.220.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3938F6E38A for ; Sat, 12 Dec 2015 08:42:54 -0800 (PST) Received: by qkfb125 with SMTP id b125so81888304qkf.2 for ; Sat, 12 Dec 2015 08:42:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=vC9G2StW1NROagneAq3H1cUaiUpbX26J45xRcUl9ovI=; b=Quxd17iIbOZ3AQ9nlaBONIMML5w1/aW+cBpGFWWAeW5UjWZo58UC8VUWoBZZbckPpC IlQGy/N97J4Zof2g5rAEk2MVYKiTFIDJzEJXCtIW3A0NG81qI1PssNTT1LOU1Me2Oi2F tox3RocsxdMq/ngigiJ0dDzqRDyMrjJf16psaOzEwf90fuP3rNqO9T/GEURo9MoiNrnO c7Z+99kNsp911iDC7ESbdeEFP+9j/GzflKwPyf9UM45BIJFdBJucAI7mx0kUXP6ZQ2BP xacKEF4rqR0Bc9NgtjUIM8//lPCPXKG49XOWDJHIFwIeAYU2lmifsWLhBvslxrV/PHnp 8u9Q== X-Received: by 10.129.98.66 with SMTP id w63mr13754049ywb.37.1449938573206; Sat, 12 Dec 2015 08:42:53 -0800 (PST) Received: from cassiopeia.local ([200.121.5.35]) by smtp.gmail.com with ESMTPSA id e64sm16694564ywb.25.2015.12.12.08.42.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Dec 2015 08:42:52 -0800 (PST) From: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/3] drm/ttm: fix documentation of ttm_bo_reserve Date: Sat, 12 Dec 2015 11:42:23 -0500 Message-Id: <1449938545-8707-1-git-send-email-nhaehnle@gmail.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Cc: =?UTF-8?q?Nicolai=20H=C3=A4hnle?= 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nicolai Hähnle Previously, the comment was inconsistent. EDEADLK is what the ww_mutex mechanism really returns. Signed-off-by: Nicolai Hähnle --- include/drm/ttm/ttm_bo_driver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 813042c..3d4bf08 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -826,10 +826,10 @@ static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo, * reserved, the validation sequence is checked against the validation * sequence of the process currently reserving the buffer, * and if the current validation sequence is greater than that of the process - * holding the reservation, the function returns -EAGAIN. Otherwise it sleeps + * holding the reservation, the function returns -EDEADLK. Otherwise it sleeps * waiting for the buffer to become unreserved, after which it retries * reserving. - * The caller should, when receiving an -EAGAIN error + * The caller should, when receiving an -EDEADLK error * release all its buffer reservations, wait for @bo to become unreserved, and * then rerun the validation with the same validation sequence. This procedure * will always guarantee that the process with the lowest validation sequence