* [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once @ 2013-04-26 13:04 Chris Wilson 2013-04-26 14:46 ` Daniel Vetter 0 siblings, 1 reply; 6+ messages in thread From: Chris Wilson @ 2013-04-26 13:04 UTC (permalink / raw) To: intel-gfx 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. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_pm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3534a71..05bc0a4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -481,8 +481,7 @@ 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"); + pr_info_once("not enough stolen space for compressed buffer (need %zd bytes), disabling. Hint: you may be able to inrease stolen memory size in hte BIOS to avoid this.\n", intel_fb->obj->base.size); DRM_DEBUG_KMS("framebuffer too large, disabling compression\n"); dev_priv->no_fbc_reason = FBC_STOLEN_TOO_SMALL; goto out_disable; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once 2013-04-26 13:04 [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once Chris Wilson @ 2013-04-26 14:46 ` Daniel Vetter 2013-04-26 15:06 ` Chris Wilson 2013-04-27 11:44 ` Chris Wilson 0 siblings, 2 replies; 6+ messages in thread From: Daniel Vetter @ 2013-04-26 14:46 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx On Fri, Apr 26, 2013 at 02:04:25PM +0100, Chris Wilson wrote: > 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. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_pm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 3534a71..05bc0a4 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -481,8 +481,7 @@ 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"); > + pr_info_once("not enough stolen space for compressed buffer (need %zd bytes), disabling. Hint: you may be able to inrease stolen memory size in hte BIOS to avoid this.\n", intel_fb->obj->base.size); s/hte/the/ in the above line while at it? -Daniel > DRM_DEBUG_KMS("framebuffer too large, disabling compression\n"); > dev_priv->no_fbc_reason = FBC_STOLEN_TOO_SMALL; > goto out_disable; > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once 2013-04-26 14:46 ` Daniel Vetter @ 2013-04-26 15:06 ` Chris Wilson 2013-04-26 15:43 ` Daniel Vetter 2013-04-27 11:44 ` Chris Wilson 1 sibling, 1 reply; 6+ messages in thread From: Chris Wilson @ 2013-04-26 15:06 UTC (permalink / raw) To: Daniel Vetter; +Cc: intel-gfx On Fri, Apr 26, 2013 at 04:46:12PM +0200, Daniel Vetter wrote: > On Fri, Apr 26, 2013 at 02:04:25PM +0100, Chris Wilson wrote: > > 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. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > --- > > drivers/gpu/drm/i915/intel_pm.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > > index 3534a71..05bc0a4 100644 > > --- a/drivers/gpu/drm/i915/intel_pm.c > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > @@ -481,8 +481,7 @@ 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"); > > + pr_info_once("not enough stolen space for compressed buffer (need %zd bytes), disabling. Hint: you may be able to inrease stolen memory size in hte BIOS to avoid this.\n", intel_fb->obj->base.size); > s/hte/the/ in the above line while at it? The other problem is that we drop the "drm: ", so perhaps we should add that back in (or start using "drm/i915: " or "i915: "). -Chris -- Chris Wilson, Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once 2013-04-26 15:06 ` Chris Wilson @ 2013-04-26 15:43 ` Daniel Vetter 0 siblings, 0 replies; 6+ messages in thread From: Daniel Vetter @ 2013-04-26 15:43 UTC (permalink / raw) To: Chris Wilson, Daniel Vetter, intel-gfx On Fri, Apr 26, 2013 at 04:06:06PM +0100, Chris Wilson wrote: > On Fri, Apr 26, 2013 at 04:46:12PM +0200, Daniel Vetter wrote: > > On Fri, Apr 26, 2013 at 02:04:25PM +0100, Chris Wilson wrote: > > > 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. > > > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > > --- > > > drivers/gpu/drm/i915/intel_pm.c | 3 +-- > > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > > > index 3534a71..05bc0a4 100644 > > > --- a/drivers/gpu/drm/i915/intel_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > > @@ -481,8 +481,7 @@ 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"); > > > + pr_info_once("not enough stolen space for compressed buffer (need %zd bytes), disabling. Hint: you may be able to inrease stolen memory size in hte BIOS to avoid this.\n", intel_fb->obj->base.size); > > s/hte/the/ in the above line while at it? > > The other problem is that we drop the "drm: ", so perhaps we should add > that back in (or start using "drm/i915: " or "i915: "). I've looked through all the macros, and there doesn't seem to be a dev_info_once version. While we discuss debug output, I still wonder whether we should eventually switch over to the dynamic device debug stuff. But I'm not sure whether that's really better than the current scheme. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once 2013-04-26 14:46 ` Daniel Vetter 2013-04-26 15:06 ` Chris Wilson @ 2013-04-27 11:44 ` Chris Wilson 2013-04-27 11:51 ` Daniel Vetter 1 sibling, 1 reply; 6+ messages in thread From: Chris Wilson @ 2013-04-27 11:44 UTC (permalink / raw) To: intel-gfx 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: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index 130d1db..74406b5 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c @@ -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 %zd more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size); return -ENOSPC; } diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 3534a71..e58cfd7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -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; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once 2013-04-27 11:44 ` Chris Wilson @ 2013-04-27 11:51 ` Daniel Vetter 0 siblings, 0 replies; 6+ messages in thread From: Daniel Vetter @ 2013-04-27 11:51 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx On Sat, Apr 27, 2013 at 12:44:16PM +0100, Chris Wilson wrote: > 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: Chris Wilson <chris@chris-wilson.co.uk> Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-27 11:48 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-26 13:04 [PATCH] drm/i915: Only print the info message about incresing stolen size for FBC once Chris Wilson 2013-04-26 14:46 ` Daniel Vetter 2013-04-26 15:06 ` Chris Wilson 2013-04-26 15:43 ` Daniel Vetter 2013-04-27 11:44 ` Chris Wilson 2013-04-27 11:51 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox