[src/trunk]: src/sys/external/bsd/drm2/include update i915_trace.h to build w...

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

details:   https://anonhg.NetBSD.org/src/rev/3ae7ea80c343
branches:  trunk
changeset: 364187:3ae7ea80c343
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:18:17 2018 +0000

description:
update i915_trace.h to build withotu -Werror

remove unused users of the type struct intel_ring_buffer
switch others to struct drm_i915_gem_request which is what callers
use.


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/include/i915_trace.h |  35 ++++++------------------------
 1 files changed, 7 insertions(+), 28 deletions(-)

diffs (88 lines):

diff -r a4c6c8d4f629 -r 3ae7ea80c343 sys/external/bsd/drm2/include/i915_trace.h
--- a/sys/external/bsd/drm2/include/i915_trace.h        Mon Aug 27 06:18:05 2018 +0000
+++ b/sys/external/bsd/drm2/include/i915_trace.h        Mon Aug 27 06:18:17 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_trace.h,v 1.4 2018/08/27 06:07:44 riastradh Exp $ */
+/*     $NetBSD: i915_trace.h,v 1.5 2018/08/27 06:18:17 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,12 +37,6 @@
 #include "intel_drv.h"
 
 static inline void
-trace_i915_flip_complete(enum plane plane __unused,
-    struct drm_i915_gem_object *obj __unused)
-{
-}
-
-static inline void
 trace_i915_flip_request(enum plane plane __unused,
     struct drm_i915_gem_object *obj __unused)
 {
@@ -120,42 +114,37 @@
 }
 
 static inline void
-trace_i915_gem_request_complete(struct intel_ring_buffer *ring __unused)
-{
-}
-
-static inline void
 trace_i915_gem_request_retire(struct drm_i915_gem_request *request __unused)
 {
 }
 
 static inline void
-trace_i915_gem_request_wait_begin(struct intel_ring_buffer *ring __unused,
+trace_i915_gem_request_wait_begin(struct drm_i915_gem_request *request __unused,
     uint32_t seqno __unused)
 {
 }
 
 static inline void
-trace_i915_gem_request_wait_end(struct intel_ring_buffer *ring __unused,
+trace_i915_gem_request_wait_end(struct drm_i915_gem_request *request __unused,
     uint32_t seqno __unused)
 {
 }
 
 static inline void
-trace_i915_gem_ring_dispatch(struct intel_ring_buffer *ring __unused,
+trace_i915_gem_ring_dispatch(struct drm_i915_gem_request *request __unused,
     uint32_t seqno __unused, uint32_t flags __unused)
 {
 }
 
 static inline void
-trace_i915_gem_ring_flush(struct intel_ring_buffer *ring __unused,
+trace_i915_gem_ring_flush(struct drm_i915_gem_request *request __unused,
     uint32_t invalidate __unused, uint32_t flags __unused)
 {
 }
 
 static inline void
-trace_i915_gem_ring_sync_to(struct intel_ring_buffer *from __unused,
-    struct intel_ring_buffer *to __unused, u32 seqno __unused)
+trace_i915_gem_ring_sync_to(struct drm_i915_gem_request *from __unused,
+    struct drm_i915_gem_request *to __unused, u32 seqno __unused)
 {
 }
 
@@ -166,16 +155,6 @@
 }
 
 static inline void
-trace_i915_ring_wait_begin(struct intel_ring_buffer *ring __unused)
-{
-}
-
-static inline void
-trace_i915_ring_wait_end(struct intel_ring_buffer *ring __unused)
-{
-}
-
-static inline void
 trace_i915_vma_bind(struct i915_vma *vma __unused, uint64_t flags __unused)
 {
 }