[Openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/Makefile.am src/via_fp.c src/via_mode.h src/via_outputs.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Wed Apr 26 04:42:48 UTC 2017
configure.ac | 2 +-
src/Makefile.am | 1 -
src/via_fp.c | 1 -
src/via_mode.h | 49 -------------------------------------------------
src/via_outputs.c | 6 ------
src/via_ums.h | 16 ++++++++++++++++
6 files changed, 17 insertions(+), 58 deletions(-)
New commits:
commit fc1de4f0960f909918f77cbfcc491c30b24e4c68
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 25 21:41:53 2017 -0700
Version bumped to 0.6.112
More legacy code clean up.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 9faaed2..80efe51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.6.111],
+ [0.6.112],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
diff --git a/src/via_mode.h b/src/via_mode.h
deleted file mode 100644
index e69de29..0000000
commit 6c7374e6ec4f1d7688c29c64abdba9d828b0f274
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 25 21:36:34 2017 -0700
Removing via_mode.h
Finally, it’s gone. When that nonsensical gigantic FP mode setting
tables were gone (Sorry for the "non-nonsensical" typo screw up.
I meant "nonsensical."), it was a matter of time before this header
file was deleted. Feels good removing useless legacy code.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 68d75c7..821acf4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ openchrome_drv_la_SOURCES = \
via_memmgr.h \
via_memmgr.c \
via_outputs.c \
- via_mode.h \
via_priv.h \
via_regs.h \
via_sii164.c \
diff --git a/src/via_fp.c b/src/via_fp.c
index 3e69bd5..fe89a2e 100644
--- a/src/via_fp.c
+++ b/src/via_fp.c
@@ -33,7 +33,6 @@
#endif
#include "via_driver.h"
-#include "via_mode.h"
#include <unistd.h>
/*
diff --git a/src/via_mode.h b/src/via_mode.h
index af462c9..e69de29 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -1,34 +0,0 @@
-/*
- * Copyright 2004-2005 The Unichrome Project [unichrome.sf.net]
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _VIA_MODE_H_
-#define _VIA_MODE_H_ 1
-
-/*
- * Bandwidth
- *
- */
-
-#endif /* _VIA_MODE_H_ */
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 02bbcf2..9468ef6 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -41,12 +41,6 @@
#include <unistd.h>
/*
- * Modetable nonsense.
- *
- */
-#include "via_mode.h"
-
-/*
* Sets IGA1 or IGA2 as the display output source for DIP0
* (Digital Interface Port 0) interface for CLE266 only.
*/
commit 44181ad7a5722090b91d521c6f45148c773da8b6
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Apr 25 21:30:37 2017 -0700
Moving remaining via_mode.h code into via_ums.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_mode.h b/src/via_mode.h
index 972f331..af462c9 100644
--- a/src/via_mode.h
+++ b/src/via_mode.h
@@ -30,20 +30,5 @@
* Bandwidth
*
*/
-#define VIA_BW_MIN 74000000 /* > 640x480 at 60Hz@32bpp */
-#define VIA_BW_DDR200 394000000
-#define VIA_BW_DDR400 553000000 /* > 1920x1200 at 60Hz@32bpp */
-#define VIA_BW_DDR667 922000000
-#define VIA_BW_DDR1066 922000000
-
-union pllparams {
- struct {
- CARD32 dtz : 2;
- CARD32 dr : 3;
- CARD32 dn : 7;
- CARD32 dm :10;
- } params;
- CARD32 packed;
-};
#endif /* _VIA_MODE_H_ */
diff --git a/src/via_ums.h b/src/via_ums.h
index 366e438..bac71c7 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -107,6 +107,12 @@
#define VIA_MEM_END 0x0B
#define VIA_MEM_NONE 0xFF
+#define VIA_BW_MIN 74000000 /* > 640x480 at 60Hz@32bpp */
+#define VIA_BW_DDR200 394000000
+#define VIA_BW_DDR400 553000000 /* > 1920x1200 at 60Hz@32bpp */
+#define VIA_BW_DDR667 922000000
+#define VIA_BW_DDR1066 922000000
+
/* Digital Output Bus Width */
#define VIA_DI_12BIT 0x00
#define VIA_DI_24BIT 0x01
@@ -217,6 +223,16 @@ typedef struct
CARD8 bTuningValue;
} ViaExpireNumberTable;
+union pllparams {
+ struct {
+ CARD32 dtz : 2;
+ CARD32 dr : 3;
+ CARD32 dn : 7;
+ CARD32 dm :10;
+ } params;
+ CARD32 packed;
+};
+
/*
* Sets analog (VGA) DAC output state.
More information about the Openchrome-devel
mailing list