[src/trunk]: src/sys/external/bsd/drm2 Use dtrace probes to implement i915_tr...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b22671239ff3
branches:  trunk
changeset: 366379:b22671239ff3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:09:35 2018 +0000

description:
Use dtrace probes to implement i915_trace.h.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h            |    4 +-
 sys/external/bsd/drm2/dist/drm/i915/i915_gem_fence.c      |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_csr.c           |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c    |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c           |    6 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c            |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        |    5 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        |    5 +-
 sys/external/bsd/drm2/i915drm/intel_dsi.c                 |    6 +-
 sys/external/bsd/drm2/i915drm/intelfb.c                   |    5 +-
 sys/external/bsd/drm2/include/i915_trace.h                |  377 +++++++++++--
 12 files changed, 329 insertions(+), 104 deletions(-)

diffs (truncated from 798 to 300 lines):

diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.25 2018/08/27 14:49:22 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.26 2018/08/27 15:09:35 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2709,8 +2709,6 @@
 #define GT_FREQUENCY_MULTIPLIER 50
 #define GEN9_FREQ_SCALER 3
 
-#include "i915_trace.h"
-
 extern const struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/i915_gem_fence.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem_fence.c      Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem_fence.c      Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_gem_fence.c,v 1.4 2018/08/27 07:17:35 riastradh Exp $     */
+/*     $NetBSD: i915_gem_fence.c,v 1.5 2018/08/27 15:09:35 riastradh Exp $     */
 
 /*
  * Copyright © 2008-2015 Intel Corporation
@@ -24,11 +24,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_fence.c,v 1.4 2018/08/27 07:17:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_fence.c,v 1.5 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
+#include "intel_drv.h"
 
 /**
  * DOC: fence register handling
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_guc_submission.c Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_guc_submission.c,v 1.7 2018/08/27 07:17:35 riastradh Exp $        */
+/*     $NetBSD: i915_guc_submission.c,v 1.8 2018/08/27 15:09:35 riastradh Exp $        */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -24,13 +24,14 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_guc_submission.c,v 1.7 2018/08/27 07:17:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_guc_submission.c,v 1.8 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <linux/bitmap.h>
 #include <linux/firmware.h>
 #include <linux/circ_buf.h>
 #include <asm/cpufeature.h>
 #include "i915_drv.h"
+#include "intel_drv.h"
 #include "intel_guc.h"
 
 /**
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c   Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c   Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_csr.c,v 1.3 2018/08/27 07:25:06 riastradh Exp $  */
+/*     $NetBSD: intel_csr.c,v 1.4 2018/08/27 15:09:35 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -24,12 +24,13 @@
  *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.3 2018/08/27 07:25:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.4 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include "i915_drv.h"
 #include "i915_reg.h"
+#include "intel_drv.h"
 
 /**
  * DOC: csr support for dmc
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c    Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_guc_loader.c    Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_guc_loader.c,v 1.11 2018/08/27 13:43:01 riastradh Exp $  */
+/*     $NetBSD: intel_guc_loader.c,v 1.12 2018/08/27 15:09:35 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -29,11 +29,12 @@
  *    Alex Dai <yu.dai%intel.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.11 2018/08/27 13:43:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_guc_loader.c,v 1.12 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include "i915_drv.h"
+#include "intel_drv.h"
 #include "intel_guc.h"
 
 /**
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c   Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_lrc.c   Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_lrc.c,v 1.8 2018/08/27 14:53:12 riastradh Exp $  */
+/*     $NetBSD: intel_lrc.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -135,11 +135,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.8 2018/08/27 14:53:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
+#include "i915_trace.h"
+#include "intel_drv.h"
 #include "intel_mocs.h"
 
 #define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_pm.c,v 1.14 2018/08/27 07:29:37 riastradh Exp $  */
