drm/radeon: Remove superfluous variable
[linux-2.6-block.git] / drivers / gpu / drm / radeon / si.c
index bafbe3216952510dc4736c823c08aa4e4de0a8c6..f0b6c2f87c4d70fd752d41918a792a43b6b93cac 100644 (file)
@@ -70,6 +70,794 @@ extern u32 evergreen_get_number_of_dram_channels(struct radeon_device *rdev);
 extern void evergreen_print_gpu_status_regs(struct radeon_device *rdev);
 extern bool evergreen_is_display_hung(struct radeon_device *rdev);
 
+static const u32 tahiti_golden_rlc_registers[] =
+{
+       0xc424, 0xffffffff, 0x00601005,
+       0xc47c, 0xffffffff, 0x10104040,
+       0xc488, 0xffffffff, 0x0100000a,
+       0xc314, 0xffffffff, 0x00000800,
+       0xc30c, 0xffffffff, 0x800000f4,
+       0xf4a8, 0xffffffff, 0x00000000
+};
+
+static const u32 tahiti_golden_registers[] =
+{
+       0x9a10, 0x00010000, 0x00018208,
+       0x9830, 0xffffffff, 0x00000000,
+       0x9834, 0xf00fffff, 0x00000400,
+       0x9838, 0x0002021c, 0x00020200,
+       0xc78, 0x00000080, 0x00000000,
+       0xd030, 0x000300c0, 0x00800040,
+       0xd830, 0x000300c0, 0x00800040,
+       0x5bb0, 0x000000f0, 0x00000070,
+       0x5bc0, 0x00200000, 0x50100000,
+       0x7030, 0x31000311, 0x00000011,
+       0x277c, 0x00000003, 0x000007ff,
+       0x240c, 0x000007ff, 0x00000000,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8b24, 0xffffffff, 0x00ffffff,
+       0x8b10, 0x0000ff0f, 0x00000000,
+       0x28a4c, 0x07ffffff, 0x4e000000,
+       0x28350, 0x3f3f3fff, 0x2a00126a,
+       0x30, 0x000000ff, 0x0040,
+       0x34, 0x00000040, 0x00004040,
+       0x9100, 0x07ffffff, 0x03000000,
+       0x8e88, 0x01ff1f3f, 0x00000000,
+       0x8e84, 0x01ff1f3f, 0x00000000,
+       0x9060, 0x0000007f, 0x00000020,
+       0x9508, 0x00010000, 0x00010000,
+       0xac14, 0x00000200, 0x000002fb,
+       0xac10, 0xffffffff, 0x0000543b,
+       0xac0c, 0xffffffff, 0xa9210876,
+       0x88d0, 0xffffffff, 0x000fff40,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x1410, 0x20000000, 0x20fffed8,
+       0x15c0, 0x000c0fc0, 0x000c0400
+};
+
+static const u32 tahiti_golden_registers2[] =
+{
+       0xc64, 0x00000001, 0x00000001
+};
+
+static const u32 pitcairn_golden_rlc_registers[] =
+{
+       0xc424, 0xffffffff, 0x00601004,
+       0xc47c, 0xffffffff, 0x10102020,
+       0xc488, 0xffffffff, 0x01000020,
+       0xc314, 0xffffffff, 0x00000800,
+       0xc30c, 0xffffffff, 0x800000a4
+};
+
+static const u32 pitcairn_golden_registers[] =
+{
+       0x9a10, 0x00010000, 0x00018208,
+       0x9830, 0xffffffff, 0x00000000,
+       0x9834, 0xf00fffff, 0x00000400,
+       0x9838, 0x0002021c, 0x00020200,
+       0xc78, 0x00000080, 0x00000000,
+       0xd030, 0x000300c0, 0x00800040,
+       0xd830, 0x000300c0, 0x00800040,
+       0x5bb0, 0x000000f0, 0x00000070,
+       0x5bc0, 0x00200000, 0x50100000,
+       0x7030, 0x31000311, 0x00000011,
+       0x2ae4, 0x00073ffe, 0x000022a2,
+       0x240c, 0x000007ff, 0x00000000,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8b24, 0xffffffff, 0x00ffffff,
+       0x8b10, 0x0000ff0f, 0x00000000,
+       0x28a4c, 0x07ffffff, 0x4e000000,
+       0x28350, 0x3f3f3fff, 0x2a00126a,
+       0x30, 0x000000ff, 0x0040,
+       0x34, 0x00000040, 0x00004040,
+       0x9100, 0x07ffffff, 0x03000000,
+       0x9060, 0x0000007f, 0x00000020,
+       0x9508, 0x00010000, 0x00010000,
+       0xac14, 0x000003ff, 0x000000f7,
+       0xac10, 0xffffffff, 0x00000000,
+       0xac0c, 0xffffffff, 0x32761054,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x15c0, 0x000c0fc0, 0x000c0400
+};
+
+static const u32 verde_golden_rlc_registers[] =
+{
+       0xc424, 0xffffffff, 0x033f1005,
+       0xc47c, 0xffffffff, 0x10808020,
+       0xc488, 0xffffffff, 0x00800008,
+       0xc314, 0xffffffff, 0x00001000,
+       0xc30c, 0xffffffff, 0x80010014
+};
+
+static const u32 verde_golden_registers[] =
+{
+       0x9a10, 0x00010000, 0x00018208,
+       0x9830, 0xffffffff, 0x00000000,
+       0x9834, 0xf00fffff, 0x00000400,
+       0x9838, 0x0002021c, 0x00020200,
+       0xc78, 0x00000080, 0x00000000,
+       0xd030, 0x000300c0, 0x00800040,
+       0xd030, 0x000300c0, 0x00800040,
+       0xd830, 0x000300c0, 0x00800040,
+       0xd830, 0x000300c0, 0x00800040,
+       0x5bb0, 0x000000f0, 0x00000070,
+       0x5bc0, 0x00200000, 0x50100000,
+       0x7030, 0x31000311, 0x00000011,
+       0x2ae4, 0x00073ffe, 0x000022a2,
+       0x2ae4, 0x00073ffe, 0x000022a2,
+       0x2ae4, 0x00073ffe, 0x000022a2,
+       0x240c, 0x000007ff, 0x00000000,
+       0x240c, 0x000007ff, 0x00000000,
+       0x240c, 0x000007ff, 0x00000000,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8b24, 0xffffffff, 0x00ffffff,
+       0x8b10, 0x0000ff0f, 0x00000000,
+       0x28a4c, 0x07ffffff, 0x4e000000,
+       0x28350, 0x3f3f3fff, 0x0000124a,
+       0x28350, 0x3f3f3fff, 0x0000124a,
+       0x28350, 0x3f3f3fff, 0x0000124a,
+       0x30, 0x000000ff, 0x0040,
+       0x34, 0x00000040, 0x00004040,
+       0x9100, 0x07ffffff, 0x03000000,
+       0x9100, 0x07ffffff, 0x03000000,
+       0x8e88, 0x01ff1f3f, 0x00000000,
+       0x8e88, 0x01ff1f3f, 0x00000000,
+       0x8e88, 0x01ff1f3f, 0x00000000,
+       0x8e84, 0x01ff1f3f, 0x00000000,
+       0x8e84, 0x01ff1f3f, 0x00000000,
+       0x8e84, 0x01ff1f3f, 0x00000000,
+       0x9060, 0x0000007f, 0x00000020,
+       0x9508, 0x00010000, 0x00010000,
+       0xac14, 0x000003ff, 0x00000003,
+       0xac14, 0x000003ff, 0x00000003,
+       0xac14, 0x000003ff, 0x00000003,
+       0xac10, 0xffffffff, 0x00000000,
+       0xac10, 0xffffffff, 0x00000000,
+       0xac10, 0xffffffff, 0x00000000,
+       0xac0c, 0xffffffff, 0x00001032,
+       0xac0c, 0xffffffff, 0x00001032,
+       0xac0c, 0xffffffff, 0x00001032,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x15c0, 0x000c0fc0, 0x000c0400
+};
+
+static const u32 oland_golden_rlc_registers[] =
+{
+       0xc424, 0xffffffff, 0x00601005,
+       0xc47c, 0xffffffff, 0x10104040,
+       0xc488, 0xffffffff, 0x0100000a,
+       0xc314, 0xffffffff, 0x00000800,
+       0xc30c, 0xffffffff, 0x800000f4
+};
+
+static const u32 oland_golden_registers[] =
+{
+       0x9a10, 0x00010000, 0x00018208,
+       0x9830, 0xffffffff, 0x00000000,
+       0x9834, 0xf00fffff, 0x00000400,
+       0x9838, 0x0002021c, 0x00020200,
+       0xc78, 0x00000080, 0x00000000,
+       0xd030, 0x000300c0, 0x00800040,
+       0xd830, 0x000300c0, 0x00800040,
+       0x5bb0, 0x000000f0, 0x00000070,
+       0x5bc0, 0x00200000, 0x50100000,
+       0x7030, 0x31000311, 0x00000011,
+       0x2ae4, 0x00073ffe, 0x000022a2,
+       0x240c, 0x000007ff, 0x00000000,
+       0x8a14, 0xf000001f, 0x00000007,
+       0x8b24, 0xffffffff, 0x00ffffff,
+       0x8b10, 0x0000ff0f, 0x00000000,
+       0x28a4c, 0x07ffffff, 0x4e000000,
+       0x28350, 0x3f3f3fff, 0x00000082,
+       0x30, 0x000000ff, 0x0040,
+       0x34, 0x00000040, 0x00004040,
+       0x9100, 0x07ffffff, 0x03000000,
+       0x9060, 0x0000007f, 0x00000020,
+       0x9508, 0x00010000, 0x00010000,
+       0xac14, 0x000003ff, 0x000000f3,
+       0xac10, 0xffffffff, 0x00000000,
+       0xac0c, 0xffffffff, 0x00003210,
+       0x88d4, 0x0000001f, 0x00000010,
+       0x15c0, 0x000c0fc0, 0x000c0400
+};
+
+static const u32 tahiti_mgcg_cgcg_init[] =
+{
+       0xc400, 0xffffffff, 0xfffffffc,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9a60, 0xffffffff, 0x00000100,
+       0x92a4, 0xffffffff, 0x00000100,
+       0xc164, 0xffffffff, 0x00000100,
+       0x9774, 0xffffffff, 0x00000100,
+       0x8984, 0xffffffff, 0x06000100,
+       0x8a18, 0xffffffff, 0x00000100,
+       0x92a0, 0xffffffff, 0x00000100,
+       0xc380, 0xffffffff, 0x00000100,
+       0x8b28, 0xffffffff, 0x00000100,
+       0x9144, 0xffffffff, 0x00000100,
+       0x8d88, 0xffffffff, 0x00000100,
+       0x8d8c, 0xffffffff, 0x00000100,
+       0x9030, 0xffffffff, 0x00000100,
+       0x9034, 0xffffffff, 0x00000100,
+       0x9038, 0xffffffff, 0x00000100,
+       0x903c, 0xffffffff, 0x00000100,
+       0xad80, 0xffffffff, 0x00000100,
+       0xac54, 0xffffffff, 0x00000100,
+       0x897c, 0xffffffff, 0x06000100,
+       0x9868, 0xffffffff, 0x00000100,
+       0x9510, 0xffffffff, 0x00000100,
+       0xaf04, 0xffffffff, 0x00000100,
+       0xae04, 0xffffffff, 0x00000100,
+       0x949c, 0xffffffff, 0x00000100,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9160, 0xffffffff, 0x00010000,
+       0x9164, 0xffffffff, 0x00030002,
+       0x9168, 0xffffffff, 0x00040007,
+       0x916c, 0xffffffff, 0x00060005,
+       0x9170, 0xffffffff, 0x00090008,
+       0x9174, 0xffffffff, 0x00020001,
+       0x9178, 0xffffffff, 0x00040003,
+       0x917c, 0xffffffff, 0x00000007,
+       0x9180, 0xffffffff, 0x00060005,
+       0x9184, 0xffffffff, 0x00090008,
+       0x9188, 0xffffffff, 0x00030002,
+       0x918c, 0xffffffff, 0x00050004,
+       0x9190, 0xffffffff, 0x00000008,
+       0x9194, 0xffffffff, 0x00070006,
+       0x9198, 0xffffffff, 0x000a0009,
+       0x919c, 0xffffffff, 0x00040003,
+       0x91a0, 0xffffffff, 0x00060005,
+       0x91a4, 0xffffffff, 0x00000009,
+       0x91a8, 0xffffffff, 0x00080007,
+       0x91ac, 0xffffffff, 0x000b000a,
+       0x91b0, 0xffffffff, 0x00050004,
+       0x91b4, 0xffffffff, 0x00070006,
+       0x91b8, 0xffffffff, 0x0008000b,
+       0x91bc, 0xffffffff, 0x000a0009,
+       0x91c0, 0xffffffff, 0x000d000c,
+       0x91c4, 0xffffffff, 0x00060005,
+       0x91c8, 0xffffffff, 0x00080007,
+       0x91cc, 0xffffffff, 0x0000000b,
+       0x91d0, 0xffffffff, 0x000a0009,
+       0x91d4, 0xffffffff, 0x000d000c,
+       0x91d8, 0xffffffff, 0x00070006,
+       0x91dc, 0xffffffff, 0x00090008,
+       0x91e0, 0xffffffff, 0x0000000c,
+       0x91e4, 0xffffffff, 0x000b000a,
+       0x91e8, 0xffffffff, 0x000e000d,
+       0x91ec, 0xffffffff, 0x00080007,
+       0x91f0, 0xffffffff, 0x000a0009,
+       0x91f4, 0xffffffff, 0x0000000d,
+       0x91f8, 0xffffffff, 0x000c000b,
+       0x91fc, 0xffffffff, 0x000f000e,
+       0x9200, 0xffffffff, 0x00090008,
+       0x9204, 0xffffffff, 0x000b000a,
+       0x9208, 0xffffffff, 0x000c000f,
+       0x920c, 0xffffffff, 0x000e000d,
+       0x9210, 0xffffffff, 0x00110010,
+       0x9214, 0xffffffff, 0x000a0009,
+       0x9218, 0xffffffff, 0x000c000b,
+       0x921c, 0xffffffff, 0x0000000f,
+       0x9220, 0xffffffff, 0x000e000d,
+       0x9224, 0xffffffff, 0x00110010,
+       0x9228, 0xffffffff, 0x000b000a,
+       0x922c, 0xffffffff, 0x000d000c,
+       0x9230, 0xffffffff, 0x00000010,
+       0x9234, 0xffffffff, 0x000f000e,
+       0x9238, 0xffffffff, 0x00120011,
+       0x923c, 0xffffffff, 0x000c000b,
+       0x9240, 0xffffffff, 0x000e000d,
+       0x9244, 0xffffffff, 0x00000011,
+       0x9248, 0xffffffff, 0x0010000f,
+       0x924c, 0xffffffff, 0x00130012,
+       0x9250, 0xffffffff, 0x000d000c,
+       0x9254, 0xffffffff, 0x000f000e,
+       0x9258, 0xffffffff, 0x00100013,
+       0x925c, 0xffffffff, 0x00120011,
+       0x9260, 0xffffffff, 0x00150014,
+       0x9264, 0xffffffff, 0x000e000d,
+       0x9268, 0xffffffff, 0x0010000f,
+       0x926c, 0xffffffff, 0x00000013,
+       0x9270, 0xffffffff, 0x00120011,
+       0x9274, 0xffffffff, 0x00150014,
+       0x9278, 0xffffffff, 0x000f000e,
+       0x927c, 0xffffffff, 0x00110010,
+       0x9280, 0xffffffff, 0x00000014,
+       0x9284, 0xffffffff, 0x00130012,
+       0x9288, 0xffffffff, 0x00160015,
+       0x928c, 0xffffffff, 0x0010000f,
+       0x9290, 0xffffffff, 0x00120011,
+       0x9294, 0xffffffff, 0x00000015,
+       0x9298, 0xffffffff, 0x00140013,
+       0x929c, 0xffffffff, 0x00170016,
+       0x9150, 0xffffffff, 0x96940200,
+       0x8708, 0xffffffff, 0x00900100,
+       0xc478, 0xffffffff, 0x00000080,
+       0xc404, 0xffffffff, 0x0020003f,
+       0x30, 0xffffffff, 0x0000001c,
+       0x34, 0x000f0000, 0x000f0000,
+       0x160c, 0xffffffff, 0x00000100,
+       0x1024, 0xffffffff, 0x00000100,
+       0x102c, 0x00000101, 0x00000000,
+       0x20a8, 0xffffffff, 0x00000104,
+       0x264c, 0x000c0000, 0x000c0000,
+       0x2648, 0x000c0000, 0x000c0000,
+       0x55e4, 0xff000fff, 0x00000100,
+       0x55e8, 0x00000001, 0x00000001,
+       0x2f50, 0x00000001, 0x00000001,
+       0x30cc, 0xc0000fff, 0x00000104,
+       0xc1e4, 0x00000001, 0x00000001,
+       0xd0c0, 0xfffffff0, 0x00000100,
+       0xd8c0, 0xfffffff0, 0x00000100
+};
+
+static const u32 pitcairn_mgcg_cgcg_init[] =
+{
+       0xc400, 0xffffffff, 0xfffffffc,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9a60, 0xffffffff, 0x00000100,
+       0x92a4, 0xffffffff, 0x00000100,
+       0xc164, 0xffffffff, 0x00000100,
+       0x9774, 0xffffffff, 0x00000100,
+       0x8984, 0xffffffff, 0x06000100,
+       0x8a18, 0xffffffff, 0x00000100,
+       0x92a0, 0xffffffff, 0x00000100,
+       0xc380, 0xffffffff, 0x00000100,
+       0x8b28, 0xffffffff, 0x00000100,
+       0x9144, 0xffffffff, 0x00000100,
+       0x8d88, 0xffffffff, 0x00000100,
+       0x8d8c, 0xffffffff, 0x00000100,
+       0x9030, 0xffffffff, 0x00000100,
+       0x9034, 0xffffffff, 0x00000100,
+       0x9038, 0xffffffff, 0x00000100,
+       0x903c, 0xffffffff, 0x00000100,
+       0xad80, 0xffffffff, 0x00000100,
+       0xac54, 0xffffffff, 0x00000100,
+       0x897c, 0xffffffff, 0x06000100,
+       0x9868, 0xffffffff, 0x00000100,
+       0x9510, 0xffffffff, 0x00000100,
+       0xaf04, 0xffffffff, 0x00000100,
+       0xae04, 0xffffffff, 0x00000100,
+       0x949c, 0xffffffff, 0x00000100,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9160, 0xffffffff, 0x00010000,
+       0x9164, 0xffffffff, 0x00030002,
+       0x9168, 0xffffffff, 0x00040007,
+       0x916c, 0xffffffff, 0x00060005,
+       0x9170, 0xffffffff, 0x00090008,
+       0x9174, 0xffffffff, 0x00020001,
+       0x9178, 0xffffffff, 0x00040003,
+       0x917c, 0xffffffff, 0x00000007,
+       0x9180, 0xffffffff, 0x00060005,
+       0x9184, 0xffffffff, 0x00090008,
+       0x9188, 0xffffffff, 0x00030002,
+       0x918c, 0xffffffff, 0x00050004,
+       0x9190, 0xffffffff, 0x00000008,
+       0x9194, 0xffffffff, 0x00070006,
+       0x9198, 0xffffffff, 0x000a0009,
+       0x919c, 0xffffffff, 0x00040003,
+       0x91a0, 0xffffffff, 0x00060005,
+       0x91a4, 0xffffffff, 0x00000009,
+       0x91a8, 0xffffffff, 0x00080007,
+       0x91ac, 0xffffffff, 0x000b000a,
+       0x91b0, 0xffffffff, 0x00050004,
+       0x91b4, 0xffffffff, 0x00070006,
+       0x91b8, 0xffffffff, 0x0008000b,
+       0x91bc, 0xffffffff, 0x000a0009,
+       0x91c0, 0xffffffff, 0x000d000c,
+       0x9200, 0xffffffff, 0x00090008,
+       0x9204, 0xffffffff, 0x000b000a,
+       0x9208, 0xffffffff, 0x000c000f,
+       0x920c, 0xffffffff, 0x000e000d,
+       0x9210, 0xffffffff, 0x00110010,
+       0x9214, 0xffffffff, 0x000a0009,
+       0x9218, 0xffffffff, 0x000c000b,
+       0x921c, 0xffffffff, 0x0000000f,
+       0x9220, 0xffffffff, 0x000e000d,
+       0x9224, 0xffffffff, 0x00110010,
+       0x9228, 0xffffffff, 0x000b000a,
+       0x922c, 0xffffffff, 0x000d000c,
+       0x9230, 0xffffffff, 0x00000010,
+       0x9234, 0xffffffff, 0x000f000e,
+       0x9238, 0xffffffff, 0x00120011,
+       0x923c, 0xffffffff, 0x000c000b,
+       0x9240, 0xffffffff, 0x000e000d,
+       0x9244, 0xffffffff, 0x00000011,
+       0x9248, 0xffffffff, 0x0010000f,
+       0x924c, 0xffffffff, 0x00130012,
+       0x9250, 0xffffffff, 0x000d000c,
+       0x9254, 0xffffffff, 0x000f000e,
+       0x9258, 0xffffffff, 0x00100013,
+       0x925c, 0xffffffff, 0x00120011,
+       0x9260, 0xffffffff, 0x00150014,
+       0x9150, 0xffffffff, 0x96940200,
+       0x8708, 0xffffffff, 0x00900100,
+       0xc478, 0xffffffff, 0x00000080,
+       0xc404, 0xffffffff, 0x0020003f,
+       0x30, 0xffffffff, 0x0000001c,
+       0x34, 0x000f0000, 0x000f0000,
+       0x160c, 0xffffffff, 0x00000100,
+       0x1024, 0xffffffff, 0x00000100,
+       0x102c, 0x00000101, 0x00000000,
+       0x20a8, 0xffffffff, 0x00000104,
+       0x55e4, 0xff000fff, 0x00000100,
+       0x55e8, 0x00000001, 0x00000001,
+       0x2f50, 0x00000001, 0x00000001,
+       0x30cc, 0xc0000fff, 0x00000104,
+       0xc1e4, 0x00000001, 0x00000001,
+       0xd0c0, 0xfffffff0, 0x00000100,
+       0xd8c0, 0xfffffff0, 0x00000100
+};
+
+static const u32 verde_mgcg_cgcg_init[] =
+{
+       0xc400, 0xffffffff, 0xfffffffc,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9a60, 0xffffffff, 0x00000100,
+       0x92a4, 0xffffffff, 0x00000100,
+       0xc164, 0xffffffff, 0x00000100,
+       0x9774, 0xffffffff, 0x00000100,
+       0x8984, 0xffffffff, 0x06000100,
+       0x8a18, 0xffffffff, 0x00000100,
+       0x92a0, 0xffffffff, 0x00000100,
+       0xc380, 0xffffffff, 0x00000100,
+       0x8b28, 0xffffffff, 0x00000100,
+       0x9144, 0xffffffff, 0x00000100,
+       0x8d88, 0xffffffff, 0x00000100,
+       0x8d8c, 0xffffffff, 0x00000100,
+       0x9030, 0xffffffff, 0x00000100,
+       0x9034, 0xffffffff, 0x00000100,
+       0x9038, 0xffffffff, 0x00000100,
+       0x903c, 0xffffffff, 0x00000100,
+       0xad80, 0xffffffff, 0x00000100,
+       0xac54, 0xffffffff, 0x00000100,
+       0x897c, 0xffffffff, 0x06000100,
+       0x9868, 0xffffffff, 0x00000100,
+       0x9510, 0xffffffff, 0x00000100,
+       0xaf04, 0xffffffff, 0x00000100,
+       0xae04, 0xffffffff, 0x00000100,
+       0x949c, 0xffffffff, 0x00000100,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9160, 0xffffffff, 0x00010000,
+       0x9164, 0xffffffff, 0x00030002,
+       0x9168, 0xffffffff, 0x00040007,
+       0x916c, 0xffffffff, 0x00060005,
+       0x9170, 0xffffffff, 0x00090008,
+       0x9174, 0xffffffff, 0x00020001,
+       0x9178, 0xffffffff, 0x00040003,
+       0x917c, 0xffffffff, 0x00000007,
+       0x9180, 0xffffffff, 0x00060005,
+       0x9184, 0xffffffff, 0x00090008,
+       0x9188, 0xffffffff, 0x00030002,
+       0x918c, 0xffffffff, 0x00050004,
+       0x9190, 0xffffffff, 0x00000008,
+       0x9194, 0xffffffff, 0x00070006,
+       0x9198, 0xffffffff, 0x000a0009,
+       0x919c, 0xffffffff, 0x00040003,
+       0x91a0, 0xffffffff, 0x00060005,
+       0x91a4, 0xffffffff, 0x00000009,
+       0x91a8, 0xffffffff, 0x00080007,
+       0x91ac, 0xffffffff, 0x000b000a,
+       0x91b0, 0xffffffff, 0x00050004,
+       0x91b4, 0xffffffff, 0x00070006,
+       0x91b8, 0xffffffff, 0x0008000b,
+       0x91bc, 0xffffffff, 0x000a0009,
+       0x91c0, 0xffffffff, 0x000d000c,
+       0x9200, 0xffffffff, 0x00090008,
+       0x9204, 0xffffffff, 0x000b000a,
+       0x9208, 0xffffffff, 0x000c000f,
+       0x920c, 0xffffffff, 0x000e000d,
+       0x9210, 0xffffffff, 0x00110010,
+       0x9214, 0xffffffff, 0x000a0009,
+       0x9218, 0xffffffff, 0x000c000b,
+       0x921c, 0xffffffff, 0x0000000f,
+       0x9220, 0xffffffff, 0x000e000d,
+       0x9224, 0xffffffff, 0x00110010,
+       0x9228, 0xffffffff, 0x000b000a,
+       0x922c, 0xffffffff, 0x000d000c,
+       0x9230, 0xffffffff, 0x00000010,
+       0x9234, 0xffffffff, 0x000f000e,
+       0x9238, 0xffffffff, 0x00120011,
+       0x923c, 0xffffffff, 0x000c000b,
+       0x9240, 0xffffffff, 0x000e000d,
+       0x9244, 0xffffffff, 0x00000011,
+       0x9248, 0xffffffff, 0x0010000f,
+       0x924c, 0xffffffff, 0x00130012,
+       0x9250, 0xffffffff, 0x000d000c,
+       0x9254, 0xffffffff, 0x000f000e,
+       0x9258, 0xffffffff, 0x00100013,
+       0x925c, 0xffffffff, 0x00120011,
+       0x9260, 0xffffffff, 0x00150014,
+       0x9150, 0xffffffff, 0x96940200,
+       0x8708, 0xffffffff, 0x00900100,
+       0xc478, 0xffffffff, 0x00000080,
+       0xc404, 0xffffffff, 0x0020003f,
+       0x30, 0xffffffff, 0x0000001c,
+       0x34, 0x000f0000, 0x000f0000,
+       0x160c, 0xffffffff, 0x00000100,
+       0x1024, 0xffffffff, 0x00000100,
+       0x102c, 0x00000101, 0x00000000,
+       0x20a8, 0xffffffff, 0x00000104,
+       0x264c, 0x000c0000, 0x000c0000,
+       0x2648, 0x000c0000, 0x000c0000,
+       0x55e4, 0xff000fff, 0x00000100,
+       0x55e8, 0x00000001, 0x00000001,
+       0x2f50, 0x00000001, 0x00000001,
+       0x30cc, 0xc0000fff, 0x00000104,
+       0xc1e4, 0x00000001, 0x00000001,
+       0xd0c0, 0xfffffff0, 0x00000100,
+       0xd8c0, 0xfffffff0, 0x00000100
+};
+
+static const u32 oland_mgcg_cgcg_init[] =
+{
+       0xc400, 0xffffffff, 0xfffffffc,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9a60, 0xffffffff, 0x00000100,
+       0x92a4, 0xffffffff, 0x00000100,
+       0xc164, 0xffffffff, 0x00000100,
+       0x9774, 0xffffffff, 0x00000100,
+       0x8984, 0xffffffff, 0x06000100,
+       0x8a18, 0xffffffff, 0x00000100,
+       0x92a0, 0xffffffff, 0x00000100,
+       0xc380, 0xffffffff, 0x00000100,
+       0x8b28, 0xffffffff, 0x00000100,
+       0x9144, 0xffffffff, 0x00000100,
+       0x8d88, 0xffffffff, 0x00000100,
+       0x8d8c, 0xffffffff, 0x00000100,
+       0x9030, 0xffffffff, 0x00000100,
+       0x9034, 0xffffffff, 0x00000100,
+       0x9038, 0xffffffff, 0x00000100,
+       0x903c, 0xffffffff, 0x00000100,
+       0xad80, 0xffffffff, 0x00000100,
+       0xac54, 0xffffffff, 0x00000100,
+       0x897c, 0xffffffff, 0x06000100,
+       0x9868, 0xffffffff, 0x00000100,
+       0x9510, 0xffffffff, 0x00000100,
+       0xaf04, 0xffffffff, 0x00000100,
+       0xae04, 0xffffffff, 0x00000100,
+       0x949c, 0xffffffff, 0x00000100,
+       0x802c, 0xffffffff, 0xe0000000,
+       0x9160, 0xffffffff, 0x00010000,
+       0x9164, 0xffffffff, 0x00030002,
+       0x9168, 0xffffffff, 0x00040007,
+       0x916c, 0xffffffff, 0x00060005,
+       0x9170, 0xffffffff, 0x00090008,
+       0x9174, 0xffffffff, 0x00020001,
+       0x9178, 0xffffffff, 0x00040003,
+       0x917c, 0xffffffff, 0x00000007,
+       0x9180, 0xffffffff, 0x00060005,
+       0x9184, 0xffffffff, 0x00090008,
+       0x9188, 0xffffffff, 0x00030002,
+       0x918c, 0xffffffff, 0x00050004,
+       0x9190, 0xffffffff, 0x00000008,
+       0x9194, 0xffffffff, 0x00070006,
+       0x9198, 0xffffffff, 0x000a0009,
+       0x919c, 0xffffffff, 0x00040003,
+       0x91a0, 0xffffffff, 0x00060005,
+       0x91a4, 0xffffffff, 0x00000009,
+       0x91a8, 0xffffffff, 0x00080007,
+       0x91ac, 0xffffffff, 0x000b000a,
+       0x91b0, 0xffffffff, 0x00050004,
+       0x91b4, 0xffffffff, 0x00070006,
+       0x91b8, 0xffffffff, 0x0008000b,
+       0x91bc, 0xffffffff, 0x000a0009,
+       0x91c0, 0xffffffff, 0x000d000c,
+       0x91c4, 0xffffffff, 0x00060005,
+       0x91c8, 0xffffffff, 0x00080007,
+       0x91cc, 0xffffffff, 0x0000000b,
+       0x91d0, 0xffffffff, 0x000a0009,
+       0x91d4, 0xffffffff, 0x000d000c,
+       0x9150, 0xffffffff, 0x96940200,
+       0x8708, 0xffffffff, 0x00900100,
+       0xc478, 0xffffffff, 0x00000080,
+       0xc404, 0xffffffff, 0x0020003f,
+       0x30, 0xffffffff, 0x0000001c,
+       0x34, 0x000f0000, 0x000f0000,
+       0x160c, 0xffffffff, 0x00000100,
+       0x1024, 0xffffffff, 0x00000100,
+       0x102c, 0x00000101, 0x00000000,
+       0x20a8, 0xffffffff, 0x00000104,
+       0x264c, 0x000c0000, 0x000c0000,
+       0x2648, 0x000c0000, 0x000c0000,
+       0x55e4, 0xff000fff, 0x00000100,
+       0x55e8, 0x00000001, 0x00000001,
+       0x2f50, 0x00000001, 0x00000001,
+       0x30cc, 0xc0000fff, 0x00000104,
+       0xc1e4, 0x00000001, 0x00000001,
+       0xd0c0, 0xfffffff0, 0x00000100,
+       0xd8c0, 0xfffffff0, 0x00000100
+};
+
+static u32 verde_pg_init[] =
+{
+       0x353c, 0xffffffff, 0x40000,
+       0x3538, 0xffffffff, 0x200010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x7007,
+       0x3538, 0xffffffff, 0x300010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x400000,
+       0x3538, 0xffffffff, 0x100010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x120200,
+       0x3538, 0xffffffff, 0x500010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x1e1e16,
+       0x3538, 0xffffffff, 0x600010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x171f1e,
+       0x3538, 0xffffffff, 0x700010ff,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x353c, 0xffffffff, 0x0,
+       0x3538, 0xffffffff, 0x9ff,
+       0x3500, 0xffffffff, 0x0,
+       0x3504, 0xffffffff, 0x10000800,
+       0x3504, 0xffffffff, 0xf,
+       0x3504, 0xffffffff, 0xf,
+       0x3500, 0xffffffff, 0x4,
+       0x3504, 0xffffffff, 0x1000051e,
+       0x3504, 0xffffffff, 0xffff,
+       0x3504, 0xffffffff, 0xffff,
+       0x3500, 0xffffffff, 0x8,
+       0x3504, 0xffffffff, 0x80500,
+       0x3500, 0xffffffff, 0x12,
+       0x3504, 0xffffffff, 0x9050c,
+       0x3500, 0xffffffff, 0x1d,
+       0x3504, 0xffffffff, 0xb052c,
+       0x3500, 0xffffffff, 0x2a,
+       0x3504, 0xffffffff, 0x1053e,
+       0x3500, 0xffffffff, 0x2d,
+       0x3504, 0xffffffff, 0x10546,
+       0x3500, 0xffffffff, 0x30,
+       0x3504, 0xffffffff, 0xa054e,
+       0x3500, 0xffffffff, 0x3c,
+       0x3504, 0xffffffff, 0x1055f,
+       0x3500, 0xffffffff, 0x3f,
+       0x3504, 0xffffffff, 0x10567,
+       0x3500, 0xffffffff, 0x42,
+       0x3504, 0xffffffff, 0x1056f,
+       0x3500, 0xffffffff, 0x45,
+       0x3504, 0xffffffff, 0x10572,
+       0x3500, 0xffffffff, 0x48,
+       0x3504, 0xffffffff, 0x20575,
+       0x3500, 0xffffffff, 0x4c,
+       0x3504, 0xffffffff, 0x190801,
+       0x3500, 0xffffffff, 0x67,
+       0x3504, 0xffffffff, 0x1082a,
+       0x3500, 0xffffffff, 0x6a,
+       0x3504, 0xffffffff, 0x1b082d,
+       0x3500, 0xffffffff, 0x87,
+       0x3504, 0xffffffff, 0x310851,
+       0x3500, 0xffffffff, 0xba,
+       0x3504, 0xffffffff, 0x891,
+       0x3500, 0xffffffff, 0xbc,
+       0x3504, 0xffffffff, 0x893,
+       0x3500, 0xffffffff, 0xbe,
+       0x3504, 0xffffffff, 0x20895,
+       0x3500, 0xffffffff, 0xc2,
+       0x3504, 0xffffffff, 0x20899,
+       0x3500, 0xffffffff, 0xc6,
+       0x3504, 0xffffffff, 0x2089d,
+       0x3500, 0xffffffff, 0xca,
+       0x3504, 0xffffffff, 0x8a1,
+       0x3500, 0xffffffff, 0xcc,
+       0x3504, 0xffffffff, 0x8a3,
+       0x3500, 0xffffffff, 0xce,
+       0x3504, 0xffffffff, 0x308a5,
+       0x3500, 0xffffffff, 0xd3,
+       0x3504, 0xffffffff, 0x6d08cd,
+       0x3500, 0xffffffff, 0x142,
+       0x3504, 0xffffffff, 0x2000095a,
+       0x3504, 0xffffffff, 0x1,
+       0x3500, 0xffffffff, 0x144,
+       0x3504, 0xffffffff, 0x301f095b,
+       0x3500, 0xffffffff, 0x165,
+       0x3504, 0xffffffff, 0xc094d,
+       0x3500, 0xffffffff, 0x173,
+       0x3504, 0xffffffff, 0xf096d,
+       0x3500, 0xffffffff, 0x184,
+       0x3504, 0xffffffff, 0x15097f,
+       0x3500, 0xffffffff, 0x19b,
+       0x3504, 0xffffffff, 0xc0998,
+       0x3500, 0xffffffff, 0x1a9,
+       0x3504, 0xffffffff, 0x409a7,
+       0x3500, 0xffffffff, 0x1af,
+       0x3504, 0xffffffff, 0xcdc,
+       0x3500, 0xffffffff, 0x1b1,
+       0x3504, 0xffffffff, 0x800,
+       0x3508, 0xffffffff, 0x6c9b2000,
+       0x3510, 0xfc00, 0x2000,
+       0x3544, 0xffffffff, 0xfc0,
+       0x28d4, 0x00000100, 0x100
+};
+
+static void si_init_golden_registers(struct radeon_device *rdev)
+{
+       switch (rdev->family) {
+       case CHIP_TAHITI:
+               radeon_program_register_sequence(rdev,
+                                                tahiti_golden_registers,
+                                                (const u32)ARRAY_SIZE(tahiti_golden_registers));
+               radeon_program_register_sequence(rdev,
+                                                tahiti_golden_rlc_registers,
+                                                (const u32)ARRAY_SIZE(tahiti_golden_rlc_registers));
+               radeon_program_register_sequence(rdev,
+                                                tahiti_mgcg_cgcg_init,
+                                                (const u32)ARRAY_SIZE(tahiti_mgcg_cgcg_init));
+               radeon_program_register_sequence(rdev,
+                                                tahiti_golden_registers2,
+                                                (const u32)ARRAY_SIZE(tahiti_golden_registers2));
+               break;
+       case CHIP_PITCAIRN:
+               radeon_program_register_sequence(rdev,
+                                                pitcairn_golden_registers,
+                                                (const u32)ARRAY_SIZE(pitcairn_golden_registers));
+               radeon_program_register_sequence(rdev,
+                                                pitcairn_golden_rlc_registers,
+                                                (const u32)ARRAY_SIZE(pitcairn_golden_rlc_registers));
+               radeon_program_register_sequence(rdev,
+                                                pitcairn_mgcg_cgcg_init,
+                                                (const u32)ARRAY_SIZE(pitcairn_mgcg_cgcg_init));
+               break;
+       case CHIP_VERDE:
+               radeon_program_register_sequence(rdev,
+                                                verde_golden_registers,
+                                                (const u32)ARRAY_SIZE(verde_golden_registers));
+               radeon_program_register_sequence(rdev,
+                                                verde_golden_rlc_registers,
+                                                (const u32)ARRAY_SIZE(verde_golden_rlc_registers));
+               radeon_program_register_sequence(rdev,
+                                                verde_mgcg_cgcg_init,
+                                                (const u32)ARRAY_SIZE(verde_mgcg_cgcg_init));
+               radeon_program_register_sequence(rdev,
+                                                verde_pg_init,
+                                                (const u32)ARRAY_SIZE(verde_pg_init));
+               break;
+       case CHIP_OLAND:
+               radeon_program_register_sequence(rdev,
+                                                oland_golden_registers,
+                                                (const u32)ARRAY_SIZE(oland_golden_registers));
+               radeon_program_register_sequence(rdev,
+                                                oland_golden_rlc_registers,
+                                                (const u32)ARRAY_SIZE(oland_golden_rlc_registers));
+               radeon_program_register_sequence(rdev,
+                                                oland_mgcg_cgcg_init,
+                                                (const u32)ARRAY_SIZE(oland_mgcg_cgcg_init));
+               break;
+       default:
+               break;
+       }
+}
+
 #define PCIE_BUS_CLK                10000
 #define TCLK                        (PCIE_BUS_CLK / 10)
 
