Sun Feb 10 01:12:35 PST 2013

3 files changed, 0 insertions, 206 deletions

diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff
deleted file mode 100644
index 87a2fa8db..000000000
--- a/extra/xf86-video-intel/fix_gen4.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 11:43:00 +0000
-Subject: sna/gen4: Further refinement to the GT allocation
-
-Still hunting for why gen4 fails utterly.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 25229e1..1a860bd 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -79,8 +79,8 @@
- #define URB_CS_ENTRY_SIZE     1
- #define URB_CS_ENTRIES	      0
- 
--#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
--#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
-+#define URB_VS_ENTRY_SIZE     1
-+#define URB_VS_ENTRIES	      32
- 
- #define URB_GS_ENTRY_SIZE     0
- #define URB_GS_ENTRIES	      0
-@@ -89,25 +89,24 @@
- #define URB_CLIP_ENTRIES      0
- 
- #define URB_SF_ENTRY_SIZE     2
--#define URB_SF_ENTRIES	      8
-+#define URB_SF_ENTRIES	      64
- 
- /*
-  * this program computes dA/dx and dA/dy for the texture coordinates along
-  * with the base texture coordinate. It was extracted from the Mesa driver
-  */
- 
--#define SF_KERNEL_NUM_GRF  16
--
--#define PS_KERNEL_NUM_GRF   32
-+#define SF_KERNEL_NUM_GRF 16
-+#define PS_KERNEL_NUM_GRF 32
- 
- static const struct gt_info {
- 	uint32_t max_sf_threads;
- 	uint32_t max_wm_threads;
- 	uint32_t urb_size;
- } gen4_gt_info = {
--	16, 32, 256,
-+	24, 32, 256,
- }, g4x_gt_info = {
--	32, 50, 384,
-+	24, 50, 384,
- };
- 
- static const uint32_t sf_kernel[][4] = {
-@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
- 		const struct sna_composite_op *op,
- 		uint16_t wm_binding_table)
- {
-+	gen4_emit_drawing_rectangle(sna, op);
- 	gen4_emit_binding_table(sna, wm_binding_table);
- 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
- 	gen4_emit_vertex_elements(sna, op);
--	gen4_emit_drawing_rectangle(sna, op);
- 
- 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
- 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
---
-cgit v0.9.0.2-2-gbebe
-From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 27 Jul 2012 12:24:04 +0000
-Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
-index 1a860bd..58d4422 100644
---- a/src/sna/gen4_render.c
-+++ b/src/sna/gen4_render.c
-@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
- 
- static void gen4_vertex_flush(struct sna *sna)
- {
--	assert(sna->render_state.gen4.vertex_offset);
-+	if (sna->render_state.gen4.vertex_offset == 0)
-+		return;
- 
- 	DBG(("%s[%x] = %d\n", __FUNCTION__,
- 	     4*sna->render_state.gen4.vertex_offset,
-@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
- 
- 	bo = sna->render.vbo;
- 	if (bo) {
--		if (sna->render_state.gen4.vertex_offset)
--			gen4_vertex_flush(sna);
-+		gen4_vertex_flush(sna);
- 
- 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
- 			if (sna->render.vertex_reloc[i]) {
-@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
- 	}
- 	priv->clear = false;
- 
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	return true;
- }
- 
-@@ -2693,8 +2692,7 @@ fastcall static void
- gen4_render_composite_spans_done(struct sna *sna,
- 				 const struct sna_composite_spans_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 
- 	DBG(("%s()\n", __FUNCTION__));
- 
-@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
- static void
- gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- }
- 
- static bool
-@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
- static void
- gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
- {
--	if (sna->render_state.gen4.vertex_offset)
--		gen4_vertex_flush(sna);
-+	gen4_vertex_flush(sna);
- 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-intel/gmux_backlight.diff b/extra/xf86-video-intel/gmux_backlight.diff
deleted file mode 100644
index a5522e82b..000000000
--- a/extra/xf86-video-intel/gmux_backlight.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xf86-video-intel-2.20.0.orig/src/intel_display.c	2012-07-15 21:02:49.000000000 +1000
-+++ xf86-video-intel-2.20.0/src/intel_display.c	2012-07-24 11:53:42.762165514 +1000
-@@ -127,6 +127,7 @@
-  * List of available kernel interfaces in priority order
-  */
- static const char *backlight_interfaces[] = {
-+	"gmux_backlight",
- 	"asus-laptop",
- 	"asus-nb-wmi",
- 	"eeepc",
diff --git a/extra/xf86-video-intel/sna_backlight_fixes.diff b/extra/xf86-video-intel/sna_backlight_fixes.diff
deleted file mode 100644
index 1511a8d79..000000000
--- a/extra/xf86-video-intel/sna_backlight_fixes.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0ab6d7a50d37cf4454577cb8c333d4b8683aa054 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 25 Jul 2012 11:20:36 +0000
-Subject: sna: Prefer platform backlight devices over firmware
-
-This is in contrast to libbacklight but closer to our original code as
-we prefer a known custom backlight controller over the ACPI interfaces.
-As only the ACPI interfaces are marked as firmware, and the custom
-backlight controllers as platform, we therefore need to prefer platform
-backlight devices.
-
-Reported-by: Austin Lund <austin.lund@gmail.com>
-References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index b31f08d..ebecd21 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -282,8 +282,8 @@ sna_output_backlight_get_max(xf86OutputPtr output)
- }
- 
- enum {
--	FIRMWARE,
- 	PLATFORM,
-+	FIRMWARE,
- 	RAW,
- 	NAMED,
- };
---
-cgit v0.9.0.2-2-gbebe
-From 484b072072c8297a87940c9e32097923f0a77c8f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 25 Jul 2012 11:22:47 +0000
-Subject: sna: Add 'gmux_backlight' to list of known devices for backwards compatability
-
-Reported-by: Austin Lund <austin.lund@gmail.com>
-References: https://bugs.freedesktop.org/show_bug.cgi?id=52423
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
-index ebecd21..a908596 100644
---- a/src/sna/sna_display.c
-+++ b/src/sna/sna_display.c
-@@ -292,6 +292,7 @@ static void
- sna_output_backlight_init(xf86OutputPtr output)
- {
- 	static const char *known_interfaces[] = {
-+		"gmux_backlight",
- 		"asus-laptop",
- 		"asus-nb-wmi",
- 		"eeepc",
---
-cgit v0.9.0.2-2-gbebe