From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Date: Thu, 22 Jun 2017 10:06:04 +0200 Message-ID: <20170622100604.4c3b93fd@bbrezillon> References: <20170621185002.28563-1-eric@anholt.net> <20170621185002.28563-3-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 553126E5F3 for ; Thu, 22 Jun 2017 08:06:15 +0000 (UTC) In-Reply-To: <20170621185002.28563-3-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Eric Anholt Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyMSBKdW4gMjAxNyAxMTo1MDowMSAtMDcwMApFcmljIEFuaG9sdCA8ZXJpY0Bhbmhv bHQubmV0PiB3cm90ZToKCj4gTm93IHRoYXQgd2UncmUgdXNpbmcgdGhlIGF0b21pYyBoZWxwZXJz IGZvciBmZW5jZSB3YWl0cywgd2UgY2FuIHVzZQo+IHRoZSBzYW1lIGNvZGVwYXRoIGFzIGRybV9h dG9taWNfaGVscGVyX2NvbW1pdCgpIGRvZXMgZm9yIGFzeW5jLAo+IGdldHRpbmcgcmlkIG9mIG91 ciBjdXN0b20gdmM0X2NvbW1pdCBzdHJ1Y3QuCj4gCj4gU2lnbmVkLW9mZi1ieTogRXJpYyBBbmhv bHQgPGVyaWNAYW5ob2x0Lm5ldD4KClJldmlld2VkLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlz LmJyZXppbGxvbkBmcmVlLWVsZWN0cm9ucy5jb20+CgpBbmQgd2l0aCB0aGlzIHJld29yaywgeW91 IGFsc28gZml4IHRoZSBsZWFrIEkgaW50cm9kdWNlZCBpbiBjb21taXQKMzRjOGVhNDAwZmY2ICgi ZHJtL3ZjNDogTWltaWMgZHJtX2F0b21pY19oZWxwZXJfY29tbWl0KCkgYmVoYXZpb3IiKS4KCj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2ttcy5jIHwgNzEgKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0 aW9ucygrKSwgNTggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS92YzQvdmM0X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfa21zLmMKPiBpbmRleCA2 YjFjY2VhNzYyNDMuLmIzNzE4NzljMzkwMSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v dmM0L3ZjNF9rbXMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2ttcy5jCj4gQEAg LTI5LDE2ICsyOSw5IEBAIHN0YXRpYyB2b2lkIHZjNF9vdXRwdXRfcG9sbF9jaGFuZ2VkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCj4gIAlkcm1fZmJkZXZfY21hX2hvdHBsdWdfZXZlbnQodmM0LT5m YmRldik7Cj4gIH0KPiAgCj4gLXN0cnVjdCB2YzRfY29tbWl0IHsKPiAtCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXY7Cj4gLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Cj4gLQlzdHJ1Y3Qg dmM0X3NlcW5vX2NiIGNiOwo+IC19Owo+IC0KPiAgc3RhdGljIHZvaWQKPiAtdmM0X2F0b21pY19j b21wbGV0ZV9jb21taXQoc3RydWN0IHZjNF9jb21taXQgKmMpCj4gK3ZjNF9hdG9taWNfY29tcGxl dGVfY29tbWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiAgewo+IC0Jc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gYy0+c3RhdGU7Cj4gIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gc3RhdGUtPmRldjsKPiAgCXN0cnVjdCB2YzRfZGV2ICp2YzQgPSB0b192YzRfZGV2 KGRldik7Cj4gIAo+IEBAIC03MiwyOCArNjUsMTQgQEAgdmM0X2F0b21pY19jb21wbGV0ZV9jb21t aXQoc3RydWN0IHZjNF9jb21taXQgKmMpCj4gIAlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7 Cj4gIAo+ICAJdXAoJnZjNC0+YXN5bmNfbW9kZXNldCk7Cj4gLQo+IC0Ja2ZyZWUoYyk7Cj4gLX0K PiAtCj4gLXN0YXRpYyB2b2lkCj4gLXZjNF9hdG9taWNfY29tcGxldGVfY29tbWl0X3NlcW5vX2Ni KHN0cnVjdCB2YzRfc2Vxbm9fY2IgKmNiKQo+IC17Cj4gLQlzdHJ1Y3QgdmM0X2NvbW1pdCAqYyA9 IGNvbnRhaW5lcl9vZihjYiwgc3RydWN0IHZjNF9jb21taXQsIGNiKTsKPiAtCj4gLQl2YzRfYXRv bWljX2NvbXBsZXRlX2NvbW1pdChjKTsKPiAgfQo+ICAKPiAtc3RhdGljIHN0cnVjdCB2YzRfY29t bWl0ICpjb21taXRfaW5pdChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4gK3N0YXRp YyB2b2lkIGNvbW1pdF93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiAgewo+IC0Jc3Ry dWN0IHZjNF9jb21taXQgKmMgPSBremFsbG9jKHNpemVvZigqYyksIEdGUF9LRVJORUwpOwo+IC0K PiAtCWlmICghYykKPiAtCQlyZXR1cm4gTlVMTDsKPiAtCWMtPmRldiA9IHN0YXRlLT5kZXY7Cj4g LQljLT5zdGF0ZSA9IHN0YXRlOwo+IC0KPiAtCXJldHVybiBjOwo+ICsJc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlID0gY29udGFpbmVyX29mKHdvcmssCj4gKwkJCQkJCSAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlLAo+ICsJCQkJCQkgICAgICBjb21taXRfd29yayk7Cj4gKwl2YzRf YXRvbWljX2NvbXBsZXRlX2NvbW1pdChzdGF0ZSk7Cj4gIH0KPiAgCj4gIC8qKgo+IEBAIC0xMTUs MjkgKzk0LDE5IEBAIHN0YXRpYyBpbnQgdmM0X2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgewo+ICAJc3RydWN0IHZjNF9kZXYgKnZjNCA9IHRvX3ZjNF9kZXYoZGV2KTsK PiAgCWludCByZXQ7Cj4gLQlpbnQgaTsKPiAtCXVpbnQ2NF90IHdhaXRfc2Vxbm8gPSAwOwo+IC0J c3RydWN0IHZjNF9jb21taXQgKmM7Cj4gLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKPiAtCXN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19zdGF0ZTsKPiAtCj4gLQljID0gY29tbWl0X2luaXQo c3RhdGUpOwo+IC0JaWYgKCFjKQo+IC0JCXJldHVybiAtRU5PTUVNOwo+ICAKPiAgCXJldCA9IGRy bV9hdG9taWNfaGVscGVyX3NldHVwX2NvbW1pdChzdGF0ZSwgbm9uYmxvY2spOwo+ICAJaWYgKHJl dCkKPiAgCQlyZXR1cm4gcmV0Owo+ICAKPiArCUlOSVRfV09SSygmc3RhdGUtPmNvbW1pdF93b3Jr LCBjb21taXRfd29yayk7Cj4gKwo+ICAJcmV0ID0gZG93bl9pbnRlcnJ1cHRpYmxlKCZ2YzQtPmFz eW5jX21vZGVzZXQpOwo+IC0JaWYgKHJldCkgewo+IC0JCWtmcmVlKGMpOwo+ICsJaWYgKHJldCkK PiAgCQlyZXR1cm4gcmV0Owo+IC0JfQo+ICAKPiAgCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3By ZXBhcmVfcGxhbmVzKGRldiwgc3RhdGUpOwo+ICAJaWYgKHJldCkgewo+IC0JCWtmcmVlKGMpOwo+ ICAJCXVwKCZ2YzQtPmFzeW5jX21vZGVzZXQpOwo+ICAJCXJldHVybiByZXQ7Cj4gIAl9Cj4gQEAg LTE0NiwyMiArMTE1LDExIEBAIHN0YXRpYyBpbnQgdmM0X2F0b21pY19jb21taXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiAgCQlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9mZW5j ZXMoZGV2LCBzdGF0ZSwgdHJ1ZSk7Cj4gIAkJaWYgKHJldCkgewo+ICAJCQlkcm1fYXRvbWljX2hl bHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKPiAtCQkJa2ZyZWUoYyk7Cj4gIAkJCXVw KCZ2YzQtPmFzeW5jX21vZGVzZXQpOwo+ICAJCQlyZXR1cm4gcmV0Owo+ICAJCX0KPiAgCX0KPiAg Cj4gLQlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIG5ld19zdGF0ZSwgaSkg ewo+IC0JCWlmICgocGxhbmUtPnN0YXRlLT5mYiAhPSBuZXdfc3RhdGUtPmZiKSAmJiBuZXdfc3Rh dGUtPmZiKSB7Cj4gLQkJCXN0cnVjdCBkcm1fZ2VtX2NtYV9vYmplY3QgKmNtYV9ibyA9Cj4gLQkJ CQlkcm1fZmJfY21hX2dldF9nZW1fb2JqKG5ld19zdGF0ZS0+ZmIsIDApOwo+IC0JCQlzdHJ1Y3Qg dmM0X2JvICpibyA9IHRvX3ZjNF9ibygmY21hX2JvLT5iYXNlKTsKPiAtCj4gLQkJCXdhaXRfc2Vx bm8gPSBtYXgoYm8tPnNlcW5vLCB3YWl0X3NlcW5vKTsKPiAtCQl9Cj4gLQl9Cj4gLQo+ICAJLyoK PiAgCSAqIFRoaXMgaXMgdGhlIHBvaW50IG9mIG5vIHJldHVybiAtIGV2ZXJ5dGhpbmcgYmVsb3cg bmV2ZXIgZmFpbHMgZXhjZXB0Cj4gIAkgKiB3aGVuIHRoZSBodyBnb2VzIGJvbmdoaXRzLiBXaGlj aCBtZWFucyB3ZSBjYW4gY29tbWl0IHRoZSBuZXcgc3RhdGUgb24KPiBAQCAtMTg3LDEzICsxNDUs MTAgQEAgc3RhdGljIGludCB2YzRfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAo+ICAJICovCj4gIAo+ICAJZHJtX2F0b21pY19zdGF0ZV9nZXQoc3RhdGUpOwo+IC0JaWYgKG5v bmJsb2NrKSB7Cj4gLQkJdmM0X3F1ZXVlX3NlcW5vX2NiKGRldiwgJmMtPmNiLCB3YWl0X3NlcW5v LAo+IC0JCQkJICAgdmM0X2F0b21pY19jb21wbGV0ZV9jb21taXRfc2Vxbm9fY2IpOwo+IC0JfSBl bHNlIHsKPiAtCQl2YzRfd2FpdF9mb3Jfc2Vxbm8oZGV2LCB3YWl0X3NlcW5vLCB+MHVsbCwgZmFs c2UpOwo+IC0JCXZjNF9hdG9taWNfY29tcGxldGVfY29tbWl0KGMpOwo+IC0JfQo+ICsJaWYgKG5v bmJsb2NrKQo+ICsJCXF1ZXVlX3dvcmsoc3lzdGVtX3VuYm91bmRfd3EsICZzdGF0ZS0+Y29tbWl0 X3dvcmspOwo+ICsJZWxzZQo+ICsJCXZjNF9hdG9taWNfY29tcGxldGVfY29tbWl0KHN0YXRlKTsK PiAgCj4gIAlyZXR1cm4gMDsKPiAgfQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752747AbdFVIGS (ORCPT ); Thu, 22 Jun 2017 04:06:18 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:59590 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124AbdFVIGQ (ORCPT ); Thu, 22 Jun 2017 04:06:16 -0400 Date: Thu, 22 Jun 2017 10:06:04 +0200 From: Boris Brezillon To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Message-ID: <20170622100604.4c3b93fd@bbrezillon> In-Reply-To: <20170621185002.28563-3-eric@anholt.net> References: <20170621185002.28563-1-eric@anholt.net> <20170621185002.28563-3-eric@anholt.net> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 21 Jun 2017 11:50:01 -0700 Eric Anholt wrote: > Now that we're using the atomic helpers for fence waits, we can use > the same codepath as drm_atomic_helper_commit() does for async, > getting rid of our custom vc4_commit struct. > > Signed-off-by: Eric Anholt Reviewed-by: Boris Brezillon And with this rework, you also fix the leak I introduced in commit 34c8ea400ff6 ("drm/vc4: Mimic drm_atomic_helper_commit() behavior"). > --- > drivers/gpu/drm/vc4/vc4_kms.c | 71 ++++++++----------------------------------- > 1 file changed, 13 insertions(+), 58 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c > index 6b1ccea76243..b371879c3901 100644 > --- a/drivers/gpu/drm/vc4/vc4_kms.c > +++ b/drivers/gpu/drm/vc4/vc4_kms.c > @@ -29,16 +29,9 @@ static void vc4_output_poll_changed(struct drm_device *dev) > drm_fbdev_cma_hotplug_event(vc4->fbdev); > } > > -struct vc4_commit { > - struct drm_device *dev; > - struct drm_atomic_state *state; > - struct vc4_seqno_cb cb; > -}; > - > static void > -vc4_atomic_complete_commit(struct vc4_commit *c) > +vc4_atomic_complete_commit(struct drm_atomic_state *state) > { > - struct drm_atomic_state *state = c->state; > struct drm_device *dev = state->dev; > struct vc4_dev *vc4 = to_vc4_dev(dev); > > @@ -72,28 +65,14 @@ vc4_atomic_complete_commit(struct vc4_commit *c) > drm_atomic_state_put(state); > > up(&vc4->async_modeset); > - > - kfree(c); > -} > - > -static void > -vc4_atomic_complete_commit_seqno_cb(struct vc4_seqno_cb *cb) > -{ > - struct vc4_commit *c = container_of(cb, struct vc4_commit, cb); > - > - vc4_atomic_complete_commit(c); > } > > -static struct vc4_commit *commit_init(struct drm_atomic_state *state) > +static void commit_work(struct work_struct *work) > { > - struct vc4_commit *c = kzalloc(sizeof(*c), GFP_KERNEL); > - > - if (!c) > - return NULL; > - c->dev = state->dev; > - c->state = state; > - > - return c; > + struct drm_atomic_state *state = container_of(work, > + struct drm_atomic_state, > + commit_work); > + vc4_atomic_complete_commit(state); > } > > /** > @@ -115,29 +94,19 @@ static int vc4_atomic_commit(struct drm_device *dev, > { > struct vc4_dev *vc4 = to_vc4_dev(dev); > int ret; > - int i; > - uint64_t wait_seqno = 0; > - struct vc4_commit *c; > - struct drm_plane *plane; > - struct drm_plane_state *new_state; > - > - c = commit_init(state); > - if (!c) > - return -ENOMEM; > > ret = drm_atomic_helper_setup_commit(state, nonblock); > if (ret) > return ret; > > + INIT_WORK(&state->commit_work, commit_work); > + > ret = down_interruptible(&vc4->async_modeset); > - if (ret) { > - kfree(c); > + if (ret) > return ret; > - } > > ret = drm_atomic_helper_prepare_planes(dev, state); > if (ret) { > - kfree(c); > up(&vc4->async_modeset); > return ret; > } > @@ -146,22 +115,11 @@ static int vc4_atomic_commit(struct drm_device *dev, > ret = drm_atomic_helper_wait_for_fences(dev, state, true); > if (ret) { > drm_atomic_helper_cleanup_planes(dev, state); > - kfree(c); > up(&vc4->async_modeset); > return ret; > } > } > > - for_each_plane_in_state(state, plane, new_state, i) { > - if ((plane->state->fb != new_state->fb) && new_state->fb) { > - struct drm_gem_cma_object *cma_bo = > - drm_fb_cma_get_gem_obj(new_state->fb, 0); > - struct vc4_bo *bo = to_vc4_bo(&cma_bo->base); > - > - wait_seqno = max(bo->seqno, wait_seqno); > - } > - } > - > /* > * This is the point of no return - everything below never fails except > * when the hw goes bonghits. Which means we can commit the new state on > @@ -187,13 +145,10 @@ static int vc4_atomic_commit(struct drm_device *dev, > */ > > drm_atomic_state_get(state); > - if (nonblock) { > - vc4_queue_seqno_cb(dev, &c->cb, wait_seqno, > - vc4_atomic_complete_commit_seqno_cb); > - } else { > - vc4_wait_for_seqno(dev, wait_seqno, ~0ull, false); > - vc4_atomic_complete_commit(c); > - } > + if (nonblock) > + queue_work(system_unbound_wq, &state->commit_work); > + else > + vc4_atomic_complete_commit(state); > > return 0; > }