blob: 0db7059415391218fc43ff732fba45fd00eb9f70 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 718d920a2dfd680811bdf987706b50a6e23f0527 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@cerno.tech>
Date: Wed, 25 Jan 2023 12:54:36 +0100
Subject: [PATCH] drm/vc4: hvs: Move the dlist allocation destruction
to a function
We'll need to destroy a dlist allocation in multiple code paths, so
let's move it to a separate function.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_hvs.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
@@ -466,6 +466,18 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
return alloc;
}
+static void vc4_hvs_free_dlist_entry_locked(struct vc4_hvs *hvs,
+ struct vc4_hvs_dlist_allocation *alloc)
+{
+ lockdep_assert_held(&hvs->mm_lock);
+
+ if (!list_empty(&alloc->node))
+ list_del(&alloc->node);
+
+ drm_mm_remove_node(&alloc->mm_node);
+ kfree(alloc);
+}
+
void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
struct vc4_hvs_dlist_allocation *alloc)
{
@@ -553,9 +565,7 @@ static void vc4_hvs_dlist_free_work(stru
if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
continue;
- list_del(&cur->node);
- drm_mm_remove_node(&cur->mm_node);
- kfree(cur);
+ vc4_hvs_free_dlist_entry_locked(hvs, cur);
}
spin_unlock_irqrestore(&hvs->mm_lock, flags);
}
|
