From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Kleiner Subject: Re: [PATCH 07/14] drm/nouveau: use drm_crtc_send_vblank_event() Date: Mon, 25 Apr 2016 09:01:10 +0200 Message-ID: <571DC0B6.90504@gmail.com> References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> <1460656118-16766-7-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com [IPv6:2a00:1450:400c:c09::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A6906E062 for ; Mon, 25 Apr 2016 07:01:15 +0000 (UTC) Received: by mail-wm0-x233.google.com with SMTP id n3so111554600wmn.0 for ; Mon, 25 Apr 2016 00:01:15 -0700 (PDT) In-Reply-To: <1460656118-16766-7-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan , dri-devel@lists.freedesktop.org Cc: Thierry Reding , Daniel Vetter , open list , Ben Skeggs , Dave Airlie , Gustavo Padovan List-Id: dri-devel@lists.freedesktop.org T24gMDQvMTQvMjAxNiAwNzo0OCBQTSwgR3VzdGF2byBQYWRvdmFuIHdyb3RlOgo+IEZyb206IEd1 c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KPgo+IFJlcGxh Y2UgdGhlIGxlZ2FjeSBkcm1fc2VuZF92YmxhbmtfZXZlbnQoKSB3aXRoIHRoZSBuZXcgaGVscGVy IGZ1bmN0aW9uLgo+Cj4gU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBh ZG92YW5AY29sbGFib3JhLmNvLnVrPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9kaXNwbGF5LmMgfCA0ICsrKy0KPiAgIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91 dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVf ZGlzcGxheS5jCj4gaW5kZXggN2NlN2ZhNS4uOTczYzJkOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L25vdXZlYXVfZGlzcGxheS5jCj4gQEAgLTg0MSwxMCArODQxLDEyIEBAIG5vdXZl YXVfZmluaXNoX3BhZ2VfZmxpcChzdHJ1Y3Qgbm91dmVhdV9jaGFubmVsICpjaGFuLAo+Cj4gICAJ cyA9IGxpc3RfZmlyc3RfZW50cnkoJmZjdHgtPmZsaXAsIHN0cnVjdCBub3V2ZWF1X3BhZ2VfZmxp cF9zdGF0ZSwgaGVhZCk7CgpIaSBHdXN0YXZvCgo+ICAgCWlmIChzLT5ldmVudCkgewo+ICsJCXN0 cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGRybV9jcnRjX2ZpbmQoZGV2LCBzLT5jcnRjKTsKPiArCgpJ IGRvbid0IHRoaW5rIHRoaXMgd291bGQgd29yay4gcy0+Y3J0YyBpcyBhIG5vdXZlYXUgaW50ZXJu YWwgZGlzcGxheSAKcGlwZSBpbmRleCwgbm90IGEgZHJtIG1vZGUgb2JqZWN0IGlkLCBzbyBpIGRv bid0IHRoaW5rIGRybV9jcnRjX2ZpbmQoKSAKd2lsbCBkbyB3aGF0IHlvdSBuZWVkLiBBbHNvIGl0 IHRha2VzIGEgbXV0ZXgsIHdoaWNoIG1pZ2h0X3NsZWVwKCkgYW5kIGkgCnRoaW5rIG5vdXZlYXVf ZmluaXNoX3BhZ2VfZmxpcCBnZXRzIGNhbGxlZCBmcm9tIGlycSBjb250ZXh0IGFuZCBob2xkcyBh IApzcGluX2xvY2tfaXJxc2F2ZSwgc28gd291bGQgZW5kIGJhZGx5LgoKWW91J2QgcHJvYmFibHkg aGF2ZSB0byBleHRlbmQgc3RydWN0IG5vdXZlYXVfcGFnZV9mbGlwX3N0YXRlIHRvIGNhcnJ5IAph cm91bmQgYSByZWZlcmVuY2UgdG8gdGhlIHJlcXVpcmVkIGRybV9jcnRjLCBzZXQgdXAgaW4gCm5v dXZlYXVfY3J0Y19wYWdlX2ZsaXAoKS4KCi1tYXJpbwoKPiAgIAkJaWYgKGRybS0+ZGV2aWNlLmlu Zm8uZmFtaWx5IDwgTlZfREVWSUNFX0lORk9fVjBfVEVTTEEpIHsKPiAgIAkJCWRybV9hcm1fdmJs YW5rX2V2ZW50KGRldiwgcy0+Y3J0Yywgcy0+ZXZlbnQpOwo+ICAgCQl9IGVsc2Ugewo+IC0JCQlk cm1fc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBzLT5jcnRjLCBzLT5ldmVudCk7Cj4gKwkJCWRybV9j cnRjX3NlbmRfdmJsYW5rX2V2ZW50KGNydGMsIHMtPmV2ZW50KTsKPgo+ICAgCQkJLyogR2l2ZSB1 cCBvd25lcnNoaXAgb2YgdmJsYW5rIGZvciBwYWdlLWZsaXBwZWQgY3J0YyAqLwo+ICAgCQkJZHJt X3ZibGFua19wdXQoZGV2LCBzLT5jcnRjKTsKPgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753552AbcDYHBQ (ORCPT ); Mon, 25 Apr 2016 03:01:16 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37028 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbcDYHBO (ORCPT ); Mon, 25 Apr 2016 03:01:14 -0400 Subject: Re: [PATCH 07/14] drm/nouveau: use drm_crtc_send_vblank_event() To: Gustavo Padovan , dri-devel@lists.freedesktop.org References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> <1460656118-16766-7-git-send-email-gustavo@padovan.org> Cc: Gustavo Padovan , David Airlie , Ben Skeggs , Daniel Vetter , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= , Dave Airlie , Ilia Mirkin , Thierry Reding , open list From: Mario Kleiner Message-ID: <571DC0B6.90504@gmail.com> Date: Mon, 25 Apr 2016 09:01:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1460656118-16766-7-git-send-email-gustavo@padovan.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/14/2016 07:48 PM, Gustavo Padovan wrote: > From: Gustavo Padovan > > Replace the legacy drm_send_vblank_event() with the new helper function. > > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/nouveau/nouveau_display.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c > index 7ce7fa5..973c2d9 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_display.c > +++ b/drivers/gpu/drm/nouveau/nouveau_display.c > @@ -841,10 +841,12 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, > > s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); Hi Gustavo > if (s->event) { > + struct drm_crtc *crtc = drm_crtc_find(dev, s->crtc); > + I don't think this would work. s->crtc is a nouveau internal display pipe index, not a drm mode object id, so i don't think drm_crtc_find() will do what you need. Also it takes a mutex, which might_sleep() and i think nouveau_finish_page_flip gets called from irq context and holds a spin_lock_irqsave, so would end badly. You'd probably have to extend struct nouveau_page_flip_state to carry around a reference to the required drm_crtc, set up in nouveau_crtc_page_flip(). -mario > if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) { > drm_arm_vblank_event(dev, s->crtc, s->event); > } else { > - drm_send_vblank_event(dev, s->crtc, s->event); > + drm_crtc_send_vblank_event(crtc, s->event); > > /* Give up ownership of vblank for page-flipped crtc */ > drm_vblank_put(dev, s->crtc); >