From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON() Date: Thu, 18 Jul 2019 13:50:58 -0400 Message-ID: <20190718175058.GH31819@art_vandelay> References: <20190718161507.2047-1-sam@ravnborg.org> <20190718161507.2047-6-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20190718161507.2047-6-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: Sam Ravnborg Cc: David Airlie , Liviu Dudau , dri-devel@lists.freedesktop.org, Maxime Ripard , Thierry Reding , Jani Nikula , Intel Graphics Development , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Christian =?iso-8859-1?Q?K=F6nig?= List-Id: linux-mediatek@lists.infradead.org T24gVGh1LCBKdWwgMTgsIDIwMTkgYXQgMDY6MTU6MDFQTSArMDIwMCwgU2FtIFJhdm5ib3JnIHdy b3RlOgo+IERSTV9XQUlUX09OKCkgaXMgZnJvbSB0aGUgZGVwcmVjYXRlZCBkcm1fb3NfbGludXgg aGVhZGVyIGFuZAo+IHRoZSBtb2Rlcm4gcmVwbGFjZW1lbnQgaXMgdGhlIHdhaXRfZXZlbnRfKi4K PiAKPiBUaGUgcmV0dXJuIHZhbHVlcyBkaWZmZXIsIHNvIGEgY29udmVyc2lvbiBpcyBuZWVkZWQg dG8KPiBrZWVwIHRoZSBvcmlnaW5hbCBpbnRlcmZhY2UgdG93YXJkcyB1c2Vyc3BhY2UuCj4gSW50 cm9kdWNlZCBhIHN3aXRjaC9jYXNlIHRvIG1ha2UgY29kZSBvYnZpb3VzIGFuZCB0byBhbGxvdwo+ IGRpZmZlcmVudCBkZWJ1ZyBwcmludHMgZGVwZW5kaW5nIG9uIHRoZSByZXN1bHQuCj4gCj4gU2ln bmVkLW9mZi1ieTogU2FtIFJhdm5ib3JnIDxzYW1AcmF2bmJvcmcub3JnPgoKUmV2aWV3ZWQtYnk6 IFNlYW4gUGF1bCA8c2VhbkBwb29ybHkucnVuPgoKPiBDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiBDYzogTWF4aW1lIFJpcGFyZCA8bWF4 aW1lLnJpcGFyZEBib290bGluLmNvbT4KPiBDYzogU2VhbiBQYXVsIDxzZWFuQHBvb3JseS5ydW4+ Cj4gQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KPiBDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsQGZmd2xsLmNoPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5j IHwgMjkgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDIw IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fdmJsYW5rLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jCj4gaW5k ZXggNjAzYWIxMDUxMjVkLi44ZTlhYzE4NzUwMGUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2RybV92YmxhbmsuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdmJsYW5rLmMKPiBA QCAtMzEsNyArMzEsNiBAQAo+ICAjaW5jbHVkZSA8ZHJtL2RybV9kcnYuaD4KPiAgI2luY2x1ZGUg PGRybS9kcm1fZnJhbWVidWZmZXIuaD4KPiAgI2luY2x1ZGUgPGRybS9kcm1fcHJpbnQuaD4KPiAt I2luY2x1ZGUgPGRybS9kcm1fb3NfbGludXguaD4KPiAgI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5r Lmg+Cj4gIAo+ICAjaW5jbHVkZSAiZHJtX2ludGVybmFsLmgiCj4gQEAgLTE2NzIsMTkgKzE2NzEs MzEgQEAgaW50IGRybV93YWl0X3ZibGFua19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAo+ICAJaWYgKHJlcV9zZXEgIT0gc2VxKSB7Cj4gIAkJRFJNX0RFQlVHKCJ3YWl0 aW5nIG9uIHZibGFuayBjb3VudCAlbGx1LCBjcnRjICV1XG4iLAo+ICAJCQkgIHJlcV9zZXEsIHBp cGUpOwo+IC0JCURSTV9XQUlUX09OKHJldCwgdmJsYW5rLT5xdWV1ZSwgMyAqIEhaLAo+IC0JCQkg ICAgdmJsYW5rX3Bhc3NlZChkcm1fdmJsYW5rX2NvdW50KGRldiwgcGlwZSksCj4gLQkJCQkJICBy ZXFfc2VxKSB8fAo+IC0JCQkgICAgIVJFQURfT05DRSh2YmxhbmstPmVuYWJsZWQpKTsKPiArCQly ZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dCh2YmxhbmstPnF1ZXVlLAo+ICsJ CQl2YmxhbmtfcGFzc2VkKGRybV92YmxhbmtfY291bnQoZGV2LCBwaXBlKSwgcmVxX3NlcSkgfHwK PiArCQkJCSAgICAgICFSRUFEX09OQ0UodmJsYW5rLT5lbmFibGVkKSwKPiArCQkJbXNlY3NfdG9f amlmZmllcygzMDAwKSk7Cj4gIAl9Cj4gIAo+IC0JaWYgKHJldCAhPSAtRUlOVFIpIHsKPiArCXN3 aXRjaCAocmV0KSB7Cj4gKwljYXNlIDA6Cj4gKwkJLyogdGltZW91dCAqLwo+ICsJCXJldCA9IC1F QlVTWTsKPiAgCQlkcm1fd2FpdF92YmxhbmtfcmVwbHkoZGV2LCBwaXBlLCAmdmJsd2FpdC0+cmVw bHkpOwo+IC0KPiAtCQlEUk1fREVCVUcoImNydGMgJWQgcmV0dXJuaW5nICV1IHRvIGNsaWVudFxu IiwKPiArCQlEUk1fREVCVUcoInRpbWVvdXQgd2FpdGluZyBmb3IgdmJsYW5rLiBjcnRjICVkIHJl dHVybmluZyAldSB0byBjbGllbnRcbiIsCj4gIAkJCSAgcGlwZSwgdmJsd2FpdC0+cmVwbHkuc2Vx dWVuY2UpOwo+IC0JfSBlbHNlIHsKPiArCQlicmVhazsKPiArCWNhc2UgLUVSRVNUQVJUU1lTOgo+ ICsJCS8qIGludGVycnVwdGVkIGJ5IHNpZ25hbCAqLwo+ICsJCXJldCA9IC1FSU5UUjsKPiAgCQlE Uk1fREVCVUcoImNydGMgJWQgdmJsYW5rIHdhaXQgaW50ZXJydXB0ZWQgYnkgc2lnbmFsXG4iLCBw aXBlKTsKPiArCQlicmVhazsKPiArCWRlZmF1bHQ6Cj4gKwkJcmV0ID0gMDsKPiArCQlkcm1fd2Fp dF92YmxhbmtfcmVwbHkoZGV2LCBwaXBlLCAmdmJsd2FpdC0+cmVwbHkpOwo+ICsJCURSTV9ERUJV RygiY3J0YyAlZCByZXR1cm5pbmcgJXUgdG8gY2xpZW50XG4iLAo+ICsJCQkgIHBpcGUsIHZibHdh aXQtPnJlcGx5LnNlcXVlbmNlKTsKPiArCQlicmVhazsKPiAgCX0KPiAgCj4gIGRvbmU6Cj4gLS0g Cj4gMi4yMC4xCj4gCgotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwgR29vZ2xlIC8g Q2hyb21pdW0gT1MKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=-8.3 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,USER_AGENT_SANE_1 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 6F1D7C7618F for ; Thu, 18 Jul 2019 17:51:05 +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 45DA721019 for ; Thu, 18 Jul 2019 17:51:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C1thr1EO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="cxxwTkoR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45DA721019 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BrWdkPl4Etqi+KnsZivgcYBavX1j93J8MGppNQXvmYo=; b=C1thr1EOqx4vXv Ons0Cxh1o9hztm9vKNCuP+J0WdvmZ+dv1cbyUkoKGRaPH1nTtYWDn4ja8SocCnAx1aVxW44jqrMVb 1PxMxabIrGQCd5T6SEuuSVIPccqAFQfYy5LRsdR31lhkCavmb6+s9hIB9+L1mxd9vjnNBPdHLmO/5 8MKunIB3fKlP5jSkaI1y4eOrckssJAEibxaGKdw6j6RloPGxzJ1y3FbeyaRyS580oqUUoLM/YhVUz WJEt52wCw3eWisGZKuJB+aQlUb/NA6b/EExw0QJ51aIDy4i+OrjP9pbWXiN7EnVcqnF4JQkqUV2Y4 4sA3/TXVQomt0AbrM2Mg==; 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 1hoAYa-0006l3-M1; Thu, 18 Jul 2019 17:51:04 +0000 Received: from mail-yw1-xc43.google.com ([2607:f8b0:4864:20::c43]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hoAYW-0006jc-2j for linux-arm-kernel@lists.infradead.org; Thu, 18 Jul 2019 17:51:01 +0000 Received: by mail-yw1-xc43.google.com with SMTP id f187so12537168ywa.5 for ; Thu, 18 Jul 2019 10:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=QQ8jJ1h1Snanwd8TvBGLmAI2GMlwl3iAL1taWT0sP4E=; b=cxxwTkoRHbPr8y5tYuJ0j466+9eTcLCTqihDg6tBsZXX30kIUIYlGBYRUt6fYC6CSy G1wrGJ4FBaY2zisW+Y4CcpxSBdU51SzivYwochDSgG8hLQ/1LkM/d2iDACoCC7qUoWl+ rLho3UcVfPOua4SFgZpckC6OV6fnC4HGEuzrlALSPDBEsnmrOcbIk4ZvAaKuBsfWJMD2 WEqPf6ba5vfKuvtsgOuXbfTY4PiZ65k8g7prl4m6blb2JXkvpbHkOBea9hRmxAIBp6Ou GuhOIsT1QalyA+yL1DA4pPh+HME/s7tMxTkxmKulg7V5SLHb3pjzDU/YYsNCnF1/Ktit mZpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=QQ8jJ1h1Snanwd8TvBGLmAI2GMlwl3iAL1taWT0sP4E=; b=V85sC9sEsf+KDxq5nJ4ofdQdmRbX/bw0e+VdtL9Jq57akdqGU5VdIxY9SPmztlrSAP yr2s6FwXXiavmQjMBZZ+n54SvBnVEG+eRVnGpK3/wxKP7CvMlV8p0Gb8PNUSqECefbab yesPCHE/irsPgt41/qRgYkzufNWQq+OxnvmkH8HWo4irhHXylo+ZORb2A9Iwme6bjaLL Bd9QEQxop8HIbn1SUIk2IcyjbgN3ACXEHot5ruFtNYqTK+64mvKYrJl5j8WLSiLh+0BX RmQSqvifxBZMIPDbdSPxwBO5Bfp3vjlg/PnPnEJwawO67xtznr/+A2WKR5mZjXgqOt5r 02iA== X-Gm-Message-State: APjAAAXs9+VKi45vMd5msGSvEPKUG/W/eB5yEtRSiVO9++QQws3ql4AS WCFE4PayQHKjEhW/cMxV0LkEAQ== X-Google-Smtp-Source: APXvYqzlBIY7jasoBtGNQmGxbVmXlBgz58CHxJFEnCz2UlyQgKK93zt9xQq1k7ZFSQo3M+6EG2QpGA== X-Received: by 2002:a81:b60c:: with SMTP id u12mr27070377ywh.79.1563472259335; Thu, 18 Jul 2019 10:50:59 -0700 (PDT) Received: from localhost ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id z6sm6964745ywg.40.2019.07.18.10.50.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 10:50:58 -0700 (PDT) Date: Thu, 18 Jul 2019 13:50:58 -0400 From: Sean Paul To: Sam Ravnborg Subject: Re: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON() Message-ID: <20190718175058.GH31819@art_vandelay> References: <20190718161507.2047-1-sam@ravnborg.org> <20190718161507.2047-6-sam@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190718161507.2047-6-sam@ravnborg.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_105100_135211_613F1E04 X-CRM114-Status: GOOD ( 18.73 ) 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 , dri-devel@lists.freedesktop.org, Chris Wilson , Eric Anholt , Rob Herring , Stefan Agner , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Intel Graphics Development , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Lionel Landwerlin , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Philipp Zabel , Christian =?iso-8859-1?Q?K=F6nig?= 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 On Thu, Jul 18, 2019 at 06:15:01PM +0200, Sam Ravnborg wrote: > 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 Reviewed-by: Sean Paul > 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 > -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel