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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH 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 4EAE0C468BD for ; Sun, 9 Jun 2019 10:08:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2784620693 for ; Sun, 9 Jun 2019 10:08:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560074935; bh=OUDXL7ZdoUSpG/knov+LTd2RHeCxht9e/S6KIvdzSwo=; h=Subject:To:Cc:From:Date:List-ID:From; b=I7oCxoNbgcA5U72VjFDqFVN7jW82fav2ygzFUeTvER5VqZ95xPPUBUtiW6VU2Jxre 78TpII6W0fsioig88UYbTw82CzJcBQOWpUyFL2u9b3JdmChWyaGtfGULcHKYKILXXv jhNLnY6GE3yRhKMO1TBsjw0wNEhPOL7atjPz2Vfg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727853AbfFIKIy (ORCPT ); Sun, 9 Jun 2019 06:08:54 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:36945 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727979AbfFIKIy (ORCPT ); Sun, 9 Jun 2019 06:08:54 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 0FF853C7; Sun, 9 Jun 2019 06:08:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sun, 09 Jun 2019 06:08:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=hFNtPi ij13TfEoWJwjNnPKJ4JlOKRjDPU6yF6jolqZI=; b=TzX62IVVq96Z2dQskLuUtC KROGxyo3I18XVzJbFqZ6GFfu+TQ8XQo6UuJ4rh4Uz5srNI3IrTGC8QHHdbWFAdgm oxwkHjzyIOTv9MKz8G06RAg5O3g0DKFR9PdJWAby1zY7vHbD3US4oM6K1+jD7sVk ey/uauqu4yk1GYFqpe4OJRcoBe1FTHo8SRmpKxv01NvHx+KNE/RFmfe2PBuLNQ8/ sL67jL5kgHvvL1xHF2qGZJWeKAV9h/xwvjxhJstZDDdnG1DWCK/+2+BI5QgTpt/F oH4BXEDU+afwyp36S8+C5rbqOEo+O7FApR0oLQY0QxcVGumcGLUFldr/nRB5Htzw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrudehtddgvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhgnecukfhppeekfedrke eirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghh rdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id D40F4380073; Sun, 9 Jun 2019 06:08:51 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/vc4: fix fb references in async update" failed to apply to 4.19-stable tree To: helen.koike@collabora.com, boris.brezillon@collabora.com, stable@vger.kernel.org Cc: From: Date: Sun, 09 Jun 2019 12:08:49 +0200 Message-ID: <156007492924468@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c16b85559dcfb5a348cc085a7b4c75ed49b05e2c Mon Sep 17 00:00:00 2001 From: Helen Koike Date: Mon, 3 Jun 2019 13:56:09 -0300 Subject: [PATCH] drm/vc4: fix fb references in async update Async update callbacks are expected to set the old_fb in the new_state so prepare/cleanup framebuffers are balanced. Calling drm_atomic_set_fb_for_plane() (which gets a reference of the new fb and put the old fb) is not required, as it's taken care by drm_mode_cursor_universal() when calling drm_atomic_helper_update_plane(). Cc: # v4.19+ Fixes: 539c320bfa97 ("drm/vc4: update cursors asynchronously through atomic") Suggested-by: Boris Brezillon Signed-off-by: Helen Koike Reviewed-by: Boris Brezillon Signed-off-by: Boris Brezillon Link: https://patchwork.freedesktop.org/patch/msgid/20190603165610.24614-5-helen.koike@collabora.com diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 4d918d3e4858..afc80b245ea3 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -1025,7 +1025,7 @@ static void vc4_plane_atomic_async_update(struct drm_plane *plane, { struct vc4_plane_state *vc4_state, *new_vc4_state; - drm_atomic_set_fb_for_plane(plane->state, state->fb); + swap(plane->state->fb, state->fb); plane->state->crtc_x = state->crtc_x; plane->state->crtc_y = state->crtc_y; plane->state->crtc_w = state->crtc_w;