drm/i915 Update Gen8 golden context batch buffer

The file drivers/gpu/drm/i915/intel_renderstate_gen8.c is
updated to the version created by IGT null_state_gen

Signed-off-by: Armin Reese <armin.c.reese@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_renderstate_gen8.c b/drivers/gpu/drm/i915/intel_renderstate_gen8.c
index 75ef1b5..78011d7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_renderstate_gen8.c
+++ b/drivers/gpu/drm/i915/intel_renderstate_gen8.c
@@ -1,70 +1,575 @@
 #include "intel_renderstate.h"
 
 static const u32 gen8_null_state_relocs[] = {
-       0x00000048,
-       0x00000050,
-       0x00000060,
-       0x000003ec,
+       0x00000798,
+       0x000007a4,
+       0x000007ac,
+       0x000007bc,
        -1,
 };
 
 static const u32 gen8_null_state_batch[] = {
+       0x7a000004,
+       0x01000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
        0x69040000,
-       0x61020001,
+       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,
-       0x79120000,
        0x00000000,
-       0x79130000,
        0x00000000,
-       0x79140000,
        0x00000000,
-       0x79150000,
        0x00000000,
-       0x79160000,
        0x00000000,
-       0x6101000e,
-       0x00000001,
        0x00000000,
-       0x00000001,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       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,
-       0xfffff001,
        0x00001001,
-       0xfffff001,
        0x00001001,
-       0x78230000,
-       0x000006e0,
-       0x78210000,
-       0x00000700,
-       0x78300000,
-       0x08010040,
-       0x78330000,
-       0x08000000,
-       0x78310000,
-       0x08000000,
-       0x78320000,
-       0x08000000,
-       0x78240000,
-       0x00000641,
-       0x780e0000,
-       0x00000601,
+       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,
-       0x78180000,
-       0x00000001,
-       0x78520003,
+       0x79060000,
        0x00000000,
+       0x7907001f,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78190009,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -75,7 +580,6 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x781b0007,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -84,26 +588,22 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78270000,
        0x00000000,
-       0x782c0000,
        0x00000000,
-       0x781c0002,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78160009,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x7902000f,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78110008,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -113,12 +613,10 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78290000,
        0x00000000,
-       0x782e0000,
        0x00000000,
-       0x781a0009,
        0x00000000,
+       0x790c000f,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -128,7 +626,6 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x781d0007,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -136,153 +633,153 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
+       0x780a0003,
        0x00000000,
-       0x78280000,
        0x00000000,
-       0x782d0000,
        0x00000000,
-       0x78260000,
        0x00000000,
-       0x782b0000,
+       0x78080083,
+       0x00004000,
        0x00000000,
-       0x78150009,
        0x00000000,
        0x00000000,
+       0x04004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x08004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x0c004000,
        0x00000000,
        0x00000000,
-       0x78100007,
        0x00000000,
+       0x10004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x14004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x18004000,
        0x00000000,
-       0x781e0003,
        0x00000000,
        0x00000000,
+       0x1c004000,
        0x00000000,
        0x00000000,
-       0x78120002,
        0x00000000,
+       0x20004000,
        0x00000000,
        0x00000000,
-       0x781f0002,
-       0x30400820,
        0x00000000,
+       0x24004000,
        0x00000000,
-       0x78510009,
        0x00000000,
        0x00000000,
+       0x28004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x2c004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x30004000,
        0x00000000,
        0x00000000,
-       0x78500003,
-       0x00210000,
        0x00000000,
+       0x34004000,
        0x00000000,
        0x00000000,
-       0x78130002,
        0x00000000,
+       0x38004000,
        0x00000000,
        0x00000000,
-       0x782a0000,
-       0x00000480,
-       0x782f0000,
-       0x00000540,
-       0x78140000,
-       0x00000800,
-       0x78170009,
        0x00000000,
+       0x3c004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x40004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x44004000,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x7820000a,
-       0x00000580,
+       0x48004000,
        0x00000000,
-       0x08080000,
        0x00000000,
        0x00000000,
-       0x1f000002,
-       0x00060000,
+       0x4c004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x50004000,
        0x00000000,
-       0x784d0000,
-       0x40000000,
-       0x784f0000,
-       0x80000100,
-       0x780f0000,
-       0x00000740,
-       0x78050006,
        0x00000000,
        0x00000000,
+       0x54004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x58004000,
        0x00000000,
        0x00000000,
-       0x78070003,
        0x00000000,
+       0x5c004000,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x78060003,
+       0x60004000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x64004000,
        0x00000000,
-       0x78040001,
        0x00000000,
-       0x00000001,
-       0x79000002,
-       0xffffffff,
+       0x00000000,
+       0x68004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x6c004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x70004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x74004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78004000,
+       0x00000000,
        0x00000000,
        0x00000000,
-       0x78080003,
-       0x00006000,
-       0x000005e0,      /* reloc */
+       0x7c004000,
        0x00000000,
        0x00000000,
-       0x78090005,
+       0x00000000,
+       0x80004000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x78090043,
        0x02000000,
        0x22220000,
-       0x02f60000,
-       0x11230000,
-       0x02850004,
-       0x11230000,
-       0x784b0000,
-       0x0000000f,
-       0x78490001,
        0x00000000,
        0x00000000,
-       0x7b000005,
        0x00000000,
-       0x00000003,
        0x00000000,
-       0x00000001,
        0x00000000,
        0x00000000,
-       0x05000000,      /* cmds end */
        0x00000000,
        0x00000000,
        0x00000000,
@@ -297,8 +794,6 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x000004c0,      /* state start */
-       0x00000500,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -345,46 +840,65 @@ static const u32 gen8_null_state_batch[] = {
        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,
-       0x00000092,
        0x00000000,
+       0x05000000,      /* cmds end */
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
+       0x00000000,      /* state start */
        0x00000000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
+       0x3f800000,
        0x00000000,
        0x00000000,
        0x00000000,
        0x00000000,
-       0x0060005a,
-       0x21403ae8,
-       0x3a0000c0,
-       0x008d0040,
-       0x0060005a,
-       0x21603ae8,
-       0x3a0000c0,
-       0x008d0080,
-       0x0060005a,
-       0x21803ae8,
-       0x3a0000d0,
-       0x008d0040,
-       0x0060005a,
-       0x21a03ae8,
-       0x3a0000d0,
-       0x008d0080,
-       0x02800031,
-       0x2e0022e8,
-       0x0e000140,
-       0x08840001,
-       0x05800031,
-       0x200022e0,
-       0x0e000e00,
-       0x90031000,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -410,38 +924,6 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
-       0x06200000,
-       0x00000002,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -449,8 +931,6 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0xf99a130c,
-       0x799a130c,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -466,9 +946,7 @@ static const u32 gen8_null_state_batch[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x3f800000,
        0x00000000,
-       0x3f800000,
        0x00000000,
        0x00000000,
        0x00000000,