]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Move the renderstate setup under gt/
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Jul 2019 09:19:25 +0000 (10:19 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 4 Jul 2019 10:48:22 +0000 (11:48 +0100)
The render state is used to initialise the default RCS context, and only
used during early setup from within the gt code. As such, it makes a
good candidate for placing within gt/, even if it is not yet entirely
clean of our GEM heritage.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190704091925.7391-1-chris@chris-wilson.co.uk
16 files changed:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/gt/gen6_renderstate.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/gen7_renderstate.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/gen8_renderstate.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/gen9_renderstate.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/intel_lrc.c
drivers/gpu/drm/i915/gt/intel_renderstate.c [new file with mode: 0644]
drivers/gpu/drm/i915/gt/intel_renderstate.h [new file with mode: 0644]
drivers/gpu/drm/i915/gt/intel_ringbuffer.c
drivers/gpu/drm/i915/i915_gem_render_state.c [deleted file]
drivers/gpu/drm/i915/i915_gem_render_state.h [deleted file]
drivers/gpu/drm/i915/intel_renderstate.h [deleted file]
drivers/gpu/drm/i915/intel_renderstate_gen6.c [deleted file]
drivers/gpu/drm/i915/intel_renderstate_gen7.c [deleted file]
drivers/gpu/drm/i915/intel_renderstate_gen8.c [deleted file]
drivers/gpu/drm/i915/intel_renderstate_gen9.c [deleted file]

index 82c49ad163616bd6f25e8c3d0a19f6cb66ff6f92..5266dbeab01fd79f40683371fea1d8bfd597ff5b 100644 (file)
@@ -78,12 +78,19 @@ gt-y += \
        gt/intel_gt_pm.o \
        gt/intel_hangcheck.o \
        gt/intel_lrc.o \
+       gt/intel_renderstate.o \
        gt/intel_reset.o \
        gt/intel_ringbuffer.o \
        gt/intel_mocs.o \
        gt/intel_sseu.o \
        gt/intel_timeline.o \
        gt/intel_workarounds.o
+# autogenerated null render state
+gt-y += \
+       gt/gen6_renderstate.o \
+       gt/gen7_renderstate.o \
+       gt/gen8_renderstate.o \
+       gt/gen9_renderstate.o
 gt-$(CONFIG_DRM_I915_SELFTEST) += \
        gt/mock_engine.o
 i915-y += $(gt-y)
@@ -123,7 +130,6 @@ i915-y += \
          i915_gem_fence_reg.o \
          i915_gem_gtt.o \
          i915_gem.o \
-         i915_gem_render_state.o \
          i915_globals.o \
          i915_query.o \
          i915_request.o \
@@ -144,12 +150,6 @@ i915-y += intel_uc.o \
          intel_huc.o \
          intel_huc_fw.o
 
-# autogenerated null render state
-i915-y += intel_renderstate_gen6.o \
-         intel_renderstate_gen7.o \
-         intel_renderstate_gen8.o \
-         intel_renderstate_gen9.o
-
 # modesetting core code
 obj-y += display/
 i915-y += \
diff --git a/drivers/gpu/drm/i915/gt/gen6_renderstate.c b/drivers/gpu/drm/i915/gt/gen6_renderstate.c
new file mode 100644 (file)
index 0000000..11c8e7b
--- /dev/null
@@ -0,0 +1,315 @@
+/*
+ * Copyright © 2014 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.
+ *
+ * Generated by: intel-gpu-tools-1.8-220-g01153e7
+ */
+
+#include "intel_renderstate.h"
+
+static const u32 gen6_null_state_relocs[] = {
+       0x00000020,
+       0x00000024,
+       0x0000002c,
+       0x000001e0,
+       0x000001e4,
+       -1,
+};
+
+static const u32 gen6_null_state_batch[] = {
+       0x69040000,
+       0x790d0001,
+       0x00000000,
+       0x00000000,
+       0x78180000,
+       0x00000001,
+       0x61010008,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000001,
+       0x61020000,
+       0x00000000,
+       0x78050001,
+       0x00000018,
+       0x00000000,
+       0x780d1002,
+       0x00000000,
+       0x00000000,
+       0x00000420,
+       0x78150003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78100004,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78160003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78110005,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78120002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78170003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79050005,
+       0xe0040000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79100000,
+       0x00000000,
+       0x79000002,
+       0xffffffff,
+       0x00000000,
+       0x00000000,
+       0x780e0002,
+       0x00000441,
+       0x00000401,
+       0x00000401,
+       0x78021002,
+       0x00000000,
+       0x00000000,
+       0x00000400,
+       0x78130012,
+       0x00400810,
+       0x00000000,
+       0x20000000,
+       0x04000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78140007,
+       0x00000280,
+       0x08080000,
+       0x00000000,
+       0x00060000,
+       0x4e080002,
+       0x00100400,
+       0x00000000,
+       0x00000000,
+       0x78090005,
+       0x02000000,
+       0x22220000,
+       0x02f60000,
+       0x11330000,
+       0x02850004,
+       0x11220000,
+       0x78011002,
+       0x00000000,
+       0x00000000,
+       0x00000200,
+       0x78080003,
+       0x00002000,
+       0x00000448,      /* reloc */
+       0x00000448,      /* reloc */
+       0x00000000,
+       0x05000000,      /* cmds end */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000220,      /* state start */
+       0x00000240,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0060005a,
+       0x204077be,
+       0x000000c0,
+       0x008d0040,
+       0x0060005a,
+       0x206077be,
+       0x000000c0,
+       0x008d0080,
+       0x0060005a,
+       0x208077be,
+       0x000000d0,
+       0x008d0040,
+       0x0060005a,
+       0x20a077be,
+       0x000000d0,
+       0x008d0080,
+       0x00000201,
+       0x20080061,
+       0x00000000,
+       0x00000000,
+       0x00600001,
+       0x20200022,
+       0x008d0000,
+       0x00000000,
+       0x02800031,
+       0x21c01cc9,
+       0x00000020,
+       0x0a8a0001,
+       0x00600001,
+       0x204003be,
+       0x008d01c0,
+       0x00000000,
+       0x00600001,
+       0x206003be,
+       0x008d01e0,
+       0x00000000,
+       0x00600001,
+       0x208003be,
+       0x008d0200,
+       0x00000000,
+       0x00600001,
+       0x20a003be,
+       0x008d0220,
+       0x00000000,
+       0x00600001,
+       0x20c003be,
+       0x008d0240,
+       0x00000000,
+       0x00600001,
+       0x20e003be,
+       0x008d0260,
+       0x00000000,
+       0x00600001,
+       0x210003be,
+       0x008d0280,
+       0x00000000,
+       0x00600001,
+       0x212003be,
+       0x008d02a0,
+       0x00000000,
+       0x05800031,
+       0x24001cc8,
+       0x00000040,
+       0x90019000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0000007e,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x30000000,
+       0x00000124,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xf99a130c,
+       0x799a130c,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x80000031,
+       0x00000003,
+       0x00000000,      /* state end */
+};
+
+RO_RENDERSTATE(6);
diff --git a/drivers/gpu/drm/i915/gt/gen7_renderstate.c b/drivers/gpu/drm/i915/gt/gen7_renderstate.c
new file mode 100644 (file)
index 0000000..6551806
--- /dev/null
@@ -0,0 +1,279 @@
+/*
+ * Copyright © 2014 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.
+ *
+ * Generated by: intel-gpu-tools-1.8-220-g01153e7
+ */
+
+#include "intel_renderstate.h"
+
+static const u32 gen7_null_state_relocs[] = {
+       0x0000000c,
+       0x00000010,
+       0x00000018,
+       0x000001ec,
+       -1,
+};
+
+static const u32 gen7_null_state_batch[] = {
+       0x69040000,
+       0x61010008,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000001,
+       0x790d0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78180000,
+       0x00000001,
+       0x79160000,
+       0x00000008,
+       0x78300000,
+       0x02010040,
+       0x78310000,
+       0x04000000,
+       0x78320000,
+       0x04000000,
+       0x78330000,
+       0x02000000,
+       0x78100004,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781b0005,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781c0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781d0004,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78110005,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78120002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78210000,
+       0x00000000,
+       0x78130005,
+       0x00000000,
+       0x20000000,
+       0x04000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78140001,
+       0x20000800,
+       0x00000000,
+       0x781e0001,
+       0x00000000,
+       0x00000000,
+       0x78050005,
+       0xe0040000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78040001,
+       0x00000000,
+       0x00000000,
+       0x78240000,
+       0x00000240,
+       0x78230000,
+       0x00000260,
+       0x782f0000,
+       0x00000280,
+       0x781f000c,
+       0x00400810,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78200006,
+       0x000002c0,
+       0x08080000,
+       0x00000000,
+       0x28000402,
+       0x00060000,
+       0x00000000,
+       0x00000000,
+       0x78090005,
+       0x02000000,
+       0x22220000,
+       0x02f60000,
+       0x11230000,
+       0x02f60004,
+       0x11230000,
+       0x78080003,
+       0x00006008,
+       0x00000340,      /* reloc */
+       0xffffffff,
+       0x00000000,
+       0x782a0000,
+       0x00000360,
+       0x79000002,
+       0xffffffff,
+       0x00000000,
+       0x00000000,
+       0x7b000005,
+       0x0000000f,
+       0x00000003,
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000000,
+       0x05000000,      /* cmds end */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000031,      /* state start */
+       0x00000003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0xf99a130c,
+       0x799a130c,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000492,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0080005a,
+       0x2e2077bd,
+       0x000000c0,
+       0x008d0040,
+       0x0080005a,
+       0x2e6077bd,
+       0x000000d0,
+       0x008d0040,
+       0x02800031,
+       0x21801fa9,
+       0x008d0e20,
+       0x08840001,
+       0x00800001,
+       0x2e2003bd,
+       0x008d0180,
+       0x00000000,
+       0x00800001,
+       0x2e6003bd,
+       0x008d01c0,
+       0x00000000,
+       0x00800001,
+       0x2ea003bd,
+       0x008d0200,
+       0x00000000,
+       0x00800001,
+       0x2ee003bd,
+       0x008d0240,
+       0x00000000,
+       0x05800031,
+       0x20001fa8,
+       0x008d0e20,
+       0x90031000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000380,
+       0x000003a0,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,      /* state end */
+};
+
+RO_RENDERSTATE(7);
diff --git a/drivers/gpu/drm/i915/gt/gen8_renderstate.c b/drivers/gpu/drm/i915/gt/gen8_renderstate.c
new file mode 100644 (file)
index 0000000..95288a3
--- /dev/null
@@ -0,0 +1,983 @@
+/*
+ * Copyright © 2014 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.
+ *
+ * Generated by: intel-gpu-tools-1.8-220-g01153e7
+ */
+
+#include "intel_renderstate.h"
+
+static const u32 gen8_null_state_relocs[] = {
+       0x00000798,
+       0x000007a4,
+       0x000007ac,
+       0x000007bc,
+       -1,
+};
+
+static const u32 gen8_null_state_batch[] = {
+       0x7a000004,
+       0x01000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x69040000,
+       0x78140000,
+       0x04000000,
+       0x7820000a,
+       0x00000000,
+       0x00000000,
+       0x80000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78130002,
+       0x00000000,
+       0x00000000,
+       0x02001808,
+       0x781f0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78510009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78100007,
+       0x00000000,
+       0x00000000,
+       0x00010000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781b0007,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000800,
+       0x00000000,
+       0x78110008,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781e0003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781d0007,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78120002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78500003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781c0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x780c0000,
+       0x00000000,
+       0x78520003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78300000,
+       0x08010040,
+       0x78310000,
+       0x1e000000,
+       0x78320000,
+       0x1e000000,
+       0x78330000,
+       0x1e000000,
+       0x79190002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x791a0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x791b0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79120000,
+       0x00000000,
+       0x79130000,
+       0x00000000,
+       0x79140000,
+       0x00000000,
+       0x79150000,
+       0x00000000,
+       0x79160000,
+       0x00000000,
+       0x78150009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78190009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781a0009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78160009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78170009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78490001,
+       0x00000000,
+       0x00000000,
+       0x784a0000,
+       0x00000000,
+       0x784b0000,
+       0x00000004,
+       0x79170101,
+       0x00000000,
+       0x00000080,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x20000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x40000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x60000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x6101000e,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00001001,
+       0x00001001,
+       0x00000001,
+       0x00001001,
+       0x61020001,
+       0x00000000,
+       0x00000000,
+       0x79000002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78050006,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x40000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x80000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0xc0000000,
+       0x00000000,
+       0x00000000,
+       0x79080001,
+       0x00000000,
+       0x00000000,
+       0x790a0001,
+       0x00000000,
+       0x00000000,
+       0x78060003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78070003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78040001,
+       0x00000000,
+       0x00000000,
+       0x79110000,
+       0x00000000,
+       0x780d0000,
+       0x00000000,
+       0x79060000,
+       0x00000000,
+       0x7907001f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x7902000f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x790c000f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x780a0003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78080083,
+       0x00004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x04004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x08004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x10004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x14004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x18004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x1c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x20004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x24004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x28004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x2c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x30004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x34004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x38004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x3c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x40004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x44004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x48004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x4c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x50004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x54004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x58004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x5c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x60004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x64004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x68004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x6c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x70004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x74004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x7c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x80004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78090043,
+       0x02000000,
+       0x22220000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x680b0001,
+       0x78260000,
+       0x00000000,
+       0x78270000,
+       0x00000000,
+       0x78280000,
+       0x00000000,
+       0x78290000,
+       0x00000000,
+       0x782a0000,
+       0x00000000,
+       0x780e0000,
+       0x00000dc1,
+       0x78240000,
+       0x00000e01,
+       0x784f0000,
+       0x80000100,
+       0x784d0000,
+       0x40000000,
+       0x782b0000,
+       0x00000000,
+       0x782c0000,
+       0x00000000,
+       0x782d0000,
+       0x00000000,
+       0x782e0000,
+       0x00000000,
+       0x782f0000,
+       0x00000000,
+       0x780f0000,
+       0x00000000,
+       0x78230000,
+       0x00000e60,
+       0x78210000,
+       0x00000e80,
+       0x7b000005,
+       0x00000004,
+       0x00000001,
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000000,
+       0x05000000,      /* cmds end */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,      /* state start */
+       0x00000000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,      /* state end */
+};
+
+RO_RENDERSTATE(8);
diff --git a/drivers/gpu/drm/i915/gt/gen9_renderstate.c b/drivers/gpu/drm/i915/gt/gen9_renderstate.c
new file mode 100644 (file)
index 0000000..7d3ac02
--- /dev/null
@@ -0,0 +1,999 @@
+/*
+ * Copyright © 2014 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.
+ *
+ * Generated by: intel-gpu-tools-1.19-177-g68e2eab2
+ */
+
+#include "intel_renderstate.h"
+
+static const u32 gen9_null_state_relocs[] = {
+       0x000007a8,
+       0x000007b4,
+       0x000007bc,
+       0x000007cc,
+       -1,
+};
+
+static const u32 gen9_null_state_batch[] = {
+       0x7a000004,
+       0x01000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x69040300,
+       0x78140000,
+       0x04000000,
+       0x7820000a,
+       0x00000000,
+       0x00000000,
+       0x80000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78130002,
+       0x00000000,
+       0x00000000,
+       0x02001808,
+       0x781f0004,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78510009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78100007,
+       0x00000000,
+       0x00000000,
+       0x00010000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781b0007,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000800,
+       0x00000000,
+       0x78110008,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781e0003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781d0009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78120002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78500003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781c0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x780c0000,
+       0x00000000,
+       0x78520003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78300000,
+       0x08010040,
+       0x78310000,
+       0x1e000000,
+       0x78320000,
+       0x1e000000,
+       0x78330000,
+       0x1e000000,
+       0x79190002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x791a0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x791b0002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79120000,
+       0x00000000,
+       0x79130000,
+       0x00000000,
+       0x79140000,
+       0x00000000,
+       0x79150000,
+       0x00000000,
+       0x79160000,
+       0x00000000,
+       0x78150009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78190009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x781a0009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78160009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78170009,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78490001,
+       0x00000000,
+       0x00000000,
+       0x784a0000,
+       0x00000000,
+       0x784b0000,
+       0x00000004,
+       0x79170101,
+       0x00000000,
+       0x00000080,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x20000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x40000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79180006,
+       0x60000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x61010011,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000001,      /* reloc */
+       0x00000000,
+       0x00001001,
+       0x00001001,
+       0x00000001,
+       0x00001001,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x61020001,
+       0x00000000,
+       0x00000000,
+       0x79000002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78050006,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x40000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0x80000000,
+       0x00000000,
+       0x00000000,
+       0x79040002,
+       0xc0000000,
+       0x00000000,
+       0x00000000,
+       0x79080001,
+       0x00000000,
+       0x00000000,
+       0x790a0001,
+       0x00000000,
+       0x00000000,
+       0x78060003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78070003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78040001,
+       0x00000000,
+       0x00000000,
+       0x79110000,
+       0x00000000,
+       0x780d0000,
+       0x00000000,
+       0x79060000,
+       0x00000000,
+       0x7907001f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x7902000f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x790c000f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x780a0003,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78080083,
+       0x00004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x04004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x08004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x0c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x10004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x14004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x18004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x1c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x20004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x24004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x28004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x2c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x30004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x34004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x38004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x3c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x40004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x44004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x48004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x4c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x50004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x54004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x58004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x5c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x60004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x64004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x68004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x6c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x70004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x74004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x7c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x80004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78090043,
+       0x02000000,
+       0x22220000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78550003,
+       0x0000000f,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x680b0001,
+       0x780e0000,
+       0x00000e01,
+       0x78240000,
+       0x00000e41,
+       0x784f0000,
+       0x80000100,
+       0x784d0000,
+       0x40000000,
+       0x782b0000,
+       0x00000000,
+       0x782c0000,
+       0x00000000,
+       0x782d0000,
+       0x00000000,
+       0x782e0000,
+       0x00000000,
+       0x782f0000,
+       0x00000000,
+       0x780f0000,
+       0x00000000,
+       0x78230000,
+       0x00000ea0,
+       0x78210000,
+       0x00000ec0,
+       0x78260000,
+       0x00000000,
+       0x78270000,
+       0x00000000,
+       0x78280000,
+       0x00000000,
+       0x78290000,
+       0x00000000,
+       0x782a0000,
+       0x00000000,
+       0x7b000005,
+       0x00000004,
+       0x00000001,
+       0x00000000,
+       0x00000001,
+       0x00000000,
+       0x00000000,
+       0x05000000,      /* cmds end */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,      /* state start */
+       0x00000000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,      /* state end */
+};
+
+RO_RENDERSTATE(9);
index 1e85e04c58c48ea4729d3492397bb0fed3ba5a93..f5b09b29f50ef87a3dca6d39576d501d9e6832c3 100644 (file)
 
 #include "gem/i915_gem_context.h"
 
-#include "gt/intel_gt.h"
 #include "i915_drv.h"
-#include "i915_gem_render_state.h"
 #include "i915_vgpu.h"
 #include "intel_engine_pm.h"
+#include "intel_gt.h"
 #include "intel_lrc_reg.h"
 #include "intel_mocs.h"
+#include "intel_renderstate.h"
 #include "intel_reset.h"
 #include "intel_workarounds.h"
 
@@ -2677,7 +2677,7 @@ static int gen8_init_rcs_context(struct i915_request *rq)
        if (ret)
                DRM_ERROR("MOCS failed to program: expect performance issues.\n");
 
-       return i915_gem_render_state_emit(rq);
+       return intel_renderstate_emit(rq);
 }
 
 static void execlists_park(struct intel_engine_cs *engine)
