summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-05-22 18:41:22 +0000
committerriastradh <riastradh@NetBSD.org>2022-05-22 18:41:22 +0000
commite3c290838afdc5b95f152efb3155f8d3f9280da3 (patch)
tree7b654fa2c4ad7b987ed621f5650591dab92bf198 /sys/external
parenta02e4b6600ce8976ba07ce9e1b9888a9e17d3948 (diff)
i915: Fix bug in gmbus_wait: test status passed, not GMBUS_ACTIVE.
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c b/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c
index d55048ed10e..3fb1c2ed281 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_gmbus.c,v 1.4 2021/12/19 12:40:31 riastradh Exp $ */
+/* $NetBSD: intel_gmbus.c,v 1.5 2022/05/22 18:41:22 riastradh Exp $ */
/*
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_gmbus.c,v 1.4 2021/12/19 12:40:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_gmbus.c,v 1.5 2022/05/22 18:41:22 riastradh Exp $");
#include <linux/export.h>
#include <linux/i2c-algo-bit.h>
@@ -355,7 +355,7 @@ static int gmbus_wait(struct drm_i915_private *dev_priv, u32 status, u32 irq_en)
ret = 0;
while ((gmbus2 = intel_uncore_read_fw(&dev_priv->uncore,
- GMBUS2)) & GMBUS_ACTIVE) {
+ GMBUS2)) & status) {
if (--timeout == 0) {
ret = -ETIMEDOUT;
break;
@@ -369,7 +369,7 @@ static int gmbus_wait(struct drm_i915_private *dev_priv, u32 status, u32 irq_en)
msecs_to_jiffies_timeout(10),
(((gmbus2 = intel_uncore_read_fw(&dev_priv->uncore,
GMBUS2))
- & GMBUS_ACTIVE)
+ & status)
== 0));
/*
* After DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL, ret<0 on