From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [RESEND PATCH v14 2/2] drm/i915: Put "cooked" vlank counters in frame CRC lines Date: Tue, 10 Jan 2017 17:54:57 +0200 Message-ID: <20170110155457.GE31595@intel.com> References: <20170110134305.26326-1-tomeu.vizoso@collabora.com> <20170110134305.26326-3-tomeu.vizoso@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170110134305.26326-3-tomeu.vizoso@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tomeu Vizoso Cc: David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thierry Reding , dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKYW4gMTAsIDIwMTcgYXQgMDI6NDM6MDVQTSArMDEwMCwgVG9tZXUgVml6b3NvIHdy b3RlOgo+IFVzZSBkcm1fYWNjdXJhdGVfdmJsYW5rX2NvdW50IHNvIHdlIGhhdmUgdGhlIGZ1bGwg MzIgYml0IHRvIHJlcHJlc2VudAo+IHRoZSBmcmFtZSBjb3VudGVyIGFuZCB1c2Vyc3BhY2UgaGFz IGEgc2ltcGxlciB3YXkgb2Yga25vd2luZyB3aGVuIHRoZQo+IGNvdW50ZXIgd3JhcHMgYXJvdW5k Lgo+IAo+IFNpZ25lZC1vZmYtYnk6IFRvbWV1IFZpem9zbyA8dG9tZXUudml6b3NvQGNvbGxhYm9y YS5jb20+Cj4gUmV2aWV3ZWQtYnk6IEVtaWwgVmVsaWtvdiA8ZW1pbC52ZWxpa292QGNvbGxhYm9y YS5jb20+Cj4gUmV2aWV3ZWQtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQuZm9zc0Bjb2xsYWJvcmEu Y29tPgo+IC0tLQo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNiArKyst LS0KPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKPiBpbmRleCBiOWJlYjU5NTVkYWUuLjc1ZmIxZjY2Y2Mw YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IEBAIC0xNTU3LDcgKzE1NTcsNiBAQCBz dGF0aWMgdm9pZCBkaXNwbGF5X3BpcGVfY3JjX2lycV9oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKPiAgCXN0cnVjdCBkcm1fZHJpdmVyICpkcml2ZXIgPSBkZXZfcHJp di0+ZHJtLmRyaXZlcjsKPiAgCXVpbnQzMl90IGNyY3NbNV07Cj4gIAlpbnQgaGVhZCwgdGFpbDsK PiAtCXUzMiBmcmFtZTsKPiAgCj4gIAlzcGluX2xvY2soJnBpcGVfY3JjLT5sb2NrKTsKPiAgCWlm IChwaXBlX2NyYy0+c291cmNlKSB7Cj4gQEAgLTE2MTIsOCArMTYxMSw5IEBAIHN0YXRpYyB2b2lk IGRpc3BsYXlfcGlwZV9jcmNfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAo+ICAJCWNyY3NbMl0gPSBjcmMyOwo+ICAJCWNyY3NbM10gPSBjcmMzOwo+ICAJCWNy Y3NbNF0gPSBjcmM0Owo+IC0JCWZyYW1lID0gZHJpdmVyLT5nZXRfdmJsYW5rX2NvdW50ZXIoJmRl dl9wcml2LT5kcm0sIHBpcGUpOwo+IC0JCWRybV9jcnRjX2FkZF9jcmNfZW50cnkoJmNydGMtPmJh c2UsIHRydWUsIGZyYW1lLCBjcmNzKTsKPiArCQlkcm1fY3J0Y19hZGRfY3JjX2VudHJ5KCZjcnRj LT5iYXNlLCB0cnVlLAo+ICsJCQkJICAgICAgIGRybV9hY2N1cmF0ZV92YmxhbmtfY291bnQoJmNy dGMtPmJhc2UpLAoKTXkgYXNzdW1wdGlvbiB3b3VsZCBiZSB0aGF0IHRoaXMgZ2V0cyBjYWxsZWQg YWZ0ZXIgdGhlIHZibGFuayBpcnEKaGFuZGxlciwgc28gdXNpbmcgdGhlIF9hY2N1cmF0ZSB2ZXJz aW9uIHNlZW1zIGEgYml0IG92ZXJraWxsLgoKPiArCQkJCSAgICAgICBjcmNzKTsKPiAgCX0KPiAg fQo+ICAjZWxzZQo+IC0tIAo+IDIuOS4zCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939407AbdAJPzF (ORCPT ); Tue, 10 Jan 2017 10:55:05 -0500 Received: from mga07.intel.com ([134.134.136.100]:11708 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932567AbdAJPzD (ORCPT ); Tue, 10 Jan 2017 10:55:03 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="1110594393" Date: Tue, 10 Jan 2017 17:54:57 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Tomeu Vizoso Cc: linux-kernel@vger.kernel.org, Sean Paul , Thierry Reding , Emil Velikov , Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, David Airlie Subject: Re: [RESEND PATCH v14 2/2] drm/i915: Put "cooked" vlank counters in frame CRC lines Message-ID: <20170110155457.GE31595@intel.com> References: <20170110134305.26326-1-tomeu.vizoso@collabora.com> <20170110134305.26326-3-tomeu.vizoso@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170110134305.26326-3-tomeu.vizoso@collabora.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 10, 2017 at 02:43:05PM +0100, Tomeu Vizoso wrote: > Use drm_accurate_vblank_count so we have the full 32 bit to represent > the frame counter and userspace has a simpler way of knowing when the > counter wraps around. > > Signed-off-by: Tomeu Vizoso > Reviewed-by: Emil Velikov > Reviewed-by: Robert Foss > --- > > drivers/gpu/drm/i915/i915_irq.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index b9beb5955dae..75fb1f66cc0c 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1557,7 +1557,6 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, > struct drm_driver *driver = dev_priv->drm.driver; > uint32_t crcs[5]; > int head, tail; > - u32 frame; > > spin_lock(&pipe_crc->lock); > if (pipe_crc->source) { > @@ -1612,8 +1611,9 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, > crcs[2] = crc2; > crcs[3] = crc3; > crcs[4] = crc4; > - frame = driver->get_vblank_counter(&dev_priv->drm, pipe); > - drm_crtc_add_crc_entry(&crtc->base, true, frame, crcs); > + drm_crtc_add_crc_entry(&crtc->base, true, > + drm_accurate_vblank_count(&crtc->base), My assumption would be that this gets called after the vblank irq handler, so using the _accurate version seems a bit overkill. > + crcs); > } > } > #else > -- > 2.9.3 -- Ville Syrjälä Intel OTC