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: Thu, 28 Feb 2019 16:03:41 +0200 Message-ID: <20190228140341.GG20097@intel.com> References: <20190225142606.gov32asdq3qe375q@smtp.gmail.com> <20190228101107.GL2665@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A04AC6E1B4 for ; Thu, 28 Feb 2019 14:03:45 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190228101107.GL2665@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Shayenne Moura , Rodrigo Siqueira , Haneen Mohammed , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBGZWIgMjgsIDIwMTkgYXQgMTE6MTE6MDdBTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBNb24sIEZlYiAyNSwgMjAxOSBhdCAxMToyNjowNkFNIC0wMzAwLCBTaGF5ZW5u ZSBNb3VyYSB3cm90ZToKPiA+IHZrbXNfY3JjX3dvcmtfaGFuZGxlIG5lZWRzIHRoZSB2YWx1ZSBv ZiB0aGUgYWN0dWFsIGZyYW1lIHRvCj4gPiBzY2hlZHVsZSB0aGUgd29ya3F1ZXVlIHRoYXQgY2Fs bHMgcGVyaW9kaWNhbGx5IHRoZSB2YmxhbmsKPiA+IGhhbmRsZXIgYW5kIHRoZSBkZXN0cm95IHN0 YXRlIGZ1bmN0aW9ucy4gSG93ZXZlciwgdGhlIGZyYW1lCj4gPiB2YWx1ZSByZXR1cm5lZCBmcm9t IHZrbXNfdmJsYW5rX3NpbXVsYXRlIGlzIHVwZGF0ZWQgYW5kCj4gPiBkaW1pbmlzaGVkIGluIHZi bGFua19nZXRfdGltZXN0YW1wIGJlY2F1c2UgaXQgaXMgbm90IGluIGEKPiA+IHZibGFuayBpbnRl cnJ1cHQsIGFuZCByZXR1cm4gYW4gaW5hY2N1cmF0ZSB2YWx1ZS4KPiA+IAo+ID4gU29sdmUgdGhp cyBnZXR0aW5nIHRoZSBhY3R1YWwgdmJsYW5rIGZyYW1lIGRpcmVjdGx5IGZyb20gdGhlCj4gPiB2 YmxhbmstPmNvdW50IGluc2lkZSB0aGUgYHN0cnVjdCBkcm1fY3J0Y2AsIGluc3RlYWQgb2YgdXNp bmcKPiA+IHRoZSBgZHJtX2FjY3VyYXRlX3ZibGFua19jb3VudGAgZnVuY3Rpb24uCj4gPiAKPiA+ IFNpZ25lZC1vZmYtYnk6IFNoYXllbm5lIE1vdXJhIDxzaGF5ZW5uZWx1em1vdXJhQGdtYWlsLmNv bT4KPiAKPiBTb3JyeSBmb3IgdGhlIGRlbGF5LCBJJ20gYSBiaXQgc3dhbXBlZCByaWdodCBub3cg Oi0vCj4gCj4gRGVidWcgd29yayB5b3UncmUgZG9pbmcgaGVyZSBpcyByZWFsbHkgaW1wcmVzc2l2 ZSEgQnV0IEkgaGF2ZSBubyBpZGVhCj4gd2hhdCdzIGdvaW5nIG9uLiBJdCBkb2Vzbid0IGxvb2sg bGlrZSBpdCdzIGp1c3QgcGFwZXJpbmcgb3ZlciBhIGJ1ZyAobGlrZQo+IHRoZSBpbl92Ymxhbmtf aXJxIGNoZWNrIHdlJ3ZlIGRpc2N1c3NlZCBvbiBpcmMpLCBidXQgSSBhbHNvIGhhdmUgbm8gaWRl YQo+IHdoeSBpdCB3b3Jrcy4KPiAKPiBJJ2xsIHB1bGwgaW4gVmlsbGUsIGhlIHVuZGVyc3RhbmRz IHRoaXMgYmV0dGVyIHRoYW4gbWUuCgpJdCdzIG5vdCBlbnRpcmVseSBjbGVhciB3aGF0IHdlJ3Jl IHRyeWluZyB0byBmaXguIEZyb20gd2hhdCBJIGNhbiBzZWUKdGhlIGNyYyB3b3JrIHNlZW1zIHRv IGJlIGluIG5vIHdheSBzeW5jaHJvbml6ZWQgd2l0aCBwYWdlIGZsaXBzLCBzbwpJJ20gbm90IHN1 cmUgaG93IGFsbCB0aGlzIGlzIHJlYWxseSBzdXBwb3NlZCB0byB3b3JrLgoKPiAtRGFuaWVsCj4g Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jICB8IDQgKysrLQo+ ID4gIGRyaXZlcnMvZ3B1L2RybS92a21zL3ZrbXNfY3J0Yy5jIHwgNCArKystCj4gPiAgMiBmaWxl cyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gPiAKPiA+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jIGIvZHJpdmVycy9ncHUvZHJt L3ZrbXMvdmttc19jcmMuYwo+ID4gaW5kZXggZDdiNDA5YTNjMGY4Li4wOWE4YjAwZWYxZjEgMTAw NjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jCj4gPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vdmttcy92a21zX2NyYy5jCj4gPiBAQCAtMTYxLDYgKzE2MSw4IEBAIHZv aWQgdmttc19jcmNfd29ya19oYW5kbGUoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ID4gIAlz dHJ1Y3Qgdmttc19vdXRwdXQgKm91dCA9IGRybV9jcnRjX3RvX3ZrbXNfb3V0cHV0KGNydGMpOwo+ ID4gIAlzdHJ1Y3Qgdmttc19kZXZpY2UgKnZkZXYgPSBjb250YWluZXJfb2Yob3V0LCBzdHJ1Y3Qg dmttc19kZXZpY2UsCj4gPiAgCQkJCQkJb3V0cHV0KTsKPiA+ICsJdW5zaWduZWQgaW50IHBpcGUg PSBkcm1fY3J0Y19pbmRleChjcnRjKTsKPiA+ICsJc3RydWN0IGRybV92YmxhbmtfY3J0YyAqdmJs YW5rID0gJmNydGMtPmRldi0+dmJsYW5rW3BpcGVdOwo+ID4gIAlzdHJ1Y3Qgdmttc19jcmNfZGF0 YSAqcHJpbWFyeV9jcmMgPSBOVUxMOwo+ID4gIAlzdHJ1Y3Qgdmttc19jcmNfZGF0YSAqY3Vyc29y X2NyYyA9IE5VTEw7Cj4gPiAgCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwo+ID4gQEAgLTE5Niw3 ICsxOTgsNyBAQCB2b2lkIHZrbXNfY3JjX3dvcmtfaGFuZGxlKHN0cnVjdCB3b3JrX3N0cnVjdCAq d29yaykKPiA+ICAJaWYgKHByaW1hcnlfY3JjKQo+ID4gIAkJY3JjMzIgPSBfdmttc19nZXRfY3Jj KHByaW1hcnlfY3JjLCBjdXJzb3JfY3JjKTsKPiA+ICAKPiA+IC0JZnJhbWVfZW5kID0gZHJtX2Ny dGNfYWNjdXJhdGVfdmJsYW5rX2NvdW50KGNydGMpOwo+ID4gKwlmcmFtZV9lbmQgPSB2Ymxhbmst PmNvdW50Owo+ID4gIAo+ID4gIAkvKiBxdWV1ZV93b3JrIGNhbiBmYWlsIHRvIHNjaGVkdWxlIGNy Y193b3JrOyBhZGQgY3JjIGZvcgo+ID4gIAkgKiBtaXNzaW5nIGZyYW1lcwo+ID4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS92a21zL3ZrbXNfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJtL3Zr bXMvdmttc19jcnRjLmMKPiA+IGluZGV4IDhhOWFlYjBhOWVhOC4uOWJmMzI2OGUyZTkyIDEwMDY0 NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZrbXMvdmttc19jcnRjLmMKPiA+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS92a21zL3ZrbXNfY3J0Yy5jCj4gPiBAQCAtMTAsNiArMTAsOCBAQCBzdGF0 aWMgZW51bSBocnRpbWVyX3Jlc3RhcnQgdmttc192Ymxhbmtfc2ltdWxhdGUoc3RydWN0IGhydGlt ZXIgKnRpbWVyKQo+ID4gIAkJCQkJCSAgdmJsYW5rX2hydGltZXIpOwo+ID4gIAlzdHJ1Y3QgZHJt X2NydGMgKmNydGMgPSAmb3V0cHV0LT5jcnRjOwo+ID4gIAlzdHJ1Y3Qgdmttc19jcnRjX3N0YXRl ICpzdGF0ZSA9IHRvX3ZrbXNfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gPiArCXVuc2lnbmVk IGludCBwaXBlID0gZHJtX2NydGNfaW5kZXgoY3J0Yyk7Cj4gPiArCXN0cnVjdCBkcm1fdmJsYW5r X2NydGMgKnZibGFuayA9ICZjcnRjLT5kZXYtPnZibGFua1twaXBlXTsKPiA+ICAJdTY0IHJldF9v dmVycnVuOwo+ID4gIAlib29sIHJldDsKPiA+ICAKPiA+IEBAIC0yMCw3ICsyMiw3IEBAIHN0YXRp YyBlbnVtIGhydGltZXJfcmVzdGFydCB2a21zX3ZibGFua19zaW11bGF0ZShzdHJ1Y3QgaHJ0aW1l ciAqdGltZXIpCj4gPiAgCQlEUk1fRVJST1IoInZrbXMgZmFpbHVyZSBvbiBoYW5kbGluZyB2Ymxh bmsiKTsKPiA+ICAKPiA+ICAJaWYgKHN0YXRlICYmIG91dHB1dC0+Y3JjX2VuYWJsZWQpIHsKPiA+ IC0JCXU2NCBmcmFtZSA9IGRybV9jcnRjX2FjY3VyYXRlX3ZibGFua19jb3VudChjcnRjKTsKPiA+ ICsJCXU2NCBmcmFtZSA9IHZibGFuay0+Y291bnQ7Cj4gPiAgCj4gPiAgCQkvKiB1cGRhdGUgZnJh bWVfc3RhcnQgb25seSBpZiBhIHF1ZXVlZCB2a21zX2NyY193b3JrX2hhbmRsZSgpCj4gPiAgCQkg KiBoYXMgcmVhZCB0aGUgZGF0YQo+ID4gLS0gCj4gPiAyLjE3LjEKPiA+IAo+IAo+IC0tIAo+IERh bmllbCBWZXR0ZXIKPiBTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KPiBodHRw Oi8vYmxvZy5mZndsbC5jaAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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 D30B9C43381 for ; Thu, 28 Feb 2019 14:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1E7320C01 for ; Thu, 28 Feb 2019 14:03:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732128AbfB1ODq (ORCPT ); Thu, 28 Feb 2019 09:03:46 -0500 Received: from mga12.intel.com ([192.55.52.136]:59011 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727960AbfB1ODp (ORCPT ); Thu, 28 Feb 2019 09:03:45 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Feb 2019 06:03:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,423,1544515200"; d="scan'208";a="137001786" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 28 Feb 2019 06:03:42 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 28 Feb 2019 16:03:41 +0200 Date: Thu, 28 Feb 2019 16:03:41 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Shayenne Moura , Rodrigo Siqueira , Haneen Mohammed , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/vkms: Solve bug on kms_crc_cursor tests Message-ID: <20190228140341.GG20097@intel.com> References: <20190225142606.gov32asdq3qe375q@smtp.gmail.com> <20190228101107.GL2665@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190228101107.GL2665@phenom.ffwll.local> 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 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. > -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