diff --git a/drivers/gpu/drm/i915/gt/intel_renderstate.c b/drivers/gpu/drm/i915/gt/intel_renderstate.c
new file mode 100644 (file)
index 0000000..06a8dc4
--- /dev/null
@@ -0,0 +1,234 @@
+/*
+ * Copyright © 2014 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:
+ *    Mika Kuoppala <mika.kuoppala@intel.com>
+ *
+ */
+
+#include "i915_drv.h"
+#include "intel_renderstate.h"
+
+struct intel_renderstate {
+       const struct intel_renderstate_rodata *rodata;
+       struct drm_i915_gem_object *obj;
+       struct i915_vma *vma;
+       u32 batch_offset;
+       u32 batch_size;
+       u32 aux_offset;
+       u32 aux_size;
+};
+
+static const struct intel_renderstate_rodata *
+render_state_get_rodata(const struct intel_engine_cs *engine)
+{
+       if (engine->id != RCS0)
+               return NULL;
+
+       switch (INTEL_GEN(engine->i915)) {
+       case 6:
+               return &gen6_null_state;
+       case 7:
+               return &gen7_null_state;
+       case 8:
+               return &gen8_null_state;
+       case 9:
+               return &gen9_null_state;
+       }
+
+       return NULL;
+}
+
+/*
+ * Macro to add commands to auxiliary batch.
+ * This macro only checks for page overflow before inserting the commands,
+ * this is sufficient as the null state generator makes the final batch
+ * with two passes to build command and state separately. At this point
+ * the size of both are known and it compacts them by relocating the state
+ * right after the commands taking care of alignment so we should sufficient
+ * space below them for adding new commands.
+ */
+#define OUT_BATCH(batch, i, val)                               \
+       do {                                                    \
+               if ((i) >= PAGE_SIZE / sizeof(u32))             \
+                       goto err;                               \
+               (batch)[(i)++] = (val);                         \
+       } while(0)
+
+static int render_state_setup(struct intel_renderstate *so,
+                             struct drm_i915_private *i915)
+{
+       const struct intel_renderstate_rodata *rodata = so->rodata;
+       unsigned int i = 0, reloc_index = 0;
+       unsigned int needs_clflush;
+       u32 *d;
+       int ret;
+
+       ret = i915_gem_object_prepare_write(so->obj, &needs_clflush);
+       if (ret)
+               return ret;
+
+       d = kmap_atomic(i915_gem_object_get_dirty_page(so->obj, 0));
+
+       while (i < rodata->batch_items) {
+               u32 s = rodata->batch[i];
+
+               if (i * 4  == rodata->reloc[reloc_index]) {
+                       u64 r = s + so->vma->node.start;
+                       s = lower_32_bits(r);
+                       if (HAS_64BIT_RELOC(i915)) {
+                               if (i + 1 >= rodata->batch_items ||
+                                   rodata->batch[i + 1] != 0)
+                                       goto err;
+
+                               d[i++] = s;
+                               s = upper_32_bits(r);
+                       }
+
+                       reloc_index++;
+               }
+
+               d[i++] = s;
+       }
+
+       if (rodata->reloc[reloc_index] != -1) {
+               DRM_ERROR("only %d relocs resolved\n", reloc_index);
+               goto err;
+       }
+
+       so->batch_offset = i915_ggtt_offset(so->vma);
+       so->batch_size = rodata->batch_items * sizeof(u32);
+
+       while (i % CACHELINE_DWORDS)
+               OUT_BATCH(d, i, MI_NOOP);
+
+       so->aux_offset = i * sizeof(u32);
+
+       if (HAS_POOLED_EU(i915)) {
+               /*
+                * We always program 3x6 pool config but depending upon which
+                * subslice is disabled HW drops down to appropriate config
+                * shown below.
+                *
+                * In the below table 2x6 config always refers to
+                * fused-down version, native 2x6 is not available and can
+                * be ignored
+                *
+                * SNo  subslices config                eu pool configuration
+                * -----------------------------------------------------------
+                * 1    3 subslices enabled (3x6)  -    0x00777000  (9+9)
+                * 2    ss0 disabled (2x6)         -    0x00777000  (3+9)
+                * 3    ss1 disabled (2x6)         -    0x00770000  (6+6)
+                * 4    ss2 disabled (2x6)         -    0x00007000  (9+3)
+                */
+               u32 eu_pool_config = 0x00777000;
+
+               OUT_BATCH(d, i, GEN9_MEDIA_POOL_STATE);
+               OUT_BATCH(d, i, GEN9_MEDIA_POOL_ENABLE);
+               OUT_BATCH(d, i, eu_pool_config);
+               OUT_BATCH(d, i, 0);
+               OUT_BATCH(d, i, 0);
+               OUT_BATCH(d, i, 0);
+       }
+
+       OUT_BATCH(d, i, MI_BATCH_BUFFER_END);
+       so->aux_size = i * sizeof(u32) - so->aux_offset;
+       so->aux_offset += so->batch_offset;
+       /*
+        * Since we are sending length, we need to strictly conform to
+        * all requirements. For Gen2 this must be a multiple of 8.
+        */
+       so->aux_size = ALIGN(so->aux_size, 8);
+
+       if (needs_clflush)
+               drm_clflush_virt_range(d, i * sizeof(u32));
+       kunmap_atomic(d);
+
+       ret = 0;
+out:
+       i915_gem_object_finish_access(so->obj);
+       return ret;
+
+err:
+       kunmap_atomic(d);
+       ret = -EINVAL;
+       goto out;
+}
+
+#undef OUT_BATCH
+
+int intel_renderstate_emit(struct i915_request *rq)
+{
+       struct intel_engine_cs *engine = rq->engine;
+       struct intel_renderstate so = {}; /* keep the compiler happy */
+       int err;
+
+       so.rodata = render_state_get_rodata(engine);
+       if (!so.rodata)
+               return 0;
+
+       if (so.rodata->batch_items * 4 > PAGE_SIZE)
+               return -EINVAL;
+
+       so.obj = i915_gem_object_create_internal(engine->i915, PAGE_SIZE);
+       if (IS_ERR(so.obj))
+               return PTR_ERR(so.obj);
+
+       so.vma = i915_vma_instance(so.obj, &engine->gt->ggtt->vm, NULL);
+       if (IS_ERR(so.vma)) {
+               err = PTR_ERR(so.vma);
+               goto err_obj;
+       }
+
+       err = i915_vma_pin(so.vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
+       if (err)
+               goto err_vma;
+
+       err = render_state_setup(&so, rq->i915);
+       if (err)
+               goto err_unpin;
+
+       err = engine->emit_bb_start(rq,
+                                   so.batch_offset, so.batch_size,
+                                   I915_DISPATCH_SECURE);
+       if (err)
+               goto err_unpin;
+
+       if (so.aux_size > 8) {
+               err = engine->emit_bb_start(rq,
+                                           so.aux_offset, so.aux_size,
+                                           I915_DISPATCH_SECURE);
+               if (err)
+                       goto err_unpin;
+       }
+
+       i915_vma_lock(so.vma);
+       err = i915_vma_move_to_active(so.vma, rq, 0);
+       i915_vma_unlock(so.vma);
+err_unpin:
+       i915_vma_unpin(so.vma);
+err_vma:
+       i915_vma_close(so.vma);
+err_obj:
+       i915_gem_object_put(so.obj);
+       return err;
+}
diff --git a/drivers/gpu/drm/i915/gt/intel_renderstate.h b/drivers/gpu/drm/i915/gt/intel_renderstate.h
new file mode 100644 (file)
index 0000000..8d50791
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2014 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.
+ */
+
+#ifndef _INTEL_RENDERSTATE_H_
+#define _INTEL_RENDERSTATE_H_
+
+#include <linux/types.h>
+
+struct i915_request;
+
+struct intel_renderstate_rodata {
+       const u32 *reloc;
+       const u32 *batch;
+       const u32 batch_items;
+};
+
+#define RO_RENDERSTATE(_g)                                             \
+       const struct intel_renderstate_rodata gen ## _g ## _null_state = { \
+               .reloc = gen ## _g ## _null_state_relocs,               \
+               .batch = gen ## _g ## _null_state_batch,                \
+               .batch_items = sizeof(gen ## _g ## _null_state_batch)/4, \
+       }
+
+extern const struct intel_renderstate_rodata gen6_null_state;
+extern const struct intel_renderstate_rodata gen7_null_state;
+extern const struct intel_renderstate_rodata gen8_null_state;
+extern const struct intel_renderstate_rodata gen9_null_state;
+
+int intel_renderstate_emit(struct i915_request *rq);
+
+#endif /* _INTEL_RENDERSTATE_H_ */
index 81f9b0422e6abaa19a5836891755d4a39d6022f2..f804ec35037da063ae3fae2a125d28641191fdab 100644 (file)
 
 #include "gem/i915_gem_context.h"
 
-#include "gt/intel_gt.h"
-
 #include "i915_drv.h"
-#include "i915_gem_render_state.h"
 #include "i915_trace.h"
 #include "intel_context.h"
+#include "intel_gt.h"
+#include "intel_renderstate.h"
 #include "intel_reset.h"
 #include "intel_workarounds.h"
 
@@ -813,7 +812,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq)
        if (ret != 0)
                return ret;
 
