drm/mm: Use helpers for drm_mm_node booleans
In preparation for rearranging the booleans into a flags field, ensure all the current users are using the inline helpers and not directly accessing the members. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20191003210100.22250-3-chris@chris-wilson.co.uk
Esse commit está contido em:
@@ -854,7 +854,7 @@ static bool assert_contiguous_in_range(struct drm_mm *mm,
|
||||
|
||||
if (start > 0) {
|
||||
node = __drm_mm_interval_first(mm, 0, start - 1);
|
||||
if (node->allocated) {
|
||||
if (drm_mm_node_allocated(node)) {
|
||||
pr_err("node before start: node=%llx+%llu, start=%llx\n",
|
||||
node->start, node->size, start);
|
||||
return false;
|
||||
@@ -863,7 +863,7 @@ static bool assert_contiguous_in_range(struct drm_mm *mm,
|
||||
|
||||
if (end < U64_MAX) {
|
||||
node = __drm_mm_interval_first(mm, end, U64_MAX);
|
||||
if (node->allocated) {
|
||||
if (drm_mm_node_allocated(node)) {
|
||||
pr_err("node after end: node=%llx+%llu, end=%llx\n",
|
||||
node->start, node->size, end);
|
||||
return false;
|
||||
@@ -1156,12 +1156,12 @@ static void show_holes(const struct drm_mm *mm, int count)
|
||||
struct drm_mm_node *next = list_next_entry(hole, node_list);
|
||||
const char *node1 = NULL, *node2 = NULL;
|
||||
|
||||
if (hole->allocated)
|
||||
if (drm_mm_node_allocated(hole))
|
||||
node1 = kasprintf(GFP_KERNEL,
|
||||
"[%llx + %lld, color=%ld], ",
|
||||
hole->start, hole->size, hole->color);
|
||||
|
||||
if (next->allocated)
|
||||
if (drm_mm_node_allocated(next))
|
||||
node2 = kasprintf(GFP_KERNEL,
|
||||
", [%llx + %lld, color=%ld]",
|
||||
next->start, next->size, next->color);
|
||||
@@ -1900,18 +1900,18 @@ static void separate_adjacent_colors(const struct drm_mm_node *node,
|
||||
u64 *start,
|
||||
u64 *end)
|
||||
{
|
||||
if (node->allocated && node->color != color)
|
||||
if (drm_mm_node_allocated(node) && node->color != color)
|
||||
++*start;
|
||||
|
||||
node = list_next_entry(node, node_list);
|
||||
if (node->allocated && node->color != color)
|
||||
if (drm_mm_node_allocated(node) && node->color != color)
|
||||
--*end;
|
||||
}
|
||||
|
||||
static bool colors_abutt(const struct drm_mm_node *node)
|
||||
{
|
||||
if (!drm_mm_hole_follows(node) &&
|
||||
list_next_entry(node, node_list)->allocated) {
|
||||
drm_mm_node_allocated(list_next_entry(node, node_list))) {
|
||||
pr_err("colors abutt; %ld [%llx + %llx] is next to %ld [%llx + %llx]!\n",
|
||||
node->color, node->start, node->size,
|
||||
list_next_entry(node, node_list)->color,
|
||||
|
Referência em uma nova issue
Block a user