[Intel-gfx] [PATCH 26/34] drm: Rename prev_node to hole in drm_mm_scan_add_block()
Chris Wilson
chris at chris-wilson.co.uk
Mon Dec 12 11:53:42 UTC 2016
Acknowledging that we were building up the hole was more useful to me
when reading the code, than knowing the relationship between this node
and the previous node.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/drm_mm.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 2a636e838bad..684e610f404a 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -810,7 +810,7 @@ bool drm_mm_scan_add_block(struct drm_mm_scan *scan,
struct drm_mm_node *node)
{
struct drm_mm *mm = scan->mm;
- struct drm_mm_node *prev_node;
+ struct drm_mm_node *hole;
u64 hole_start, hole_end;
u64 adj_start, adj_end;
@@ -820,17 +820,17 @@ bool drm_mm_scan_add_block(struct drm_mm_scan *scan,
node->scanned_block = 1;
mm->scan_active++;
- prev_node = list_prev_entry(node, node_list);
+ hole = list_prev_entry(node, node_list);
- node->scanned_preceeds_hole = prev_node->hole_follows;
- prev_node->hole_follows = 1;
+ node->scanned_preceeds_hole = hole->hole_follows;
+ hole->hole_follows = 1;
list_del(&node->node_list);
- node->node_list.prev = &prev_node->node_list;
+ node->node_list.prev = &hole->node_list;
node->node_list.next = &scan->prev_scanned_node->node_list;
scan->prev_scanned_node = node;
- adj_start = hole_start = drm_mm_hole_node_start(prev_node);
- adj_end = hole_end = drm_mm_hole_node_end(prev_node);
+ adj_start = hole_start = drm_mm_hole_node_start(hole);
+ adj_end = hole_end = drm_mm_hole_node_end(hole);
if (scan->check_range) {
if (adj_start < scan->range_start)
@@ -840,7 +840,7 @@ bool drm_mm_scan_add_block(struct drm_mm_scan *scan,
}
if (mm->color_adjust)
- mm->color_adjust(prev_node, scan->color, &adj_start, &adj_end);
+ mm->color_adjust(hole, scan->color, &adj_start, &adj_end);
if (check_free_hole(adj_start, adj_end,
scan->size, scan->alignment)) {
--
2.11.0
More information about the Intel-gfx
mailing list