Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / gpu / drm / nouveau / core / subdev / pwr / fuc / nva3.fuc.h

diff --git a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
index 21000e5..64e97ba 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/subdev/pwr/fuc/nva3.fuc.h
@@ -46,8 +46,8 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x584d454d,
-       0x00000624,
-       0x00000616,
+       0x000006e0,
+       0x000006d2,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -68,8 +68,8 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x46524550,
-       0x00000628,
-       0x00000626,
+       0x000006e4,
+       0x000006e2,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -90,8 +90,8 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x5f433249,
-       0x00000a58,
-       0x000008fb,
+       0x00000b14,
+       0x000009b7,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -112,8 +112,8 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x54534554,
-       0x00000a81,
-       0x00000a5a,
+       0x00000b3d,
+       0x00000b16,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -134,8 +134,8 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x454c4449,
-       0x00000a8d,
-       0x00000a8b,
+       0x00000b49,
+       0x00000b47,
        0x00000000,
        0x00000000,
        0x00000000,
@@ -227,27 +227,31 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
 /* 0x0370: memx_func_head */
-       0x00010000,
+       0x00000001,
        0x00000000,
        0x00000551,
 /* 0x037c: memx_func_next */
-       0x00000001,
-       0x00000000,
-       0x00000578,
        0x00000002,
+       0x00000000,
+       0x000005a8,
+       0x00000003,
        0x00000002,
-       0x00000599,
-       0x00040003,
+       0x0000063a,
+       0x00040004,
        0x00000000,
-       0x000005b5,
-       0x00010004,
+       0x00000656,
+       0x00010005,
        0x00000000,
-       0x000005d2,
-/* 0x03ac: memx_func_tail */
-/* 0x03ac: memx_data_head */
+       0x00000673,
+       0x00010006,
        0x00000000,
+       0x000005f8,
+/* 0x03b8: memx_func_tail */
+/* 0x03b8: memx_ts_start */
        0x00000000,
+/* 0x03bc: memx_ts_end */
        0x00000000,
+/* 0x03c0: memx_data_head */
        0x00000000,
        0x00000000,
        0x00000000,
@@ -757,8 +761,11 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-/* 0x0bac: memx_data_tail */
-/* 0x0bac: i2c_scl_map */
+       0x00000000,
+       0x00000000,
+       0x00000000,
+/* 0x0bc0: memx_data_tail */
+/* 0x0bc0: i2c_scl_map */
        0x00001000,
        0x00004000,
        0x00010000,