@@ -1211,6 +1999,7 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev)
                                gb_tile_moden = 0;
                                break;
                        }
+                       rdev->config.si.tile_mode_array[reg_offset] = gb_tile_moden;
                        WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden);
                }
        } else if ((rdev->family == CHIP_VERDE) ||
@@ -1451,6 +2240,7 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev)
                                gb_tile_moden = 0;
                                break;
                        }
+                       rdev->config.si.tile_mode_array[reg_offset] = gb_tile_moden;
                        WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden);
                }
        } else
@@ -1463,7 +2253,7 @@ static void si_select_se_sh(struct radeon_device *rdev,
        u32 data = INSTANCE_BROADCAST_WRITES;
 
        if ((se_num == 0xffffffff) && (sh_num == 0xffffffff))
-               data = SH_BROADCAST_WRITES | SE_BROADCAST_WRITES;
+               data |= SH_BROADCAST_WRITES | SE_BROADCAST_WRITES;
        else if (se_num == 0xffffffff)
                data |= SE_BROADCAST_WRITES | SH_INDEX(sh_num);
        else if (sh_num == 0xffffffff)
@@ -1765,9 +2555,13 @@ static void si_gpu_init(struct radeon_device *rdev)
 
        WREG32(GB_ADDR_CONFIG, gb_addr_config);
        WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
+       WREG32(DMIF_ADDR_CALC, gb_addr_config);
        WREG32(HDP_ADDR_CONFIG, gb_addr_config);
        WREG32(DMA_TILING_CONFIG + DMA0_REGISTER_OFFSET, gb_addr_config);
        WREG32(DMA_TILING_CONFIG + DMA1_REGISTER_OFFSET, gb_addr_config);
+       WREG32(UVD_UDEC_ADDR_CONFIG, gb_addr_config);
+       WREG32(UVD_UDEC_DB_ADDR_CONFIG, gb_addr_config);
+       WREG32(UVD_UDEC_DBW_ADDR_CONFIG, gb_addr_config);
 
        si_tiling_mode_table_init(rdev);
 
@@ -2538,46 +3332,6 @@ static void si_mc_program(struct radeon_device *rdev)
        rv515_vga_render_disable(rdev);
 }
 
