Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:11:46 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_sw_fence.c
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_display.c
Log Message:
i915: Fix some inadvertent void * abuse.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.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/i915_sw_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c:1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c:1.5 Sun Dec 19 11:56:38 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_sw_fence.c Sun Dec 19 12:11:46 2021
@@ -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 @@ struct i915_sw_fence_wq {
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);
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c:1.8 Sun Dec 19 11:56:38 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c Sun Dec 19 12:11:46 2021
@@ -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 void intel_atomic_helper_free_sta
static int
intel_atomic_commit_fence_wake(struct i915_sw_fence_waiter *waiter,
- unsigned mode, int flags, void *cookie)
+ unsigned mode, int flags, void *not_a_cookie)
{
- struct intel_atomic_state *intel_state = 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);
