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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 82E2AC43381 for ; Tue, 12 Mar 2019 15:34:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46EE92083D for ; Tue, 12 Mar 2019 15:34:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726807AbfCLPez (ORCPT ); Tue, 12 Mar 2019 11:34:55 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:60084 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbfCLPez (ORCPT ); Tue, 12 Mar 2019 11:34:55 -0400 Received: from [IPv6:2804:431:9719:798c:867b:ebff:fe52:de60] (unknown [IPv6:2804:431:9719:798c:867b:ebff:fe52:de60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 2A00A281027; Tue, 12 Mar 2019 15:34:48 +0000 (GMT) Subject: Re: [PATCH v2 1/5] drm/rockchip: fix fb references in async update To: Boris Brezillon Cc: dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com, andrey.grodzovsky@amd.com, daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org, Tomasz Figa , David Airlie , Sean Paul , kernel@collabora.com, harry.wentland@amd.com, =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Sandy Huang , linux-rockchip@lists.infradead.org, =?UTF-8?Q?Heiko_St=c3=bcbner?= , linux-arm-kernel@lists.infradead.org, Daniel Vetter References: <20190312022204.2775-1-helen.koike@collabora.com> <20190312022204.2775-2-helen.koike@collabora.com> <20190312073438.05ad8173@collabora.com> From: Helen Koike Openpgp: preference=signencrypt Autocrypt: addr=helen.koike@collabora.com; keydata= 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 Message-ID: Date: Tue, 12 Mar 2019 12:34:45 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190312073438.05ad8173@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/12/19 3:34 AM, Boris Brezillon wrote: > On Mon, 11 Mar 2019 23:21:59 -0300 > Helen Koike wrote: > >> In the case of async update, modifications are done in place, i.e. in the >> current plane state, so the new_state is prepared and the new_state is >> cleanup up (instead of the old_state, diferrently on what happen in a > > ^ cleaned up ^ differently (but maybe > "unlike what happens" is more appropriate here). > >> normal sync update). >> To cleanup the old_fb properly, it needs to be placed in the new_state >> in the end of async_update, so cleanup call will unreference the old_fb >> correctly. >> >> Also, the previous code had a: >> >> plane_state = plane->funcs->atomic_duplicate_state(plane); >> ... >> swap(plane_state, plane->state); >> >> if (plane->state->fb && plane->state->fb != new_state->fb) { >> ... >> } >> >> Which was wrong, as the fb were just assigned to be equal, so this if >> statement nevers evaluates to true. >> >> Another details is that the function drm_crtc_vblank_get() can only be >> called when vop->is_enabled is true, otherwise it has no effect and >> trows a WARN_ON(). >> >> Calling drm_atomic_set_fb_for_plane() (which get a referent of the new >> fb and pus the old fb) is not required, as it is taken care by >> drm_mode_cursor_universal() when calling >> drm_atomic_helper_update_plane(). >> >> Signed-off-by: Helen Koike >> >> --- >> Hello, >> >> I tested on the rockchip ficus v1.1 using igt plane_cursor_legacy and >> kms_cursor_legacy and I didn't see any regressions. >> >> Changes in v2: None >> >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 42 ++++++++++++--------- >> 1 file changed, 24 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index c7d4c6073ea5..a1ee8c156a7b 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -912,30 +912,31 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane, >> struct drm_plane_state *new_state) >> { >> struct vop *vop = to_vop(plane->state->crtc); >> - struct drm_plane_state *plane_state; >> + struct drm_framebuffer *old_fb = plane->state->fb; >> >> - plane_state = plane->funcs->atomic_duplicate_state(plane); >> - plane_state->crtc_x = new_state->crtc_x; >> - plane_state->crtc_y = new_state->crtc_y; >> - plane_state->crtc_h = new_state->crtc_h; >> - plane_state->crtc_w = new_state->crtc_w; >> - plane_state->src_x = new_state->src_x; >> - plane_state->src_y = new_state->src_y; >> - plane_state->src_h = new_state->src_h; >> - plane_state->src_w = new_state->src_w; >> - >> - if (plane_state->fb != new_state->fb) >> - drm_atomic_set_fb_for_plane(plane_state, new_state->fb); >> - >> - swap(plane_state, plane->state); >> - >> - if (plane->state->fb && plane->state->fb != new_state->fb) { >> + /* >> + * A scanout can still be occurring, so we can't drop the reference to >> + * the old framebuffer. To solve this we get a reference to old_fb and >> + * set a worker to release it later. > > Hm, doesn't look like an async update to me if we have to wait for the > next VBLANK to happen to get the new content on the screen. Maybe we > should reject async updates when old_fb != new_fb in the rk > ->async_check() hook. Unless I am misunderstanding this, we don't wait here, we just grab a reference to the fb in case it is being still used by the hw, so it doesn't get released prematurely. > >> + */ >> + if (vop->is_enabled && >> + plane->state->fb && plane->state->fb != new_state->fb) { >> drm_framebuffer_get(plane->state->fb); >> WARN_ON(drm_crtc_vblank_get(plane->state->crtc) != 0); >> drm_flip_work_queue(&vop->fb_unref_work, plane->state->fb); >> set_bit(VOP_PENDING_FB_UNREF, &vop->pending); >> } > > In any case, I think this should be called after > vop_plane_atomic_update() to prevent the situation where the VBLANK > event happens between this point and the following > vop_plane_atomic_update() call. ack, I'll update it in the next version. > >> >> + plane->state->crtc_x = new_state->crtc_x; >> + plane->state->crtc_y = new_state->crtc_y; >> + plane->state->crtc_h = new_state->crtc_h; >> + plane->state->crtc_w = new_state->crtc_w; >> + plane->state->src_x = new_state->src_x; >> + plane->state->src_y = new_state->src_y; >> + plane->state->src_h = new_state->src_h; >> + plane->state->src_w = new_state->src_w; >> + plane->state->fb = new_state->fb; > > Any reason not to use swap() here and reference plane->state->fb > instead of new_state->fb after this point? I had the impression I had to do this in one of my tests, but re-testing now and re-looking at the code this doesn't seem to be necessary. I'll use a swap() in the next version. Thanks for your feedback. Helen > >> + >> if (vop->is_enabled) { >> rockchip_drm_psr_inhibit_get_state(new_state->state); >> vop_plane_atomic_update(plane, plane->state); >> @@ -945,7 +946,12 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane, >> rockchip_drm_psr_inhibit_put_state(new_state->state); >> } >> >> - plane->funcs->atomic_destroy_state(plane, plane_state); >> + /* >> + * In async update we perform inplace modifications and release the >> + * new_state. The following is required so we release the reference of >> + * the old framebuffer. >> + */ >> + new_state->fb = old_fb; >> } >> >> static const struct drm_plane_helper_funcs plane_helper_funcs = { > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Helen Koike Subject: Re: [PATCH v2 1/5] drm/rockchip: fix fb references in async update Date: Tue, 12 Mar 2019 12:34:45 -0300 Message-ID: References: <20190312022204.2775-1-helen.koike@collabora.com> <20190312022204.2775-2-helen.koike@collabora.com> <20190312073438.05ad8173@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190312073438.05ad8173@collabora.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Boris Brezillon Cc: =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Sean Paul , David Airlie , daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Tomasz Figa , linux-rockchip@lists.infradead.org, kernel@collabora.com, nicholas.kazlauskas@amd.com, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org CgpPbiAzLzEyLzE5IDM6MzQgQU0sIEJvcmlzIEJyZXppbGxvbiB3cm90ZToKPiBPbiBNb24sIDEx IE1hciAyMDE5IDIzOjIxOjU5IC0wMzAwCj4gSGVsZW4gS29pa2UgPGhlbGVuLmtvaWtlQGNvbGxh Ym9yYS5jb20+IHdyb3RlOgo+IAo+PiBJbiB0aGUgY2FzZSBvZiBhc3luYyB1cGRhdGUsIG1vZGlm aWNhdGlvbnMgYXJlIGRvbmUgaW4gcGxhY2UsIGkuZS4gaW4gdGhlCj4+IGN1cnJlbnQgcGxhbmUg c3RhdGUsIHNvIHRoZSBuZXdfc3RhdGUgaXMgcHJlcGFyZWQgYW5kIHRoZSBuZXdfc3RhdGUgaXMK Pj4gY2xlYW51cCB1cCAoaW5zdGVhZCBvZiB0aGUgb2xkX3N0YXRlLCBkaWZlcnJlbnRseSBvbiB3 aGF0IGhhcHBlbiBpbiBhCj4gCj4gICBeIGNsZWFuZWQgdXAJCQkJXiBkaWZmZXJlbnRseSAoYnV0 IG1heWJlCj4gInVubGlrZSB3aGF0IGhhcHBlbnMiIGlzIG1vcmUgYXBwcm9wcmlhdGUgaGVyZSku Cj4gCj4+IG5vcm1hbCBzeW5jIHVwZGF0ZSkuCj4+IFRvIGNsZWFudXAgdGhlIG9sZF9mYiBwcm9w ZXJseSwgaXQgbmVlZHMgdG8gYmUgcGxhY2VkIGluIHRoZSBuZXdfc3RhdGUKPj4gaW4gdGhlIGVu ZCBvZiBhc3luY191cGRhdGUsIHNvIGNsZWFudXAgY2FsbCB3aWxsIHVucmVmZXJlbmNlIHRoZSBv bGRfZmIKPj4gY29ycmVjdGx5Lgo+Pgo+PiBBbHNvLCB0aGUgcHJldmlvdXMgY29kZSBoYWQgYToK Pj4KPj4gCXBsYW5lX3N0YXRlID0gcGxhbmUtPmZ1bmNzLT5hdG9taWNfZHVwbGljYXRlX3N0YXRl KHBsYW5lKTsKPj4gCS4uLgo+PiAJc3dhcChwbGFuZV9zdGF0ZSwgcGxhbmUtPnN0YXRlKTsKPj4K Pj4gCWlmIChwbGFuZS0+c3RhdGUtPmZiICYmIHBsYW5lLT5zdGF0ZS0+ZmIgIT0gbmV3X3N0YXRl LT5mYikgewo+PiAJLi4uCj4+IAl9Cj4+Cj4+IFdoaWNoIHdhcyB3cm9uZywgYXMgdGhlIGZiIHdl cmUganVzdCBhc3NpZ25lZCB0byBiZSBlcXVhbCwgc28gdGhpcyBpZgo+PiBzdGF0ZW1lbnQgbmV2 ZXJzIGV2YWx1YXRlcyB0byB0cnVlLgo+Pgo+PiBBbm90aGVyIGRldGFpbHMgaXMgdGhhdCB0aGUg ZnVuY3Rpb24gZHJtX2NydGNfdmJsYW5rX2dldCgpIGNhbiBvbmx5IGJlCj4+IGNhbGxlZCB3aGVu IHZvcC0+aXNfZW5hYmxlZCBpcyB0cnVlLCBvdGhlcndpc2UgaXQgaGFzIG5vIGVmZmVjdCBhbmQK Pj4gdHJvd3MgYSBXQVJOX09OKCkuCj4+Cj4+IENhbGxpbmcgZHJtX2F0b21pY19zZXRfZmJfZm9y X3BsYW5lKCkgKHdoaWNoIGdldCBhIHJlZmVyZW50IG9mIHRoZSBuZXcKPj4gZmIgYW5kIHB1cyB0 aGUgb2xkIGZiKSBpcyBub3QgcmVxdWlyZWQsIGFzIGl0IGlzIHRha2VuIGNhcmUgYnkKPj4gZHJt X21vZGVfY3Vyc29yX3VuaXZlcnNhbCgpIHdoZW4gY2FsbGluZwo+PiBkcm1fYXRvbWljX2hlbHBl cl91cGRhdGVfcGxhbmUoKS4KPj4KPj4gU2lnbmVkLW9mZi1ieTogSGVsZW4gS29pa2UgPGhlbGVu LmtvaWtlQGNvbGxhYm9yYS5jb20+Cj4+Cj4+IC0tLQo+PiBIZWxsbywKPj4KPj4gSSB0ZXN0ZWQg b24gdGhlIHJvY2tjaGlwIGZpY3VzIHYxLjEgdXNpbmcgaWd0IHBsYW5lX2N1cnNvcl9sZWdhY3kg YW5kCj4+IGttc19jdXJzb3JfbGVnYWN5IGFuZCBJIGRpZG4ndCBzZWUgYW55IHJlZ3Jlc3Npb25z Lgo+Pgo+PiBDaGFuZ2VzIGluIHYyOiBOb25lCj4+Cj4+ICBkcml2ZXJzL2dwdS9kcm0vcm9ja2No aXAvcm9ja2NoaXBfZHJtX3ZvcC5jIHwgNDIgKysrKysrKysrKysrLS0tLS0tLS0tCj4+ICAxIGZp bGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCj4+Cj4+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIGIvZHJp dmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwo+PiBpbmRleCBjN2Q0YzYw NzNlYTUuLmExZWU4YzE1NmE3YiAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL3JvY2tjaGlwX2RybV92b3AuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAv cm9ja2NoaXBfZHJtX3ZvcC5jCj4+IEBAIC05MTIsMzAgKzkxMiwzMSBAQCBzdGF0aWMgdm9pZCB2 b3BfcGxhbmVfYXRvbWljX2FzeW5jX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPj4g IAkJCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpuZXdfc3RhdGUpCj4+ICB7Cj4+ICAJc3Ry dWN0IHZvcCAqdm9wID0gdG9fdm9wKHBsYW5lLT5zdGF0ZS0+Y3J0Yyk7Cj4+IC0Jc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Cj4+ICsJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq b2xkX2ZiID0gcGxhbmUtPnN0YXRlLT5mYjsKPj4gIAo+PiAtCXBsYW5lX3N0YXRlID0gcGxhbmUt PmZ1bmNzLT5hdG9taWNfZHVwbGljYXRlX3N0YXRlKHBsYW5lKTsKPj4gLQlwbGFuZV9zdGF0ZS0+ Y3J0Y194ID0gbmV3X3N0YXRlLT5jcnRjX3g7Cj4+IC0JcGxhbmVfc3RhdGUtPmNydGNfeSA9IG5l d19zdGF0ZS0+Y3J0Y195Owo+PiAtCXBsYW5lX3N0YXRlLT5jcnRjX2ggPSBuZXdfc3RhdGUtPmNy dGNfaDsKPj4gLQlwbGFuZV9zdGF0ZS0+Y3J0Y193ID0gbmV3X3N0YXRlLT5jcnRjX3c7Cj4+IC0J cGxhbmVfc3RhdGUtPnNyY194ID0gbmV3X3N0YXRlLT5zcmNfeDsKPj4gLQlwbGFuZV9zdGF0ZS0+ c3JjX3kgPSBuZXdfc3RhdGUtPnNyY195Owo+PiAtCXBsYW5lX3N0YXRlLT5zcmNfaCA9IG5ld19z dGF0ZS0+c3JjX2g7Cj4+IC0JcGxhbmVfc3RhdGUtPnNyY193ID0gbmV3X3N0YXRlLT5zcmNfdzsK Pj4gLQo+PiAtCWlmIChwbGFuZV9zdGF0ZS0+ZmIgIT0gbmV3X3N0YXRlLT5mYikKPj4gLQkJZHJt X2F0b21pY19zZXRfZmJfZm9yX3BsYW5lKHBsYW5lX3N0YXRlLCBuZXdfc3RhdGUtPmZiKTsKPj4g LQo+PiAtCXN3YXAocGxhbmVfc3RhdGUsIHBsYW5lLT5zdGF0ZSk7Cj4+IC0KPj4gLQlpZiAocGxh bmUtPnN0YXRlLT5mYiAmJiBwbGFuZS0+c3RhdGUtPmZiICE9IG5ld19zdGF0ZS0+ZmIpIHsKPj4g KwkvKgo+PiArCSAqIEEgc2Nhbm91dCBjYW4gc3RpbGwgYmUgb2NjdXJyaW5nLCBzbyB3ZSBjYW4n dCBkcm9wIHRoZSByZWZlcmVuY2UgdG8KPj4gKwkgKiB0aGUgb2xkIGZyYW1lYnVmZmVyLiBUbyBz b2x2ZSB0aGlzIHdlIGdldCBhIHJlZmVyZW5jZSB0byBvbGRfZmIgYW5kCj4+ICsJICogc2V0IGEg d29ya2VyIHRvIHJlbGVhc2UgaXQgbGF0ZXIuCj4gCj4gSG0sIGRvZXNuJ3QgbG9vayBsaWtlIGFu IGFzeW5jIHVwZGF0ZSB0byBtZSBpZiB3ZSBoYXZlIHRvIHdhaXQgZm9yIHRoZQo+IG5leHQgVkJM QU5LIHRvIGhhcHBlbiB0byBnZXQgdGhlIG5ldyBjb250ZW50IG9uIHRoZSBzY3JlZW4uIE1heWJl IHdlCj4gc2hvdWxkIHJlamVjdCBhc3luYyB1cGRhdGVzIHdoZW4gb2xkX2ZiICE9IG5ld19mYiBp biB0aGUgcmsKPiAtPmFzeW5jX2NoZWNrKCkgaG9vay4KClVubGVzcyBJIGFtIG1pc3VuZGVyc3Rh bmRpbmcgdGhpcywgd2UgZG9uJ3Qgd2FpdCBoZXJlLCB3ZSBqdXN0IGdyYWIgYQpyZWZlcmVuY2Ug dG8gdGhlIGZiIGluIGNhc2UgaXQgaXMgYmVpbmcgc3RpbGwgdXNlZCBieSB0aGUgaHcsIHNvIGl0 CmRvZXNuJ3QgZ2V0IHJlbGVhc2VkIHByZW1hdHVyZWx5LgoKPiAKPj4gKwkgKi8KPj4gKwlpZiAo dm9wLT5pc19lbmFibGVkICYmCj4+ICsJICAgIHBsYW5lLT5zdGF0ZS0+ZmIgJiYgcGxhbmUtPnN0 YXRlLT5mYiAhPSBuZXdfc3RhdGUtPmZiKSB7Cj4+ICAJCWRybV9mcmFtZWJ1ZmZlcl9nZXQocGxh bmUtPnN0YXRlLT5mYik7Cj4+ICAJCVdBUk5fT04oZHJtX2NydGNfdmJsYW5rX2dldChwbGFuZS0+ c3RhdGUtPmNydGMpICE9IDApOwo+PiAgCQlkcm1fZmxpcF93b3JrX3F1ZXVlKCZ2b3AtPmZiX3Vu cmVmX3dvcmssIHBsYW5lLT5zdGF0ZS0+ZmIpOwo+PiAgCQlzZXRfYml0KFZPUF9QRU5ESU5HX0ZC X1VOUkVGLCAmdm9wLT5wZW5kaW5nKTsKPj4gIAl9Cj4gCj4gSW4gYW55IGNhc2UsIEkgdGhpbmsg dGhpcyBzaG91bGQgYmUgY2FsbGVkIGFmdGVyCj4gdm9wX3BsYW5lX2F0b21pY191cGRhdGUoKSB0 byBwcmV2ZW50IHRoZSBzaXR1YXRpb24gd2hlcmUgdGhlIFZCTEFOSwo+IGV2ZW50IGhhcHBlbnMg YmV0d2VlbiB0aGlzIHBvaW50IGFuZCB0aGUgZm9sbG93aW5nCj4gdm9wX3BsYW5lX2F0b21pY191 cGRhdGUoKSBjYWxsLgoKYWNrLCBJJ2xsIHVwZGF0ZSBpdCBpbiB0aGUgbmV4dCB2ZXJzaW9uLgoK PiAKPj4gIAo+PiArCXBsYW5lLT5zdGF0ZS0+Y3J0Y194ID0gbmV3X3N0YXRlLT5jcnRjX3g7Cj4+ ICsJcGxhbmUtPnN0YXRlLT5jcnRjX3kgPSBuZXdfc3RhdGUtPmNydGNfeTsKPj4gKwlwbGFuZS0+ c3RhdGUtPmNydGNfaCA9IG5ld19zdGF0ZS0+Y3J0Y19oOwo+PiArCXBsYW5lLT5zdGF0ZS0+Y3J0 Y193ID0gbmV3X3N0YXRlLT5jcnRjX3c7Cj4+ICsJcGxhbmUtPnN0YXRlLT5zcmNfeCA9IG5ld19z dGF0ZS0+c3JjX3g7Cj4+ICsJcGxhbmUtPnN0YXRlLT5zcmNfeSA9IG5ld19zdGF0ZS0+c3JjX3k7 Cj4+ICsJcGxhbmUtPnN0YXRlLT5zcmNfaCA9IG5ld19zdGF0ZS0+c3JjX2g7Cj4+ICsJcGxhbmUt PnN0YXRlLT5zcmNfdyA9IG5ld19zdGF0ZS0+c3JjX3c7Cj4+ICsJcGxhbmUtPnN0YXRlLT5mYiA9 IG5ld19zdGF0ZS0+ZmI7Cj4gCj4gQW55IHJlYXNvbiBub3QgdG8gdXNlIHN3YXAoKSBoZXJlIGFu ZCByZWZlcmVuY2UgcGxhbmUtPnN0YXRlLT5mYgo+IGluc3RlYWQgb2YgbmV3X3N0YXRlLT5mYiBh ZnRlciB0aGlzIHBvaW50PwoKSSBoYWQgdGhlIGltcHJlc3Npb24gSSBoYWQgdG8gZG8gdGhpcyBp biBvbmUgb2YgbXkgdGVzdHMsIGJ1dCByZS10ZXN0aW5nCm5vdyBhbmQgcmUtbG9va2luZyBhdCB0 aGUgY29kZSB0aGlzIGRvZXNuJ3Qgc2VlbSB0byBiZSBuZWNlc3NhcnkuIEknbGwKdXNlIGEgc3dh cCgpIGluIHRoZSBuZXh0IHZlcnNpb24uCgpUaGFua3MgZm9yIHlvdXIgZmVlZGJhY2suCkhlbGVu Cgo+IAo+PiArCj4+ICAJaWYgKHZvcC0+aXNfZW5hYmxlZCkgewo+PiAgCQlyb2NrY2hpcF9kcm1f cHNyX2luaGliaXRfZ2V0X3N0YXRlKG5ld19zdGF0ZS0+c3RhdGUpOwo+PiAgCQl2b3BfcGxhbmVf YXRvbWljX3VwZGF0ZShwbGFuZSwgcGxhbmUtPnN0YXRlKTsKPj4gQEAgLTk0NSw3ICs5NDYsMTIg QEAgc3RhdGljIHZvaWQgdm9wX3BsYW5lX2F0b21pY19hc3luY191cGRhdGUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCj4+ICAJCXJvY2tjaGlwX2RybV9wc3JfaW5oaWJpdF9wdXRfc3RhdGUobmV3 X3N0YXRlLT5zdGF0ZSk7Cj4+ICAJfQo+PiAgCj4+IC0JcGxhbmUtPmZ1bmNzLT5hdG9taWNfZGVz dHJveV9zdGF0ZShwbGFuZSwgcGxhbmVfc3RhdGUpOwo+PiArCS8qCj4+ICsJICogSW4gYXN5bmMg dXBkYXRlIHdlIHBlcmZvcm0gaW5wbGFjZSBtb2RpZmljYXRpb25zIGFuZCByZWxlYXNlIHRoZQo+ PiArCSAqIG5ld19zdGF0ZS4gVGhlIGZvbGxvd2luZyBpcyByZXF1aXJlZCBzbyB3ZSByZWxlYXNl IHRoZSByZWZlcmVuY2Ugb2YKPj4gKwkgKiB0aGUgb2xkIGZyYW1lYnVmZmVyLgo+PiArCSAqLwo+ PiArCW5ld19zdGF0ZS0+ZmIgPSBvbGRfZmI7Cj4+ICB9Cj4+ICAKPj4gIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyBwbGFuZV9oZWxwZXJfZnVuY3MgPSB7Cj4gCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 40F70C43381 for ; Tue, 12 Mar 2019 15:35:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E2792083D for ; Tue, 12 Mar 2019 15:35:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fL7oX053" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E2792083D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ie74lbKacfNDBKKAOZWDdrre4tLHvcydrPefEvAtI4U=; b=fL7oX053AQ7kc4 dUnhGqfFySg69Y+sSTrduN/NEqnL7hNJczDnFrDgAV/HSdDfLC2CEdBgbGcwmUCqQY5XfR4t2aphx 3wG0p5PAi17fUG+AnHfvTRLGp+3TifkspaTD4CIPvKNv5aCDrwVPNqKZWEcMqEri9c2zwW7UObWRz 70zdUOQHW10DMGKxG8Nn/vGHQ5UVr5jHCpNAW4K2qk3ubylUOeXpsKGrjxzVhfZ163xh/V8+4WCvd SLQnOU2KsmmSoTGW2M+HDboLeIfOAAinq3w0lUonwdRL1OepXCVlPhO8wIjVgP+10vj6TOG3B/a42 dR0BE6KpJ7g4VUzCknTA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h3jQh-0000hw-Ga; Tue, 12 Mar 2019 15:34:59 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h3jQd-0000XY-Tb; Tue, 12 Mar 2019 15:34:58 +0000 Received: from [IPv6:2804:431:9719:798c:867b:ebff:fe52:de60] (unknown [IPv6:2804:431:9719:798c:867b:ebff:fe52:de60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: koike) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 2A00A281027; Tue, 12 Mar 2019 15:34:48 +0000 (GMT) Subject: Re: [PATCH v2 1/5] drm/rockchip: fix fb references in async update To: Boris Brezillon References: <20190312022204.2775-1-helen.koike@collabora.com> <20190312022204.2775-2-helen.koike@collabora.com> <20190312073438.05ad8173@collabora.com> From: Helen Koike Openpgp: preference=signencrypt Autocrypt: addr=helen.koike@collabora.com; keydata= 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 Message-ID: Date: Tue, 12 Mar 2019 12:34:45 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190312073438.05ad8173@collabora.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190312_083456_332096_0C7F0CDB X-CRM114-Status: GOOD ( 29.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrey.grodzovsky@amd.com, =?UTF-8?Q?St=c3=a9phane_Marchesin?= , =?UTF-8?Q?Heiko_St=c3=bcbner?= , Sean Paul , David Airlie , daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Tomasz Figa , linux-rockchip@lists.infradead.org, Sandy Huang , Daniel Vetter , kernel@collabora.com, harry.wentland@amd.com, nicholas.kazlauskas@amd.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 3/12/19 3:34 AM, Boris Brezillon wrote: > On Mon, 11 Mar 2019 23:21:59 -0300 > Helen Koike wrote: > >> In the case of async update, modifications are done in place, i.e. in the >> current plane state, so the new_state is prepared and the new_state is >> cleanup up (instead of the old_state, diferrently on what happen in a > > ^ cleaned up ^ differently (but maybe > "unlike what happens" is more appropriate here). > >> normal sync update). >> To cleanup the old_fb properly, it needs to be placed in the new_state >> in the end of async_update, so cleanup call will unreference the old_fb >> correctly. >> >> Also, the previous code had a: >> >> plane_state = plane->funcs->atomic_duplicate_state(plane); >> ... >> swap(plane_state, plane->state); >> >> if (plane->state->fb && plane->state->fb != new_state->fb) { >> ... >> } >> >> Which was wrong, as the fb were just assigned to be equal, so this if >> statement nevers evaluates to true. >> >> Another details is that the function drm_crtc_vblank_get() can only be >> called when vop->is_enabled is true, otherwise it has no effect and >> trows a WARN_ON(). >> >> Calling drm_atomic_set_fb_for_plane() (which get a referent of the new >> fb and pus the old fb) is not required, as it is taken care by >> drm_mode_cursor_universal() when calling >> drm_atomic_helper_update_plane(). >> >> Signed-off-by: Helen Koike >> >> --- >> Hello, >> >> I tested on the rockchip ficus v1.1 using igt plane_cursor_legacy and >> kms_cursor_legacy and I didn't see any regressions. >> >> Changes in v2: None >> >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 42 ++++++++++++--------- >> 1 file changed, 24 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> index c7d4c6073ea5..a1ee8c156a7b 100644 >> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >> @@ -912,30 +912,31 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane, >> struct drm_plane_state *new_state) >> { >> struct vop *vop = to_vop(plane->state->crtc); >> - struct drm_plane_state *plane_state; >> + struct drm_framebuffer *old_fb = plane->state->fb; >> >> - plane_state = plane->funcs->atomic_duplicate_state(plane); >> - plane_state->crtc_x = new_state->crtc_x; >> - plane_state->crtc_y = new_state->crtc_y; >> - plane_state->crtc_h = new_state->crtc_h; >> - plane_state->crtc_w = new_state->crtc_w; >> - plane_state->src_x = new_state->src_x; >> - plane_state->src_y = new_state->src_y; >> - plane_state->src_h = new_state->src_h; >> - plane_state->src_w = new_state->src_w; >> - >> - if (plane_state->fb != new_state->fb) >> - drm_atomic_set_fb_for_plane(plane_state, new_state->fb); >> - >> - swap(plane_state, plane->state); >> - >> - if (plane->state->fb && plane->state->fb != new_state->fb) { >> + /* >> + * A scanout can still be occurring, so we can't drop the reference to >> + * the old framebuffer. To solve this we get a reference to old_fb and >> + * set a worker to release it later. > > Hm, doesn't look like an async update to me if we have to wait for the > next VBLANK to happen to get the new content on the screen. Maybe we > should reject async updates when old_fb != new_fb in the rk > ->async_check() hook. Unless I am misunderstanding this, we don't wait here, we just grab a reference to the fb in case it is being still used by the hw, so it doesn't get released prematurely. > >> + */ >> + if (vop->is_enabled && >> + plane->state->fb && plane->state->fb != new_state->fb) { >> drm_framebuffer_get(plane->state->fb); >> WARN_ON(drm_crtc_vblank_get(plane->state->crtc) != 0); >> drm_flip_work_queue(&vop->fb_unref_work, plane->state->fb); >> set_bit(VOP_PENDING_FB_UNREF, &vop->pending); >> } > > In any case, I think this should be called after > vop_plane_atomic_update() to prevent the situation where the VBLANK > event happens between this point and the following > vop_plane_atomic_update() call. ack, I'll update it in the next version. > >> >> + plane->state->crtc_x = new_state->crtc_x; >> + plane->state->crtc_y = new_state->crtc_y; >> + plane->state->crtc_h = new_state->crtc_h; >> + plane->state->crtc_w = new_state->crtc_w; >> + plane->state->src_x = new_state->src_x; >> + plane->state->src_y = new_state->src_y; >> + plane->state->src_h = new_state->src_h; >> + plane->state->src_w = new_state->src_w; >> + plane->state->fb = new_state->fb; > > Any reason not to use swap() here and reference plane->state->fb > instead of new_state->fb after this point? I had the impression I had to do this in one of my tests, but re-testing now and re-looking at the code this doesn't seem to be necessary. I'll use a swap() in the next version. Thanks for your feedback. Helen > >> + >> if (vop->is_enabled) { >> rockchip_drm_psr_inhibit_get_state(new_state->state); >> vop_plane_atomic_update(plane, plane->state); >> @@ -945,7 +946,12 @@ static void vop_plane_atomic_async_update(struct drm_plane *plane, >> rockchip_drm_psr_inhibit_put_state(new_state->state); >> } >> >> - plane->funcs->atomic_destroy_state(plane, plane_state); >> + /* >> + * In async update we perform inplace modifications and release the >> + * new_state. The following is required so we release the reference of >> + * the old framebuffer. >> + */ >> + new_state->fb = old_fb; >> } >> >> static const struct drm_plane_helper_funcs plane_helper_funcs = { > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel