Re: [Intel-gfx] [PATCH 2/2] drm/i915: differe error message between forcwake timeouts

2012-09-02 Thread Ben Widawsky 
On Fri, 24 Aug 2012 17:26:21 +0200
Daniel Vetter daniel.vet...@ffwll.ch wrote:

 ickle danvet: in the force wake, both DRM_ERRORs have the same string.
 ickle useful for .txt shrinkage, horrible for debugging
 
 Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
Reviewed-by: Ben Widawsky b...@bwidawsk.net
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 2/2] drm/i915: differe error message between forcwake timeouts

2012-08-24 Thread Daniel Vetter 
ickle danvet: in the force wake, both DRM_ERRORs have the same string.
ickle useful for .txt shrinkage, horrible for debugging

Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
---
 drivers/gpu/drm/i915/intel_pm.c |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1a197da..1e4d25e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3969,13 +3969,13 @@ static void __gen6_gt_force_wake_get(struct 
drm_i915_private *dev_priv)
forcewake_ack = FORCEWAKE_ACK;
 
if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack)  1) == 0, 
500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake old ack to 
clear.\n);
 
I915_WRITE_NOTRACE(FORCEWAKE, 1);
POSTING_READ(FORCEWAKE);
 
if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack)  1), 500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake to ack request.\n);
 
__gen6_gt_wait_for_thread_c0(dev_priv);
 }
@@ -3990,13 +3990,13 @@ static void __gen6_gt_force_wake_mt_get(struct 
drm_i915_private *dev_priv)
forcewake_ack = FORCEWAKE_MT_ACK;
 
if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack)  1) == 0, 
500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake old ack to 
clear.\n);
 
I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(1));
POSTING_READ(FORCEWAKE_MT);
 
if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack)  1), 500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake to ack request.\n);
 
__gen6_gt_wait_for_thread_c0(dev_priv);
 }
@@ -4076,12 +4076,12 @@ int __gen6_gt_wait_for_fifo(struct drm_i915_private 
*dev_priv)
 static void vlv_force_wake_get(struct drm_i915_private *dev_priv)
 {
if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV)  1) == 0, 
500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake old ack to 
clear.\n);
 
I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_ENABLE(1));
 
if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV)  1), 500))
-   DRM_ERROR(Force wake wait timed out\n);
+   DRM_ERROR(Timed out waiting for forcewake to ack request.\n);
 
__gen6_gt_wait_for_thread_c0(dev_priv);
 }
-- 
1.7.10.4

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 2/2] drm/i915: differe error message between forcwake timeouts

2012-08-24 Thread Paul Menzel 
Am Freitag, den 24.08.2012, 17:26 +0200 schrieb Daniel Vetter:

In the commit summary: s,differe,different,

 ickle danvet: in the force wake, both DRM_ERRORs have the same string.
 ickle useful for .txt shrinkage, horrible for debugging
 
 Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch

 ---
  drivers/gpu/drm/i915/intel_pm.c |   12 ++--
  1 file changed, 6 insertions(+), 6 deletions(-)

[…]

Acked-by: Paul Menzel paulepan...@users.sourceforge.net


Thanks,

Paul


signature.asc
Description: This is a digitally signed message part
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx