[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Fix bug in...

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

details:   https://anonhg.NetBSD.org/src/rev/4f80307f5689
branches:  trunk
changeset: 366353:4f80307f5689
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun May 22 18:41:22 2022 +0000

description:
i915: Fix bug in gmbus_wait: test status passed, not GMBUS_ACTIVE.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r aff538227dc1 -r 4f80307f5689 sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c Sun May 22 18:41:14 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_gmbus.c Sun May 22 18:41:22 2022 +0000
@@ -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@localhost>
@@ -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 @@
 
                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 @@
                    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