Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp930754imc; Mon, 11 Mar 2019 02:42:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbbh2mXHIEwfsBCSpfsMcDx4k54ZY5eZ6b9KsoMXicvyu3fQYmxw6ZY6z9amGwH5vTTyF4 X-Received: by 2002:a17:902:728f:: with SMTP id d15mr33282235pll.156.1552297319950; Mon, 11 Mar 2019 02:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552297319; cv=none; d=google.com; s=arc-20160816; b=0lT6zXCssqai5L4qhMgZ59q2JQF4+2ReJ5CNlm45NkEbXo/4SM+hTGD7GwgM7y1lq/ Ra0jamDiybq1YuxxBrZjVDx9GVQ586kB/PUiAhMVQeagusVYHmDu0ME9O5m+NpaehjNL QvgHEsrXSWblU8ACJyZgi9HA/yCx8TTZYe3EpHfK+ZwPQT5uhlER7gmWapv+Ri6qDm0F eO54biGm9baToLu+wlulkVe/cDcm1HI+W8CMLO+zzZvB7xaWL0LiykQmJqKCCc4WEcrj kCODDaD+HtcLvv3o9HvyUaNiu1MpsO1Gx+tmlRYrLihOq80mXiFX2K4mRoyCfcSN62K5 iaPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=u1ZnhQqNySPfNl38e5F7Nkei66p8aivvEyHitkhgJaA=; b=rHPtIfvEiGw1p1ZF9kjjPVdq/Ofyg45sqzRt6X1py1VC96NgD0PAINhwJ9pzCmmh1U TzK+y6xdbTxagopPCKdIr9PzSGXvNosuTwkwjuCTUl8H8BMjDurAp38rDBxbO/bQdJJw XY0Kmr1yP63ImgZKrVQQ3pdUJ0E6XyJ0eQKwi6eRgrJyrknJqGdKcU6OUZ1u5DyVbMLE IBgMfy8umo5EfEFF/IPh12iaXuNhNwxr+5NEl/YZ+/teQ/mkjIsNd7b7h8sN1+SFq/mA GXzfpiINbZSOjVqvujsPoV/vG0Afgn9ui4H2rIJ4Z+38fZXub4iO4pgkwXFU9u4Piete QbWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u15si5139374pfc.265.2019.03.11.02.41.44; Mon, 11 Mar 2019 02:41:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727356AbfCKJj6 (ORCPT + 99 others); Mon, 11 Mar 2019 05:39:58 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:53588 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727143AbfCKJj5 (ORCPT ); Mon, 11 Mar 2019 05:39:57 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 806F426048B; Mon, 11 Mar 2019 09:39:53 +0000 (GMT) Date: Mon, 11 Mar 2019 10:39:50 +0100 From: Boris Brezillon To: Helen Koike 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?B?U3TDqXBoYW5l?= Marchesin Subject: Re: [PATCH 1/5] drm: don't block fb changes for async plane updates Message-ID: <20190311103950.4465ea8c@collabora.com> In-Reply-To: <20190304144909.6267-2-helen.koike@collabora.com> References: <20190304144909.6267-1-helen.koike@collabora.com> <20190304144909.6267-2-helen.koike@collabora.com> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 4 Mar 2019 11:49:05 -0300 Helen Koike wrote: > In the case of a normal sync update, the preparation of framebuffers (be > it calling drm_atomic_helper_prepare_planes() or doing setups with > drm_framebuffer_get()) are performed in the new_state and the respective > cleanups are performed in the old_state. > > In the case of async updates, the preparation is also done in the > new_state but the cleanups are done in the new_state (because updates > are performed in place, i.e. in the current state). > > The current code blocks async udpates when the fb is changed, turning > async updates into sync updates, slowing down cursor updates and > introducing regressions in igt tests with errors of type: > > "CRITICAL: completed 97 cursor updated in a period of 30 flips, we > expect to complete approximately 15360 updates, with the threshold set > at 7680" > > Fb changes in async updates were prevented to avoid the following scenario: > > - Async update, oldfb = NULL, newfb = fb1, prepare fb1, cleanup fb1 > - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb2 > - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 (wrong) > Where we have a single call to prepare fb2 but double cleanup call to fb2. > > To solve the above problems, instead of blocking async fb changes, we > place the old framebuffer in the new_state object, so when the code > performs cleanups in the new_state it will cleanup the old_fb and we > will have the following scenario instead: > > - Async update, oldfb = NULL, newfb = fb1, prepare fb1, no cleanup > - Async update, oldfb = fb1, newfb = fb2, prepare fb2, cleanup fb1 > - Non-async commit, oldfb = fb2, newfb = fb1, prepare fb1, cleanup fb2 > > Where calls to prepare/cleanup are ballanced. > > Cc: # v4.14+: 25dc194b34dd: drm: Block fb changes for async plane updates > Fixes: 25dc194b34dd ("drm: Block fb changes for async plane updates") > Suggested-by: Boris Brezillon > Signed-off-by: Helen Koike > > --- > Hello, > > As mentioned in the cover letter, > I tested on the rockchip and on i915 (with a patch I am still working on for > replacing cursors by async update), with igt plane_cursor_legacy and > kms_cursor_legacy and I didn't see any regressions. > I couldn't test on MSM and AMD because I don't have the hardware (and I am > having some issues testing on vc4) and I would appreciate if anyone could help > me testing those. > > I also think it would be a better solution if, instead of having async > to do in-place updates in the current state, the async path should be > equivalent to a syncronous update, i.e., modifying new_state and > performing a flip > IMHO, the only difference between sync and async should be that async update > doesn't wait for vblank and applies the changes immeditally to the hw, > but the code path could be almost the same. > But for now I think this solution is ok (swaping new_fb/old_fb), and > then we can adjust things little by little, what do you think? > > Thanks! > Helen > > drivers/gpu/drm/drm_atomic_helper.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 540a77a2ade9..e7eb96f1efc2 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -1608,15 +1608,6 @@ int drm_atomic_helper_async_check(struct drm_device *dev, > old_plane_state->crtc != new_plane_state->crtc) > return -EINVAL; > > - /* > - * FIXME: Since prepare_fb and cleanup_fb are always called on > - * the new_plane_state for async updates we need to block framebuffer > - * changes. This prevents use of a fb that's been cleaned up and > - * double cleanups from occuring. > - */ > - if (old_plane_state->fb != new_plane_state->fb) > - return -EINVAL; > - > funcs = plane->helper_private; > if (!funcs->atomic_async_update) > return -EINVAL; > @@ -1657,6 +1648,9 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, > int i; > > for_each_new_plane_in_state(state, plane, plane_state, i) { > + struct drm_framebuffer *new_fb = plane_state->fb; > + struct drm_framebuffer *old_fb = plane->state->fb; > + > funcs = plane->helper_private; > funcs->atomic_async_update(plane, plane_state); > > @@ -1665,11 +1659,17 @@ void drm_atomic_helper_async_commit(struct drm_device *dev, > * plane->state in-place, make sure at least common > * properties have been properly updated. > */ > - WARN_ON_ONCE(plane->state->fb != plane_state->fb); > + WARN_ON_ONCE(plane->state->fb != new_fb); > WARN_ON_ONCE(plane->state->crtc_x != plane_state->crtc_x); > WARN_ON_ONCE(plane->state->crtc_y != plane_state->crtc_y); > WARN_ON_ONCE(plane->state->src_x != plane_state->src_x); > WARN_ON_ONCE(plane->state->src_y != plane_state->src_y); > + > + /* > + * Make sure the FBs have been swapped so that cleanups in the > + * new_state performs a cleanup in the old FB. > + */ > + WARN_ON_ONCE(plane_state->fb != old_fb); Looks like this patch should go last in the series if you want to keep things bisectable, otherwise you'll have a WARN_ON() backtrace in the drivers your fixing in the following patches. > } > } > EXPORT_SYMBOL(drm_atomic_helper_async_commit);