From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] intel_error_decode: use 64b gtt_offset Date: Tue, 29 Apr 2014 10:52:44 +0200 Message-ID: <20140429085244.GK32404@phenom.ffwll.local> References: <1398735784-7069-1-git-send-email-benjamin.widawsky@intel.com> <1398735950-23760-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D6976E96D for ; Tue, 29 Apr 2014 01:52:49 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id e53so21301eek.39 for ; Tue, 29 Apr 2014 01:52:48 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1398735950-23760-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ben Widawsky Cc: Intel GFX List-Id: intel-gfx@lists.freedesktop.org On Mon, Apr 28, 2014 at 06:45:50PM -0700, Ben Widawsky wrote: > See the relevant kernel patch for the details. I guess this breaks > support for older error state, I am not actually sure. Without > versioning our error state though, I cannot think of a better way. > Suggestions are welcome. Just drop the length qualifier and let scanf it the full number? -Daniel > > Signed-off-by: Ben Widawsky > --- > tools/intel_error_decode.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c > index 1eeff07..d0028a1 100644 > --- a/tools/intel_error_decode.c > +++ b/tools/intel_error_decode.c > @@ -311,17 +311,17 @@ print_fence(unsigned int devid, uint64_t fence) > uint32_t head[MAX_RINGS]; > int head_ndx = 0; > int num_rings = 0; > -static void print_batch(int is_batch, const char *ring_name, uint32_t gtt_offset) > +static void print_batch(int is_batch, const char *ring_name, uint64_t gtt_offset) > { > const char *buffer_type[2] = { "ringbuffer", "batchbuffer" }; > if (is_batch || !num_rings) > - printf("%s (%s) at 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset); > + printf("%s (%s) at 0x%016lx\n", buffer_type[is_batch], ring_name, gtt_offset); > else > - printf("%s (%s) at 0x%08x; HEAD points to: 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset, head[head_ndx++ % num_rings] + gtt_offset); > + printf("%s (%s) at 0x%016lx; HEAD points to: 0x%016lx\n", buffer_type[is_batch], ring_name, gtt_offset, head[head_ndx++ % num_rings] + gtt_offset); > } > > static void decode(struct drm_intel_decode *ctx, bool is_batch, > - const char *ring_name, uint32_t gtt_offset, uint32_t *data, > + const char *ring_name, uint64_t gtt_offset, uint32_t *data, > int *count) > { > if (!*count) > @@ -344,7 +344,7 @@ read_data_file(FILE *file) > char *line = NULL; > size_t line_size; > uint32_t offset, value, ring_length = 0; > - uint32_t gtt_offset = 0, new_gtt_offset; > + uint64_t gtt_offset = 0, new_gtt_offset; > char *ring_name = NULL; > int is_batch = 1; > > @@ -361,7 +361,7 @@ read_data_file(FILE *file) > if (num_rings == -1) > num_rings = head_ndx; > > - matched = sscanf(dashes, "--- gtt_offset = 0x%08x\n", > + matched = sscanf(dashes, "--- gtt_offset = 0x%016lx\n", > &new_gtt_offset); > if (matched == 1) { > decode(decode_ctx, is_batch, ring_name, > @@ -373,7 +373,7 @@ read_data_file(FILE *file) > continue; > } > > - matched = sscanf(dashes, "--- ringbuffer = 0x%08x\n", > + matched = sscanf(dashes, "--- ringbuffer = 0x%08lx\n", > &new_gtt_offset); > if (matched == 1) { > decode(decode_ctx, is_batch, ring_name, > -- > 1.9.2 > > _______________________________________________ > 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