From patchwork Tue Jun 5 13:41:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10448325 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 7A982600CA for ; Tue, 5 Jun 2018 13:41:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69CB429446 for ; Tue, 5 Jun 2018 13:41:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E78B2944F; Tue, 5 Jun 2018 13:41:35 +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 E835C29446 for ; Tue, 5 Jun 2018 13:41:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 568666E2D1; Tue, 5 Jun 2018 13:41:34 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x22a.google.com (mail-wr0-x22a.google.com [IPv6:2a00:1450:400c:c0c::22a]) by gabe.freedesktop.org (Postfix) with ESMTPS id A2EE66E2D1 for ; Tue, 5 Jun 2018 13:41:32 +0000 (UTC) Received: by mail-wr0-x22a.google.com with SMTP id a12-v6so2507105wro.1 for ; Tue, 05 Jun 2018 06:41:32 -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=WTzVgDY1Z7cIzQhN+ujal0ZlfyX9OhCTUMIiN3XkmDY=; b=s/plvpKnY7ZPOrOCJChM4eemv7hL2SCTrpiGj26hLjX1idZZpqmWLTECQL5awte5Cn YZMcN/m0Lj5X1VAZPnW638qbP7yxG7rU/ptYQvmAG/lJU9ZmkyVD0kPulaCujJ1cNDoj ch4B+D+Zt/aj455vkWCU1qGxcoSO1IFVh97kOtwMHqC1/t59BnxDepbx4yl5y9p6HxAN RZKTVhO2N2lXWcIFSPveH079s36TURPLMkC+pXrRjW6sHAms/KWwrgAZ11GqGnG7BHw+ J6PEUjtSdk4RmOrxlgne3Iyky5CkgMSu8jaqXteMdOoWfjHJq0wEsIoMWfvAFMRDZmCp i3IA== X-Gm-Message-State: ALKqPweqggNX4ZqDsKFL7YJstxLrTuCjIWfwShJ7fBOtiCGOUritsO7l CRB99QbLi7EKpL7lw4lYbV9lRDks X-Google-Smtp-Source: ADUXVKIV17OcKjn6baFDPcWzlxolx34e9qEwoXOLqewDU0tvT3+c/f9UrXDoNJLfk7jifww1FpaJXw== X-Received: by 2002:adf:8df3:: with SMTP id o106-v6mr20808844wrb.251.1528206090967; Tue, 05 Jun 2018 06:41:30 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id n21-v6sm1439088wmc.42.2018.06.05.06.41.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jun 2018 06:41:30 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 5 Jun 2018 14:41:24 +0100 Message-Id: <20180605134124.25672-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <152723821294.11749.1074875749010031287@mail.alporthouse.com> References: <152723821294.11749.1074875749010031287@mail.alporthouse.com> Subject: [Intel-gfx] [PATCH v2 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. v2: * Re-order binary packet for 64-bit alignment. (Chris Wilson) Signed-off-by: Tvrtko Ursulin Suggested-by: Chris Wilson Reviewed-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..3d5716d86e27 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -621,9 +621,9 @@ TRACE_EVENT(i915_request_queue, TP_STRUCT__entry( __field(u32, dev) __field(u32, hw_id) + __field(u64, ctx) __field(u16, class) __field(u16, instance) - __field(u32, 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) @@ -651,9 +651,9 @@ DECLARE_EVENT_CLASS(i915_request, TP_STRUCT__entry( __field(u32, dev) __field(u32, hw_id) + __field(u64, ctx) __field(u16, class) __field(u16, instance) - __field(u32, 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) @@ -697,9 +697,9 @@ TRACE_EVENT(i915_request_in, TP_STRUCT__entry( __field(u32, dev) __field(u32, hw_id) + __field(u64, ctx) __field(u16, class) __field(u16, instance) - __field(u32, 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) @@ -731,9 +731,9 @@ TRACE_EVENT(i915_request_out, TP_STRUCT__entry( __field(u32, dev) __field(u32, hw_id) + __field(u64, ctx) __field(u16, class) __field(u16, instance) - __field(u32, 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) @@ -817,9 +817,9 @@ TRACE_EVENT(i915_request_wait_begin, TP_STRUCT__entry( __field(u32, dev) __field(u32, hw_id) + __field(u64, ctx) __field(u16, class) __field(u16, instance) - __field(u32, 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),