Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:37:29 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_engine_pm.c
Log Message:
i915: Omit spurious compile-time assertion.
The assertion failed on i386 with our struct drm_fence_callback.
Could change drm_fence_callback to be a little smaller (use the
nullness of the previous pointer instead of a separate boolean to
detect whether it's on the list, perhaps). But it's unclear why the
relative sizes of these members matter; they're in a union. Upstream
commit message doesn't illuminate.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.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_engine_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c:1.4 Sun Dec 19 12:33:56 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c Sun Dec 19 12:37:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_engine_pm.c,v 1.4 2021/12/19 12:33:56 riastradh Exp $ */
+/* $NetBSD: intel_engine_pm.c,v 1.5 2021/12/19 12:37:28 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_engine_pm.c,v 1.4 2021/12/19 12:33:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_engine_pm.c,v 1.5 2021/12/19 12:37:28 riastradh Exp $");
#include "i915_drv.h"
@@ -210,7 +210,6 @@ static bool switch_to_kernel_context(str
* until the background request retirement running every
* second or two).
*/
- BUILD_BUG_ON(sizeof(rq->duration) > sizeof(rq->submitq));
dma_fence_add_callback(&rq->fence, &rq->duration.cb, duration);
rq->duration.emitted = ktime_get();
}
