From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/vkms: Solve bug on kms_crc_cursor tests Date: Fri, 1 Mar 2019 17:25:58 +0200 Message-ID: <20190301152558.GR20097@intel.com> References: <20190225142606.gov32asdq3qe375q@smtp.gmail.com> <20190228101107.GL2665@phenom.ffwll.local> <20190228140341.GG20097@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3D476E30D for ; Fri, 1 Mar 2019 15:26:02 +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: Shayenne Moura Cc: David Airlie , Haneen Mohammed , dri-devel , Rodrigo Siqueira , Linux Kernel Mailing List List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBNYXIgMDEsIDIwMTkgYXQgMTE6NTU6MTFBTSAtMDMwMCwgU2hheWVubmUgTW91cmEg d3JvdGU6Cj4gRW0gcXVpLCAyOCBkZSBmZXYgZGUgMjAxOSDDoHMgMTE6MDMsIFZpbGxlIFN5cmrD pGzDpAo+IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4gZXNjcmV2ZXU6Cj4gPgo+ID4g T24gVGh1LCBGZWIgMjgsIDIwMTkgYXQgMTE6MTE6MDdBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiA+ID4gT24gTW9uLCBGZWIgMjUsIDIwMTkgYXQgMTE6MjY6MDZBTSAtMDMwMCwgU2hh eWVubmUgTW91cmEgd3JvdGU6Cj4gPiA+ID4gdmttc19jcmNfd29ya19oYW5kbGUgbmVlZHMgdGhl IHZhbHVlIG9mIHRoZSBhY3R1YWwgZnJhbWUgdG8KPiA+ID4gPiBzY2hlZHVsZSB0aGUgd29ya3F1 ZXVlIHRoYXQgY2FsbHMgcGVyaW9kaWNhbGx5IHRoZSB2YmxhbmsKPiA+ID4gPiBoYW5kbGVyIGFu ZCB0aGUgZGVzdHJveSBzdGF0ZSBmdW5jdGlvbnMuIEhvd2V2ZXIsIHRoZSBmcmFtZQo+ID4gPiA+ IHZhbHVlIHJldHVybmVkIGZyb20gdmttc192Ymxhbmtfc2ltdWxhdGUgaXMgdXBkYXRlZCBhbmQK PiA+ID4gPiBkaW1pbmlzaGVkIGluIHZibGFua19nZXRfdGltZXN0YW1wIGJlY2F1c2UgaXQgaXMg bm90IGluIGEKPiA+ID4gPiB2YmxhbmsgaW50ZXJydXB0LCBhbmQgcmV0dXJuIGFuIGluYWNjdXJh dGUgdmFsdWUuCj4gPiA+ID4KPiA+ID4gPiBTb2x2ZSB0aGlzIGdldHRpbmcgdGhlIGFjdHVhbCB2 YmxhbmsgZnJhbWUgZGlyZWN0bHkgZnJvbSB0aGUKPiA+ID4gPiB2YmxhbmstPmNvdW50IGluc2lk ZSB0aGUgYHN0cnVjdCBkcm1fY3J0Y2AsIGluc3RlYWQgb2YgdXNpbmcKPiA+ID4gPiB0aGUgYGRy bV9hY2N1cmF0ZV92YmxhbmtfY291bnRgIGZ1bmN0aW9uLgo+ID4gPiA+Cj4gPiA+ID4gU2lnbmVk LW9mZi1ieTogU2hheWVubmUgTW91cmEgPHNoYXllbm5lbHV6bW91cmFAZ21haWwuY29tPgo+ID4g Pgo+ID4gPiBTb3JyeSBmb3IgdGhlIGRlbGF5LCBJJ20gYSBiaXQgc3dhbXBlZCByaWdodCBub3cg Oi0vCj4gPiA+Cj4gPiA+IERlYnVnIHdvcmsgeW91J3JlIGRvaW5nIGhlcmUgaXMgcmVhbGx5IGlt cHJlc3NpdmUhIEJ1dCBJIGhhdmUgbm8gaWRlYQo+ID4gPiB3aGF0J3MgZ29pbmcgb24uIEl0IGRv ZXNuJ3QgbG9vayBsaWtlIGl0J3MganVzdCBwYXBlcmluZyBvdmVyIGEgYnVnIChsaWtlCj4gPiA+ IHRoZSBpbl92YmxhbmtfaXJxIGNoZWNrIHdlJ3ZlIGRpc2N1c3NlZCBvbiBpcmMpLCBidXQgSSBh bHNvIGhhdmUgbm8gaWRlYQo+ID4gPiB3aHkgaXQgd29ya3MuCj4gPiA+Cj4gPiA+IEknbGwgcHVs bCBpbiBWaWxsZSwgaGUgdW5kZXJzdGFuZHMgdGhpcyBiZXR0ZXIgdGhhbiBtZS4KPiA+Cj4gPiBJ dCdzIG5vdCBlbnRpcmVseSBjbGVhciB3aGF0IHdlJ3JlIHRyeWluZyB0byBmaXguIEZyb20gd2hh dCBJIGNhbiBzZWUKPiA+IHRoZSBjcmMgd29yayBzZWVtcyB0byBiZSBpbiBubyB3YXkgc3luY2hy b25pemVkIHdpdGggcGFnZSBmbGlwcywgc28KPiA+IEknbSBub3Qgc3VyZSBob3cgYWxsIHRoaXMg aXMgcmVhbGx5IHN1cHBvc2VkIHRvIHdvcmsuCj4gPgo+IAo+IEhpLCBWaWxsZSEKPiAKPiBUaGFu ayB5b3UgZm9yIHRoZSByZXZpZXchIDopCj4gCj4gSSBkbyBub3QgdW5kZXJzdGFuZCB3ZWxsIHdo YXQgY3JjIGNvZGUgaXMgZG9pbmcsIGJ1dCB0aGUgaXNzdWUgdGhhdCBJIGZvdW5kCj4gaXMgcmVs YXRlZCB0byB0aGUgdmJsYW5rIHRpbWVzdGFtcCBhbmQgZnJhbWUgY291bnQuCj4gCj4gV2hlbiB2 a21zIGhhbmRsZXMgdGhlIGNyY19jdXJzb3IgaXQgdXNlcyB0aGUgc3RhcnQgZnJhbWUgYW5kIGVu ZCBmcmFtZQo+IHZhbHVlcyB0byB2ZXJpZnkgaWYgaXQgbmVlZHMgdG8gY2FsbCB0aGUgZnVuY3Rp b24gJ2RybV9jcnRjX2FkZF9jcmNfZW50cnkoKScKPiBmb3IgZWFjaCBmcmFtZS4KPiAKPiBIb3dl dmVyLCB3aGVuIGdldHRpbmcgdGhlIGZyYW1lIGNvdW50LCB0aGUgY29kZSBpcyBjYWxsaW5nIHRo ZSBmdW5jdGlvbgo+IGRybV91cGRhdGVfdmJsYW5rX2NvdW50KGRldiwgcGlwZSwgZmFsc2UpIGFu ZCwgYmVjYXVzZSBvZiB0aGUgJ2ZhbHNlJywKPiBzdWJ0cmFjdGluZyB0aGUgYWN0dWFsIHZibGFu ayB0aW1lc3RhbXAgKGNvbnNlcXVlbnRseSwgdGhlIGZyYW1lIGNvdW50Cj4gdmFsdWUpLCBjYXVz aW5nIGNvbmZsaWN0cy4KClRoZSBpbl92YmxhbmtfaXJxIGJlaGF2b3VyIGxvb2tzIHNhbmUgdG8g bWUuIFdoYXQgYXJlIHRoZXNlIGNvbmZsaWN0cz8KCj4gCj4gRG9lcyBpdCBtYWtlIHNlbnNlPyBJ IGFtIG5vdCBzdXJlIGFib3V0IHRoaXMgY3JjIGNvZGUgYmVoYXZpb3IuCj4gCj4gU2hheWVubmUK PiAKPiA+ID4gLURhbmllbAo+ID4gPgo+ID4gPiA+IC0tLQo+ID4gPiA+ICBkcml2ZXJzL2dwdS9k cm0vdmttcy92a21zX2NyYy5jICB8IDQgKysrLQo+ID4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vdmtt cy92a21zX2NydGMuYyB8IDQgKysrLQo+ID4gPiA+ICAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0 aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKPiA+ID4gPgo+ID4gPiA+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jIGIvZHJpdmVycy9ncHUvZHJtL3ZrbXMvdmttc19j cmMuYwo+ID4gPiA+IGluZGV4IGQ3YjQwOWEzYzBmOC4uMDlhOGIwMGVmMWYxIDEwMDY0NAo+ID4g PiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS92a21zL3ZrbXNfY3JjLmMKPiA+ID4gPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jCj4gPiA+ID4gQEAgLTE2MSw2ICsxNjEsOCBA QCB2b2lkIHZrbXNfY3JjX3dvcmtfaGFuZGxlKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiA+ ID4gPiAgICAgc3RydWN0IHZrbXNfb3V0cHV0ICpvdXQgPSBkcm1fY3J0Y190b192a21zX291dHB1 dChjcnRjKTsKPiA+ID4gPiAgICAgc3RydWN0IHZrbXNfZGV2aWNlICp2ZGV2ID0gY29udGFpbmVy X29mKG91dCwgc3RydWN0IHZrbXNfZGV2aWNlLAo+ID4gPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0KTsKPiA+ID4gPiArICAgdW5zaWduZWQgaW50 IHBpcGUgPSBkcm1fY3J0Y19pbmRleChjcnRjKTsKPiA+ID4gPiArICAgc3RydWN0IGRybV92Ymxh bmtfY3J0YyAqdmJsYW5rID0gJmNydGMtPmRldi0+dmJsYW5rW3BpcGVdOwo+ID4gPiA+ICAgICBz dHJ1Y3Qgdmttc19jcmNfZGF0YSAqcHJpbWFyeV9jcmMgPSBOVUxMOwo+ID4gPiA+ICAgICBzdHJ1 Y3Qgdmttc19jcmNfZGF0YSAqY3Vyc29yX2NyYyA9IE5VTEw7Cj4gPiA+ID4gICAgIHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lOwo+ID4gPiA+IEBAIC0xOTYsNyArMTk4LDcgQEAgdm9pZCB2a21zX2Ny Y193b3JrX2hhbmRsZShzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gPiA+ID4gICAgIGlmIChw cmltYXJ5X2NyYykKPiA+ID4gPiAgICAgICAgICAgICBjcmMzMiA9IF92a21zX2dldF9jcmMocHJp bWFyeV9jcmMsIGN1cnNvcl9jcmMpOwo+ID4gPiA+Cj4gPiA+ID4gLSAgIGZyYW1lX2VuZCA9IGRy bV9jcnRjX2FjY3VyYXRlX3ZibGFua19jb3VudChjcnRjKTsKPiA+ID4gPiArICAgZnJhbWVfZW5k ID0gdmJsYW5rLT5jb3VudDsKPiA+ID4gPgo+ID4gPiA+ICAgICAvKiBxdWV1ZV93b3JrIGNhbiBm YWlsIHRvIHNjaGVkdWxlIGNyY193b3JrOyBhZGQgY3JjIGZvcgo+ID4gPiA+ICAgICAgKiBtaXNz aW5nIGZyYW1lcwo+ID4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmttcy92a21z X2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS92a21zL3ZrbXNfY3J0Yy5jCj4gPiA+ID4gaW5kZXgg OGE5YWViMGE5ZWE4Li45YmYzMjY4ZTJlOTIgMTAwNjQ0Cj4gPiA+ID4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL3ZrbXMvdmttc19jcnRjLmMKPiA+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vdmtt cy92a21zX2NydGMuYwo+ID4gPiA+IEBAIC0xMCw2ICsxMCw4IEBAIHN0YXRpYyBlbnVtIGhydGlt ZXJfcmVzdGFydCB2a21zX3ZibGFua19zaW11bGF0ZShzdHJ1Y3QgaHJ0aW1lciAqdGltZXIpCj4g PiA+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZibGFu a19ocnRpbWVyKTsKPiA+ID4gPiAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjID0gJm91dHB1dC0+ Y3J0YzsKPiA+ID4gPiAgICAgc3RydWN0IHZrbXNfY3J0Y19zdGF0ZSAqc3RhdGUgPSB0b192a21z X2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwo+ID4gPiA+ICsgICB1bnNpZ25lZCBpbnQgcGlwZSA9 IGRybV9jcnRjX2luZGV4KGNydGMpOwo+ID4gPiA+ICsgICBzdHJ1Y3QgZHJtX3ZibGFua19jcnRj ICp2YmxhbmsgPSAmY3J0Yy0+ZGV2LT52YmxhbmtbcGlwZV07Cj4gPiA+ID4gICAgIHU2NCByZXRf b3ZlcnJ1bjsKPiA+ID4gPiAgICAgYm9vbCByZXQ7Cj4gPiA+ID4KPiA+ID4gPiBAQCAtMjAsNyAr MjIsNyBAQCBzdGF0aWMgZW51bSBocnRpbWVyX3Jlc3RhcnQgdmttc192Ymxhbmtfc2ltdWxhdGUo c3RydWN0IGhydGltZXIgKnRpbWVyKQo+ID4gPiA+ICAgICAgICAgICAgIERSTV9FUlJPUigidmtt cyBmYWlsdXJlIG9uIGhhbmRsaW5nIHZibGFuayIpOwo+ID4gPiA+Cj4gPiA+ID4gICAgIGlmIChz dGF0ZSAmJiBvdXRwdXQtPmNyY19lbmFibGVkKSB7Cj4gPiA+ID4gLSAgICAgICAgICAgdTY0IGZy YW1lID0gZHJtX2NydGNfYWNjdXJhdGVfdmJsYW5rX2NvdW50KGNydGMpOwo+ID4gPiA+ICsgICAg ICAgICAgIHU2NCBmcmFtZSA9IHZibGFuay0+Y291bnQ7Cj4gPiA+ID4KPiA+ID4gPiAgICAgICAg ICAgICAvKiB1cGRhdGUgZnJhbWVfc3RhcnQgb25seSBpZiBhIHF1ZXVlZCB2a21zX2NyY193b3Jr X2hhbmRsZSgpCj4gPiA+ID4gICAgICAgICAgICAgICogaGFzIHJlYWQgdGhlIGRhdGEKPiA+ID4g PiAtLQo+ID4gPiA+IDIuMTcuMQo+ID4gPiA+Cj4gPiA+Cj4gPiA+IC0tCj4gPiA+IERhbmllbCBW ZXR0ZXIKPiA+ID4gU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCj4gPiA+IGh0 dHA6Ly9ibG9nLmZmd2xsLmNoCj4gPiA+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCj4gPiA+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiA+ID4gZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ID4gPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo+ID4KPiA+IC0tCj4gPiBWaWxsZSBTeXJq w6Rsw6QKPiA+IEludGVsCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 92368C43381 for ; Fri, 1 Mar 2019 15:26:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 557D820851 for ; Fri, 1 Mar 2019 15:26:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388689AbfCAP0D (ORCPT ); Fri, 1 Mar 2019 10:26:03 -0500 Received: from mga14.intel.com ([192.55.52.115]:22353 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726067AbfCAP0D (ORCPT ); Fri, 1 Mar 2019 10:26:03 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2019 07:26:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,428,1544515200"; d="scan'208";a="120142363" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga006.jf.intel.com with SMTP; 01 Mar 2019 07:25:59 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 01 Mar 2019 17:25:58 +0200 Date: Fri, 1 Mar 2019 17:25:58 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Shayenne Moura Cc: Rodrigo Siqueira , Haneen Mohammed , David Airlie , dri-devel , Linux Kernel Mailing List Subject: Re: [PATCH] drm/vkms: Solve bug on kms_crc_cursor tests Message-ID: <20190301152558.GR20097@intel.com> References: <20190225142606.gov32asdq3qe375q@smtp.gmail.com> <20190228101107.GL2665@phenom.ffwll.local> <20190228140341.GG20097@intel.com> 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, Mar 01, 2019 at 11:55:11AM -0300, Shayenne Moura wrote: > Em qui, 28 de fev de 2019 às 11:03, Ville Syrjälä > escreveu: > > > > On Thu, Feb 28, 2019 at 11:11:07AM +0100, Daniel Vetter wrote: > > > On Mon, Feb 25, 2019 at 11:26:06AM -0300, Shayenne Moura wrote: > > > > vkms_crc_work_handle needs the value of the actual frame to > > > > schedule the workqueue that calls periodically the vblank > > > > handler and the destroy state functions. However, the frame > > > > value returned from vkms_vblank_simulate is updated and > > > > diminished in vblank_get_timestamp because it is not in a > > > > vblank interrupt, and return an inaccurate value. > > > > > > > > Solve this getting the actual vblank frame directly from the > > > > vblank->count inside the `struct drm_crtc`, instead of using > > > > the `drm_accurate_vblank_count` function. > > > > > > > > Signed-off-by: Shayenne Moura > > > > > > Sorry for the delay, I'm a bit swamped right now :-/ > > > > > > Debug work you're doing here is really impressive! But I have no idea > > > what's going on. It doesn't look like it's just papering over a bug (like > > > the in_vblank_irq check we've discussed on irc), but I also have no idea > > > why it works. > > > > > > I'll pull in Ville, he understands this better than me. > > > > It's not entirely clear what we're trying to fix. From what I can see > > the crc work seems to be in no way synchronized with page flips, so > > I'm not sure how all this is really supposed to work. > > > > Hi, Ville! > > Thank you for the review! :) > > I do not understand well what crc code is doing, but the issue that I found > is related to the vblank timestamp and frame count. > > When vkms handles the crc_cursor it uses the start frame and end frame > values to verify if it needs to call the function 'drm_crtc_add_crc_entry()' > for each frame. > > However, when getting the frame count, the code is calling the function > drm_update_vblank_count(dev, pipe, false) and, because of the 'false', > subtracting the actual vblank timestamp (consequently, the frame count > value), causing conflicts. The in_vblank_irq behavour looks sane to me. What are these conflicts? > > Does it make sense? I am not sure about this crc code behavior. > > Shayenne > > > > -Daniel > > > > > > > --- > > > > drivers/gpu/drm/vkms/vkms_crc.c | 4 +++- > > > > drivers/gpu/drm/vkms/vkms_crtc.c | 4 +++- > > > > 2 files changed, 6 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c > > > > index d7b409a3c0f8..09a8b00ef1f1 100644 > > > > --- a/drivers/gpu/drm/vkms/vkms_crc.c > > > > +++ b/drivers/gpu/drm/vkms/vkms_crc.c > > > > @@ -161,6 +161,8 @@ void vkms_crc_work_handle(struct work_struct *work) > > > > struct vkms_output *out = drm_crtc_to_vkms_output(crtc); > > > > struct vkms_device *vdev = container_of(out, struct vkms_device, > > > > output); > > > > + unsigned int pipe = drm_crtc_index(crtc); > > > > + struct drm_vblank_crtc *vblank = &crtc->dev->vblank[pipe]; > > > > struct vkms_crc_data *primary_crc = NULL; > > > > struct vkms_crc_data *cursor_crc = NULL; > > > > struct drm_plane *plane; > > > > @@ -196,7 +198,7 @@ void vkms_crc_work_handle(struct work_struct *work) > > > > if (primary_crc) > > > > crc32 = _vkms_get_crc(primary_crc, cursor_crc); > > > > > > > > - frame_end = drm_crtc_accurate_vblank_count(crtc); > > > > + frame_end = vblank->count; > > > > > > > > /* queue_work can fail to schedule crc_work; add crc for > > > > * missing frames > > > > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c > > > > index 8a9aeb0a9ea8..9bf3268e2e92 100644 > > > > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > > > > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > > > > @@ -10,6 +10,8 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > > > > vblank_hrtimer); > > > > struct drm_crtc *crtc = &output->crtc; > > > > struct vkms_crtc_state *state = to_vkms_crtc_state(crtc->state); > > > > + unsigned int pipe = drm_crtc_index(crtc); > > > > + struct drm_vblank_crtc *vblank = &crtc->dev->vblank[pipe]; > > > > u64 ret_overrun; > > > > bool ret; > > > > > > > > @@ -20,7 +22,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > > > > DRM_ERROR("vkms failure on handling vblank"); > > > > > > > > if (state && output->crc_enabled) { > > > > - u64 frame = drm_crtc_accurate_vblank_count(crtc); > > > > + u64 frame = vblank->count; > > > > > > > > /* update frame_start only if a queued vkms_crc_work_handle() > > > > * has read the data > > > > -- > > > > 2.17.1 > > > > > > > > > > -- > > > Daniel Vetter > > > Software Engineer, Intel Corporation > > > http://blog.ffwll.ch > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > -- > > Ville Syrjälä > > Intel -- Ville Syrjälä Intel