[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Fix some inadverte...

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

details:   https://anonhg.NetBSD.org/src/rev/bf7ff93dacbf
branches:  trunk
changeset: 1028846:bf7ff93dacbf
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:11:46 2021 +0000

description:
i915: Fix some inadvertent void * abuse.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c |  10 +++++-----
 sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c         |   8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r 221826aa5052 -r bf7ff93dacbf sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 12:11:36 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 12:11:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.8 2021/12/19 11:56:38 riastradh Exp $      */
+/*     $NetBSD: intel_display.c,v 1.9 2021/12/19 12:11:46 riastradh Exp $      */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.8 2021/12/19 11:56:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.9 2021/12/19 12:11:46 riastradh Exp $");
 
 #include "intel_display.h"     /* for pipe_drmhack */
 
@@ -15275,9 +15275,9 @@
 
 static int
 intel_atomic_commit_fence_wake(struct i915_sw_fence_waiter *waiter,
-    unsigned mode, int flags, void *cookie)
-{
-       struct intel_atomic_state *intel_state = cookie;
+    unsigned mode, int flags, void *not_a_cookie)
+{
+       struct intel_atomic_state *intel_state = waiter->private;
        struct drm_i915_private *dev_priv = to_i915(intel_state->base.dev);
 
        spin_lock(&dev_priv->atomic_commit_lock);
diff -r 221826aa5052 -r bf7ff93dacbf sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c       Sun Dec 19 12:11:36 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c       Sun Dec 19 12:11:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_sw_fence.c,v 1.5 2021/12/19 11:56:38 riastradh Exp $      */
+/*     $NetBSD: i915_sw_fence.c,v 1.6 2021/12/19 12:11:46 riastradh Exp $      */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_sw_fence.c,v 1.5 2021/12/19 11:56:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_sw_fence.c,v 1.6 2021/12/19 12:11:46 riastradh Exp $");
 
 #include <linux/slab.h>
 #include <linux/dma-fence.h>
@@ -165,9 +165,9 @@
 
 static int
 autoremove_wake_function(struct i915_sw_fence_waiter *waiter, unsigned mode,
-    int flags, void *cookie)
+    int flags, void *donottouch_no_really)
 {
-       struct i915_sw_fence_wq *sfw = cookie;
+       struct i915_sw_fence_wq *sfw = waiter->private;
 
        /* Caller presumably already completed the fence.  */
        DRM_SPIN_WAKEUP_ALL(&sfw->wq, &sfw->fence->wait.lock);