exa: support major version 3

8 files changed, 17 insertions, 7 deletions

diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
index f9b720d..70e5fec 100644
--- a/src/nouveau_xv.c
+++ b/src/nouveau_xv.c
@@ -27,7 +27,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -35,6 +34,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 #include "vl_hwmc.h"
 
 #define IMAGE_MAX_W 2046
diff --git a/src/nv04_xv_blit.c b/src/nv04_xv_blit.c
index f86f988..c88f611 100644
--- a/src/nv04_xv_blit.c
+++ b/src/nv04_xv_blit.c
@@ -26,7 +26,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -34,6 +33,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 #define FOURCC_RGB 0x0000003
 
 extern Atom xvSetDefaults, xvSyncToVBlank;
diff --git a/src/nv04_xv_ovl.c b/src/nv04_xv_ovl.c
index 04bf28a..322a5f6 100644
--- a/src/nv04_xv_ovl.c
+++ b/src/nv04_xv_ovl.c
@@ -26,7 +26,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -34,6 +33,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 extern Atom xvBrightness, xvColorKey, xvAutopaintColorKey, xvSetDefaults;
 
 void
diff --git a/src/nv10_xv_ovl.c b/src/nv10_xv_ovl.c
index 2384c38..4ffac5d 100644
--- a/src/nv10_xv_ovl.c
+++ b/src/nv10_xv_ovl.c
@@ -26,7 +26,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -34,6 +33,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 extern Atom xvBrightness, xvContrast, xvColorKey, xvSaturation;
 extern Atom xvHue, xvAutopaintColorKey, xvSetDefaults, xvDoubleBuffer;
 extern Atom xvITURBT709, xvSyncToVBlank, xvOnCRTCNb;
diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
index 7e41d87..24796b2 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
@@ -28,7 +28,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -36,6 +35,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 #include "nv30_shaders.h"
 
 extern Atom xvSyncToVBlank, xvSetDefaults;
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
index c7bbd4e..87baa42 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
@@ -28,7 +28,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
@@ -36,6 +35,8 @@
 #include "nv_include.h"
 #include "nv_dma.h"
 
+#include "exa.h"
+
 #include "nv30_shaders.h"
 
 extern Atom xvSyncToVBlank, xvSetDefaults;
diff --git a/src/nv50_xv.c b/src/nv50_xv.c
index 5741cbd..5923dcf 100644
--- a/src/nv50_xv.c
+++ b/src/nv50_xv.c
@@ -26,13 +26,15 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "exa.h"
 #include "damage.h"
 #include "dixstruct.h"
 #include "fourcc.h"
 
 #include "nv_include.h"
 #include "nv_dma.h"
+
+#include "exa.h"
+
 #include "nv50_accel.h"
 #include "nv50_texture.h"
 
diff --git a/src/nv_include.h b/src/nv_include.h
index be004ef..e38f907 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -66,6 +66,8 @@
 
 #define NV_DMA_DEBUG 0
 
+#define EXA_DRIVER_KNOWN_MAJOR 3
+
 #include "nv_local.h"
 #include "nv_type.h"
 #include "nv_proto.h"