From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>
Cc: Dom Cobley <dom@raspberrypi.com>,
Tim Gover <tim.gover@raspberrypi.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Jian-Hong Pan <jhp@endlessos.org>,
dri-devel@lists.freedesktop.org,
Phil Elwell <phil@raspberrypi.com>
Subject: [PATCH 3/6] drm/vc4: kms: Add missing drm_crtc_commit_put
Date: Mon, 15 Nov 2021 12:31:02 +0100 [thread overview]
Message-ID: <20211115113105.103275-4-maxime@cerno.tech> (raw)
In-Reply-To: <20211115113105.103275-1-maxime@cerno.tech>
Commit 9ec03d7f1ed3 ("drm/vc4: kms: Wait on previous FIFO users before a
commit") introduced a global state for the HVS, with each FIFO storing
the current CRTC commit so that we can properly synchronize commits.
However, the refcounting was off and we thus ended up leaking the
drm_crtc_commit structure every commit. Add a drm_crtc_commit_put to
prevent the leakage.
Fixes: 9ec03d7f1ed3 ("drm/vc4: kms: Wait on previous FIFO users before a commit")
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_kms.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index 3f780c195749..4847d1af399a 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -372,6 +372,8 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state)
ret = drm_crtc_commit_wait(old_hvs_state->fifo_state[channel].pending_commit);
if (ret)
drm_err(dev, "Timed out waiting for commit\n");
+
+ drm_crtc_commit_put(commit);
}
if (vc4->hvs->hvs5)
--
2.33.1
next prev parent reply other threads:[~2021-11-15 11:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 11:30 [PATCH 0/6] drm/vc4: kms: Misc fixes for HVS commits Maxime Ripard
2021-11-15 11:31 ` [PATCH 1/6] drm/vc4: kms: Wait for the commit before increasing our clock rate Maxime Ripard
2021-11-15 11:31 ` [PATCH 2/6] drm/vc4: kms: Fix return code check Maxime Ripard
2021-11-15 11:31 ` Maxime Ripard [this message]
2021-11-15 11:31 ` [PATCH 4/6] drm/vc4: kms: Clear the HVS FIFO commit pointer once done Maxime Ripard
2021-11-15 11:31 ` [PATCH 5/6] drm/vc4: kms: Don't duplicate pending commit Maxime Ripard
2021-11-15 11:31 ` [PATCH 6/6] drm/vc4: kms: Fix previous HVS commit wait Maxime Ripard
2021-11-17 7:08 ` [PATCH 0/6] drm/vc4: kms: Misc fixes for HVS commits Jian-Hong Pan
2021-11-17 8:24 ` Maxime Ripard
2021-11-17 8:58 ` Maxime Ripard
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=20211115113105.103275-4-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jhp@endlessos.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=phil@raspberrypi.com \
--cc=tim.gover@raspberrypi.com \
--cc=tzimmermann@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.