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

Commit d8241785 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Only print the info message about incresing stolen size for FBC once 



Instead of repeatedly bombarding the user with a request to reboot and
increase the stolen size with every fb refresh, just inform them the
first time only.

v2: Rearrange code so the hint to increase the amount of memory stolen
by the BIOS is only emitted if we fail to find sufficient stolen memory
for FBC.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Fixup formatting code mismatch that gcc spotted.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2ce12e3d

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static int i915_setup_compression(struct drm_device *dev, int size) 
err_fb:

	drm_mm_put_block(compressed_fb);

err:

	pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);

	return -ENOSPC;

}

drivers/gpu/drm/i915/intel_pm.c

+0 −2
Original line number Diff line number Diff line
@@ -481,8 +481,6 @@ void intel_update_fbc(struct drm_device *dev) 
		goto out_disable;



	if (i915_gem_stolen_setup_compression(dev, intel_fb->obj->base.size)) {

		DRM_INFO("not enough stolen space for compressed buffer (need %zd bytes), disabling\n", intel_fb->obj->base.size);

		DRM_INFO("hint: you may be able to increase stolen memory size in the BIOS to avoid this\n");

		DRM_DEBUG_KMS("framebuffer too large, disabling compression\n");

		dev_priv->no_fbc_reason = FBC_STOLEN_TOO_SMALL;

		goto out_disable;