Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
drm_mm.c
diff --git
a/kernel/drivers/gpu/drm/drm_mm.c
b/kernel/drivers/gpu/drm/drm_mm.c
index
1134526
..
04de6fd
100644
(file)
--- a/
kernel/drivers/gpu/drm/drm_mm.c
+++ b/
kernel/drivers/gpu/drm/drm_mm.c
@@
-267,12
+267,12
@@
static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
if (adj_end > end)
adj_end = end;
if (adj_end > end)
adj_end = end;
- if (flags & DRM_MM_CREATE_TOP)
- adj_start = adj_end - size;
-
if (mm->color_adjust)
mm->color_adjust(hole_node, color, &adj_start, &adj_end);
if (mm->color_adjust)
mm->color_adjust(hole_node, color, &adj_start, &adj_end);
+ if (flags & DRM_MM_CREATE_TOP)
+ adj_start = adj_end - size;
+
if (alignment) {
u64 tmp = adj_start;
unsigned rem;
if (alignment) {
u64 tmp = adj_start;
unsigned rem;
@@
-825,7
+825,7
@@
static u64 drm_mm_dump_hole(struct seq_file *m, struct drm_mm_node *entry)
hole_start = drm_mm_hole_node_start(entry);
hole_end = drm_mm_hole_node_end(entry);
hole_size = hole_end - hole_start;
hole_start = drm_mm_hole_node_start(entry);
hole_end = drm_mm_hole_node_end(entry);
hole_size = hole_end - hole_start;
- seq_printf(m, "%#
llx-%#
llx: %llu: free\n", hole_start,
+ seq_printf(m, "%#
018llx-%#018
llx: %llu: free\n", hole_start,
hole_end, hole_size);
return hole_size;
}
hole_end, hole_size);
return hole_size;
}
@@
-846,7
+846,7
@@
int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm)
total_free += drm_mm_dump_hole(m, &mm->head_node);
drm_mm_for_each_node(entry, mm) {
total_free += drm_mm_dump_hole(m, &mm->head_node);
drm_mm_for_each_node(entry, mm) {
- seq_printf(m, "%#01
6llx-%#016
llx: %llu: used\n", entry->start,
+ seq_printf(m, "%#01
8llx-%#018
llx: %llu: used\n", entry->start,
entry->start + entry->size, entry->size);
total_used += entry->size;
total_free += drm_mm_dump_hole(m, entry);
entry->start + entry->size, entry->size);
total_used += entry->size;
total_free += drm_mm_dump_hole(m, entry);