-/* SI MC address space is 40 bits */
-static void si_vram_location(struct radeon_device *rdev,
-                            struct radeon_mc *mc, u64 base)
-{
-       mc->vram_start = base;
-       if (mc->mc_vram_size > (0xFFFFFFFFFFULL - base + 1)) {
-               dev_warn(rdev->dev, "limiting VRAM to PCI aperture size\n");
-               mc->real_vram_size = mc->aper_size;
-               mc->mc_vram_size = mc->aper_size;
-       }
-       mc->vram_end = mc->vram_start + mc->mc_vram_size - 1;
-       dev_info(rdev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n",
-                       mc->mc_vram_size >> 20, mc->vram_start,
-                       mc->vram_end, mc->real_vram_size >> 20);
-}
-
-static void si_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)
-{
-       u64 size_af, size_bf;
-
-       size_af = ((0xFFFFFFFFFFULL - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align;
-       size_bf = mc->vram_start & ~mc->gtt_base_align;
-       if (size_bf > size_af) {
-               if (mc->gtt_size > size_bf) {
-                       dev_warn(rdev->dev, "limiting GTT\n");
-                       mc->gtt_size = size_bf;
-               }
-               mc->gtt_start = (mc->vram_start & ~mc->gtt_base_align) - mc->gtt_size;
-       } else {
-               if (mc->gtt_size > size_af) {
-                       dev_warn(rdev->dev, "limiting GTT\n");
-                       mc->gtt_size = size_af;
-               }
-               mc->gtt_start = (mc->vram_end + 1 + mc->gtt_base_align) & ~mc->gtt_base_align;
-       }
-       mc->gtt_end = mc->gtt_start + mc->gtt_size - 1;
-       dev_info(rdev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n",
-                       mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end);
-}
-
 static void si_vram_gtt_location(struct radeon_device *rdev,
                                 struct radeon_mc *mc)
 {
@@ -2587,9 +3341,9 @@ static void si_vram_gtt_location(struct radeon_device *rdev,
                mc->real_vram_size = 0xFFC0000000ULL;
                mc->mc_vram_size = 0xFFC0000000ULL;
        }
-       si_vram_location(rdev, &rdev->mc, 0);
+       radeon_vram_location(rdev, &rdev->mc, 0);
        rdev->mc.gtt_base_align = 0;
-       si_gtt_location(rdev, mc);
+       radeon_gtt_location(rdev, mc);
 }
 
 static int si_mc_init(struct radeon_device *rdev)
@@ -4322,14 +5076,6 @@ static int si_startup(struct radeon_device *rdev)
                return r;
        si_gpu_init(rdev);
 
-#if 0
-       r = evergreen_blit_init(rdev);
-       if (r) {
-               r600_blit_fini(rdev);
-               rdev->asic->copy = NULL;
-               dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
-       }
-#endif
        /* allocate rlc buffers */
        r = si_rlc_init(rdev);
        if (r) {
@@ -4372,6 +5118,16 @@ static int si_startup(struct radeon_device *rdev)
                return r;
        }
 
+       r = rv770_uvd_resume(rdev);
+       if (!r) {
+               r = radeon_fence_driver_start_ring(rdev,
+                                                  R600_RING_TYPE_UVD_INDEX);
+               if (r)
+                       dev_err(rdev->dev, "UVD fences init error (%d).\n", r);
+       }
+       if (r)
+               rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_size = 0;
+
        /* Enable IRQ */
        r = si_irq_init(rdev);
        if (r) {
@@ -4429,6 +5185,18 @@ static int si_startup(struct radeon_device *rdev)
        if (r)
                return r;
 
+       ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
+       if (ring->ring_size) {
+               r = radeon_ring_init(rdev, ring, ring->ring_size,
+                                    R600_WB_UVD_RPTR_OFFSET,
+                                    UVD_RBC_RB_RPTR, UVD_RBC_RB_WPTR,
+                                    0, 0xfffff, RADEON_CP_PACKET2);
+               if (!r)
+                       r = r600_uvd_init(rdev);
+               if (r)
+                       DRM_ERROR("radeon: failed initializing UVD (%d).\n", r);
+       }
+
        r = radeon_ib_pool_init(rdev);
        if (r) {
                dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
@@ -4455,6 +5223,9 @@ int si_resume(struct radeon_device *rdev)
        /* post card */
        atom_asic_init(rdev->mode_info.atom_context);
 
+       /* init golden registers */
+       si_init_golden_registers(rdev);
+
        rdev->accel_working = true;
        r = si_startup(rdev);
        if (r) {
@@ -4472,6 +5243,8 @@ int si_suspend(struct radeon_device *rdev)
        radeon_vm_manager_fini(rdev);
        si_cp_enable(rdev, false);
        cayman_dma_stop(rdev);
+       r600_uvd_rbc_stop(rdev);
+       radeon_uvd_suspend(rdev);
        si_irq_suspend(rdev);
        radeon_wb_disable(rdev);
        si_pcie_gart_disable(rdev);
@@ -4512,6 +5285,8 @@ int si_init(struct radeon_device *rdev)
                DRM_INFO("GPU not posted. posting now...\n");
                atom_asic_init(rdev->mode_info.atom_context);
        }
+       /* init golden registers */
+       si_init_golden_registers(rdev);
        /* Initialize scratch registers */
        si_scratch_init(rdev);
        /* Initialize surface registers */
@@ -4557,6 +5332,13 @@ int si_init(struct radeon_device *rdev)
        ring->ring_obj = NULL;
        r600_ring_init(rdev, ring, 64 * 1024);
 
+       r = radeon_uvd_init(rdev);
+       if (!r) {
+               ring = &rdev->ring[R600_RING_TYPE_UVD_INDEX];
+               ring->ring_obj = NULL;
+               r600_ring_init(rdev, ring, 4096);
+       }
+
        rdev->ih.ring_obj = NULL;
        r600_ih_ring_init(rdev, 64 * 1024);
 
@@ -4594,9 +5376,6 @@ int si_init(struct radeon_device *rdev)
 
 void si_fini(struct radeon_device *rdev)
 {
-#if 0
-       r600_blit_fini(rdev);
-#endif
        si_cp_fini(rdev);
        cayman_dma_fini(rdev);
        si_irq_fini(rdev);
@@ -4605,6 +5384,7 @@ void si_fini(struct radeon_device *rdev)
        radeon_vm_manager_fini(rdev);
        radeon_ib_pool_fini(rdev);
        radeon_irq_kms_fini(rdev);
+       radeon_uvd_fini(rdev);
        si_pcie_gart_fini(rdev);
        r600_vram_scratch_fini(rdev);
        radeon_gem_fini(rdev);
@@ -4634,3 +5414,94 @@ uint64_t si_get_gpu_clock_counter(struct radeon_device *rdev)
        mutex_unlock(&rdev->gpu_clock_mutex);
        return clock;
 }
+
+int si_set_uvd_clocks(struct radeon_device *rdev, u32 vclk, u32 dclk)
+{
+       unsigned fb_div = 0, vclk_div = 0, dclk_div = 0;
+       int r;
+
+       /* bypass vclk and dclk with bclk */
+       WREG32_P(CG_UPLL_FUNC_CNTL_2,
+               VCLK_SRC_SEL(1) | DCLK_SRC_SEL(1),
+               ~(VCLK_SRC_SEL_MASK | DCLK_SRC_SEL_MASK));
+
+       /* put PLL in bypass mode */
+       WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_BYPASS_EN_MASK, ~UPLL_BYPASS_EN_MASK);
+
+       if (!vclk || !dclk) {
+               /* keep the Bypass mode, put PLL to sleep */
+               WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_SLEEP_MASK, ~UPLL_SLEEP_MASK);
+               return 0;
+       }
+
+       r = radeon_uvd_calc_upll_dividers(rdev, vclk, dclk, 125000, 250000,
+                                         16384, 0x03FFFFFF, 0, 128, 5,
+                                         &fb_div, &vclk_div, &dclk_div);
+       if (r)
+               return r;
+
+       /* set RESET_ANTI_MUX to 0 */
+       WREG32_P(CG_UPLL_FUNC_CNTL_5, 0, ~RESET_ANTI_MUX_MASK);
+
+       /* set VCO_MODE to 1 */
+       WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_VCO_MODE_MASK, ~UPLL_VCO_MODE_MASK);
+
+       /* toggle UPLL_SLEEP to 1 then back to 0 */
+       WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_SLEEP_MASK, ~UPLL_SLEEP_MASK);
+       WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_SLEEP_MASK);
+
+       /* deassert UPLL_RESET */
+       WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_RESET_MASK);
+
+       mdelay(1);
+
+       r = radeon_uvd_send_upll_ctlreq(rdev, CG_UPLL_FUNC_CNTL);
+       if (r)
+               return r;
+
+       /* assert UPLL_RESET again */
+       WREG32_P(CG_UPLL_FUNC_CNTL, UPLL_RESET_MASK, ~UPLL_RESET_MASK);
+
+       /* disable spread spectrum. */
+       WREG32_P(CG_UPLL_SPREAD_SPECTRUM, 0, ~SSEN_MASK);
+
+       /* set feedback divider */
+       WREG32_P(CG_UPLL_FUNC_CNTL_3, UPLL_FB_DIV(fb_div), ~UPLL_FB_DIV_MASK);
+
+       /* set ref divider to 0 */
+       WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_REF_DIV_MASK);
+
+       if (fb_div < 307200)
+               WREG32_P(CG_UPLL_FUNC_CNTL_4, 0, ~UPLL_SPARE_ISPARE9);
+       else
+               WREG32_P(CG_UPLL_FUNC_CNTL_4, UPLL_SPARE_ISPARE9, ~UPLL_SPARE_ISPARE9);
+
+       /* set PDIV_A and PDIV_B */
+       WREG32_P(CG_UPLL_FUNC_CNTL_2,
+               UPLL_PDIV_A(vclk_div) | UPLL_PDIV_B(dclk_div),
+               ~(UPLL_PDIV_A_MASK | UPLL_PDIV_B_MASK));
+
+       /* give the PLL some time to settle */
+       mdelay(15);
+
+       /* deassert PLL_RESET */
+       WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_RESET_MASK);
+
+       mdelay(15);
+
+       /* switch from bypass mode to normal mode */
+       WREG32_P(CG_UPLL_FUNC_CNTL, 0, ~UPLL_BYPASS_EN_MASK);
+
+       r = radeon_uvd_send_upll_ctlreq(rdev, CG_UPLL_FUNC_CNTL);
+       if (r)
+               return r;
+
+       /* switch VCLK and DCLK selection */
+       WREG32_P(CG_UPLL_FUNC_CNTL_2,
+               VCLK_SRC_SEL(2) | DCLK_SRC_SEL(2),
+               ~(VCLK_SRC_SEL_MASK | DCLK_SRC_SEL_MASK));
+
+       mdelay(100);
+
+       return 0;
+}