From: Thomas Zimmermann <tzimmermann@suse.de>
To: Maxime Ripard <maxime@cerno.tech>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Eric Anholt <eric@anholt.net>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: devicetree@vger.kernel.org, Tim Gover <tim.gover@raspberrypi.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
dri-devel@lists.freedesktop.org,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Phil Elwell <phil@raspberrypi.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 7/8] drm/vc4: kms: Remove async modeset semaphore
Date: Fri, 20 Nov 2020 15:03:45 +0100 [thread overview]
Message-ID: <c0985d0b-97ad-63d9-053e-41873baeb354@suse.de> (raw)
In-Reply-To: <20201113152956.139663-8-maxime@cerno.tech>
[-- Attachment #1.1.1.1: Type: text/plain, Size: 4933 bytes --]
Am 13.11.20 um 16:29 schrieb Maxime Ripard:
> Now that we have proper ordering guaranteed by the previous patch, the
> semaphore is redundant and can be removed.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/vc4/vc4_crtc.c | 13 -------------
> drivers/gpu/drm/vc4/vc4_drv.h | 2 --
> drivers/gpu/drm/vc4/vc4_kms.c | 20 +-------------------
> 3 files changed, 1 insertion(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 29b77f4b4e56..65d43e2e1d51 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -699,7 +699,6 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)
> container_of(cb, struct vc4_async_flip_state, cb);
> struct drm_crtc *crtc = flip_state->crtc;
> struct drm_device *dev = crtc->dev;
> - struct vc4_dev *vc4 = to_vc4_dev(dev);
> struct drm_plane *plane = crtc->primary;
>
> vc4_plane_async_set_fb(plane, flip_state->fb);
> @@ -731,8 +730,6 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)
> }
>
> kfree(flip_state);
> -
> - up(&vc4->async_modeset);
> }
>
> /* Implements async (non-vblank-synced) page flips.
> @@ -747,7 +744,6 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
> uint32_t flags)
> {
> struct drm_device *dev = crtc->dev;
> - struct vc4_dev *vc4 = to_vc4_dev(dev);
> struct drm_plane *plane = crtc->primary;
> int ret = 0;
> struct vc4_async_flip_state *flip_state;
> @@ -776,15 +772,6 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
> flip_state->crtc = crtc;
> flip_state->event = event;
>
> - /* Make sure all other async modesetes have landed. */
> - ret = down_interruptible(&vc4->async_modeset);
> - if (ret) {
> - drm_framebuffer_put(fb);
> - vc4_bo_dec_usecnt(bo);
> - kfree(flip_state);
> - return ret;
> - }
> -
> /* Save the current FB before it's replaced by the new one in
> * drm_atomic_set_fb_for_plane(). We'll need the old FB in
> * vc4_async_page_flip_complete() to decrement the BO usecnt and keep
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
> index 9eefd76cb09e..60062afba7b6 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.h
> +++ b/drivers/gpu/drm/vc4/vc4_drv.h
> @@ -215,8 +215,6 @@ struct vc4_dev {
> struct work_struct reset_work;
> } hangcheck;
>
> - struct semaphore async_modeset;
> -
> struct drm_modeset_lock ctm_state_lock;
> struct drm_private_obj ctm_manager;
> struct drm_private_obj hvs_channels;
> diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
> index 849bc6b4cea4..79ab7b8a5e0e 100644
> --- a/drivers/gpu/drm/vc4/vc4_kms.c
> +++ b/drivers/gpu/drm/vc4/vc4_kms.c
> @@ -414,8 +414,6 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
> clk_set_min_rate(hvs->core_clk, 0);
>
> drm_atomic_state_put(state);
> -
> - up(&vc4->async_modeset);
> }
>
> static void commit_work(struct work_struct *work)
> @@ -473,14 +471,9 @@ static int vc4_atomic_commit(struct drm_device *dev,
> struct drm_atomic_state *state,
> bool nonblock)
> {
> - struct vc4_dev *vc4 = to_vc4_dev(dev);
> int ret;
>
> if (state->async_update) {
> - ret = down_interruptible(&vc4->async_modeset);
> - if (ret)
> - return ret;
> -
> ret = drm_atomic_helper_prepare_planes(dev, state);
> if (ret) {
> up(&vc4->async_modeset);
> @@ -491,8 +484,6 @@ static int vc4_atomic_commit(struct drm_device *dev,
>
> drm_atomic_helper_cleanup_planes(dev, state);
>
> - up(&vc4->async_modeset);
> -
> return 0;
> }
>
> @@ -508,21 +499,14 @@ static int vc4_atomic_commit(struct drm_device *dev,
>
> INIT_WORK(&state->commit_work, commit_work);
>
> - ret = down_interruptible(&vc4->async_modeset);
> - if (ret)
> - return ret;
> -
> ret = drm_atomic_helper_prepare_planes(dev, state);
> - if (ret) {
> - up(&vc4->async_modeset);
> + if (ret)
> return ret;
> - }
>
> if (!nonblock) {
> ret = drm_atomic_helper_wait_for_fences(dev, state, true);
> if (ret) {
> drm_atomic_helper_cleanup_planes(dev, state);
> - up(&vc4->async_modeset);
> return ret;
> }
> }
> @@ -1006,8 +990,6 @@ int vc4_kms_load(struct drm_device *dev)
> vc4->load_tracker_enabled = true;
> }
>
> - sema_init(&vc4->async_modeset, 1);
> -
> /* Set support for vblank irq fast disable, before drm_vblank_init() */
> dev->vblank_disable_immediate = true;
>
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.1.1.2: OpenPGP_0x680DC11D530B7A23.asc --]
[-- Type: application/pgp-keys, Size: 7535 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-11-20 14:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 15:29 [PATCH 0/8] vc4: Convert to drm_atomic_helper_commit Maxime Ripard
2020-11-13 15:29 ` [PATCH 1/8] drm: Introduce an atomic_commit_setup function Maxime Ripard
2020-11-13 21:02 ` Daniel Vetter
2020-11-20 13:34 ` Maxime Ripard
2020-11-20 14:50 ` Daniel Vetter
2020-11-19 9:59 ` Thomas Zimmermann
2020-11-19 15:32 ` Daniel Vetter
2020-11-20 8:38 ` Thomas Zimmermann
2020-11-20 9:29 ` Daniel Vetter
2020-11-13 15:29 ` [PATCH 2/8] drm: Document use-after-free gotcha with private objects Maxime Ripard
2020-11-19 15:38 ` Daniel Vetter
2020-11-13 15:29 ` [PATCH 3/8] drm/vc4: kms: Move HVS state helpers around Maxime Ripard
2020-11-19 9:26 ` Thomas Zimmermann
2020-11-13 15:29 ` [PATCH 4/8] drm/vc4: kms: Simplify a bit the private obj state hooks Maxime Ripard
2020-11-19 9:27 ` Thomas Zimmermann
2020-11-13 15:29 ` [PATCH 5/8] drm/vc4: Simplify a bit the global atomic_check Maxime Ripard
2020-11-19 9:32 ` Thomas Zimmermann
2020-11-13 15:29 ` [PATCH 6/8] drm/vc4: kms: Wait on previous FIFO users before a commit Maxime Ripard
2020-11-20 13:19 ` Thomas Zimmermann
2020-12-01 17:06 ` Maxime Ripard
2020-11-13 15:29 ` [PATCH 7/8] drm/vc4: kms: Remove async modeset semaphore Maxime Ripard
2020-11-20 14:03 ` Thomas Zimmermann [this message]
2020-11-13 15:29 ` [PATCH 8/8] drm/vc4: kms: Convert to atomic helpers Maxime Ripard
2020-11-20 14:08 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c0985d0b-97ad-63d9-053e-41873baeb354@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=frowand.list@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mark.rutland@arm.com \
--cc=maxime@cerno.tech \
--cc=phil@raspberrypi.com \
--cc=robh+dt@kernel.org \
--cc=tim.gover@raspberrypi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).