Re: Linux-2.6.31-rc4 - shut the annoying "failed to acquire vblank..."

[Frans Pop <elendil@planet.nl>]

Paul Rolland wrote:
> Some applications/hardware combinations are triggering the message
> "failed to acquire vblank counter" to be issued up to 20 times a second,
> which makes it both useless and dangerous, as this may hide other
> important messages. This changes makes it only appear when people are
> debugging. 
> 
> Signed-off-by: Paul Rolland <rol@as2917.net>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> --- linux-2.6.31-rc4/drivers/gpu/drm/drm_irq.c.orig     2009-07-26 21:36:20.000000000 +0200
> +++ linux-2.6.31-rc4/drivers/gpu/drm/drm_irq.c  2009-07-26 21:36:34.000000000 +0200
> @@ -566,7 +566,7 @@ int drm_wait_vblank(struct drm_device *d
> 
> ret = drm_vblank_get(dev, crtc);
> 	if (ret) {
> -		DRM_ERROR("failed to acquire vblank counter, %d\n", ret);
> +		DRM_DEBUG("failed to acquire vblank counter, %d\n", ret);
> 		return ret;
> 	}
> 	seq = drm_vblank_count(dev, crtc);

Actually, I just see that I get a different, but related error on suspend
and when opening/closing a second X session:
   *ERROR* trying to get vblank count for disabled pipe 0/1

Would it make sense to add the following to this patch:

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 7ba23a6..d8b86ed 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -190,7 +190,7 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
 	low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
 
 	if (!i915_pipe_enabled(dev, pipe)) {
-		DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);
+		DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);
 		return 0;
 	}
 
@@ -219,7 +219,7 @@ u32 gm45_get_vblank_counter(struct drm_device *dev, int pipe)
 	int reg = pipe ? PIPEB_FRMCOUNT_GM45 : PIPEA_FRMCOUNT_GM45;
 
 	if (!i915_pipe_enabled(dev, pipe)) {
-		DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);
+		DRM_DEBUG("trying to get vblank count for disabled pipe %d\n", pipe);
 		return 0;
 	}