From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v4 2/2] Revert "drm/vblank: Do not update vblank count if interrupts are already disabled." Date: Fri, 28 Jun 2019 15:13:15 +0300 Message-ID: <20190628121315.GH5942@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 757D86E8FD for ; Fri, 28 Jun 2019 12:13:19 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Robert Beckett Cc: Maxime Ripard , David Airlie , Sean Paul , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBKdW4gMjgsIDIwMTkgYXQgMDE6MDU6MzJQTSArMDEwMCwgUm9iZXJ0IEJlY2tldHQg d3JvdGU6Cj4gSWYgaW50ZXJydXB0cyBhcmUgYWxyZWFkeSBkaXNhYmxlZCwgdGhlbiB0aGUgdGlt ZXN0YW1wIGZvciB0aGUgdmJsYW5rCj4gZG9lcyBub3QgZ2V0IHVwZGF0ZWQsIGNhdXNpbmcgYSBz dGFsZSB0aW1lc3RhbXAgdG8gYmUgcmVwb3J0ZWQgdG8KPiB1c2VybGFuZCB3aGlsZSBkaXNhYmxp bmcgY3J0Y3MuCj4gCj4gVGhpcyByZXZlcnRzIGNvbW1pdCA2ODAzNmIwOGI5MWJjNDkxY2NjMzA4 ZjkwMjYxNmE1NzBhNDkyMjdjLgoKUGxlYXNlIGNjIHRoZSBwZW9wbGUgaW52b2x2ZWQgaW4gdGhh dC4gQW5kIEknZCBkcm9wIHRoZSBsa21sIGNjLgoKPiAKPiBTaWduZWQtb2ZmLWJ5OiBSb2JlcnQg QmVja2V0dCA8Ym9iLmJlY2tldHRAY29sbGFib3JhLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL2RybV92YmxhbmsuYyB8IDE4ICsrKysrKysrLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdl ZCwgOCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV92YmxhbmsuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdmJsYW5rLmMK PiBpbmRleCA3ZGFiYjJiZGI3MzMuLmFlYjk3MzRkNzc5OSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX3ZibGFuay5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV92Ymxhbmsu Ywo+IEBAIC0zNzEsMjUgKzM3MSwyMyBAQCB2b2lkIGRybV92YmxhbmtfZGlzYWJsZV9hbmRfc2F2 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKPiAgCXNwaW5fbG9j a19pcnFzYXZlKCZkZXYtPnZibGFua190aW1lX2xvY2ssIGlycWZsYWdzKTsKPiAgCj4gIAkvKgo+ IC0JICogVXBkYXRlIHZibGFuayBjb3VudCBhbmQgZGlzYWJsZSB2YmxhbmsgaW50ZXJydXB0cyBv bmx5IGlmIHRoZQo+IC0JICogaW50ZXJydXB0cyB3ZXJlIGVuYWJsZWQuIFRoaXMgYXZvaWRzIGNh bGxpbmcgdGhlIC0+ZGlzYWJsZV92YmxhbmsoKQo+IC0JICogb3BlcmF0aW9uIGluIGF0b21pYyBj b250ZXh0IHdpdGggdGhlIGhhcmR3YXJlIHBvdGVudGlhbGx5IHJ1bnRpbWUKPiAtCSAqIHN1c3Bl bmRlZC4KPiArCSAqIE9ubHkgZGlzYWJsZSB2YmxhbmsgaW50ZXJydXB0cyBpZiB0aGV5J3JlIGVu YWJsZWQuIFRoaXMgYXZvaWRzCj4gKwkgKiBjYWxsaW5nIHRoZSAtPmRpc2FibGVfdmJsYW5rKCkg b3BlcmF0aW9uIGluIGF0b21pYyBjb250ZXh0IHdpdGggdGhlCj4gKwkgKiBoYXJkd2FyZSBwb3Rl bnRpYWxseSBydW50aW1lIHN1c3BlbmRlZC4KPiAgCSAqLwo+IC0JaWYgKCF2YmxhbmstPmVuYWJs ZWQpCj4gLQkJZ290byBvdXQ7Cj4gKwlpZiAodmJsYW5rLT5lbmFibGVkKSB7Cj4gKwkJX19kaXNh YmxlX3ZibGFuayhkZXYsIHBpcGUpOwo+ICsJCXZibGFuay0+ZW5hYmxlZCA9IGZhbHNlOwo+ICsJ fQo+ICAKPiAgCS8qCj4gLQkgKiBVcGRhdGUgdGhlIGNvdW50IGFuZCB0aW1lc3RhbXAgdG8gbWFp bnRhaW4gdGhlCj4gKwkgKiBBbHdheXMgdXBkYXRlIHRoZSBjb3VudCBhbmQgdGltZXN0YW1wIHRv IG1haW50YWluIHRoZQo+ICAJICogYXBwZWFyYW5jZSB0aGF0IHRoZSBjb3VudGVyIGhhcyBiZWVu IHRpY2tpbmcgYWxsIGFsb25nIHVudGlsCj4gIAkgKiB0aGlzIHRpbWUuIFRoaXMgbWFrZXMgdGhl IGNvdW50IGFjY291bnQgZm9yIHRoZSBlbnRpcmUgdGltZQo+ICAJICogYmV0d2VlbiBkcm1fY3J0 Y192Ymxhbmtfb24oKSBhbmQgZHJtX2NydGNfdmJsYW5rX29mZigpLgo+ICAJICovCj4gIAlkcm1f dXBkYXRlX3ZibGFua19jb3VudChkZXYsIHBpcGUsIGZhbHNlKTsKPiAtCV9fZGlzYWJsZV92Ymxh bmsoZGV2LCBwaXBlKTsKPiAtCXZibGFuay0+ZW5hYmxlZCA9IGZhbHNlOwo+ICAKPiAtb3V0Ogo+ ICAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT52YmxhbmtfdGltZV9sb2NrLCBpcnFmbGFn cyk7Cj4gIH0KPiAgCj4gLS0gCj4gMi4xOC4wCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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.2 required=3.0 tests=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 05CF3C4321A for ; Fri, 28 Jun 2019 12:13:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D95A4208E3 for ; Fri, 28 Jun 2019 12:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727190AbfF1MNW (ORCPT ); Fri, 28 Jun 2019 08:13:22 -0400 Received: from mga04.intel.com ([192.55.52.120]:32923 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726836AbfF1MNT (ORCPT ); Fri, 28 Jun 2019 08:13:19 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jun 2019 05:13:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,427,1557212400"; d="scan'208";a="189422313" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga002.fm.intel.com with SMTP; 28 Jun 2019 05:13:15 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 28 Jun 2019 15:13:15 +0300 Date: Fri, 28 Jun 2019 15:13:15 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Robert Beckett Cc: dri-devel@lists.freedesktop.org, Maxime Ripard , linux-kernel@vger.kernel.org, David Airlie , Sean Paul Subject: Re: [PATCH v4 2/2] Revert "drm/vblank: Do not update vblank count if interrupts are already disabled." Message-ID: <20190628121315.GH5942@intel.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 28, 2019 at 01:05:32PM +0100, Robert Beckett wrote: > If interrupts are already disabled, then the timestamp for the vblank > does not get updated, causing a stale timestamp to be reported to > userland while disabling crtcs. > > This reverts commit 68036b08b91bc491ccc308f902616a570a49227c. Please cc the people involved in that. And I'd drop the lkml cc. > > Signed-off-by: Robert Beckett > --- > drivers/gpu/drm/drm_vblank.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c > index 7dabb2bdb733..aeb9734d7799 100644 > --- a/drivers/gpu/drm/drm_vblank.c > +++ b/drivers/gpu/drm/drm_vblank.c > @@ -371,25 +371,23 @@ void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe) > spin_lock_irqsave(&dev->vblank_time_lock, irqflags); > > /* > - * Update vblank count and disable vblank interrupts only if the > - * interrupts were enabled. This avoids calling the ->disable_vblank() > - * operation in atomic context with the hardware potentially runtime > - * suspended. > + * Only disable vblank interrupts if they're enabled. This avoids > + * calling the ->disable_vblank() operation in atomic context with the > + * hardware potentially runtime suspended. > */ > - if (!vblank->enabled) > - goto out; > + if (vblank->enabled) { > + __disable_vblank(dev, pipe); > + vblank->enabled = false; > + } > > /* > - * Update the count and timestamp to maintain the > + * Always update the count and timestamp to maintain the > * appearance that the counter has been ticking all along until > * this time. This makes the count account for the entire time > * between drm_crtc_vblank_on() and drm_crtc_vblank_off(). > */ > drm_update_vblank_count(dev, pipe, false); > - __disable_vblank(dev, pipe); > - vblank->enabled = false; > > -out: > spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); > } > > -- > 2.18.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel