[src/trunk]: src/sys/arch/arm/allwinner clear repeater sel bits before settin...

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

details:   https://anonhg.NetBSD.org/src/rev/ed23ed895437
branches:  trunk
changeset: 333813:ed23ed895437
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Nov 17 10:00:14 2014 +0000

description:
clear repeater sel bits before setting -- would cause an issue if we ever switched away from a pixel doubling mode

diffstat:

 sys/arch/arm/allwinner/awin_hdmi.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 7b248d38bd3a -r ed23ed895437 sys/arch/arm/allwinner/awin_hdmi.c
--- a/sys/arch/arm/allwinner/awin_hdmi.c        Mon Nov 17 08:48:59 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_hdmi.c        Mon Nov 17 10:00:14 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_hdmi.c,v 1.14 2014/11/17 01:38:00 jmcneill Exp $ */
+/* $NetBSD: awin_hdmi.c,v 1.15 2014/11/17 10:00:14 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -32,7 +32,7 @@
 #define AWIN_HDMI_PLL  3       /* PLL7 or PLL3 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.14 2014/11/17 01:38:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_hdmi.c,v 1.15 2014/11/17 10:00:14 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -737,11 +737,12 @@
                val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_HDMI_MODE_HDMI,
                                 AWIN_HDMI_VID_CTRL_HDMI_MODE);
        }
-       val &= ~AWIN_HDMI_VID_CTRL_OUTPUT_FMT;
+       val &= ~AWIN_HDMI_VID_CTRL_REPEATER_SEL;
        if (dblscan_p) {
                val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_REPEATER_SEL_2X,
                                 AWIN_HDMI_VID_CTRL_REPEATER_SEL);
        }
+       val &= ~AWIN_HDMI_VID_CTRL_OUTPUT_FMT;
        if (interlace_p) {
                val |= __SHIFTIN(AWIN_HDMI_VID_CTRL_OUTPUT_FMT_INTERLACE,
                                 AWIN_HDMI_VID_CTRL_OUTPUT_FMT);