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 = { > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: Re: [PATCH v3 3/5] drm/msm: fix fb references in async update Date: Fri, 31 May 2019 11:50:09 -0700 Message-ID: References: <20190314002027.7833-1-helen.koike@collabora.com> <20190314002027.7833-4-helen.koike@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Helen Koike Cc: Sean Paul , "Grodzovsky, Andrey" , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , Sean Paul , David Airlie , Daniel Vetter , Maarten Lankhorst , Linux Kernel Mailing List , dri-devel , Tomasz Figa , freedreno , Helen Koike , Boris Brezillon , Mamta Shukla , stable , Daniel Vetter , linux-arm-msm , kernel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org, Harry Wentland , nicholas.kazlauskas-5C7GfCeVMHo@public.gmane.org, =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBNYXkgMzEsIDIwMTkgYXQgMTA6NTQgQU0gSGVsZW4gS29pa2UgPGhlbGVuQGtvaWtl Y28uZGU+IHdyb3RlOgo+Cj4gSGVsbG8sCj4KPiBPbiAzLzEzLzE5IDk6MjAgUE0sIEhlbGVuIEtv aWtlIHdyb3RlOgo+ID4gQXN5bmMgdXBkYXRlIGNhbGxiYWNrcyBhcmUgZXhwZWN0ZWQgdG8gc2V0 IHRoZSBvbGRfZmIgaW4gdGhlIG5ld19zdGF0ZQo+ID4gc28gcHJlcGFyZS9jbGVhbnVwIGZyYW1l YnVmZmVycyBhcmUgYmFsYW5jZWQuCj4gPgo+ID4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3Jn PiAjIHY0LjE0Kwo+ID4gRml4ZXM6IDIyNGE0Yzk3MDk4NyAoImRybS9tc206IHVwZGF0ZSBjdXJz b3JzIGFzeW5jaHJvbm91c2x5IHRocm91Z2ggYXRvbWljIikKPiA+IFN1Z2dlc3RlZC1ieTogQm9y aXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AY29sbGFib3JhLmNvbT4KPiA+IFNpZ25lZC1v ZmYtYnk6IEhlbGVuIEtvaWtlIDxoZWxlbi5rb2lrZUBjb2xsYWJvcmEuY29tPgoKVGhhbmtzLCBJ J20gbm90IHN1cGVyIGhhcHB5IGFib3V0IHRoZSByZWZjbnQnaW5nIHN1YnRsZW5lc3MgaGVyZQoo bW9zdGx5IGJlY2F1c2UgaXQgbWFrZXMgaXQgaGFyZGVyIHRvIHBhZ2UgaW4gaG93IHRoaW5ncyB3 b3JrIG9uCmtlcm5lbC9kaXNwbGF5IHNpZGUgYWZ0ZXIgc3BlbmRpbmcgbW9zdCBvZiBteSB0aW1l IGluIHVzZXJzcGFjZS9tZXNhKSwKYnV0IEkgZG9uJ3Qgd2FudCB0byBob2xkIHRoaXMgdXAuLgoK QWNrZWQtYnk6IFJvYiBDbGFyayA8cm9iZGNsYXJrQGdtYWlsLmNvbT4KCj4gPgo+ID4gLS0tCj4g PiBIZWxsbywKPiA+Cj4gPiBBcyBtZW50aW9uZWQgaW4gdGhlIGNvdmVyIGxldHRlciwKPiA+IEJ1 dCBJIGNvdWxkbid0IHRlc3Qgb24gTVNNIGJlY2F1c2UgSSBkb24ndCBoYXZlIHRoZSBoYXJkd2Fy ZSBhbmQgSSB3b3VsZAo+ID4gYXBwcmVjaWF0ZSBpZiBhbnlvbmUgY291bGQgdGVzdCBpdC4KPgo+ IEkgZ290IHRoaXMgdGVzdGVkIG9uIGEgZHJhZ29uYm9hcmQgNDEwYywgbm8gcmVncmVzc2lvbnMg d2hlcmUgZm91bmQgYW5kCj4gbm8gZXh0cmEgd2FybmluZ3MuCj4KPiBUaGVzZSB0d28gdGVzdHMg d2hlcmUgYWxyZWFkeSBmYWlsaW5nIGZvciBvdGhlciByZWFzb25zOgo+IGZsaXAtdnMtY3Vyc29y LWNyYy1hdG9taWMKPiBmbGlwLXZzLWN1cnNvci1jcmMtbGVnYWN5Cj4KPiBJZiB5b3Ugd2FudCB0 byBzZWUgdGhlIGZ1bGwgbG9nOgo+Cj4gaHR0cHM6Ly9wZW9wbGUuY29sbGFib3JhLmNvbS9+a29p a2UvZHJtLWZpeGVzLXJlc3VsdHMuemlwCj4KPiBUaGFua3MKPiBIZWxlbgo+Cj4gPgo+ID4gSW4g b3RoZXIgcGxhdGZvcm1zIChWQzQsIEFNRCwgUm9ja2NoaXApLCB0aGVyZSBpcyBhIGhpZGRlbgo+ ID4gZHJtX2ZyYW1lYnVmZmVyX2dldChuZXdfZmIpL2RybV9mcmFtZWJ1ZmZlcl9wdXQob2xkX2Zi KSBpbiBhc3luY191cGRhdGUKPiA+IHRoYXQgaXMgd3JvbmcsIGJ1dCBJIGNvdWxkbid0IGlkZW50 aWZ5IHRob3NlIGhlcmUsIG5vdCBzdXJlIGlmIGl0IGlzIGhpZGRlbgo+ID4gc29tZXdoZXJlIGVs c2UsIGJ1dCBpZiB0ZXN0cyBmYWlsIHRoaXMgaXMgcHJvYmFibHkgdGhlIGNhdXNlLgo+ID4KPiA+ IFRoYW5rcyEKPiA+IEhlbGVuCj4gPgo+ID4gQ2hhbmdlcyBpbiB2MzogTm9uZQo+ID4gQ2hhbmdl cyBpbiB2MjoKPiA+IC0gdXBkYXRlIENDIHN0YWJsZSBhbmQgRml4ZXMgdGFnCj4gPgo+ID4gIGRy aXZlcnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVfcGxhbmUuYyB8IDQgKysrKwo+ID4gIDEg ZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKykKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL21zbS9kaXNwL21kcDUvbWRwNV9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21z bS9kaXNwL21kcDUvbWRwNV9wbGFuZS5jCj4gPiBpbmRleCBiZTEzMTQwOTY3YjQuLmI4NTRmNDcx ZTllNSAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9tZHA1L21kcDVf cGxhbmUuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL21kcDUvbWRwNV9wbGFu ZS5jCj4gPiBAQCAtNTAyLDYgKzUwMiw4IEBAIHN0YXRpYyBpbnQgbWRwNV9wbGFuZV9hdG9taWNf YXN5bmNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gPiAgc3RhdGljIHZvaWQgbWRw NV9wbGFuZV9hdG9taWNfYXN5bmNfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ID4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpuZXdfc3RhdGUpCj4gPiAgewo+ID4gKyAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqb2xkX2ZiID0gcGxhbmUtPnN0YXRlLT5mYjsKPiA+ICsKPiA+ICAgICAgIHBsYW5lLT5zdGF0 ZS0+c3JjX3ggPSBuZXdfc3RhdGUtPnNyY194Owo+ID4gICAgICAgcGxhbmUtPnN0YXRlLT5zcmNf eSA9IG5ld19zdGF0ZS0+c3JjX3k7Cj4gPiAgICAgICBwbGFuZS0+c3RhdGUtPmNydGNfeCA9IG5l d19zdGF0ZS0+Y3J0Y194Owo+ID4gQEAgLTUyNCw2ICs1MjYsOCBAQCBzdGF0aWMgdm9pZCBtZHA1 X3BsYW5lX2F0b21pY19hc3luY191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gPgo+ ID4gICAgICAgKnRvX21kcDVfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKSA9Cj4gPiAgICAgICAg ICAgICAgICp0b19tZHA1X3BsYW5lX3N0YXRlKG5ld19zdGF0ZSk7Cj4gPiArCj4gPiArICAgICBu ZXdfc3RhdGUtPmZiID0gb2xkX2ZiOwo+ID4gIH0KPiA+Cj4gPiAgc3RhdGljIGNvbnN0IHN0cnVj dCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzIG1kcDVfcGxhbmVfaGVscGVyX2Z1bmNzID0gewo+ID4K X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5v IG1haWxpbmcgbGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5v