Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:47:16 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_lrc.c
Log Message:
Make intel_lrc.c build moar
Author: Maya Rashish <[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/dist/drm/i915/gt/intel_lrc.c
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/dist/drm/i915/gt/intel_lrc.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_lrc.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_lrc.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_lrc.c:1.4 Sun Dec 19 11:46:47 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_lrc.c Sun Dec 19 11:47:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_lrc.c,v 1.4 2021/12/19 11:46:47 riastradh Exp $ */
+/* $NetBSD: intel_lrc.c,v 1.5 2021/12/19 11:47:16 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -134,7 +134,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.4 2021/12/19 11:46:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,v 1.5 2021/12/19 11:47:16 riastradh Exp $");
#include <linux/interrupt.h>
@@ -153,6 +153,8 @@ __KERNEL_RCSID(0, "$NetBSD: intel_lrc.c,
#include "intel_ring.h"
#include "intel_workarounds.h"
+#include <linux/nbsd-namespace.h>
+
#define RING_EXECLIST_QFULL (1 << 0x2)
#define RING_EXECLIST1_VALID (1 << 0x3)
#define RING_EXECLIST0_VALID (1 << 0x4)
@@ -1395,7 +1397,7 @@ trace_ports(const struct intel_engine_ex
struct i915_request * const *ports)
{
const struct intel_engine_cs *engine =
- container_of(execlists, typeof(*engine), execlists);
+ const_container_of(execlists, typeof(*engine), execlists);
if (!ports[0])
return;
