From patchwork Sun Feb 16 08:53:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 3657841 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6538C9F2CD for ; Sun, 16 Feb 2014 08:54:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5E92A20172 for ; Sun, 16 Feb 2014 08:54:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 792C020155 for ; Sun, 16 Feb 2014 08:54:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3686FA4EF; Sun, 16 Feb 2014 00:54:05 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f48.google.com (mail-qg0-f48.google.com [209.85.192.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C8F2FA3A0; Sun, 16 Feb 2014 00:54:04 -0800 (PST) Received: by mail-qg0-f48.google.com with SMTP id a108so3437661qge.7 for ; Sun, 16 Feb 2014 00:54:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=U3nL1UGWbT6e5mUFURRlxCtilEGBoZTYdIw8wpP1Wug=; b=wcYIrVIxc/z1xcOhHeEEnhk5XxhTXesdRT2H2moI/QzOsQd67cqKUjnPXNfIX0JEFv 46j4KpFjFh6LkigXWCuuStYG6+Ol6pzceVbhthqQ1EFyM1oOHGqkWkKG9Ms9bNd9G3K9 6qf9YVLXQGSXd0gyrhrSTN+/53ZuGO5XJpuhGV+FMGNy3GgRuEpmKZSD8r4tndGwBjpi mElZVzWWE+W+Cg6dLneHF0ugeYUac6eWHiQ0XmCZVQuOGwKCnykVY8IwKXqb8Z0Tx13d 24zUOWBzelL6TzEiXIrjJx6rqRKiHQ87o5DfLvSErv2MaoYPrAIiUWNrjl56dAfQnUAH JsPQ== X-Received: by 10.224.172.133 with SMTP id l5mr26961967qaz.25.1392540842508; Sun, 16 Feb 2014 00:54:02 -0800 (PST) Received: from localhost.localdomain (cpe-74-71-29-187.nyc.res.rr.com. [74.71.29.187]) by mx.google.com with ESMTPSA id w9sm33476489qax.3.2014.02.16.00.54.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Feb 2014 00:54:01 -0800 (PST) From: Ilia Mirkin To: Ben Skeggs , nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/nouveau/bios: fix INDEX_ADDRESS_LATCHED trace printout Date: Sun, 16 Feb 2014 03:53:55 -0500 Message-Id: <1392540835-11012-1-git-send-email-imirkin@alum.mit.edu> X-Mailer: git-send-email 1.8.3.2 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Having a \n in the middle of a format string means that the next line doesn't get the prefixes unlike every other line printed by the trace. Signed-off-by: Ilia Mirkin --- drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c index de201ba..126651b 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c @@ -845,9 +845,8 @@ init_idx_addr_latched(struct nvbios_init *init) u32 data = nv_ro32(bios, init->offset + 13); u8 count = nv_ro08(bios, init->offset + 17); - trace("INDEX_ADDRESS_LATCHED\t" - "R[0x%06x] : R[0x%06x]\n\tCTRL &= 0x%08x |= 0x%08x\n", - creg, dreg, mask, data); + trace("INDEX_ADDRESS_LATCHED\tR[0x%06x] : R[0x%06x]\n", creg, dreg); + trace("\tCTRL &= 0x%08x |= 0x%08x\n", mask, data); init->offset += 18; while (count--) {