Module Name: src
Committed By: macallan
Date: Wed Jan 13 17:07:52 UTC 2016
Modified Files:
src/sys/arch/arm/allwinner: awin_tcon.c
Log Message:
revert accidentially committed changes in awin_tcon1_set_videomode()
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/allwinner/awin_tcon.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/allwinner/awin_tcon.c
diff -u src/sys/arch/arm/allwinner/awin_tcon.c:1.12 src/sys/arch/arm/allwinner/awin_tcon.c:1.13
--- src/sys/arch/arm/allwinner/awin_tcon.c:1.12 Wed Jan 13 13:29:51 2016
+++ src/sys/arch/arm/allwinner/awin_tcon.c Wed Jan 13 17:07:51 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $ */
+/* $NetBSD: awin_tcon.c,v 1.13 2016/01/13 17:07:51 macallan Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_allwinner.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.12 2016/01/13 13:29:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_tcon.c,v 1.13 2016/01/13 17:07:51 macallan Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -670,9 +670,9 @@ awin_tcon1_set_videomode(int unit, const
const u_int phsync_p = !!(mode->flags & VID_PHSYNC);
const u_int pvsync_p = !!(mode->flags & VID_PVSYNC);
const u_int hspw = mode->hsync_end - mode->hsync_start;
- const u_int hbp = mode->htotal - mode->hsync_end;
+ const u_int hbp = mode->htotal - mode->hsync_start;
const u_int vspw = mode->vsync_end - mode->vsync_start;
- const u_int vbp = mode->vtotal - mode->vsync_end;
+ const u_int vbp = mode->vtotal - mode->vsync_start;
const u_int vblank_len =
((mode->vtotal << interlace_p) >> 1) - mode->vdisplay - 2;
const u_int start_delay =
