From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomeu Vizoso Subject: Re: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2 Date: Fri, 1 Apr 2016 13:47:30 +0200 Message-ID: <56FE5FD2.2050106@collabora.com> References: <1459411680-6176-1-git-send-email-tomeu.vizoso@collabora.com> <56FE5AE9.40806@rock-chips.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <56FE5AE9.40806@rock-chips.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Mark yao , linux-kernel@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gMDQvMDEvMjAxNiAwMToyNiBQTSwgTWFyayB5YW8gd3JvdGU6Cj4gT24gMjAxNuW5tDAz5pyI MzHml6UgMTY6MDgsIFRvbWV1IFZpem9zbyB3cm90ZToKPj4gQXMgcGVyIHRoZSBkb2NzLCBhdG9t aWNfY29tbWl0IHNob3VsZCByZXR1cm4gLUVCVVNZICJpZiBhbiBhc3ljbmhyb25vdXMKPj4gdXBk YXRlZCBpcyByZXF1ZXN0ZWQgYW5kIHRoZXJlIGlzIGFuIGVhcmxpZXIgdXBkYXRlZCBwZW5kaW5n Ii4KPj4KPj4gdjI6IFVzZSB0aGUgc3RhdHVzIG9mIHRoZSB3b3JrcXVldWUgaW5zdGVhZCBvZiB2 b3AtPmV2ZW50LCBhbmQgZG9uJ3QgYWRkCj4+IGEgc3VwZXJmbHVvdXMgd2FpdCBvbiB0aGUgd29y a3F1ZXVlLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBUb21ldSBWaXpvc28gPHRvbWV1LnZpem9zb0Bj b2xsYWJvcmEuY29tPgo+PiAtLS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hp cF9kcm1fZmIuYyB8IDMgKysrCj4+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspCj4+ Cj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Zi LmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMKPj4gaW5kZXgg M2I4ZjY1MjY5OGY4Li4yODVmOGNkNWFmZTEgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZmIuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvcm9ja2NoaXBfZHJtX2ZiLmMKPj4gQEAgLTI4Miw2ICsyODIsOSBAQCBpbnQgcm9ja2No aXBfZHJtX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPj4gIAlzdHJ1Y3Qg cm9ja2NoaXBfYXRvbWljX2NvbW1pdCAqY29tbWl0ID0gJnByaXZhdGUtPmNvbW1pdDsKPj4gIAlp bnQgcmV0Owo+PiAgCj4+ICsJaWYgKGFzeW5jICYmIHdvcmtfYnVzeSgmY29tbWl0LT53b3JrKSkK Pj4gKwkJcmV0dXJuIC1FQlVTWTsKPj4gKwo+IAo+IFNvcnJ5IGZvciByZXBseSBsYXRlLgo+IAo+ IFRoZXJlIGlzIGEgY29tbWVudCBvbiB3b3JrX2J1c3kgZnVuY3Rpb24gZGVzY3JpYmUgOgo+IAo+ ICAgICAidGhlIHRlc3QgcmVzdWx0IGlzICB1bnJlbGlhYmxlIGFuZCBvbmx5IHVzZWZ1bCBhcyBh ZHZpc29yeSBoaW50cyBvcgo+IGZvciBkZWJ1Z2dpbmcuIgo+IAo+IEkgZG9uJ3Qga25vdyBpZiBp dCdzIHN1aXRhYmxlIHRvIHVzZSBpdCBoZXJlLCBkb2VzIHNvbWUgZ3V5cyBrbm93IGl0PwoKSSdt IG5vdCBzdXJlLCBidXQgaWYgdGhlIHJlYXNvbiBpcyB0aGUgY2F2ZWF0IGV4cGxhaW5lZCBpbgpm aW5kX3dvcmtlcl9leGVjdXRpbmdfd29yaygpLCB0aGVuIGl0J3MgcHJvYmFibHkgc2FmZSAoYW5k IHdvdWxkIGV4cGxhaW4KaG93IHRoZSBmdW5jdGlvbiBpcyB1c2VkIGluIG90aGVyIHBhcnRzIGlu IHRoZSBrZXJuZWwpLgoKPiBBbmQgdGhlbiwgdGhlICJmbHVzaF93b3JrKCZjb21taXQtPndvcmsp OyIgaXMgbm8gbmVlZGVkIGlmIHJldHVybiAtRUJVU1kKPiBoZXJlLgo+IHlvdSBjYW4gcmVtb3Zl IGl0IGF0IHRoaXMgcGF0Y2guCgpXZSBzdGlsbCBuZWVkIHRvIHdhaXQgaWYgaXQncyBiZWluZyBj YWxsZWQgaW4gc3luYyBtb2RlLgoKUmVnYXJkcywKClRvbWV1Cgo+PiAgCXJldCA9IGRybV9hdG9t aWNfaGVscGVyX3ByZXBhcmVfcGxhbmVzKGRldiwgc3RhdGUpOwo+PiAgCWlmIChyZXQpCj4+ICAJ CXJldHVybiByZXQ7Cj4gCj4gCj4gCj4gLS0gCj4g77ytYXJrIFlhbwo+IAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: tomeu.vizoso@collabora.com (Tomeu Vizoso) Date: Fri, 1 Apr 2016 13:47:30 +0200 Subject: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2 In-Reply-To: <56FE5AE9.40806@rock-chips.com> References: <1459411680-6176-1-git-send-email-tomeu.vizoso@collabora.com> <56FE5AE9.40806@rock-chips.com> Message-ID: <56FE5FD2.2050106@collabora.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 04/01/2016 01:26 PM, Mark yao wrote: > On 2016?03?31? 16:08, Tomeu Vizoso wrote: >> As per the docs, atomic_commit should return -EBUSY "if an asycnhronous >> updated is requested and there is an earlier updated pending". >> >> v2: Use the status of the workqueue instead of vop->event, and don't add >> a superfluous wait on the workqueue. >> >> Signed-off-by: Tomeu Vizoso >> --- >> drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> index 3b8f652698f8..285f8cd5afe1 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> @@ -282,6 +282,9 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, >> struct rockchip_atomic_commit *commit = &private->commit; >> int ret; >> >> + if (async && work_busy(&commit->work)) >> + return -EBUSY; >> + > > Sorry for reply late. > > There is a comment on work_busy function describe : > > "the test result is unreliable and only useful as advisory hints or > for debugging." > > I don't know if it's suitable to use it here, does some guys know it? I'm not sure, but if the reason is the caveat explained in find_worker_executing_work(), then it's probably safe (and would explain how the function is used in other parts in the kernel). > And then, the "flush_work(&commit->work);" is no needed if return -EBUSY > here. > you can remove it at this patch. We still need to wait if it's being called in sync mode. Regards, Tomeu >> ret = drm_atomic_helper_prepare_planes(dev, state); >> if (ret) >> return ret; > > > > -- > ?ark Yao > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753799AbcDALrh (ORCPT ); Fri, 1 Apr 2016 07:47:37 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:49990 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751902AbcDALrg (ORCPT ); Fri, 1 Apr 2016 07:47:36 -0400 Subject: Re: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2 To: Mark yao , linux-kernel@vger.kernel.org References: <1459411680-6176-1-git-send-email-tomeu.vizoso@collabora.com> <56FE5AE9.40806@rock-chips.com> Cc: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org From: Tomeu Vizoso Message-ID: <56FE5FD2.2050106@collabora.com> Date: Fri, 1 Apr 2016 13:47:30 +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: <56FE5AE9.40806@rock-chips.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/01/2016 01:26 PM, Mark yao wrote: > On 2016年03月31日 16:08, Tomeu Vizoso wrote: >> As per the docs, atomic_commit should return -EBUSY "if an asycnhronous >> updated is requested and there is an earlier updated pending". >> >> v2: Use the status of the workqueue instead of vop->event, and don't add >> a superfluous wait on the workqueue. >> >> Signed-off-by: Tomeu Vizoso >> --- >> drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> index 3b8f652698f8..285f8cd5afe1 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c >> @@ -282,6 +282,9 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, >> struct rockchip_atomic_commit *commit = &private->commit; >> int ret; >> >> + if (async && work_busy(&commit->work)) >> + return -EBUSY; >> + > > Sorry for reply late. > > There is a comment on work_busy function describe : > > "the test result is unreliable and only useful as advisory hints or > for debugging." > > I don't know if it's suitable to use it here, does some guys know it? I'm not sure, but if the reason is the caveat explained in find_worker_executing_work(), then it's probably safe (and would explain how the function is used in other parts in the kernel). > And then, the "flush_work(&commit->work);" is no needed if return -EBUSY > here. > you can remove it at this patch. We still need to wait if it's being called in sync mode. Regards, Tomeu >> ret = drm_atomic_helper_prepare_planes(dev, state); >> if (ret) >> return ret; > > > > -- > Mark Yao >