-       ret = i915_gem_render_state_emit(rq);
+       ret = intel_renderstate_emit(rq);
        if (ret)
                return ret;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
deleted file mode 100644 (file)
index 6bda08c..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright © 2014 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:
- *    Mika Kuoppala <mika.kuoppala@intel.com>
- *
- */
-
-#include "i915_drv.h"
-#include "i915_gem_render_state.h"
-#include "intel_renderstate.h"
-
-struct intel_render_state {
-       const struct intel_renderstate_rodata *rodata;
-       struct drm_i915_gem_object *obj;
-       struct i915_vma *vma;
-       u32 batch_offset;
-       u32 batch_size;
-       u32 aux_offset;
-       u32 aux_size;
-};
-
-static const struct intel_renderstate_rodata *
-render_state_get_rodata(const struct intel_engine_cs *engine)
-{
-       if (engine->id != RCS0)
-               return NULL;
-
-       switch (INTEL_GEN(engine->i915)) {
-       case 6:
-               return &gen6_null_state;
-       case 7:
-               return &gen7_null_state;
-       case 8:
-               return &gen8_null_state;
-       case 9:
-               return &gen9_null_state;
-       }
-
-       return NULL;
-}
-
-/*
- * Macro to add commands to auxiliary batch.
- * This macro only checks for page overflow before inserting the commands,
- * this is sufficient as the null state generator makes the final batch
- * with two passes to build command and state separately. At this point
- * the size of both are known and it compacts them by relocating the state
- * right after the commands taking care of alignment so we should sufficient
- * space below them for adding new commands.
- */
-#define OUT_BATCH(batch, i, val)                               \
-       do {                                                    \
-               if ((i) >= PAGE_SIZE / sizeof(u32))             \
-                       goto err;                               \
-               (batch)[(i)++] = (val);                         \
-       } while(0)
-
-static int render_state_setup(struct intel_render_state *so,
-                             struct drm_i915_private *i915)
-{
-       const struct intel_renderstate_rodata *rodata = so->rodata;
-       unsigned int i = 0, reloc_index = 0;
-       unsigned int needs_clflush;
-       u32 *d;
-       int ret;
-
-       ret = i915_gem_object_prepare_write(so->obj, &needs_clflush);
-       if (ret)
-               return ret;
-
-       d = kmap_atomic(i915_gem_object_get_dirty_page(so->obj, 0));
-
-       while (i < rodata->batch_items) {
-               u32 s = rodata->batch[i];
-
-               if (i * 4  == rodata->reloc[reloc_index]) {
-                       u64 r = s + so->vma->node.start;
-                       s = lower_32_bits(r);
-                       if (HAS_64BIT_RELOC(i915)) {
-                               if (i + 1 >= rodata->batch_items ||
-                                   rodata->batch[i + 1] != 0)
-                                       goto err;
-
-                               d[i++] = s;
-                               s = upper_32_bits(r);
-                       }
-
-                       reloc_index++;
-               }
-
-               d[i++] = s;
-       }
-
-       if (rodata->reloc[reloc_index] != -1) {
-               DRM_ERROR("only %d relocs resolved\n", reloc_index);
-               goto err;
-       }
-
-       so->batch_offset = i915_ggtt_offset(so->vma);
-       so->batch_size = rodata->batch_items * sizeof(u32);
-
-       while (i % CACHELINE_DWORDS)
-               OUT_BATCH(d, i, MI_NOOP);
-
-       so->aux_offset = i * sizeof(u32);
-
-       if (HAS_POOLED_EU(i915)) {
-               /*
-                * We always program 3x6 pool config but depending upon which
-                * subslice is disabled HW drops down to appropriate config
-                * shown below.
-                *
-                * In the below table 2x6 config always refers to
-                * fused-down version, native 2x6 is not available and can
-                * be ignored
-                *
-                * SNo  subslices config                eu pool configuration
-                * -----------------------------------------------------------
-                * 1    3 subslices enabled (3x6)  -    0x00777000  (9+9)
-                * 2    ss0 disabled (2x6)         -    0x00777000  (3+9)
-                * 3    ss1 disabled (2x6)         -    0x00770000  (6+6)
-                * 4    ss2 disabled (2x6)         -    0x00007000  (9+3)
-                */
-               u32 eu_pool_config = 0x00777000;
-
-               OUT_BATCH(d, i, GEN9_MEDIA_POOL_STATE);
-               OUT_BATCH(d, i, GEN9_MEDIA_POOL_ENABLE);
-               OUT_BATCH(d, i, eu_pool_config);
-               OUT_BATCH(d, i, 0);
-               OUT_BATCH(d, i, 0);
-               OUT_BATCH(d, i, 0);
-       }
-
-       OUT_BATCH(d, i, MI_BATCH_BUFFER_END);
-       so->aux_size = i * sizeof(u32) - so->aux_offset;
-       so->aux_offset += so->batch_offset;
-       /*
-        * Since we are sending length, we need to strictly conform to
-        * all requirements. For Gen2 this must be a multiple of 8.
-        */
-       so->aux_size = ALIGN(so->aux_size, 8);
-
-       if (needs_clflush)
-               drm_clflush_virt_range(d, i * sizeof(u32));
-       kunmap_atomic(d);
-
-       ret = 0;
-out:
-       i915_gem_object_finish_access(so->obj);
-       return ret;
-
-err:
-       kunmap_atomic(d);
-       ret = -EINVAL;
-       goto out;
-}
-
-#undef OUT_BATCH
-
-int i915_gem_render_state_emit(struct i915_request *rq)
-{
-       struct intel_engine_cs *engine = rq->engine;
-       struct intel_render_state so = {}; /* keep the compiler happy */
-       int err;
-
-       so.rodata = render_state_get_rodata(engine);
-       if (!so.rodata)
-               return 0;
-
-       if (so.rodata->batch_items * 4 > PAGE_SIZE)
-               return -EINVAL;
-
-       so.obj = i915_gem_object_create_internal(engine->i915, PAGE_SIZE);
-       if (IS_ERR(so.obj))
-               return PTR_ERR(so.obj);
-
-       so.vma = i915_vma_instance(so.obj, &engine->gt->ggtt->vm, NULL);
-       if (IS_ERR(so.vma)) {
-               err = PTR_ERR(so.vma);
-               goto err_obj;
-       }
-
-       err = i915_vma_pin(so.vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
-       if (err)
-               goto err_vma;
-
-       err = render_state_setup(&so, rq->i915);
-       if (err)
-               goto err_unpin;
-
-       err = engine->emit_bb_start(rq,
-                                   so.batch_offset, so.batch_size,
-                                   I915_DISPATCH_SECURE);
-       if (err)
-               goto err_unpin;
-
-       if (so.aux_size > 8) {
-               err = engine->emit_bb_start(rq,
-                                           so.aux_offset, so.aux_size,
-                                           I915_DISPATCH_SECURE);
-               if (err)
-                       goto err_unpin;
-       }
-
-       i915_vma_lock(so.vma);
-       err = i915_vma_move_to_active(so.vma, rq, 0);
-       i915_vma_unlock(so.vma);
-err_unpin:
-       i915_vma_unpin(so.vma);
-err_vma:
-       i915_vma_close(so.vma);
-err_obj:
-       i915_gem_object_put(so.obj);
-       return err;
-}
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.h b/drivers/gpu/drm/i915/i915_gem_render_state.h
deleted file mode 100644 (file)
index 112cda8..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright © 2014 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.
- */
-
-#ifndef _I915_GEM_RENDER_STATE_H_
-#define _I915_GEM_RENDER_STATE_H_
-
-struct i915_request;
-
-int i915_gem_render_state_emit(struct i915_request *rq);
-
-#endif /* _I915_GEM_RENDER_STATE_H_ */
diff --git a/drivers/gpu/drm/i915/intel_renderstate.h b/drivers/gpu/drm/i915/intel_renderstate.h
deleted file mode 100644 (file)
index 08f6fea..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2014 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.
- */
-
-#ifndef _INTEL_RENDERSTATE_H
-#define _INTEL_RENDERSTATE_H
-
-#include <linux/types.h>
-
-struct intel_renderstate_rodata {
-       const u32 *reloc;
-       const u32 *batch;
-       const u32 batch_items;
-};
-
-#define RO_RENDERSTATE(_g)                                             \
-       const struct intel_renderstate_rodata gen ## _g ## _null_state = { \
-               .reloc = gen ## _g ## _null_state_relocs,               \
-               .batch = gen ## _g ## _null_state_batch,                \
-               .batch_items = sizeof(gen ## _g ## _null_state_batch)/4, \
-       }
-
-extern const struct intel_renderstate_rodata gen6_null_state;
-extern const struct intel_renderstate_rodata gen7_null_state;
-extern const struct intel_renderstate_rodata gen8_null_state;
-extern const struct intel_renderstate_rodata gen9_null_state;
-
-#endif /* INTEL_RENDERSTATE_H */
diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen6.c b/drivers/gpu/drm/i915/intel_renderstate_gen6.c
deleted file mode 100644 (file)
index 11c8e7b..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright © 2014 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.
- *
- * Generated by: intel-gpu-tools-1.8-220-g01153e7
- */
-
-#include "intel_renderstate.h"
-
-static const u32 gen6_null_state_relocs[] = {
-       0x00000020,
-       0x00000024,
-       0x0000002c,
-       0x000001e0,
-       0x000001e4,
-       -1,
-};
-
-static const u32 gen6_null_state_batch[] = {
-       0x69040000,
-       0x790d0001,
-       0x00000000,
-       0x00000000,
-       0x78180000,
-       0x00000001,
-       0x61010008,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000001,
-       0x61020000,
-       0x00000000,
-       0x78050001,
-       0x00000018,
-       0x00000000,
-       0x780d1002,
-       0x00000000,
-       0x00000000,
-       0x00000420,
-       0x78150003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78100004,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78160003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78110005,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78120002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78170003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79050005,
-       0xe0040000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79100000,
-       0x00000000,
-       0x79000002,
-       0xffffffff,
-       0x00000000,
-       0x00000000,
-       0x780e0002,
-       0x00000441,
-       0x00000401,
-       0x00000401,
-       0x78021002,
-       0x00000000,
-       0x00000000,
-       0x00000400,
-       0x78130012,
-       0x00400810,
-       0x00000000,
-       0x20000000,
-       0x04000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78140007,
-       0x00000280,
-       0x08080000,
-       0x00000000,
-       0x00060000,
-       0x4e080002,
-       0x00100400,
-       0x00000000,
-       0x00000000,
-       0x78090005,
-       0x02000000,
-       0x22220000,
-       0x02f60000,
-       0x11330000,
-       0x02850004,
-       0x11220000,
-       0x78011002,
-       0x00000000,
-       0x00000000,
-       0x00000200,
-       0x78080003,
-       0x00002000,
-       0x00000448,      /* reloc */
-       0x00000448,      /* reloc */
-       0x00000000,
-       0x05000000,      /* cmds end */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000220,      /* state start */
-       0x00000240,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0060005a,
-       0x204077be,
-       0x000000c0,
-       0x008d0040,
-       0x0060005a,
-       0x206077be,
-       0x000000c0,
-       0x008d0080,
-       0x0060005a,
-       0x208077be,
-       0x000000d0,
-       0x008d0040,
-       0x0060005a,
-       0x20a077be,
-       0x000000d0,
-       0x008d0080,
-       0x00000201,
-       0x20080061,
-       0x00000000,
-       0x00000000,
-       0x00600001,
-       0x20200022,
-       0x008d0000,
-       0x00000000,
-       0x02800031,
-       0x21c01cc9,
-       0x00000020,
-       0x0a8a0001,
-       0x00600001,
-       0x204003be,
-       0x008d01c0,
-       0x00000000,
-       0x00600001,
-       0x206003be,
-       0x008d01e0,
-       0x00000000,
-       0x00600001,
-       0x208003be,
-       0x008d0200,
-       0x00000000,
-       0x00600001,
-       0x20a003be,
-       0x008d0220,
-       0x00000000,
-       0x00600001,
-       0x20c003be,
-       0x008d0240,
-       0x00000000,
-       0x00600001,
-       0x20e003be,
-       0x008d0260,
-       0x00000000,
-       0x00600001,
-       0x210003be,
-       0x008d0280,
-       0x00000000,
-       0x00600001,
-       0x212003be,
-       0x008d02a0,
-       0x00000000,
-       0x05800031,
-       0x24001cc8,
-       0x00000040,
-       0x90019000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0000007e,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x30000000,
-       0x00000124,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xf99a130c,
-       0x799a130c,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x80000031,
-       0x00000003,
-       0x00000000,      /* state end */
-};
-
-RO_RENDERSTATE(6);
diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen7.c b/drivers/gpu/drm/i915/intel_renderstate_gen7.c
deleted file mode 100644 (file)
index 6551806..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright © 2014 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.
- *
- * Generated by: intel-gpu-tools-1.8-220-g01153e7
- */
-
-#include "intel_renderstate.h"
-
-static const u32 gen7_null_state_relocs[] = {
-       0x0000000c,
-       0x00000010,
-       0x00000018,
-       0x000001ec,
-       -1,
-};
-
-static const u32 gen7_null_state_batch[] = {
-       0x69040000,
-       0x61010008,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000001,
-       0x790d0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78180000,
-       0x00000001,
-       0x79160000,
-       0x00000008,
-       0x78300000,
-       0x02010040,
-       0x78310000,
-       0x04000000,
-       0x78320000,
-       0x04000000,
-       0x78330000,
-       0x02000000,
-       0x78100004,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781b0005,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781c0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781d0004,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78110005,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78120002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78210000,
-       0x00000000,
-       0x78130005,
-       0x00000000,
-       0x20000000,
-       0x04000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78140001,
-       0x20000800,
-       0x00000000,
-       0x781e0001,
-       0x00000000,
-       0x00000000,
-       0x78050005,
-       0xe0040000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78040001,
-       0x00000000,
-       0x00000000,
-       0x78240000,
-       0x00000240,
-       0x78230000,
-       0x00000260,
-       0x782f0000,
-       0x00000280,
-       0x781f000c,
-       0x00400810,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78200006,
-       0x000002c0,
-       0x08080000,
-       0x00000000,
-       0x28000402,
-       0x00060000,
-       0x00000000,
-       0x00000000,
-       0x78090005,
-       0x02000000,
-       0x22220000,
-       0x02f60000,
-       0x11230000,
-       0x02f60004,
-       0x11230000,
-       0x78080003,
-       0x00006008,
-       0x00000340,      /* reloc */
-       0xffffffff,
-       0x00000000,
-       0x782a0000,
-       0x00000360,
-       0x79000002,
-       0xffffffff,
-       0x00000000,
-       0x00000000,
-       0x7b000005,
-       0x0000000f,
-       0x00000003,
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000000,
-       0x05000000,      /* cmds end */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000031,      /* state start */
-       0x00000003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0xf99a130c,
-       0x799a130c,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000492,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0080005a,
-       0x2e2077bd,
-       0x000000c0,
-       0x008d0040,
-       0x0080005a,
-       0x2e6077bd,
-       0x000000d0,
-       0x008d0040,
-       0x02800031,
-       0x21801fa9,
-       0x008d0e20,
-       0x08840001,
-       0x00800001,
-       0x2e2003bd,
-       0x008d0180,
-       0x00000000,
-       0x00800001,
-       0x2e6003bd,
-       0x008d01c0,
-       0x00000000,
-       0x00800001,
-       0x2ea003bd,
-       0x008d0200,
-       0x00000000,
-       0x00800001,
-       0x2ee003bd,
-       0x008d0240,
-       0x00000000,
-       0x05800031,
-       0x20001fa8,
-       0x008d0e20,
-       0x90031000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000380,
-       0x000003a0,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,      /* state end */
-};
-
-RO_RENDERSTATE(7);
diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen8.c b/drivers/gpu/drm/i915/intel_renderstate_gen8.c
deleted file mode 100644 (file)
index 95288a3..0000000
+++ /dev/null
@@ -1,983 +0,0 @@
-/*
- * Copyright © 2014 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.
- *
- * Generated by: intel-gpu-tools-1.8-220-g01153e7
- */
-
-#include "intel_renderstate.h"
-
-static const u32 gen8_null_state_relocs[] = {
-       0x00000798,
-       0x000007a4,
-       0x000007ac,
-       0x000007bc,
-       -1,
-};
-
-static const u32 gen8_null_state_batch[] = {
-       0x7a000004,
-       0x01000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x69040000,
-       0x78140000,
-       0x04000000,
-       0x7820000a,
-       0x00000000,
-       0x00000000,
-       0x80000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78130002,
-       0x00000000,
-       0x00000000,
-       0x02001808,
-       0x781f0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78510009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78100007,
-       0x00000000,
-       0x00000000,
-       0x00010000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781b0007,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000800,
-       0x00000000,
-       0x78110008,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781e0003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781d0007,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78120002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78500003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781c0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x780c0000,
-       0x00000000,
-       0x78520003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78300000,
-       0x08010040,
-       0x78310000,
-       0x1e000000,
-       0x78320000,
-       0x1e000000,
-       0x78330000,
-       0x1e000000,
-       0x79190002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x791a0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x791b0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79120000,
-       0x00000000,
-       0x79130000,
-       0x00000000,
-       0x79140000,
-       0x00000000,
-       0x79150000,
-       0x00000000,
-       0x79160000,
-       0x00000000,
-       0x78150009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78190009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781a0009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78160009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78170009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78490001,
-       0x00000000,
-       0x00000000,
-       0x784a0000,
-       0x00000000,
-       0x784b0000,
-       0x00000004,
-       0x79170101,
-       0x00000000,
-       0x00000080,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x20000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x40000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x60000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x6101000e,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00001001,
-       0x00001001,
-       0x00000001,
-       0x00001001,
-       0x61020001,
-       0x00000000,
-       0x00000000,
-       0x79000002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78050006,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x40000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x80000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0xc0000000,
-       0x00000000,
-       0x00000000,
-       0x79080001,
-       0x00000000,
-       0x00000000,
-       0x790a0001,
-       0x00000000,
-       0x00000000,
-       0x78060003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78070003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78040001,
-       0x00000000,
-       0x00000000,
-       0x79110000,
-       0x00000000,
-       0x780d0000,
-       0x00000000,
-       0x79060000,
-       0x00000000,
-       0x7907001f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x7902000f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x790c000f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x780a0003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78080083,
-       0x00004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x04004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x08004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x10004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x14004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x18004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x1c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x20004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x24004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x28004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x2c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x30004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x34004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x38004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x3c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x40004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x44004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x48004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x4c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x50004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x54004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x58004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x5c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x60004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x64004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x68004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x6c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x70004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x74004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x7c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x80004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78090043,
-       0x02000000,
-       0x22220000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x680b0001,
-       0x78260000,
-       0x00000000,
-       0x78270000,
-       0x00000000,
-       0x78280000,
-       0x00000000,
-       0x78290000,
-       0x00000000,
-       0x782a0000,
-       0x00000000,
-       0x780e0000,
-       0x00000dc1,
-       0x78240000,
-       0x00000e01,
-       0x784f0000,
-       0x80000100,
-       0x784d0000,
-       0x40000000,
-       0x782b0000,
-       0x00000000,
-       0x782c0000,
-       0x00000000,
-       0x782d0000,
-       0x00000000,
-       0x782e0000,
-       0x00000000,
-       0x782f0000,
-       0x00000000,
-       0x780f0000,
-       0x00000000,
-       0x78230000,
-       0x00000e60,
-       0x78210000,
-       0x00000e80,
-       0x7b000005,
-       0x00000004,
-       0x00000001,
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000000,
-       0x05000000,      /* cmds end */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,      /* state start */
-       0x00000000,
-       0x3f800000,
-       0x3f800000,
-       0x3f800000,
-       0x3f800000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,      /* state end */
-};
-
-RO_RENDERSTATE(8);
diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen9.c b/drivers/gpu/drm/i915/intel_renderstate_gen9.c
deleted file mode 100644 (file)
index 7d3ac02..0000000
+++ /dev/null
@@ -1,999 +0,0 @@
-/*
- * Copyright © 2014 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.
- *
- * Generated by: intel-gpu-tools-1.19-177-g68e2eab2
- */
-
-#include "intel_renderstate.h"
-
-static const u32 gen9_null_state_relocs[] = {
-       0x000007a8,
-       0x000007b4,
-       0x000007bc,
-       0x000007cc,
-       -1,
-};
-
-static const u32 gen9_null_state_batch[] = {
-       0x7a000004,
-       0x01000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x69040300,
-       0x78140000,
-       0x04000000,
-       0x7820000a,
-       0x00000000,
-       0x00000000,
-       0x80000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78130002,
-       0x00000000,
-       0x00000000,
-       0x02001808,
-       0x781f0004,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78510009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78100007,
-       0x00000000,
-       0x00000000,
-       0x00010000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781b0007,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000800,
-       0x00000000,
-       0x78110008,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781e0003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781d0009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78120002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78500003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781c0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x780c0000,
-       0x00000000,
-       0x78520003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78300000,
-       0x08010040,
-       0x78310000,
-       0x1e000000,
-       0x78320000,
-       0x1e000000,
-       0x78330000,
-       0x1e000000,
-       0x79190002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x791a0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x791b0002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79120000,
-       0x00000000,
-       0x79130000,
-       0x00000000,
-       0x79140000,
-       0x00000000,
-       0x79150000,
-       0x00000000,
-       0x79160000,
-       0x00000000,
-       0x78150009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78190009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x781a0009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78160009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78170009,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78490001,
-       0x00000000,
-       0x00000000,
-       0x784a0000,
-       0x00000000,
-       0x784b0000,
-       0x00000004,
-       0x79170101,
-       0x00000000,
-       0x00000080,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x20000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x40000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79180006,
-       0x60000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x61010011,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000001,      /* reloc */
-       0x00000000,
-       0x00001001,
-       0x00001001,
-       0x00000001,
-       0x00001001,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x61020001,
-       0x00000000,
-       0x00000000,
-       0x79000002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78050006,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x40000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0x80000000,
-       0x00000000,
-       0x00000000,
-       0x79040002,
-       0xc0000000,
-       0x00000000,
-       0x00000000,
-       0x79080001,
-       0x00000000,
-       0x00000000,
-       0x790a0001,
-       0x00000000,
-       0x00000000,
-       0x78060003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78070003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78040001,
-       0x00000000,
-       0x00000000,
-       0x79110000,
-       0x00000000,
-       0x780d0000,
-       0x00000000,
-       0x79060000,
-       0x00000000,
-       0x7907001f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x7902000f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x790c000f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x780a0003,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78080083,
-       0x00004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x04004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x08004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x0c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x10004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x14004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x18004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x1c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x20004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x24004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x28004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x2c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x30004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x34004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x38004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x3c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x40004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x44004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x48004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x4c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x50004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x54004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x58004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x5c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x60004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x64004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x68004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x6c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x70004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x74004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x7c004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x80004000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78090043,
-       0x02000000,
-       0x22220000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x78550003,
-       0x0000000f,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x680b0001,
-       0x780e0000,
-       0x00000e01,
-       0x78240000,
-       0x00000e41,
-       0x784f0000,
-       0x80000100,
-       0x784d0000,
-       0x40000000,
-       0x782b0000,
-       0x00000000,
-       0x782c0000,
-       0x00000000,
-       0x782d0000,
-       0x00000000,
-       0x782e0000,
-       0x00000000,
-       0x782f0000,
-       0x00000000,
-       0x780f0000,
-       0x00000000,
-       0x78230000,
-       0x00000ea0,
-       0x78210000,
-       0x00000ec0,
-       0x78260000,
-       0x00000000,
-       0x78270000,
-       0x00000000,
-       0x78280000,
-       0x00000000,
-       0x78290000,
-       0x00000000,
-       0x782a0000,
-       0x00000000,
-       0x7b000005,
-       0x00000004,
-       0x00000001,
-       0x00000000,
-       0x00000001,
-       0x00000000,
-       0x00000000,
-       0x05000000,      /* cmds end */
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,      /* state start */
-       0x00000000,
-       0x3f800000,
-       0x3f800000,
-       0x3f800000,
-       0x3f800000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,      /* state end */
-};
-
-RO_RENDERSTATE(9);