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 v2 5/6] drm/vc4: kms: Don't duplicate pending commit
Date: Wed, 17 Nov 2021 10:45:26 +0100 [thread overview]
Message-ID: <20211117094527.146275-6-maxime@cerno.tech> (raw)
In-Reply-To: <20211117094527.146275-1-maxime@cerno.tech>
Our HVS global state, when duplicated, will also copy the pointer to the
drm_crtc_commit (and increase the reference count) for each FIFO if the
pointer is not NULL.
However, our atomic_setup function will overwrite that pointer without
putting the reference back leading to a memory leak.
Since the commit is only relevant during the atomic commit process, it
doesn't make sense to duplicate the reference to the commit anyway.
Let's remove it.
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 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index f80370e87e98..d9b3e3ad71ea 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -676,12 +676,6 @@ vc4_hvs_channels_duplicate_state(struct drm_private_obj *obj)
for (i = 0; i < HVS_NUM_CHANNELS; i++) {
state->fifo_state[i].in_use = old_state->fifo_state[i].in_use;
-
- if (!old_state->fifo_state[i].pending_commit)
- continue;
-
- state->fifo_state[i].pending_commit =
- drm_crtc_commit_get(old_state->fifo_state[i].pending_commit);
}
return &state->base;
--
2.33.1
next prev parent reply other threads:[~2021-11-17 9:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 9:45 [PATCH v2 0/6] drm/vc4: kms: Misc fixes for HVS commits Maxime Ripard
2021-11-17 9:45 ` [PATCH v2 1/6] drm/vc4: kms: Wait for the commit before increasing our clock rate Maxime Ripard
2021-11-17 9:45 ` [PATCH v2 2/6] drm/vc4: kms: Fix return code check Maxime Ripard
2021-11-17 9:45 ` [PATCH v2 3/6] drm/vc4: kms: Add missing drm_crtc_commit_put Maxime Ripard
2021-11-17 9:45 ` [PATCH v2 4/6] drm/vc4: kms: Clear the HVS FIFO commit pointer once done Maxime Ripard
2021-11-17 9:45 ` Maxime Ripard [this message]
2021-11-17 9:45 ` [PATCH v2 6/6] drm/vc4: kms: Fix previous HVS commit wait Maxime Ripard
2021-11-29 11:31 ` Dave Stevenson
2021-11-18 6:42 ` [PATCH v2 0/6] drm/vc4: kms: Misc fixes for HVS commits Jian-Hong Pan
2021-11-18 10:40 ` Maxime Ripard
2021-11-19 10:24 ` Jian-Hong Pan
2021-11-26 15:45 ` Maxime Ripard
2021-11-29 8:31 ` Jian-Hong Pan
2021-12-03 14:03 ` Maxime Ripard
2021-12-07 10:11 ` Jian-Hong Pan
2021-11-29 14:35 ` 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=20211117094527.146275-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox