xf86-video-intel: 2 commits - src/sna/kgem_debug_gen2.c src/sna/sna_video_overlay.c

[Chris Wilson]

 src/sna/kgem_debug_gen2.c   |   60 ++++++++++++++++++++++++++++++++++++++++++++
 src/sna/sna_video_overlay.c |    2 -
 2 files changed, 61 insertions(+), 1 deletion(-)

New commits:
commit 98f2e3855d70c02b05e2721a70ebce0c17e44283
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jul 2 09:53:11 2011 +0100

    sna/video: Downgrade severity of "overlay not found" message
    
    We don't need to warn the user that their hardware does not support the
    video overlay plane (but Jesse is working on it!), but merely inform
    them that its presence is lacking.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index 422ce53..a20c111 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -632,7 +632,7 @@ XF86VideoAdaptorPtr sna_video_overlay_setup(struct sna *sna,
 	XF86AttributePtr att;
 
 	if (!sna_has_overlay(sna)) {
-		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
+		xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
 			   "Overlay video not supported on this hardware\n");
 		return NULL;
 	}
commit 01c258718e981f4da949a4e48595a0660d55d66e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 1 23:17:54 2011 +0100

    sna/gen2: Add missing stub debug files
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem_debug_gen2.c b/src/sna/kgem_debug_gen2.c
new file mode 100644
index 0000000..b5f61a3
--- /dev/null
+++ b/src/sna/kgem_debug_gen2.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2007-2011 Intel Corporation
+ *
+ * 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, sublicense,
+ * 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 NONINFRINGEMENT.  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.
+ *
+ * Authors:
+ *    Eric Anholt <eric at anholt.net>
+ *    Chris Wilson <chris at chris-wilson.co.uk>
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/mman.h>
+#include <assert.h>
+
+#include "sna.h"
+#include "sna_reg.h"
+
+#include "gen2_render.h"
+
+#include "kgem_debug.h"
+
+static struct state {
+	int vertex_format;
+} state;
+
+int kgem_gen2_decode_3d(struct kgem *kgem, uint32_t offset)
+{
+    uint32_t *data = kgem->batch + offset;
+    uint32_t opcode = (data[0] & 0x1f000000) >> 24;
+    uint32_t len = (data[0] & 0xff) + 2;
+
+    kgem_debug_print(data, offset, 0, "3D UNKNOWN: 3d opcode = 0x%x\n", opcode);
+    return len;
+}
+
+void kgem_gen2_finish_state(struct kgem *kgem)
+{
+	memset(&state, 0, sizeof(state));
+}