From patchwork Tue Mar 12 02:21:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helen Mae Koike Fornazier X-Patchwork-Id: 10848513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34F801515 for ; Tue, 12 Mar 2019 02:24:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CD1C28B1B for ; Tue, 12 Mar 2019 02:24:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1026128CBD; Tue, 12 Mar 2019 02:24:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6DD928B1B for ; Tue, 12 Mar 2019 02:24:03 +0000 (UTC) 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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tPUaue1UqlGtpFUlkec/AYtx1DSdFmPw8o3DtXqwyFg=; b=fq7yJN/aoF9dKx akeJssTQOGJ8Nf/K7GgYNcVnp88x8gx4bwomeBV/ySF5eoJSQcgkNwWwv2fGgcgaKRpN+7waR71v9 5sZqoWj6AyJWapkCtXrq5hBfXgDpM80Qb3ukOJGIuv8CZZTH4dJJMEmdplW34YPWEGS9EwNGw7V1y HhLAN2qSRcCxuyqE7/KwYRGGJhKPd9uv0LE1dSYpkeamqGIF5SjNjwSJbw5xh920M4HvBz9SVltA2 NeP2upeXNOEthcqjRmUFfPkmQcQC6N6537L6g9JkZn8SzhieUeRtwEijMUhFgmYqiZP82JDuRYQne 9SMRQPZ+jJE8TBymOkOg==; 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 1h3X57-0007sw-48; Tue, 12 Mar 2019 02:23:53 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h3X53-0007rW-9H; Tue, 12 Mar 2019 02:23:51 +0000 Received: from localhost.localdomain (unknown [IPv6:2804:431:9719:798c:6bb0:a97a:4a09:e6d8]) (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 CFCD326F5EE; Tue, 12 Mar 2019 02:23:39 +0000 (GMT) From: Helen Koike To: dri-devel@lists.freedesktop.org, nicholas.kazlauskas@amd.com Subject: [PATCH v2 1/5] drm/rockchip: fix fb references in async update Date: Mon, 11 Mar 2019 23:21:59 -0300 Message-Id: <20190312022204.2775-2-helen.koike@collabora.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312022204.2775-1-helen.koike@collabora.com> References: <20190312022204.2775-1-helen.koike@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190311_192349_581542_7B6AEAA2 X-CRM114-Status: GOOD ( 17.01 ) 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_S?= =?utf-8?q?t=C3=BCbner?= , Sean Paul , Sandy Huang , David Airlie , daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org, Tomasz Figa , linux-rockchip@lists.infradead.org, Helen Koike , boris.brezillon@collabora.com, Daniel Vetter , kernel@collabora.com, harry.wentland@amd.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 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. + */ + 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); } + 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; + 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 = {