From patchwork Sun Nov 17 21:25:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3194841 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 540A2C045C for ; Sun, 17 Nov 2013 21:41:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84195206AA for ; Sun, 17 Nov 2013 21:41:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C0043206B0 for ; Sun, 17 Nov 2013 21:40:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 084CBFD041; Sun, 17 Nov 2013 13:40:55 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) by gabe.freedesktop.org (Postfix) with ESMTP id EC07BFD041 for ; Sun, 17 Nov 2013 13:40:52 -0800 (PST) Received: by mail-ea0-f180.google.com with SMTP id f15so254715eak.39 for ; Sun, 17 Nov 2013 13:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=NsUGdJINC9gvots4y1D/YBXLGDvBtNH8xTFAo/5Gzac=; b=e6I9bty3ya1Vm7hd1tjZnkU0tuj7Jdx4ZLPBvGLuLCOSOf7z6Gajibg/a9sCPNtUTQ dDwi1lLr0e/bRCYYtIcIrjMY/yQFs39RJ45Ja+IpG86AaFWNaM5MhuRkcOC0X3p/xjQr PDWO+2kgbQhhgjBiBWV+mksHowzCSIR5yhevo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NsUGdJINC9gvots4y1D/YBXLGDvBtNH8xTFAo/5Gzac=; b=jgwv86kvoF45qWbODBLV5v+T2h8CEn58EcaGL1dInmDvgrdnMH9wwiHF1hW7bCI9nD zau2hgc44Xu3mbQpX7UPJCekbRupCFrtMmF54dl3igjXVD1NjWk2vc5Of4aO5bLGmM3C h3ftDu+GQZWm/jGfr5uhiCS4Bwt9nwRIPIfYaDYwnYJYUIG/xtxId/vKxKiuOiLDvo8G M2vOcAx7QLyQp9GJ9sAmQxQyGmn6dAckzwxjUsfWRxqgcT+G4e+Q202JQNtHM9CsE+hx mQ2iXTwgXxqvs3Bj7BNTJl2AP1EKJo2F28kYew7CApCwJllVyDUXobaOSkUNCq3GwC4v a6FA== X-Gm-Message-State: ALoCoQlcXAOjq1YSDDbRtzxbJRvcEQxzAbqi4v4wTpIAMiKpifhRQqJa/w9GlyZRR47j117rsgqk X-Received: by 10.14.102.66 with SMTP id c42mr7468042eeg.47.1384724450423; Sun, 17 Nov 2013 13:40:50 -0800 (PST) Received: from fliege.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id a51sm30990248eeh.8.2013.11.17.13.40.48 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 13:40:48 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm: Don't split up debug output Date: Sun, 17 Nov 2013 22:25:02 +0100 Message-Id: <1384723502-13398-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.1.4 Cc: Daniel Vetter , Intel Graphics Development 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=unavailable 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 Otherwise we risk that the 2nd part of the line ends up on a line of it's own, which means a kernel dmesg line without a log level. This then upsets the dmesg checker in piglit. Only really happens in some of the truly nasty igt testcases which race cache dropping (through debugfs) with other gem operations. Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_stub.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index f53d5246979c..74e0357c1c38 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -99,13 +99,19 @@ void drm_ut_debug_printk(unsigned int request_level, const char *function_name, const char *format, ...) { + struct va_format vaf; va_list args; if (drm_debug & request_level) { - if (function_name) - printk(KERN_DEBUG "[%s:%s], ", prefix, function_name); va_start(args, format); - vprintk(format, args); + vaf.fmt = format; + vaf.va = &args; + + if (function_name) + printk(KERN_DEBUG "[%s:%s], %pV", prefix, + function_name, &vaf); + else + printk(KERN_DEBUG "%pV", &vaf); va_end(args); } }