@@ -769,7 +776,7 @@ uint32_t nva3_pwr_data[] = {
        0x01000000,
        0x04000000,
        0x10000000,
-/* 0x0bd4: i2c_sda_map */
+/* 0x0be8: i2c_sda_map */
        0x00002000,
        0x00008000,
        0x00020000,
@@ -780,7 +787,7 @@ uint32_t nva3_pwr_data[] = {
        0x02000000,
        0x08000000,
        0x20000000,
-/* 0x0bfc: i2c_ctrl */
+/* 0x0c10: i2c_ctrl */
        0x0000e138,
        0x0000e150,
        0x0000e168,
@@ -841,11 +848,6 @@ uint32_t nva3_pwr_data[] = {
        0x00000000,
        0x00000000,
        0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
-       0x00000000,
 };
 
 uint32_t nva3_pwr_code[] = {
@@ -1234,166 +1236,219 @@ uint32_t nva3_pwr_code[] = {
        0x01d00604,
        0xf804bd00,
 /* 0x0551: memx_func_enter */
-       0x0467f000,
-       0x07e007f1,
-       0xd00604b6,
-       0x04bd0006,
-/* 0x0560: memx_func_enter_wait */
-       0x07c067f1,
-       0xcf0664b6,
-       0x64f00066,
-       0xf30bf404,
-       0xb6001698,
-       0x00f80410,
-/* 0x0578: memx_func_leave */
+       0x1087f100,
+       0x028eb916,
+       0xb90421f4,
+       0x67f102d7,
+       0x63f1fffc,
+       0x76fdffff,
+       0x0267f104,
+       0x0576fd00,
+       0x70f980f9,
+       0xe0fcd0fc,
+       0xf03f21f4,
+       0x07f10467,
+       0x04b607e0,
+       0x0006d006,
+/* 0x058a: memx_func_enter_wait */
+       0x67f104bd,
+       0x64b607c0,
+       0x0066cf06,
+       0xf40464f0,
+       0x67f0f30b,
+       0x0664b62c,
+       0x800066cf,
+       0x00f8ee06,
+/* 0x05a8: memx_func_leave */
+       0xb62c67f0,
+       0x66cf0664,
+       0xef068000,
        0xf10467f0,
        0xb607e407,
        0x06d00604,
-/* 0x0587: memx_func_leave_wait */
+/* 0x05c3: memx_func_leave_wait */
        0xf104bd00,
        0xb607c067,
        0x66cf0664,
        0x0464f000,
-       0xf8f31bf4,
-/* 0x0599: memx_func_wr32 */
-       0x00169800,
-       0xb6011598,
-       0x60f90810,
-       0xd0fc50f9,
-       0x21f4e0fc,
-       0x0242b63f,
-       0xf8e91bf4,
-/* 0x05b5: memx_func_wait */
-       0x2c87f000,
-       0xcf0684b6,
-       0x1e980088,
-       0x011d9800,
-       0x98021c98,
-       0x10b6031b,
-       0xa421f410,
-/* 0x05d2: memx_func_delay */
-       0x1e9800f8,
-       0x0410b600,
-       0xf87f21f4,
-/* 0x05dd: memx_exec */
-       0xf9e0f900,
-       0x02c1b9d0,
-/* 0x05e7: memx_exec_next */
-       0x9802b2b9,
-       0x10b60013,
-       0x10349504,
-       0x980c30f0,
-       0x55f9de35,
-       0xf40612b8,
-       0xd0fcec1e,
+       0xf1f31bf4,
+       0xb9161087,
+       0x21f4028e,
+       0x02d7b904,
+       0xffcc67f1,
+       0xffff63f1,
+       0xf90476fd,
+       0xfc70f980,
+       0xf4e0fcd0,
+       0x00f83f21,
+/* 0x05f8: memx_func_wait_vblank */
+       0xb0001698,
+       0x0bf40066,
+       0x0166b013,
+       0xf4060bf4,
+/* 0x060a: memx_func_wait_vblank_head1 */
+       0x77f12e0e,
+       0x0ef40020,
+/* 0x0611: memx_func_wait_vblank_head0 */
+       0x0877f107,
+/* 0x0615: memx_func_wait_vblank_0 */
+       0xc467f100,
+       0x0664b607,
+       0xfd0066cf,
+       0x1bf40467,
+/* 0x0625: memx_func_wait_vblank_1 */
+       0xc467f1f3,
+       0x0664b607,
+       0xfd0066cf,
+       0x0bf40467,
+/* 0x0635: memx_func_wait_vblank_fini */
+       0x0410b6f3,
+/* 0x063a: memx_func_wr32 */
+       0x169800f8,
+       0x01159800,
+       0xf90810b6,
+       0xfc50f960,
+       0xf4e0fcd0,
+       0x42b63f21,
+       0xe91bf402,
+/* 0x0656: memx_func_wait */
+       0x87f000f8,
+       0x0684b62c,
+       0x980088cf,
+       0x1d98001e,
+       0x021c9801,
+       0xb6031b98,
+       0x21f41010,
+/* 0x0673: memx_func_delay */
+       0x9800f8a4,
+       0x10b6001e,
+       0x7f21f404,
+/* 0x067e: memx_exec */
+       0xe0f900f8,
+       0xc1b9d0f9,
+       0x02b2b902,
+/* 0x0688: memx_exec_next */
+       0xb6001398,
+       0x34e70410,
+       0x33e701f0,
+       0x32b601e0,
+       0x0c30f001,
+       0xf9de3598,
+       0x0612b855,
+       0x98e41ef4,
+       0x0c98ee0b,
+       0x02cbbbef,
+       0x07c4b7f1,
+       0xcf06b4b6,
+       0xd0fc00bb,
        0x21f5e0fc,
        0x00f80342,
-/* 0x0608: memx_info */
-       0x03acc7f1,
+/* 0x06c4: memx_info */
+       0x03c0c7f1,
        0x0800b7f1,
        0x034221f5,
-/* 0x0616: memx_recv */
+/* 0x06d2: memx_recv */
        0xd6b000f8,
-       0xc40bf401,
+       0xa90bf401,
        0xf400d6b0,
        0x00f8e90b,
-/* 0x0624: memx_init */
-/* 0x0626: perf_recv */
+/* 0x06e0: memx_init */
+/* 0x06e2: perf_recv */
        0x00f800f8,
-/* 0x0628: perf_init */
-/* 0x062a: i2c_drive_scl */
+/* 0x06e4: perf_init */
+/* 0x06e6: i2c_drive_scl */
        0x36b000f8,
        0x110bf400,
        0x07e007f1,
        0xd00604b6,
        0x04bd0001,
-/* 0x063e: i2c_drive_scl_lo */
+/* 0x06fa: i2c_drive_scl_lo */
        0x07f100f8,
        0x04b607e4,
        0x0001d006,
        0x00f804bd,
-/* 0x064c: i2c_drive_sda */
+/* 0x0708: i2c_drive_sda */
        0xf40036b0,
        0x07f1110b,
        0x04b607e0,
        0x0002d006,
        0x00f804bd,
-/* 0x0660: i2c_drive_sda_lo */
+/* 0x071c: i2c_drive_sda_lo */
        0x07e407f1,
        0xd00604b6,
        0x04bd0002,
-/* 0x066e: i2c_sense_scl */
+/* 0x072a: i2c_sense_scl */
        0x32f400f8,
        0xc437f101,
        0x0634b607,
        0xfd0033cf,
        0x0bf40431,
        0x0131f406,
-/* 0x0684: i2c_sense_scl_done */
-/* 0x0686: i2c_sense_sda */
+/* 0x0740: i2c_sense_scl_done */
+/* 0x0742: i2c_sense_sda */
        0x32f400f8,
        0xc437f101,
        0x0634b607,
        0xfd0033cf,
        0x0bf40432,
        0x0131f406,
-/* 0x069c: i2c_sense_sda_done */
-/* 0x069e: i2c_raise_scl */
+/* 0x0758: i2c_sense_sda_done */
+/* 0x075a: i2c_raise_scl */
        0x40f900f8,
        0x089847f1,
        0xf50137f0,
-/* 0x06ab: i2c_raise_scl_wait */
-       0xf1062a21,
+/* 0x0767: i2c_raise_scl_wait */
+       0xf106e621,
        0xf403e8e7,
        0x21f57f21,
-       0x01f4066e,
+       0x01f4072a,
        0x0142b609,
-/* 0x06bf: i2c_raise_scl_done */
+/* 0x077b: i2c_raise_scl_done */
        0xfcef1bf4,
-/* 0x06c3: i2c_start */
+/* 0x077f: i2c_start */
        0xf500f840,
-       0xf4066e21,
+       0xf4072a21,
        0x21f50d11,
-       0x11f40686,
+       0x11f40742,
        0x300ef406,
-/* 0x06d4: i2c_start_rep */
+/* 0x0790: i2c_start_rep */
        0xf50037f0,
-       0xf0062a21,
+       0xf006e621,
        0x21f50137,
-       0x76bb064c,
+       0x76bb0708,
        0x0465b600,
        0x659450f9,
        0x0256bb04,
        0x75fd50bd,
        0xf550fc04,
-       0xb6069e21,
+       0xb6075a21,
        0x11f40464,
-/* 0x0701: i2c_start_send */
+/* 0x07bd: i2c_start_send */
        0x0037f01f,
-       0x064c21f5,
+       0x070821f5,
        0x1388e7f1,
        0xf07f21f4,
        0x21f50037,
-       0xe7f1062a,
+       0xe7f106e6,
        0x21f41388,
-/* 0x071d: i2c_start_out */
-/* 0x071f: i2c_stop */
+/* 0x07d9: i2c_start_out */
+/* 0x07db: i2c_stop */
        0xf000f87f,
        0x21f50037,
-       0x37f0062a,
-       0x4c21f500,
-       0xe8e7f106,
+       0x37f006e6,
+       0x0821f500,
+       0xe8e7f107,
        0x7f21f403,
        0xf50137f0,
-       0xf1062a21,
+       0xf106e621,
        0xf41388e7,
        0x37f07f21,
-       0x4c21f501,
-       0x88e7f106,
+       0x0821f501,
+       0x88e7f107,
        0x7f21f413,
-/* 0x0752: i2c_bitw */
+/* 0x080e: i2c_bitw */
        0x21f500f8,
-       0xe7f1064c,
+       0xe7f10708,
        0x21f403e8,
        0x0076bb7f,
        0xf90465b6,
@@ -1401,18 +1456,18 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b6069e,
+       0x64b6075a,
        0x1811f404,
        0x1388e7f1,
        0xf07f21f4,
        0x21f50037,
-       0xe7f1062a,
+       0xe7f106e6,
        0x21f41388,
-/* 0x0791: i2c_bitw_out */
-/* 0x0793: i2c_bitr */
+/* 0x084d: i2c_bitw_out */
+/* 0x084f: i2c_bitr */
        0xf000f87f,
        0x21f50137,
-       0xe7f1064c,
+       0xe7f10708,
        0x21f403e8,
        0x0076bb7f,
        0xf90465b6,
@@ -1420,26 +1475,26 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b6069e,
+       0x64b6075a,
        0x1b11f404,
-       0x068621f5,
+       0x074221f5,
        0xf50037f0,
-       0xf1062a21,
+       0xf106e621,
        0xf41388e7,
        0x3cf07f21,
        0x0131f401,
-/* 0x07d8: i2c_bitr_done */
-/* 0x07da: i2c_get_byte */
+/* 0x0894: i2c_bitr_done */
+/* 0x0896: i2c_get_byte */
        0x57f000f8,
        0x0847f000,
-/* 0x07e0: i2c_get_byte_next */
+/* 0x089c: i2c_get_byte_next */
        0xbb0154b6,
        0x65b60076,
        0x9450f904,
        0x56bb0465,
        0xfd50bd02,
        0x50fc0475,
-       0x079321f5,
+       0x084f21f5,
        0xf40464b6,
        0x53fd2b11,
        0x0142b605,
@@ -1450,11 +1505,11 @@ uint32_t nva3_pwr_code[] = {
        0x0256bb04,
        0x75fd50bd,
        0xf550fc04,
-       0xb6075221,
-/* 0x082a: i2c_get_byte_done */
+       0xb6080e21,
+/* 0x08e6: i2c_get_byte_done */
        0x00f80464,
-/* 0x082c: i2c_put_byte */
-/* 0x082f: i2c_put_byte_next */
+/* 0x08e8: i2c_put_byte */
+/* 0x08eb: i2c_put_byte_next */
        0xb60847f0,
        0x54ff0142,
        0x0076bb38,
@@ -1463,7 +1518,7 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b60752,
+       0x64b6080e,
        0x3411f404,
        0xf40046b0,
        0x76bbd81b,
@@ -1472,20 +1527,20 @@ uint32_t nva3_pwr_code[] = {
        0x0256bb04,
        0x75fd50bd,
        0xf550fc04,
-       0xb6079321,
+       0xb6084f21,
        0x11f40464,
        0x0076bb0f,
        0xf40136b0,
        0x32f4061b,
-/* 0x0885: i2c_put_byte_done */
-/* 0x0887: i2c_addr */
+/* 0x0941: i2c_put_byte_done */
+/* 0x0943: i2c_addr */
        0xbb00f801,
        0x65b60076,
        0x9450f904,
        0x56bb0465,
        0xfd50bd02,
        0x50fc0475,
-       0x06c321f5,
+       0x077f21f5,
        0xf40464b6,
        0xc3e72911,
        0x34b6012e,
@@ -1495,32 +1550,32 @@ uint32_t nva3_pwr_code[] = {
        0xbb046594,
        0x50bd0256,
        0xfc0475fd,
-       0x2c21f550,
+       0xe821f550,
        0x0464b608,
-/* 0x08cc: i2c_addr_done */
-/* 0x08ce: i2c_acquire_addr */
+/* 0x0988: i2c_addr_done */
+/* 0x098a: i2c_acquire_addr */
        0xcec700f8,
        0x02e4b6f8,
-       0x0bfce0b7,
+       0x0c10e0b7,
        0xf800ee98,
-/* 0x08dd: i2c_acquire */
-       0xce21f500,
-       0x0421f408,
+/* 0x0999: i2c_acquire */
+       0x8a21f500,
+       0x0421f409,
        0xf403d9f0,
        0x00f83f21,
-/* 0x08ec: i2c_release */
-       0x08ce21f5,
+/* 0x09a8: i2c_release */
+       0x098a21f5,
        0xf00421f4,
        0x21f403da,
-/* 0x08fb: i2c_recv */
+/* 0x09b7: i2c_recv */
        0xf400f83f,
        0xc1c70132,
        0x0214b6f8,
        0xf52816b0,
        0xa0013a1f,
-       0x980bd413,
+       0x980be813,
        0x13a00032,
-       0x31980bac,
+       0x31980bc0,
        0x0231f400,
        0xe0f9d0f9,
        0x67f1d0f9,
@@ -1532,7 +1587,7 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b608dd,
+       0x64b60999,
        0xb0d0fc04,
        0x1bf500d6,
        0x57f000b3,
@@ -1542,7 +1597,7 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b60887,
+       0x64b60943,
        0xd011f504,
        0xe0c5c700,
        0xb60076bb,
@@ -1550,7 +1605,7 @@ uint32_t nva3_pwr_code[] = {
        0xbb046594,
        0x50bd0256,
        0xfc0475fd,
-       0x2c21f550,
+       0xe821f550,
        0x0464b608,
        0x00ad11f5,
        0xbb0157f0,
@@ -1559,7 +1614,7 @@ uint32_t nva3_pwr_code[] = {
        0x56bb0465,
        0xfd50bd02,
        0x50fc0475,
-       0x088721f5,
+       0x094321f5,
        0xf50464b6,
        0xbb008a11,
        0x65b60076,
@@ -1567,7 +1622,7 @@ uint32_t nva3_pwr_code[] = {
        0x56bb0465,
        0xfd50bd02,
        0x50fc0475,
-       0x07da21f5,
+       0x089621f5,
        0xf40464b6,
        0x5bcb6a11,
        0x0076bbe0,
@@ -1576,37 +1631,37 @@ uint32_t nva3_pwr_code[] = {
        0xbd0256bb,
        0x0475fd50,
        0x21f550fc,
-       0x64b6071f,
+       0x64b607db,
        0x025bb904,
        0x0ef474bd,
-/* 0x0a01: i2c_recv_not_rd08 */
+/* 0x0abd: i2c_recv_not_rd08 */
        0x01d6b043,
        0xf03d1bf4,
        0x21f50057,
-       0x11f40887,
+       0x11f40943,
        0xe0c5c733,
-       0x082c21f5,
+       0x08e821f5,
        0xf02911f4,
        0x21f50057,
-       0x11f40887,
+       0x11f40943,
        0xe0b5c71f,
-       0x082c21f5,
+       0x08e821f5,
        0xf51511f4,
-       0xbd071f21,
+       0xbd07db21,
        0x08c5c774,
        0xf4091bf4,
        0x0ef40232,
-/* 0x0a41: i2c_recv_not_wr08 */
-/* 0x0a41: i2c_recv_done */
+/* 0x0afd: i2c_recv_not_wr08 */
+/* 0x0afd: i2c_recv_done */
        0xf8cec703,
-       0x08ec21f5,
+       0x09a821f5,
        0xd0fce0fc,
        0xb90a12f4,
        0x21f5027c,
-/* 0x0a56: i2c_recv_exit */
+/* 0x0b12: i2c_recv_exit */
        0x00f80342,
-/* 0x0a58: i2c_init */
-/* 0x0a5a: test_recv */
+/* 0x0b14: i2c_init */
+/* 0x0b16: test_recv */
        0x17f100f8,
        0x14b605d8,
        0x0011cf06,
@@ -1617,12 +1672,12 @@ uint32_t nva3_pwr_code[] = {
        0xf1d900e7,
        0xf5134fe3,
        0xf8026221,
-/* 0x0a81: test_init */
+/* 0x0b3d: test_init */
        0x00e7f100,
        0x6221f508,
-/* 0x0a8b: idle_recv */
+/* 0x0b47: idle_recv */
        0xf800f802,
-/* 0x0a8d: idle */
+/* 0x0b49: idle */
        0x0031f400,
        0x05d417f1,
        0xcf0614b6,
@@ -1630,16 +1685,16 @@ uint32_t nva3_pwr_code[] = {
        0xd407f101,
        0x0604b605,
        0xbd0001d0,
-/* 0x0aa9: idle_loop */
+/* 0x0b65: idle_loop */
        0x5817f004,
-/* 0x0aaf: idle_proc */
-/* 0x0aaf: idle_proc_exec */
+/* 0x0b6b: idle_proc */
+/* 0x0b6b: idle_proc_exec */
        0xf90232f4,
        0x021eb910,
        0x034b21f5,
        0x11f410fc,
        0x0231f409,
-/* 0x0ac3: idle_proc_next */
+/* 0x0b7f: idle_proc_next */
        0xb6ef0ef4,
        0x1fb85810,
        0xe61bf406,
@@ -1656,4 +1711,21 @@ uint32_t nva3_pwr_code[] = {
        0x00000000,
        0x00000000,
        0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
+       0x00000000,
 };