[openchrome-devel] xf86-video-openchrome: Branch 'main' - 9 commits - configure.ac src/drmmode_display.h src/via_display.c src/via_driver.c src/via_driver.h src/via_eng_regs.h src/via_priv.h src/via_xv.c src/via_xvmc.c src/via_xv_overlay.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Sep 4 22:45:26 UTC 2020
configure.ac | 2 -
src/drmmode_display.h | 1
src/via_display.c | 2 +
src/via_driver.c | 7 +++-
src/via_driver.h | 81 ++++++++++++++++++++++++++++++--------------------
src/via_eng_regs.h | 16 ---------
src/via_priv.h | 5 ---
src/via_xv.c | 2 +
src/via_xv_overlay.c | 2 +
src/via_xvmc.c | 1
10 files changed, 64 insertions(+), 55 deletions(-)
New commits:
commit 378e9a89f61a0d4806c5995b1c8fa76f12fdc607
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 15:44:41 2020 -0700
Version bumped to 0.6.312
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index e991b9b..a2af4fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.311],
+ [0.6.312],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 7b5cf479af5e2c43a6276f59c303f6e01b70be88
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 15:34:43 2020 -0700
Rearrange DDX related header files inside src/via_driver.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 968567b..2a06e41 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -62,28 +62,31 @@
#include <pciaccess.h>
#endif
+#include "compat-api.h"
+
+#include "drmmode_display.h"
+
+#include "via_3d.h"
+#include "via_dmabuffer.h"
+#include "via_memmgr.h"
+#include "via_regs.h"
+#include "via_ums.h"
+#include "via_xv.h"
+#include "via_xv_overlay.h"
+
#ifdef OPENCHROMEDRI
#define _XF86DRI_SERVER_
#include "xf86dri.h"
+
#include "sarea.h"
#include "dri.h"
#include "drm_fourcc.h"
#include "GL/glxint.h"
+
#include "via_dri.h"
#include "via_drmclient.h"
#include "via_drm.h"
#endif
-#include "via_memmgr.h"
-
-#include "via_regs.h"
-#include "drmmode_display.h"
-#include "via_ums.h"
-#include "via_dmabuffer.h"
-#include "via_3d.h"
-#include "via_xv.h"
-#include "via_xv_overlay.h"
-
-#include "compat-api.h"
#define VIA_NAME "OpenChrome"
commit f47ca077a1032612fdeb459d62882e751d855c23
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 14:40:48 2020 -0700
Stop including header files inside src/via_priv.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_priv.h b/src/via_priv.h
index 34a4b42..79400bc 100644
--- a/src/via_priv.h
+++ b/src/via_priv.h
@@ -27,11 +27,6 @@
#ifndef _VIA_PRIV_H_
#define _VIA_PRIV_H_ 1
-#ifdef OPENCHROMEDRI
-#include "via_drm.h"
-#endif
-#include "exa.h"
-
/*
* Alignment macro functions
*/
commit c7b74c65492282a80ca8d7bca61765bfd7a547b6
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 14:15:39 2020 -0700
Include xf86drm.h inside src/drmmode_display.h
This resolves the issue of drmEventContext type struct not being
declared when src/drmmode_display.h inclusion order is altered
inside src/via_driver.h.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index a71079f..ec3fa69 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -28,6 +28,7 @@
#define DRMMODE_DISPLAY_H
#ifdef OPENCHROMEDRI
+#include "xf86drm.h"
#include "xf86drmMode.h"
#endif
#ifdef HAVE_LIBUDEV
commit 9b5d72f3ddd05b6b3ef5b4e99543cdd8d95d87c3
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 12:31:14 2020 -0700
Remove inclusion of src/via_vt1632.h inside src/via_driver.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 7f5c1ac..968567b 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -83,8 +83,6 @@
#include "via_xv.h"
#include "via_xv_overlay.h"
-#include "via_vt1632.h"
-
#include "compat-api.h"
commit ace5902e47581b0713e88be31664313532f8b6cb
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 12:31:03 2020 -0700
Rearrange external header files inclusion order inside src/via_driver.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 0e5c4e5..7f5c1ac 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -34,26 +34,33 @@
#define DEBUG(x)
#endif
+
+#include "compiler.h"
+
+#include <errno.h>
+
#include "vgaHW.h"
-#include "xf86.h"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "xf86cmap.h"
+#include "xf86Crtc.h"
+#include "xf86Cursor.h"
+#include "xf86fbman.h"
+#include "xf86Pci.h"
+#include "xf86RandR12.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
-#include "xf86Pci.h"
-#include "xf86_OSproc.h"
-#include "compiler.h"
-#include "xf86Cursor.h"
-#include "mipointer.h"
-#include "micmap.h"
-#include "fourcc.h"
+#include "exa.h"
#include "fb.h"
-
-#include "xf86Crtc.h"
-#include "xf86fbman.h"
-#include "xf86RandR12.h"
-#include "xf86cmap.h"
+#include "fourcc.h"
+#include "micmap.h"
+#include "mipointer.h"
+#ifdef XSERVER_LIBPCIACCESS
+#include <pciaccess.h>
+#endif
#ifdef OPENCHROMEDRI
#define _XF86DRI_SERVER_
@@ -66,7 +73,6 @@
#include "via_drmclient.h"
#include "via_drm.h"
#endif
-#include "exa.h"
#include "via_memmgr.h"
#include "via_regs.h"
@@ -77,11 +83,6 @@
#include "via_xv.h"
#include "via_xv_overlay.h"
-#ifdef XSERVER_LIBPCIACCESS
-#include <pciaccess.h>
-#endif
-#include <errno.h>
-
#include "via_vt1632.h"
#include "compat-api.h"
commit 3786908030999ea53589c4c3fcb275eba043de60
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 12:30:35 2020 -0700
Include src/via_eng_regs.h only if the content is actually used
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 696251f..8663ce6 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -29,6 +29,8 @@
#include "config.h"
#endif
+#include "via_eng_regs.h"
+
#include "via_driver.h"
static ViaExpireNumberTable CLE266AExpireNumber[] = {
diff --git a/src/via_driver.h b/src/via_driver.h
index 3026433..0e5c4e5 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -76,7 +76,6 @@
#include "via_3d.h"
#include "via_xv.h"
#include "via_xv_overlay.h"
-#include "via_eng_regs.h"
#ifdef XSERVER_LIBPCIACCESS
#include <pciaccess.h>
diff --git a/src/via_xv.c b/src/via_xv.c
index 4fee066..b1ce782 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -48,6 +48,8 @@
#include "via_xvpriv.h"
#include "fourcc.h"
+#include "via_eng_regs.h"
+
/*
* D E F I N E
*/
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index b2d9e7b..1dc650e 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -40,6 +40,8 @@
#include <math.h>
#include <unistd.h>
+#include "via_eng_regs.h"
+
/*
* Warning: this file contains revision checks which are CLE266-specific.
* There seems to be no checking present for KM400 or more recent devices.
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index b2a5cc9..da7b75d 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -59,6 +59,7 @@
#include "dri.h"
#include "via_xvpriv.h"
#include "via_xv.h"
+#include "via_eng_regs.h"
#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE)
commit 109efc8af6c3f0e4b48ca0a0b3bdb6b830e5a193
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 12:30:21 2020 -0700
Move PCI access definitions
Move them from src/via_eng_regs.h to src/via_driver.h where it is
a more appropriate place to define them.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index efd9961..3026433 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -126,6 +126,22 @@
#define VIDEO_ENGINE_CLE 1 /* CLE First generation video engine */
#define VIDEO_ENGINE_CME 2 /* CME Second generation video engine */
+#ifdef XSERVER_LIBPCIACCESS
+#define VIA_MEMBASE(p,n) (p)->regions[(n)].base_addr
+#define VENDOR_ID(p) (p)->vendor_id
+#define DEVICE_ID(p) (p)->device_id
+#define SUBVENDOR_ID(p) (p)->subvendor_id
+#define SUBSYS_ID(p) (p)->subdevice_id
+#define CHIP_REVISION(p) (p)->revision
+#else
+#define VIA_MEMBASE(p,n) (p)->memBase[n]
+#define VENDOR_ID(p) (p)->vendor
+#define DEVICE_ID(p) (p)->chipType
+#define SUBVENDOR_ID(p) (p)->subsysVendor
+#define SUBSYS_ID(p) (p)->subsysCard
+#define CHIP_REVISION(p) (p)->chipRev
+#endif
+
extern int gVIAEntityIndex;
/*
diff --git a/src/via_eng_regs.h b/src/via_eng_regs.h
index 4f1f8e8..f08fd38 100644
--- a/src/via_eng_regs.h
+++ b/src/via_eng_regs.h
@@ -722,20 +722,4 @@
#define MPG_SLICE_LENGTH 0x9C
#define MPG_SLICE_DATA 0xA0
-#ifdef XSERVER_LIBPCIACCESS
-#define VIA_MEMBASE(p,n) (p)->regions[(n)].base_addr
-#define VENDOR_ID(p) (p)->vendor_id
-#define DEVICE_ID(p) (p)->device_id
-#define SUBVENDOR_ID(p) (p)->subvendor_id
-#define SUBSYS_ID(p) (p)->subdevice_id
-#define CHIP_REVISION(p) (p)->revision
-#else
-#define VIA_MEMBASE(p,n) (p)->memBase[n]
-#define VENDOR_ID(p) (p)->vendor
-#define DEVICE_ID(p) (p)->chipType
-#define SUBVENDOR_ID(p) (p)->subsysVendor
-#define SUBSYS_ID(p) (p)->subsysCard
-#define CHIP_REVISION(p) (p)->chipRev
-#endif
-
#endif /* _VIA_ENG_REGS_H_ */
commit 34b126fa9cd50178df0f00428c53d69d7519937c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Sep 4 12:30:08 2020 -0700
Include via_driver.h as the last header file to include
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index db41677..6e53b7c 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -33,6 +33,9 @@
#include "shadow.h"
#include "globals.h"
+
+#include "xf86.h"
+
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
#else
@@ -40,7 +43,6 @@
#include <X11/extensions/dpms.h>
#endif
-#include "via_driver.h"
#include "drm_fourcc.h"
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
@@ -57,6 +59,9 @@
/* RandR support */
#include "xf86RandR12.h"
+#include "via_driver.h"
+
+
#ifdef OPENCHROMEDRI
static const ViaDRMVersion drmVIADRMExpected = { 1, 3, 0 };
static const ViaDRMVersion drmVIADRMCompat = { 3, 0, 0 };
More information about the openchrome-devel
mailing list