mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From ff06c5211fc9921c45ed2fe23f43ff2e8656c402 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 21 Oct 2021 13:57:44 +0200
|
|
Subject: [PATCH 613/634] drm/vc4: kms: Don't duplicate pending commit
|
|
|
|
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 59f10c4d76ae..2ac6c7c66fc2 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -720,12 +720,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;
|
|
state->fifo_state[i].fifo_load = old_state->fifo_state[i].fifo_load;
|
|
-
|
|
- 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);
|
|
}
|
|
|
|
state->core_clock_rate = old_state->core_clock_rate;
|
|
--
|
|
2.33.1
|
|
|