OSDN Git Service

drm/i915: Avoid requesting a zero-sized stolen object
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 10 Mar 2014 08:07:02 +0000 (08:07 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Mar 2014 08:18:15 +0000 (09:18 +0100)
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>
drivers/gpu/drm/i915/intel_display.c

index 1f180a4..500435f 100644 (file)
@@ -2076,6 +2076,9 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc,
        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)