On Wed, Sep 25, 2013 at 10:23:19AM +0100, Chris Wilson wrote:
> Add the missing cache-level to the describe_obj() function for debug and
> error reporting.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Merged to dinq ...
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 28c886d..e8ffd57 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -324,7 +324,7 @@ struct drm_i915_error_state {
> u32 dirty:1;
> u32 purgeable:1;
> s32 ring:4;
> - u32 cache_level:2;
> + u32 cache_level:3;
... but I wonder a bit whether we should just use the i915_cache_level
enum here? Same for the ring id maybe. Otoh meh ;-)
-Daniel
> } **active_bo, **pinned_bo;
> u32 *active_bo_count, *pinned_bo_count;
> struct intel_overlay_error_state *overlay;
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index c3ff6bd..0a49b65 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -1012,6 +1012,7 @@ const char *i915_cache_level_str(int type)
> case I915_CACHE_NONE: return " uncached";
> case I915_CACHE_LLC: return " snooped or LLC";
> case I915_CACHE_L3_LLC: return " L3+LLC";
> + case I915_CACHE_WT: return " WT";
> default: return "";
> }
> }
> --
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
