Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897f9ed0 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: WARN if the bios reserved range is bigger than stolen size 



v2: Bail out if we hit the WARN_ON to avoid fallout later on. Spotted
by Chris Wilson.

Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 36c0cc61

drivers/gpu/drm/i915/i915_gem_stolen.c

+3 −0
Original line number Diff line number Diff line
@@ -215,6 +215,9 @@ int i915_gem_init_stolen(struct drm_device *dev) 
	if (IS_VALLEYVIEW(dev))

		bios_reserved = 1024*1024; /* top 1M on VLV/BYT */



	if (WARN_ON(bios_reserved > dev_priv->gtt.stolen_size))

		return 0;



	/* Basic memrange allocator for stolen space */

	drm_mm_init(&dev_priv->mm.stolen, 0, dev_priv->gtt.stolen_size -

		    bios_reserved);