From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON() Date: Thu, 18 Jul 2019 18:15:01 +0200 Message-ID: <20190718161507.2047-6-sam@ravnborg.org> References: <20190718161507.2047-1-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190718161507.2047-1-sam@ravnborg.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, Intel Graphics Development Cc: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: linux-mediatek@lists.infradead.org RFJNX1dBSVRfT04oKSBpcyBmcm9tIHRoZSBkZXByZWNhdGVkIGRybV9vc19saW51eCBoZWFkZXIg YW5kCnRoZSBtb2Rlcm4gcmVwbGFjZW1lbnQgaXMgdGhlIHdhaXRfZXZlbnRfKi4KClRoZSByZXR1 cm4gdmFsdWVzIGRpZmZlciwgc28gYSBjb252ZXJzaW9uIGlzIG5lZWRlZCB0bwprZWVwIHRoZSBv cmlnaW5hbCBpbnRlcmZhY2UgdG93YXJkcyB1c2Vyc3BhY2UuCkludHJvZHVjZWQgYSBzd2l0Y2gv Y2FzZSB0byBtYWtlIGNvZGUgb2J2aW91cyBhbmQgdG8gYWxsb3cKZGlmZmVyZW50IGRlYnVnIHBy aW50cyBkZXBlbmRpbmcgb24gdGhlIHJlc3VsdC4KClNpZ25lZC1vZmYtYnk6IFNhbSBSYXZuYm9y ZyA8c2FtQHJhdm5ib3JnLm9yZz4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBNYXhpbWUgUmlwYXJkIDxtYXhpbWUucmlwYXJkQGJv b3RsaW4uY29tPgpDYzogU2VhbiBQYXVsIDxzZWFuQHBvb3JseS5ydW4+CkNjOiBEYXZpZCBBaXJs aWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYyB8IDI5ICsrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV92YmxhbmsuYwppbmRleCA2MDNhYjEwNTEyNWQuLjhlOWFjMTg3NTAwZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX3ZibGFuay5jCkBAIC0zMSw3ICszMSw2IEBACiAjaW5jbHVkZSA8ZHJtL2RybV9k cnYuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2ZyYW1lYnVmZmVyLmg+CiAjaW5jbHVkZSA8ZHJtL2Ry bV9wcmludC5oPgotI2luY2x1ZGUgPGRybS9kcm1fb3NfbGludXguaD4KICNpbmNsdWRlIDxkcm0v ZHJtX3ZibGFuay5oPgogCiAjaW5jbHVkZSAiZHJtX2ludGVybmFsLmgiCkBAIC0xNjcyLDE5ICsx NjcxLDMxIEBAIGludCBkcm1fd2FpdF92YmxhbmtfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAlpZiAocmVxX3NlcSAhPSBzZXEpIHsKIAkJRFJNX0RFQlVHKCJ3YWl0 aW5nIG9uIHZibGFuayBjb3VudCAlbGx1LCBjcnRjICV1XG4iLAogCQkJICByZXFfc2VxLCBwaXBl KTsKLQkJRFJNX1dBSVRfT04ocmV0LCB2YmxhbmstPnF1ZXVlLCAzICogSFosCi0JCQkgICAgdmJs YW5rX3Bhc3NlZChkcm1fdmJsYW5rX2NvdW50KGRldiwgcGlwZSksCi0JCQkJCSAgcmVxX3NlcSkg fHwKLQkJCSAgICAhUkVBRF9PTkNFKHZibGFuay0+ZW5hYmxlZCkpOworCQlyZXQgPSB3YWl0X2V2 ZW50X2ludGVycnVwdGlibGVfdGltZW91dCh2YmxhbmstPnF1ZXVlLAorCQkJdmJsYW5rX3Bhc3Nl ZChkcm1fdmJsYW5rX2NvdW50KGRldiwgcGlwZSksIHJlcV9zZXEpIHx8CisJCQkJICAgICAgIVJF QURfT05DRSh2YmxhbmstPmVuYWJsZWQpLAorCQkJbXNlY3NfdG9famlmZmllcygzMDAwKSk7CiAJ fQogCi0JaWYgKHJldCAhPSAtRUlOVFIpIHsKKwlzd2l0Y2ggKHJldCkgeworCWNhc2UgMDoKKwkJ LyogdGltZW91dCAqLworCQlyZXQgPSAtRUJVU1k7CiAJCWRybV93YWl0X3ZibGFua19yZXBseShk ZXYsIHBpcGUsICZ2Ymx3YWl0LT5yZXBseSk7Ci0KLQkJRFJNX0RFQlVHKCJjcnRjICVkIHJldHVy bmluZyAldSB0byBjbGllbnRcbiIsCisJCURSTV9ERUJVRygidGltZW91dCB3YWl0aW5nIGZvciB2 YmxhbmsuIGNydGMgJWQgcmV0dXJuaW5nICV1IHRvIGNsaWVudFxuIiwKIAkJCSAgcGlwZSwgdmJs d2FpdC0+cmVwbHkuc2VxdWVuY2UpOwotCX0gZWxzZSB7CisJCWJyZWFrOworCWNhc2UgLUVSRVNU QVJUU1lTOgorCQkvKiBpbnRlcnJ1cHRlZCBieSBzaWduYWwgKi8KKwkJcmV0ID0gLUVJTlRSOwog CQlEUk1fREVCVUcoImNydGMgJWQgdmJsYW5rIHdhaXQgaW50ZXJydXB0ZWQgYnkgc2lnbmFsXG4i LCBwaXBlKTsKKwkJYnJlYWs7CisJZGVmYXVsdDoKKwkJcmV0ID0gMDsKKwkJZHJtX3dhaXRfdmJs YW5rX3JlcGx5KGRldiwgcGlwZSwgJnZibHdhaXQtPnJlcGx5KTsKKwkJRFJNX0RFQlVHKCJjcnRj ICVkIHJldHVybmluZyAldSB0byBjbGllbnRcbiIsCisJCQkgIHBpcGUsIHZibHdhaXQtPnJlcGx5 LnNlcXVlbmNlKTsKKwkJYnJlYWs7CiAJfQogCiBkb25lOgotLSAKMi4yMC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01CCDC7618F for ; Thu, 18 Jul 2019 16:17:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CAC7E21850 for ; Thu, 18 Jul 2019 16:17:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bgzi4wRH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BbtCb9g2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CAC7E21850 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/M+FC8+U4KxCBiFTUl5FBV3qZaTm0qSmNPI5xYF3Wwc=; b=bgzi4wRHbqCcNp UBrOctdOzBFAJJVAVZraSNMT6iJ4LHFGamqQPZF1Dboz4IN6iIDF2JLvbmxBS6KOcpM/5UnSFAo9/ MbmyvvDFL45Khi1YB+csj/fUI63fpEnLuZqj8TSXnyIsicqNh7h6vPt3PmL3ICYxLNZstADElScHL oD7FHVpNKmzbjeyaInGfwUzzBxTdd885qFp/dOjbNBXZXdkCwCRF3YXYluph46tqW3s0wja/YjgIs zxaR+EN9qpAATnwbfH6BSQKYci1FgPwVQccGNjxpP2rrBnv+fD4CZoQS/CQSTJ5ldnR7V8HC1G8v7 0SoWsST/w4A5nnTRZ+Nw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho95u-0001d1-DD; Thu, 18 Jul 2019 16:17:22 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho949-0007sY-Ut; Thu, 18 Jul 2019 16:15:35 +0000 Received: by mail-lj1-x243.google.com with SMTP id v18so27900877ljh.6; Thu, 18 Jul 2019 09:15:33 -0700 (PDT) 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=vfJth78zrsCE8EvAkb2q7xxIdGu3poPk3dyoAqmz7bA=; b=BbtCb9g2DsNiEp4NQaoJ4QYlf9TOBMn5FNfXAILkgRxVvjMv4oYQ2QWQur2QpY1oDs tY+hq6tQpdn6sv4GaAaRN3zqoKMtOJxKTS+CE/FeurecYR2py7DmD+wOYqDqFPliavRD kUvnCwNnxdpmg77SNaygFlJnpzjhLEFeu3r3pjJqPBA1qYv13+DJUC4oqyBIegVvlLUf yV55m8LLBBHpOjCBjccG83p4/fiVAPoDBnjNwfJNh1ay525CqTZIoid4MD9BRXItWgVc N7jdcGxdFSDusx5NEMh0a+wZcDux71kNRXlqKP3VfMBmJJZlGukoBFODa+OKNFpsR1xe 1F0g== 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=vfJth78zrsCE8EvAkb2q7xxIdGu3poPk3dyoAqmz7bA=; b=LqbK/+jZVxnm50TMxZKpqmoBc06FIUJekbIkibPN24RYwGYGQSRp36XhEvV7CFkHXo yBvkoU+PG1eH2NzcQ1wTZPFuqDvfDM+qgDjHoF6LJYIl4s2d6yqcSgEUvrZwH2uOkNOL b32MPYEpzrp+YZLfc/Mt2W0sXrzK/5SJrT9RWAahQGRsTP8lDj5jOf5prgHNRsIWwIRl +d7mR2OeHc+Czs3Sg/y4qHEBdIHZB2vyFkhWdZok/LIA+6ffNvOUVC6k7piiJw3YWkqn B6CL0H22Whf2wmbJlw/K1eaXMVakqTBw8zV7UqcRDJ9WThZ0RQA0uJ1QlQEheItwzBJj 0DCw== X-Gm-Message-State: APjAAAUe+p/ZN9d/MQiSFFKowg4XgTfSIW6hF6CSHeJZ5zdrRV9SIXeL MzRwTjEc4Dpccdu+1pH1fYA= X-Google-Smtp-Source: APXvYqz+lvIEFfsf44rKsdxmLLQVJPn5lk9Rv8gUung+m8ggZXDMg+iNeOqEP6Hx4DqN5fgQu97mtQ== X-Received: by 2002:a2e:3013:: with SMTP id w19mr24846595ljw.73.1563466532065; Thu, 18 Jul 2019 09:15:32 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id d21sm4057995lfc.73.2019.07.18.09.15.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:31 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON() Date: Thu, 18 Jul 2019 18:15:01 +0200 Message-Id: <20190718161507.2047-6-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190718161507.2047-1-sam@ravnborg.org> References: <20190718161507.2047-1-sam@ravnborg.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091534_009385_AF96F885 X-CRM114-Status: GOOD ( 13.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Philipp Zabel , =?UTF-8?q?Christian=20K=C3=B6nig?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DRM_WAIT_ON() is from the deprecated drm_os_linux header and the modern replacement is the wait_event_*. The return values differ, so a conversion is needed to keep the original interface towards userspace. Introduced a switch/case to make code obvious and to allow different debug prints depending on the result. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter --- drivers/gpu/drm/drm_vblank.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index 603ab105125d..8e9ac187500e 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "drm_internal.h" @@ -1672,19 +1671,31 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data, if (req_seq != seq) { DRM_DEBUG("waiting on vblank count %llu, crtc %u\n", req_seq, pipe); - DRM_WAIT_ON(ret, vblank->queue, 3 * HZ, - vblank_passed(drm_vblank_count(dev, pipe), - req_seq) || - !READ_ONCE(vblank->enabled)); + ret = wait_event_interruptible_timeout(vblank->queue, + vblank_passed(drm_vblank_count(dev, pipe), req_seq) || + !READ_ONCE(vblank->enabled), + msecs_to_jiffies(3000)); } - if (ret != -EINTR) { + switch (ret) { + case 0: + /* timeout */ + ret = -EBUSY; drm_wait_vblank_reply(dev, pipe, &vblwait->reply); - - DRM_DEBUG("crtc %d returning %u to client\n", + DRM_DEBUG("timeout waiting for vblank. crtc %d returning %u to client\n", pipe, vblwait->reply.sequence); - } else { + break; + case -ERESTARTSYS: + /* interrupted by signal */ + ret = -EINTR; DRM_DEBUG("crtc %d vblank wait interrupted by signal\n", pipe); + break; + default: + ret = 0; + drm_wait_vblank_reply(dev, pipe, &vblwait->reply); + DRM_DEBUG("crtc %d returning %u to client\n", + pipe, vblwait->reply.sequence); + break; } done: -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel