From patchwork Mon Oct 13 10:21:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 399116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9EBFE140076 for ; Mon, 13 Oct 2014 21:22:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753590AbaJMKWE (ORCPT ); Mon, 13 Oct 2014 06:22:04 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:42612 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbaJMKWD (ORCPT ); Mon, 13 Oct 2014 06:22:03 -0400 Received: by mail-wi0-f178.google.com with SMTP id h11so3277831wiw.17 for ; Mon, 13 Oct 2014 03:22:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TF51qyOdDVMOHMINdM3ZDI1kEKhuu7NVIsEOrcGIGi0=; b=I/jNHgVj0TiToO17lBicP8cu6ErG9ZiMS7izjmhMMPzwvLZWpW7SzkzdX6FBE5BrnG bWmk1KiIp+neyfQKDmg4DHLMlkekkh0C5aL28uiSp7VdyprA7GGHeP47NnWMEi4grlvQ W9idTGGghNhQ+c8MKT5sbNHKnmuDY4WZxeQHYTQd87jTrgDYO1MC9g+AMVIeGVG1T1rZ 4qcWNoYxhmfK/SKgXY2koUvnvUvTVHbIjq4F21H2y9YNVgIze0g6BECfV0meutowFC6X f/ZJkODI91QTyhkNsiHCyggmzosr6v/nAiH9mqKTAKSi4uVgBtXQkG2UvblIX7BOjAkk EbsQ== X-Received: by 10.194.120.37 with SMTP id kz5mr1715543wjb.107.1413195721898; Mon, 13 Oct 2014 03:22:01 -0700 (PDT) Received: from localhost (port-4359.pppoe.wtnet.de. [84.46.17.24]) by mx.google.com with ESMTPSA id o1sm16119496wja.25.2014.10.13.03.22.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Oct 2014 03:22:01 -0700 (PDT) From: Thierry Reding To: dri-devel@lists.freedesktop.org Cc: Sean Paul , linux-tegra@vger.kernel.org Subject: [PATCH 04/14] gpu: host1x: Print address/offset pairs consistently Date: Mon, 13 Oct 2014 12:21:45 +0200 Message-Id: <1413195715-4719-4-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413195715-4719-1-git-send-email-thierry.reding@gmail.com> References: <1413195715-4719-1-git-send-email-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Consistently use a format of %pad+%#x to print address/offset in debug messages. Signed-off-by: Thierry Reding --- drivers/gpu/host1x/hw/cdma_hw.c | 4 ++-- drivers/gpu/host1x/hw/debug_hw.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/host1x/hw/cdma_hw.c b/drivers/gpu/host1x/hw/cdma_hw.c index 072d8209c06c..305ea8f3382d 100644 --- a/drivers/gpu/host1x/hw/cdma_hw.c +++ b/drivers/gpu/host1x/hw/cdma_hw.c @@ -54,8 +54,8 @@ static void cdma_timeout_cpu_incr(struct host1x_cdma *cdma, u32 getptr, u32 *p = (u32 *)(pb->mapped + getptr); *(p++) = HOST1X_OPCODE_NOP; *(p++) = HOST1X_OPCODE_NOP; - dev_dbg(host1x->dev, "%s: NOP at %#llx\n", __func__, - (u64)pb->phys + getptr); + dev_dbg(host1x->dev, "%s: NOP at %pad+%#x\n", __func__, + &pb->phys, getptr); getptr = (getptr + 8) & (pb->size_bytes - 1); } wmb(); diff --git a/drivers/gpu/host1x/hw/debug_hw.c b/drivers/gpu/host1x/hw/debug_hw.c index f72c873eff81..791de9351eeb 100644 --- a/drivers/gpu/host1x/hw/debug_hw.c +++ b/drivers/gpu/host1x/hw/debug_hw.c @@ -163,8 +163,8 @@ static void show_channel_gathers(struct output *o, struct host1x_cdma *cdma) continue; } - host1x_debug_output(o, " GATHER at %#llx+%04x, %d words\n", - (u64)g->base, g->offset, g->words); + host1x_debug_output(o, " GATHER at %pad+%#x, %d words\n", + &g->base, g->offset, g->words); show_gather(o, g->base + g->offset, g->words, cdma, g->base, mapped);