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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A78BAC04AB6 for ; Fri, 31 May 2019 18:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DE53259A7 for ; Fri, 31 May 2019 18:50:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i/FN5emt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727038AbfEaSuZ (ORCPT ); Fri, 31 May 2019 14:50:25 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:39516 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726589AbfEaSuZ (ORCPT ); Fri, 31 May 2019 14:50:25 -0400 Received: by mail-ed1-f68.google.com with SMTP id e24so15950056edq.6; Fri, 31 May 2019 11:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9F1WuqVm5Nwgt2J2M3yybMSAaWZKrJwC/jdTGtkMibQ=; b=i/FN5emthvipoIzFp3zGS9/f6xBcQBDTkQ7GC/lmQe0TwDLTHCS3IgiVtCQRBB44uB 6WEp7SwcJyAqdjMEYkv19i0jR/gVwbKMEhj2oMHnhpkKRJZ5d0RmumzwB+qOHE1anNKc 0EoAj2WEuDVIMfXdkxJ3IGB25hWm23hdRd/FWTJFpXyho+ouicbkZl4TX2nNirMfcJ64 mai4mjwMYtQ6nXS7rThoZY8t1lc4IYhFlbouzCfip/E3hE+7kuTzGaxnhDM8chWESfLK 33z4dteGs8q9xfQWTk8CUAzFuf3deuNaSOza9pxhkogn2H2EOi/hLl8Wobn2pzywPjxr xrfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9F1WuqVm5Nwgt2J2M3yybMSAaWZKrJwC/jdTGtkMibQ=; b=RJh9o9MV3rfUIu2h0nNdDOZO7JgeoBidWqeCXH2hBCsyCG4sT5Nzzp02lsTwg7foHL KMWkn4jflkC9Mr8bXkiAEpfXFMkEtuyZpxSKJFBlLIw42tXUsFD1kmSu5J7dh/pJ8+/o xdTS5Y5+xAsX7G6NkAQnrW5ZursvoJHYsoQQxZiOBu2uvev8WTC4aKU2+L5bO9UFulVF C8xK9fg64X0bH5uVNnYBH9Uo98aNcfaNZS5WcjNCM5YKuQyQl1aIdzrp//203hLrl+A1 nW2Lr/LZynjGC2leScEOfllBMCC0gl/714+Whrk2LLmIb5/wPr1JegbYfn/Y75XIMHP5 xBCw== X-Gm-Message-State: APjAAAV9qePpBsgcZ85CQrMQ3SRfxN4NdRgWVxN/wD9qBFo7kOdG9BmA xlVW3wpuWnjza1cZGn0IRtLQ/hNpCccKYzTwXQpyQhWp X-Google-Smtp-Source: APXvYqzPMqyWQ+/oc5RiQ0JtssEbM6wdvalwO7IL3dmiggPgXl4aCaKyvkmw+wPethuMjUFG0dLNSwtXsRd8qIV8JHw= X-Received: by 2002:a50:bc15:: with SMTP id j21mr13082718edh.163.1559328623286; Fri, 31 May 2019 11:50:23 -0700 (PDT) MIME-Version: 1.0 References: <20190314002027.7833-1-helen.koike@collabora.com> <20190314002027.7833-4-helen.koike@collabora.com> In-Reply-To: From: Rob Clark Date: Fri, 31 May 2019 11:50:09 -0700 Message-ID: Subject: Re: [PATCH v3 3/5] drm/msm: fix fb references in async update To: Helen Koike Cc: Helen Koike , dri-devel , nicholas.kazlauskas@amd.com, "Grodzovsky, Andrey" , Daniel Vetter , Linux Kernel Mailing List , Tomasz Figa , Boris Brezillon , David Airlie , Sean Paul , kernel@collabora.com, Harry Wentland , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , stable , Sean Paul , linux-arm-msm , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= , Maarten Lankhorst , freedreno , Mamta Shukla , Daniel Vetter Content-Type: text/plain; charset="UTF-8" Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, May 31, 2019 at 10:54 AM Helen Koike wrote: > > Hello, > > On 3/13/19 9:20 PM, Helen Koike wrote: > > Async update callbacks are expected to set the old_fb in the new_state > > so prepare/cleanup framebuffers are balanced. > > > > Cc: # v4.14+ > > Fixes: 224a4c970987 ("drm/msm: update cursors asynchronously through atomic") > > Suggested-by: Boris Brezillon > > Signed-off-by: Helen Koike Thanks, I'm not super happy about the refcnt'ing subtleness here (mostly because it makes it harder to page in how things work on kernel/display side after spending most of my time in userspace/mesa), but I don't want to hold this up.. Acked-by: Rob Clark > > > > --- > > Hello, > > > > As mentioned in the cover letter, > > But I couldn't test on MSM because I don't have the hardware and I would > > appreciate if anyone could test it. > > I got this tested on a dragonboard 410c, no regressions where found and > no extra warnings. > > These two tests where already failing for other reasons: > flip-vs-cursor-crc-atomic > flip-vs-cursor-crc-legacy > > If you want to see the full log: > > https://people.collabora.com/~koike/drm-fixes-results.zip > > Thanks > Helen > > > > > In other platforms (VC4, AMD, Rockchip), there is a hidden > > drm_framebuffer_get(new_fb)/drm_framebuffer_put(old_fb) in async_update > > that is wrong, but I couldn't identify those here, not sure if it is hidden > > somewhere else, but if tests fail this is probably the cause. > > > > Thanks! > > Helen > > > > Changes in v3: None > > Changes in v2: > > - update CC stable and Fixes tag > > > > drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > > index be13140967b4..b854f471e9e5 100644 > > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > > @@ -502,6 +502,8 @@ static int mdp5_plane_atomic_async_check(struct drm_plane *plane, > > static void mdp5_plane_atomic_async_update(struct drm_plane *plane, > > struct drm_plane_state *new_state) > > { > > + struct drm_framebuffer *old_fb = plane->state->fb; > > + > > plane->state->src_x = new_state->src_x; > > plane->state->src_y = new_state->src_y; > > plane->state->crtc_x = new_state->crtc_x; > > @@ -524,6 +526,8 @@ static void mdp5_plane_atomic_async_update(struct drm_plane *plane, > > > > *to_mdp5_plane_state(plane->state) = > > *to_mdp5_plane_state(new_state); > > + > > + new_state->fb = old_fb; > > } > > > > static const struct drm_plane_helper_funcs mdp5_plane_helper_funcs = { > >