Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:18:17 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include: i915_trace.h
Log Message:
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 <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/i915_trace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/i915_trace.h
diff -u src/sys/external/bsd/drm2/include/i915_trace.h:1.4 src/sys/external/bsd/drm2/include/i915_trace.h:1.5
--- src/sys/external/bsd/drm2/include/i915_trace.h:1.4 Mon Aug 27 06:07:44 2018
+++ src/sys/external/bsd/drm2/include/i915_trace.h Mon Aug 27 06:18:17 2018
@@ -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 @@ trace_i915_gem_request_add(struct drm_i9
}
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 @@ trace_i915_reg_rw(bool write __unused, u
}
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)
{
}
