tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/trace: Context field needs to be 64-bit wide
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 <tvrtko.ursulin@intel.com>
Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180605134124.25672-1-tvrtko.ursulin@linux.intel.com
+10
-10
+10
-10
drivers/gpu/drm/i915/i915_trace.h
+10
-10
drivers/gpu/drm/i915/i915_trace.h
···
621
621
TP_STRUCT__entry(
622
622
__field(u32, dev)
623
623
__field(u32, hw_id)
624
+
__field(u64, ctx)
624
625
__field(u16, class)
625
626
__field(u16, instance)
626
-
__field(u32, ctx)
627
627
__field(u32, seqno)
628
628
__field(u32, flags)
629
629
),
···
638
638
__entry->flags = flags;
639
639
),
640
640
641
-
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, flags=0x%x",
641
+
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, flags=0x%x",
642
642
__entry->dev, __entry->class, __entry->instance,
643
643
__entry->hw_id, __entry->ctx, __entry->seqno,
644
644
__entry->flags)
···
651
651
TP_STRUCT__entry(
652
652
__field(u32, dev)
653
653
__field(u32, hw_id)
654
+
__field(u64, ctx)
654
655
__field(u16, class)
655
656
__field(u16, instance)
656
-
__field(u32, ctx)
657
657
__field(u32, seqno)
658
658
__field(u32, global)
659
659
),
···
668
668
__entry->global = rq->global_seqno;
669
669
),
670
670
671
-
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u",
671
+
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u",
672
672
__entry->dev, __entry->class, __entry->instance,
673
673
__entry->hw_id, __entry->ctx, __entry->seqno,
674
674
__entry->global)
···
697
697
TP_STRUCT__entry(
698
698
__field(u32, dev)
699
699
__field(u32, hw_id)
700
+
__field(u64, ctx)
700
701
__field(u16, class)
701
702
__field(u16, instance)
702
-
__field(u32, ctx)
703
703
__field(u32, seqno)
704
704
__field(u32, global_seqno)
705
705
__field(u32, port)
···
718
718
__entry->port = port;
719
719
),
720
720
721
-
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u",
721
+
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, prio=%u, global=%u, port=%u",
722
722
__entry->dev, __entry->class, __entry->instance,
723
723
__entry->hw_id, __entry->ctx, __entry->seqno,
724
724
__entry->prio, __entry->global_seqno, __entry->port)
···
731
731
TP_STRUCT__entry(
732
732
__field(u32, dev)
733
733
__field(u32, hw_id)
734
+
__field(u64, ctx)
734
735
__field(u16, class)
735
736
__field(u16, instance)
736
-
__field(u32, ctx)
737
737
__field(u32, seqno)
738
738
__field(u32, global_seqno)
739
739
__field(u32, completed)
···
750
750
__entry->completed = i915_request_completed(rq);
751
751
),
752
752
753
-
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, completed?=%u",
753
+
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u, completed?=%u",
754
754
__entry->dev, __entry->class, __entry->instance,
755
755
__entry->hw_id, __entry->ctx, __entry->seqno,
756
756
__entry->global_seqno, __entry->completed)
···
817
817
TP_STRUCT__entry(
818
818
__field(u32, dev)
819
819
__field(u32, hw_id)
820
+
__field(u64, ctx)
820
821
__field(u16, class)
821
822
__field(u16, instance)
822
-
__field(u32, ctx)
823
823
__field(u32, seqno)
824
824
__field(u32, global)
825
825
__field(unsigned int, flags)
···
842
842
__entry->flags = flags;
843
843
),
844
844
845
-
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x",
845
+
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u, blocking=%u, flags=0x%x",
846
846
__entry->dev, __entry->class, __entry->instance,
847
847
__entry->hw_id, __entry->ctx, __entry->seqno,
848
848
__entry->global, !!(__entry->flags & I915_WAIT_LOCKED),