[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gt i915: Omit spurious c...

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

details:   https://anonhg.NetBSD.org/src/rev/993fbc6b29ed
branches:  trunk
changeset: 1028976:993fbc6b29ed
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:37:28 2021 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r ea27f3c91381 -r 993fbc6b29ed sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c  Sun Dec 19 12:37:17 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_pm.c  Sun Dec 19 12:37:28 2021 +0000
@@ -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 @@
                 * 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();
        }