Module Name: src
Committed By: thorpej
Date: Mon Dec 23 00:24:02 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_hdmi.c
Log Message:
When deciding to delay (rather than kpause), pay attention to
I2C_F_POLL, not 'cold'.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sunxi_hdmi.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/arch/arm/sunxi/sunxi_hdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.8 src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.9
--- src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.8 Sun Dec 22 23:23:30 2019
+++ src/sys/arch/arm/sunxi/sunxi_hdmi.c Mon Dec 23 00:24:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.8 2019/12/22 23:23:30 thorpej Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.8 2019/12/22 23:23:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -408,7 +408,7 @@ sunxi_hdmi_i2c_xfer_1_4(void *priv, i2c_
val = HDMI_READ(sc, SUNXI_A31_HDMI_DDC_CTRL_REG);
if ((val & SUNXI_A31_HDMI_DDC_CTRL_ACCESS_CMD_START) == 0)
break;
- if (cold)
+ if (flags & I2C_F_POLL)
delay(1000);
else
kpause("hdmiddc", false, mstohz(10), &sc->sc_exec_lock);
