drm/i915: Avoid requesting a zero-sized stolen object

The stolen allocator objects loudly if the caller requests a zero-sized object. This is a useful verbose check as in most cases the request should have been pruned much early. Here we just want to silently return before attempting the allocation. Regression from commit 484b41dd70a9fbea894632d8926bbb93f05021c7 Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Fri Mar 7 08:57:55 2014 -0800 drm/i915: remove early fb allocation dependency on CONFIG_FB v2 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75963 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

drm/i915: Avoid requesting a zero-sized stolen object
The stolen allocator objects loudly if the caller requests a zero-sized object. This is a useful verbose check as in most cases the request should have been pruned much early. Here we just want to silently return before attempting the allocation. Regression from commit 484b41dd70a9fbea894632d8926bbb93f05021c7 Author: Jesse Barnes <jbarnes@virtuousgeek.org> Date: Fri Mar 7 08:57:55 2014 -0800 drm/i915: remove early fb allocation dependency on CONFIG_FB v2 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75963 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Chris Wilson · Daniel Vetter
1 parent d1a59868ef
Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff
drivers/gpu/drm/i915/intel_display.c
@@ -2076,6 +2076,9 @@
 	struct drm_mode_fb_cmd2 mode_cmd = { 0 };
 	u32 base = plane_config->base;
  
+	if (plane_config->size == 0)
+		return false;
+
 	obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base,
 							     plane_config->size);
 	if (!obj)
...	...	@@ -2076,6 +2076,9 @@
2076	2076	struct drm_mode_fb_cmd2 mode_cmd = { 0 };
2077	2077	u32 base = plane_config->base;
2078	2078
	2079	+ if (plane_config->size == 0)
	2080	+ return false;
	2081	+
2079	2082	obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base,
2080	2083	plane_config->size);
2081	2084	if (!obj)