[PATCH] drm/mm: Fix support 4 GiB and larger ranges

kolasa · airlied · commit 046d669c62f3 · 2015-03-16T06:28:50.000+10:00
bad argument if(tmp)... in check_free_hole

fix oops: kernel BUG at drivers/gpu/drm/drm_mm.c:305!

[airlied: excellent, this was my task for today].

Signed-off-by: Krzysztof Kolasa &lt;kkolasa@winsoft.pl&gt;
Reviewed-by: Chris wilson &lt;chris@chris-wilson.co.uk&gt;
Signed-off-by: Dave Airlie &lt;airlied@redhat.com&gt;
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
@@ -403,7 +403,7 @@ static int check_free_hole(u64 start, u64 end, u64 size, unsigned alignment)
 		unsigned rem;
 
 		rem = do_div(tmp, alignment);
-		if (tmp)
+		if (rem)
 			start += alignment - rem;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ static int check_free_hole(u64 start, u64 end, u64 size, unsigned alignment)`
`403`	`403`	`unsigned rem;`
`404`	`404`
`405`	`405`	`rem = do_div(tmp, alignment);`
`406`		`- if (tmp)`
	`406`	`+ if (rem)`
`407`	`407`	`start += alignment - rem;`
`408`	`408`	`}`
`409`	`409`