Attachment 81791 Details for Bug 65953 – debug patch

[patch] debug patch

debug.patch (text/plain), 2.63 KB, created by Daniel Vetter on 2013-07-01 08:56:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-07-01 08:56:45 UTC

Size: 2.63 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
>index 07cf99c..d303e31 100644
>--- a/drivers/gpu/drm/drm_mm.c
>+++ b/drivers/gpu/drm/drm_mm.c
>@@ -699,8 +699,8 @@ void drm_mm_takedown(struct drm_mm * mm)
> {
> 	struct drm_mm_node *entry, *next;
> 
>-	if (!list_empty(&mm->head_node.node_list)) {
>-		DRM_ERROR("Memory manager not clean. Delaying takedown\n");
>+	if (WARN(!list_empty(&mm->head_node.node_list),
>+		 "Memory manager not clean. Delaying takedown\n")) {
> 		return;
> 	}
> 
>@@ -716,36 +716,37 @@ void drm_mm_takedown(struct drm_mm * mm)
> }
> EXPORT_SYMBOL(drm_mm_takedown);
> 
>-void drm_mm_debug_table(struct drm_mm *mm, const char *prefix)
>+static unsigned long drm_mm_debug_hole(struct drm_mm_node *entry,
>+				       const char *prefix)
> {
>-	struct drm_mm_node *entry;
>-	unsigned long total_used = 0, total_free = 0, total = 0;
> 	unsigned long hole_start, hole_end, hole_size;
> 
>-	hole_start = drm_mm_hole_node_start(&mm->head_node);
>-	hole_end = drm_mm_hole_node_end(&mm->head_node);
>-	hole_size = hole_end - hole_start;
>-	if (hole_size)
>+	if (entry->hole_follows) {
>+		hole_start = drm_mm_hole_node_start(entry);
>+		hole_end = drm_mm_hole_node_end(entry);
>+		hole_size = hole_end - hole_start;
> 		printk(KERN_DEBUG "%s 0x%08lx-0x%08lx: %8lu: free\n",
> 			prefix, hole_start, hole_end,
> 			hole_size);
>-	total_free += hole_size;
>+		return hole_size;
>+	}
>+
>+	return 0;
>+}
>+
>+void drm_mm_debug_table(struct drm_mm *mm, const char *prefix)
>+{
>+	struct drm_mm_node *entry;
>+	unsigned long total_used = 0, total_free = 0, total = 0;
>+
>+	total_free += drm_mm_debug_hole(&mm->head_node, prefix);
> 
> 	drm_mm_for_each_node(entry, mm) {
> 		printk(KERN_DEBUG "%s 0x%08lx-0x%08lx: %8lu: used\n",
> 			prefix, entry->start, entry->start + entry->size,
> 			entry->size);
> 		total_used += entry->size;
>-
>-		if (entry->hole_follows) {
>-			hole_start = drm_mm_hole_node_start(entry);
>-			hole_end = drm_mm_hole_node_end(entry);
>-			hole_size = hole_end - hole_start;
>-			printk(KERN_DEBUG "%s 0x%08lx-0x%08lx: %8lu: free\n",
>-				prefix, hole_start, hole_end,
>-				hole_size);
>-			total_free += hole_size;
>-		}
>+		total_free += drm_mm_debug_hole(entry, prefix);
> 	}
> 	total = total_free + total_used;
> 
>diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
>index 8e02344..5bad1db 100644
>--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
>+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
>@@ -179,6 +179,9 @@ void i915_gem_cleanup_stolen(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 
>+	if (dev_priv->mm.stolen_base == 0)
>+		return;
>+
> 	i915_gem_stolen_cleanup_compression(dev);
> 	drm_mm_takedown(&dev_priv->mm.stolen);
> }

Actions: View | Splinter Review

Attachments on bug 65953: 81380 | 81590 | 81778 | 81791 | 81844 | 81845

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.