drm/i915: Fix view type in warning message

Submitted by Tvrtko Ursulin on April 16, 2015, 9:13 a.m.

Details

Message ID 1429175624-4893-1-git-send-email-tvrtko.ursulin@linux.intel.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Tvrtko Ursulin April 16, 2015, 9:13 a.m.
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

One month passed between posting a patch and it getting merged, and
unfortunately even though it still applies, it needs fixing to account
for changes in function parameters since:

   commit d385612e15b8b6eb3db328d83f1872ef8a381788
   Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
   Date:   Tue Mar 17 14:45:29 2015 +0000

       drm/i915: Log view type when printing warnings

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1d3f7bd..f7b8766 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5181,7 +5181,7 @@  i915_gem_obj_ggtt_offset_view(struct drm_i915_gem_object *o,
 		    i915_ggtt_view_equal(&vma->ggtt_view, view))
 			return vma->node.start;
 
-	WARN(1, "global vma for this object not found. (view=%u)\n", view);
+	WARN(1, "global vma for this object not found. (view=%u)\n", view->type);
 	return -1;
 }
 

Comments

On to, 2015-04-16 at 10:13 +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> One month passed between posting a patch and it getting merged, and
> unfortunately even though it still applies, it needs fixing to account
> for changes in function parameters since:
> 
>    commit d385612e15b8b6eb3db328d83f1872ef8a381788
>    Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>    Date:   Tue Mar 17 14:45:29 2015 +0000
> 
>        drm/i915: Log view type when printing warnings
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

This patch makes the debug message useful. (Should be applied on top of
the previous patch).

Regards, Joonas

> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 1d3f7bd..f7b8766 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -5181,7 +5181,7 @@ i915_gem_obj_ggtt_offset_view(struct drm_i915_gem_object *o,
>  		    i915_ggtt_view_equal(&vma->ggtt_view, view))
>  			return vma->node.start;
>  
> -	WARN(1, "global vma for this object not found. (view=%u)\n", view);
> +	WARN(1, "global vma for this object not found. (view=%u)\n", view->type);
>  	return -1;
>  }
>
On Fri, Apr 17, 2015 at 05:02:39PM +0300, Joonas Lahtinen wrote:
> On to, 2015-04-16 at 10:13 +0100, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > 
> > One month passed between posting a patch and it getting merged, and
> > unfortunately even though it still applies, it needs fixing to account
> > for changes in function parameters since:
> > 
> >    commit d385612e15b8b6eb3db328d83f1872ef8a381788
> >    Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >    Date:   Tue Mar 17 14:45:29 2015 +0000
> > 
> >        drm/i915: Log view type when printing warnings
> > 
> > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel