From patchwork Fri May 25 08:26:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10426625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1305F6032C for ; Fri, 25 May 2018 08:26:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 018E5295ED for ; Fri, 25 May 2018 08:26:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA524295F0; Fri, 25 May 2018 08:26:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 95B8E295ED for ; Fri, 25 May 2018 08:26:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A49D6E8D8; Fri, 25 May 2018 08:26:56 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x233.google.com (mail-wr0-x233.google.com [IPv6:2a00:1450:400c:c0c::233]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DEFF6E8D7 for ; Fri, 25 May 2018 08:26:52 +0000 (UTC) Received: by mail-wr0-x233.google.com with SMTP id y15-v6so7692932wrg.11 for ; Fri, 25 May 2018 01:26:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SP1HD6YZWkZvhR1LIQLrJlG2VzERci09jJPd3u2LfYk=; b=kpca37ZqJKuHVHbMQ8jO/NA6OG68Q8CUiWc0J9FfCBY3EX2EE5UigGjqkccdJ+XvWp kADmpOSCYmtKfS0Ku+UE8CCpmi8zHqTDj3GHCr0OCfTDY3tr8iHAycPASK13IZN1sTce TapCEGT6U5fF8tmDcerDRMKp+X6QCRTk2xDX+l0r3NehpRTyNcbdCidoqLc/EA59sTVB y1ZFM+TmRhVImfZgkeA0EelYex4p1IyAy+OWz6hd2+LQWTXUs7OBfq7hYCW1sSx1Fvuf zvxhwvzdIHOnL1PL1mVi7H0ONpGgIigqkAF5rPQ7vIXPSc1Q9uRmF92YFPUIXkmaF7KK 7mZA== X-Gm-Message-State: ALKqPweJE+7g2dio6JNYLHQDoGnDcwXF3rP1Tys1s6J8eR8b6zPWy5Uw zvrB8YHAxnzjCQ22yyI5ibO0aMTW X-Google-Smtp-Source: AB8JxZr0nyLWpLITLqR/BMP0cEW+p5AH2J8rBi/748Yvz2APYfE4Lbp+cHCq3VXt79o+BTcZNdQecg== X-Received: by 2002:adf:ce8b:: with SMTP id r11-v6mr1095080wrn.242.1527236810898; Fri, 25 May 2018 01:26:50 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id z10-v6sm28873194wre.43.2018.05.25.01.26.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 May 2018 01:26:50 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 25 May 2018 09:26:42 +0100 Message-Id: <20180525082642.18246-3-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525082642.18246-1-tvrtko.ursulin@linux.intel.com> References: <20180525082642.18246-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 3/3] drm/i915/trace: Context field needs to be 64-bit wide X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Underlaying field is u64 so the tracepoint needs to be as well. Signed-off-by: Tvrtko Ursulin Suggested-by: Chris Wilson --- drivers/gpu/drm/i915/i915_trace.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index bac582ed3a0b..009862261218 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -623,7 +623,7 @@ TRACE_EVENT(i915_request_queue, __field(u32, hw_id) __field(u16, class) __field(u16, instance) - __field(u32, ctx) + __field(u64, ctx) __field(u32, seqno) __field(u32, flags) ), @@ -638,7 +638,7 @@ TRACE_EVENT(i915_request_queue, __entry->flags = flags; ), - TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, flags=0x%x", + TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, flags=0x%x", __entry->dev, __entry->class, __entry->instance, __entry->hw_id, __entry->ctx, __entry->seqno, __entry->flags) @@ -653,7 +653,7 @@ DECLARE_EVENT_CLASS(i915_request, __field(u32, hw_id) __field(u16, class) __field(u16, instance) - __field(u32, ctx) + __field(u64, ctx) __field(u32, seqno) __field(u32, global) ), @@ -668,7 +668,7 @@ DECLARE_EVENT_CLASS(i915_request, __entry->global = rq->global_seqno; ), - TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u", + TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u", __entry->dev, __entry->class, __entry->instance, __entry->hw_id, __entry->ctx, __entry->seqno, __entry->global) @@ -699,7 +699,7 @@ TRACE_EVENT(i915_request_in, __field(u32, hw_id) __field(u16, class) __field(u16, instance) - __field(u32, ctx) + __field(u64, ctx) __field(u32, seqno) __field(u32, global_seqno) __field(u32, port) @@ -718,7 +718,7 @@ TRACE_EVENT(i915_request_in, __entry->port = port; ), - TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u", + TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, prio=%u, global=%u, port=%u", __entry->dev, __entry->class, __entry->instance, __entry->hw_id, __entry->ctx, __entry->seqno, __entry->prio, __entry->global_seqno, __entry->port) @@ -733,7 +733,7 @@ TRACE_EVENT(i915_request_out, __field(u32, hw_id) __field(u16, class) __field(u16, instance) - __field(u32, ctx) + __field(u64, ctx) __field(u32, seqno) __field(u32, global_seqno) __field(u32, completed) @@ -750,7 +750,7 @@ TRACE_EVENT(i915_request_out, __entry->completed = i915_request_completed(rq); ), - TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, completed?=%u", + TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u, completed?=%u", __entry->dev, __entry->class, __entry->instance, __entry->hw_id, __entry->ctx, __entry->seqno, __entry->global_seqno, __entry->completed) @@ -819,7 +819,7 @@ TRACE_EVENT(i915_request_wait_begin, __field(u32, hw_id) __field(u16, class) __field(u16, instance) - __field(u32, ctx) + __field(u64, ctx) __field(u32, seqno) __field(u32, global) __field(unsigned int, flags) @@ -842,7 +842,7 @@ TRACE_EVENT(i915_request_wait_begin, __entry->flags = flags; ), - TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x", + TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u, blocking=%u, flags=0x%x", __entry->dev, __entry->class, __entry->instance, __entry->hw_id, __entry->ctx, __entry->seqno, __entry->global, !!(__entry->flags & I915_WAIT_LOCKED),