+/*     $NetBSD: intel_pm.c,v 1.15 2018/08/27 15:09:35 riastradh Exp $  */
 
 /*
  * Copyright © 2012 Intel Corporation
@@ -28,12 +28,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.14 2018/08/27 07:29:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_pm.c,v 1.15 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <linux/bitops.h>
 #include <linux/cpufreq.h>
 #include <linux/export.h>
 #include "i915_drv.h"
+#include "i915_trace.h"
 #include "intel_drv.h"
 #ifndef __NetBSD__
 #include "../../../platform/x86/intel_ips.h"
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_sprite.c,v 1.8 2018/08/27 14:43:00 riastradh Exp $       */
+/*     $NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $       */
 
 /*
  * Copyright © 2011 Intel Corporation
@@ -32,7 +32,7 @@
  * support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.8 2018/08/27 14:43:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.9 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
@@ -43,6 +43,7 @@
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
+#include "i915_trace.h"
 
 static bool
 format_is_yuv(uint32_t format)
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_uncore.c,v 1.9 2018/08/27 13:43:39 riastradh Exp $       */
+/*     $NetBSD: intel_uncore.c,v 1.10 2018/08/27 15:09:35 riastradh Exp $      */
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -24,11 +24,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.9 2018/08/27 13:43:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.10 2018/08/27 15:09:35 riastradh Exp $");
 
 #include "i915_drv.h"
 #include "intel_drv.h"
 #include "i915_vgpu.h"
+#include "i915_trace.h"
 
 #include <linux/err.h>
 #include <linux/pm_runtime.h>
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/i915drm/intel_dsi.c
--- a/sys/external/bsd/drm2/i915drm/intel_dsi.c Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/intel_dsi.c Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_dsi.c,v 1.1 2018/08/27 13:35:15 riastradh Exp $  */
+/*     $NetBSD: intel_dsi.c,v 1.2 2018/08/27 15:09:35 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,9 +30,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_dsi.c,v 1.1 2018/08/27 13:35:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_dsi.c,v 1.2 2018/08/27 15:09:35 riastradh Exp $");
 
-#include "i915_drv.h"
+#include "intel_drv.h"
 
 void
 intel_dsi_init(struct drm_device *dev)
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/i915drm/intelfb.c
--- a/sys/external/bsd/drm2/i915drm/intelfb.c   Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/intelfb.c   Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intelfb.c,v 1.14 2016/12/12 19:45:56 maya Exp $        */
+/*     $NetBSD: intelfb.c,v 1.15 2018/08/27 15:09:35 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.14 2016/12/12 19:45:56 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.15 2018/08/27 15:09:35 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
@@ -42,6 +42,7 @@
 
 #include "i915_drv.h"
 #include "i915_pci.h"
+#include "intel_drv.h"
 #include "intelfb.h"
 
 static int     intelfb_match(device_t, cfdata_t, void *);
diff -r 2153450da16c -r b22671239ff3 sys/external/bsd/drm2/include/i915_trace.h
--- a/sys/external/bsd/drm2/include/i915_trace.h        Mon Aug 27 15:08:54 2018 +0000
+++ b/sys/external/bsd/drm2/include/i915_trace.h        Mon Aug 27 15:09:35 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_trace.h,v 1.12 2018/08/27 07:27:38 riastradh Exp $        */
+/*     $NetBSD: i915_trace.h,v 1.13 2018/08/27 15:09:35 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,235 +33,452 @@
 #define _I915_TRACE_H_
 
 #include <sys/types.h>
+#include <sys/sdt.h>
 
 #include "intel_drv.h"
 
+/* Must come last.  */
+#include <drm/drm_trace_netbsd.h>
+
+DEFINE_TRACE2(i915,, flip__request,
+    "enum plane"/*plane*/, "struct drm_i915_gem_object *"/*obj*/);
 static inline void
-trace_i915_flip_request(enum plane plane __unused,
-    struct drm_i915_gem_object *obj __unused)
+trace_i915_flip_request(enum plane plane, struct drm_i915_gem_object *obj)
 {
+       TRACE2(i915,, flip__request,  plane, obj);
 }
 
+DEFINE_TRACE2(i915,, flip__complete,
+    "enum plane"/*plane*/, "struct drm_i915_gem_object *"/*obj*/);
 static inline void
-trace_i915_flip_complete(enum plane plane __unused,
-    struct drm_i915_gem_object *obj __unused)
+trace_i915_flip_complete(enum plane plane, struct drm_i915_gem_object *obj)
 {
+       TRACE2(i915,, flip__complete,  plane, obj);
 }
 
+DEFINE_TRACE4(i915,, gem__evict,
+    "int"/*devno*/,
+    "int"/*min_size*/, "unsigned"/*alignment*/, "unsigned"/*flags*/);