Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next

This time around we have a mix of new hw enablement (mdp5 v1.3 /
apq8084), plus devicetree and various upstream changes (mostly
adapting to CCF vs downstream clk driver differences) for mdp4 /
apq8064.  With these drm/msm patches plus a few other small patchsets
(from linaro qcom integration branch.. mostly stuff queued up for
3.17) we have the inforce ifc6410 board working, with gpu.  Much nicer
to work with than ancient vendor android branch :-)

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/hdmi: fix HDMI_MUX_EN gpio request typo
  drm/msm/hdmi: enable lpm-mux if it is present
  drm/msm/mdp5: add support for MDP5 v1.3
  drm/msm: fix potential deadlock in gpu init
  drm/msm: use upstream iommu
  drm/msm: no mmu is only error if not using vram carveout
  drm/msm: fix BUG_ON() in error cleanup path
  drm/msm/mdp4: add mdp axi clk
  drm/msm: hdmi phy 8960 phy pll
  drm/msm: update generated headers
  drm/msm: DT support for 8960/8064 (v3)
  drm/msm: Implement msm drm fb_mmap callback function
  drm/msm: activate iommu support
  drm/msm: fix double struct_mutex acquire

33 files changed, 1837 insertions, 392 deletions

diff --git a/Documentation/devicetree/bindings/drm/msm/gpu.txt b/Documentation/devicetree/bindings/drm/msm/gpu.txt
new file mode 100644
index 000000000000..67d0a58dbb77
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/msm/gpu.txt
@@ -0,0 +1,52 @@
+Qualcomm adreno/snapdragon GPU
+
+Required properties:
+- compatible: "qcom,adreno-3xx"
+- reg: Physical base address and length of the controller's registers.
+- interrupts: The interrupt signal from the gpu.
+- clocks: device clocks
+  See ../clocks/clock-bindings.txt for details.
+- clock-names: the following clocks are required:
+  * "core_clk"
+  * "iface_clk"
+  * "mem_iface_clk"
+- qcom,chipid: gpu chip-id.  Note this may become optional for future
+  devices if we can reliably read the chipid from hw
+- qcom,gpu-pwrlevels: list of operating points
+  - compatible: "qcom,gpu-pwrlevels"
+  - for each qcom,gpu-pwrlevel:
+    - qcom,gpu-freq: requested gpu clock speed
+    - NOTE: downstream android driver defines additional parameters to
+      configure memory bandwidth scaling per OPP.
+
+Example:
+
+/ {
+        ...
+
+        gpu: qcom,kgsl-3d0@4300000 {
+                compatible = "qcom,adreno-3xx";
+                reg = <0x04300000 0x20000>;
+                reg-names = "kgsl_3d0_reg_memory";
+                interrupts = <GIC_SPI 80 0>;
+                interrupt-names = "kgsl_3d0_irq";
+                clock-names =
+                    "core_clk",
+                    "iface_clk",
+                    "mem_iface_clk";
+                clocks =
+                    <&mmcc GFX3D_CLK>,
+                    <&mmcc GFX3D_AHB_CLK>,
+                    <&mmcc MMSS_IMEM_AHB_CLK>;
+                qcom,chipid = <0x03020100>;
+                qcom,gpu-pwrlevels {
+                        compatible = "qcom,gpu-pwrlevels";
+                        qcom,gpu-pwrlevel@0 {
+                                qcom,gpu-freq = <450000000>;
+                        };
+                        qcom,gpu-pwrlevel@1 {
+                                qcom,gpu-freq = <27000000>;
+                        };
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
new file mode 100644
index 000000000000..aca917fe2ba7
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/msm/hdmi.txt
@@ -0,0 +1,46 @@
+Qualcomm adreno/snapdragon hdmi output
+
+Required properties:
+- compatible: one of the following
+   * "qcom,hdmi-tx-8660"
+   * "qcom,hdmi-tx-8960"
+- reg: Physical base address and length of the controller's registers
+- reg-names: "core_physical"
+- interrupts: The interrupt signal from the hdmi block.
+- clocks: device clocks
+  See ../clocks/clock-bindings.txt for details.
+- qcom,hdmi-tx-ddc-clk-gpio: ddc clk pin
+- qcom,hdmi-tx-ddc-data-gpio: ddc data pin
+- qcom,hdmi-tx-hpd-gpio: hpd pin
+- core-vdda-supply: phandle to supply regulator
+- hdmi-mux-supply: phandle to mux regulator
+
+Optional properties:
+- qcom,hdmi-tx-mux-en-gpio: hdmi mux enable pin
+- qcom,hdmi-tx-mux-sel-gpio: hdmi mux select pin
+
+Example:
+
+/ {
+        ...
+
+        hdmi: qcom,hdmi-tx-8960@4a00000 {
+                compatible = "qcom,hdmi-tx-8960";
+                reg-names = "core_physical";
+                reg = <0x04a00000 0x1000>;
+                interrupts = <GIC_SPI 79 0>;
+                clock-names =
+                    "core_clk",
+                    "master_iface_clk",
+                    "slave_iface_clk";
+                clocks =
+                    <&mmcc HDMI_APP_CLK>,
+                    <&mmcc HDMI_M_AHB_CLK>,
+                    <&mmcc HDMI_S_AHB_CLK>;
+                qcom,hdmi-tx-ddc-clk = <&msmgpio 70 GPIO_ACTIVE_HIGH>;
+                qcom,hdmi-tx-ddc-data = <&msmgpio 71 GPIO_ACTIVE_HIGH>;
+                qcom,hdmi-tx-hpd = <&msmgpio 72 GPIO_ACTIVE_HIGH>;
+                core-vdda-supply = <&pm8921_hdmi_mvs>;
+                hdmi-mux-supply = <&ext_3p3v>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/drm/msm/mdp.txt b/Documentation/devicetree/bindings/drm/msm/mdp.txt
new file mode 100644
index 000000000000..1a0598e5279d
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/msm/mdp.txt
@@ -0,0 +1,48 @@
+Qualcomm adreno/snapdragon display controller
+
+Required properties:
+- compatible:
+  * "qcom,mdp" - mdp4
+- reg: Physical base address and length of the controller's registers.
+- interrupts: The interrupt signal from the display controller.
+- connectors: array of phandles for output device(s)
+- clocks: device clocks
+  See ../clocks/clock-bindings.txt for details.
+- clock-names: the following clocks are required:
+  * "core_clk"
+  * "iface_clk"
+  * "lut_clk"
+  * "src_clk"
+  * "hdmi_clk"
+  * "mpd_clk"
+
+Optional properties:
+- gpus: phandle for gpu device
+
+Example:
+
+/ {
+        ...
+
+        mdp: qcom,mdp@5100000 {
+                compatible = "qcom,mdp";
+                reg = <0x05100000 0xf0000>;
+                interrupts = <GIC_SPI 75 0>;
+                connectors = <&hdmi>;
+                gpus = <&gpu>;
+                clock-names =
+                    "core_clk",
+                    "iface_clk",
+                    "lut_clk",
+                    "src_clk",
+                    "hdmi_clk",
+                    "mdp_clk";
+                clocks =
+                    <&mmcc MDP_SRC>,
+                    <&mmcc MDP_AHB_CLK>,
+                    <&mmcc MDP_LUT_CLK>,
+                    <&mmcc TV_SRC>,
+                    <&mmcc HDMI_TV_CLK>,
+                    <&mmcc MDP_TV_CLK>;
+        };
+};
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index f12388967856..c99c50de3226 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -2,7 +2,6 @@
 config DRM_MSM
         tristate "MSM DRM"
         depends on DRM
-        depends on MSM_IOMMU
         depends on ARCH_QCOM || (ARM && COMPILE_TEST)
         select DRM_KMS_HELPER
         select SHMEM
diff --git a/drivers/gpu/drm/msm/adreno/a2xx.xml.h b/drivers/gpu/drm/msm/adreno/a2xx.xml.h
index 85d615e7d62f..a8a144b38eaa 100644
--- a/drivers/gpu/drm/msm/adreno/a2xx.xml.h
+++ b/drivers/gpu/drm/msm/adreno/a2xx.xml.h
@@ -10,13 +10,13 @@ git clone https://github.com/freedreno/envytools.git
 The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   9859 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14477 bytes, from 2014-05-16 11:51:57)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  58020 bytes, from 2014-06-25 12:57:16)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  26602 bytes, from 2014-06-25 12:57:16)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -203,6 +203,15 @@ enum a2xx_rb_copy_sample_select {
         SAMPLE_0123 = 6,
 };
 
+enum a2xx_rb_blend_opcode {
+        BLEND_DST_PLUS_SRC = 0,
+        BLEND_SRC_MINUS_DST = 1,
+        BLEND_MIN_DST_SRC = 2,
+        BLEND_MAX_DST_SRC = 3,
+        BLEND_DST_MINUS_SRC = 4,
+        BLEND_DST_PLUS_SRC_BIAS = 5,
+};
+
 enum adreno_mmu_clnt_beh {
         BEH_NEVR = 0,
         BEH_TRAN_RNG = 1,
@@ -890,6 +899,39 @@ static inline uint32_t A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS(uint32_t val)
 #define REG_A2XX_VGT_EVENT_INITIATOR                            0x000021f9
 
 #define REG_A2XX_VGT_DRAW_INITIATOR                             0x000021fc
+#define A2XX_VGT_DRAW_INITIATOR_PRIM_TYPE__MASK                 0x0000003f
+#define A2XX_VGT_DRAW_INITIATOR_PRIM_TYPE__SHIFT                0
+static inline uint32_t A2XX_VGT_DRAW_INITIATOR_PRIM_TYPE(enum pc_di_primtype val)
+{
+        return ((val) << A2XX_VGT_DRAW_INITIATOR_PRIM_TYPE__SHIFT) & A2XX_VGT_DRAW_INITIATOR_PRIM_TYPE__MASK;
+}
+#define A2XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__MASK             0x000000c0
+#define A2XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__SHIFT            6
+static inline uint32_t A2XX_VGT_DRAW_INITIATOR_SOURCE_SELECT(enum pc_di_src_sel val)
+{
+        return ((val) << A2XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__SHIFT) & A2XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__MASK;
+}
+#define A2XX_VGT_DRAW_INITIATOR_VIS_CULL__MASK                  0x00000600
+#define A2XX_VGT_DRAW_INITIATOR_VIS_CULL__SHIFT                 9
+static inline uint32_t A2XX_VGT_DRAW_INITIATOR_VIS_CULL(enum pc_di_vis_cull_mode val)
+{
+        return ((val) << A2XX_VGT_DRAW_INITIATOR_VIS_CULL__SHIFT) & A2XX_VGT_DRAW_INITIATOR_VIS_CULL__MASK;
+}
+#define A2XX_VGT_DRAW_INITIATOR_INDEX_SIZE__MASK                0x00000800
+#define A2XX_VGT_DRAW_INITIATOR_INDEX_SIZE__SHIFT               11
+static inline uint32_t A2XX_VGT_DRAW_INITIATOR_INDEX_SIZE(enum pc_di_index_size val)
+{
+        return ((val) << A2XX_VGT_DRAW_INITIATOR_INDEX_SIZE__SHIFT) & A2XX_VGT_DRAW_INITIATOR_INDEX_SIZE__MASK;
+}
+#define A2XX_VGT_DRAW_INITIATOR_NOT_EOP                         0x00001000
+#define A2XX_VGT_DRAW_INITIATOR_SMALL_INDEX                     0x00002000
+#define A2XX_VGT_DRAW_INITIATOR_PRE_DRAW_INITIATOR_ENABLE       0x00004000
+#define A2XX_VGT_DRAW_INITIATOR_NUM_INDICES__MASK               0xffff0000
+#define A2XX_VGT_DRAW_INITIATOR_NUM_INDICES__SHIFT              16
+static inline uint32_t A2XX_VGT_DRAW_INITIATOR_NUM_INDICES(uint32_t val)
+{
+        return ((val) << A2XX_VGT_DRAW_INITIATOR_NUM_INDICES__SHIFT) & A2XX_VGT_DRAW_INITIATOR_NUM_INDICES__MASK;
+}
 
 #define REG_A2XX_VGT_IMMED_DATA                                 0x000021fd
 
@@ -963,7 +1005,7 @@ static inline uint32_t A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND(enum adreno_rb_blend
 }
 #define A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__MASK              0x000000e0
 #define A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__SHIFT             5
-static inline uint32_t A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN(enum adreno_rb_blend_opcode val)
+static inline uint32_t A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN(enum a2xx_rb_blend_opcode val)
 {
         return ((val) << A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__SHIFT) & A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__MASK;
 }
@@ -981,7 +1023,7 @@ static inline uint32_t A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND(enum adreno_rb_blend
 }
 #define A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__MASK              0x00e00000
 #define A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__SHIFT             21
-static inline uint32_t A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN(enum adreno_rb_blend_opcode val)
+static inline uint32_t A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN(enum a2xx_rb_blend_opcode val)
 {
         return ((val) << A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__SHIFT) & A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__MASK;
 }
diff --git a/drivers/gpu/drm/msm/adreno/a3xx.xml.h b/drivers/gpu/drm/msm/adreno/a3xx.xml.h
index a7be56163d23..303e8a9e91a5 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx.xml.h
+++ b/drivers/gpu/drm/msm/adreno/a3xx.xml.h
@@ -10,13 +10,13 @@ git clone https://github.com/freedreno/envytools.git
 The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   9859 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14477 bytes, from 2014-05-16 11:51:57)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  58020 bytes, from 2014-06-25 12:57:16)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  26602 bytes, from 2014-06-25 12:57:16)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -41,31 +41,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 
-enum a3xx_render_mode {
-        RB_RENDERING_PASS = 0,
-        RB_TILING_PASS = 1,
-        RB_RESOLVE_PASS = 2,
-};
-
 enum a3xx_tile_mode {
         LINEAR = 0,
         TILE_32X32 = 2,
 };
 
-enum a3xx_threadmode {
-        MULTI = 0,
-        SINGLE = 1,
-};
-
-enum a3xx_instrbuffermode {
-        BUFFER = 1,
-};
-
-enum a3xx_threadsize {
-        TWO_QUADS = 0,
-        FOUR_QUADS = 1,
-};
-
 enum a3xx_state_block_id {
         HLSQ_BLOCK_ID_TP_TEX = 2,
         HLSQ_BLOCK_ID_TP_MIPMAP = 3,
@@ -169,6 +149,8 @@ enum a3xx_color_fmt {
         RB_R8G8B8A8_UNORM = 8,
         RB_Z16_UNORM = 12,
         RB_A8_UNORM = 20,
+        RB_R16G16B16A16_FLOAT = 27,
+        RB_R32G32B32A32_FLOAT = 51,
 };
 
 enum a3xx_color_swap {
@@ -178,12 +160,6 @@ enum a3xx_color_swap {
         XYZW = 3,
 };
 
-enum a3xx_msaa_samples {
-        MSAA_ONE = 0,
-        MSAA_TWO = 1,
-        MSAA_FOUR = 2,
-};
-
 enum a3xx_sp_perfcounter_select {
         SP_FS_CFLOW_INSTRUCTIONS = 12,
         SP_FS_FULL_ALU_INSTRUCTIONS = 14,
@@ -191,21 +167,45 @@ enum a3xx_sp_perfcounter_select {
         SP_ALU_ACTIVE_CYCLES = 29,
 };
 
-enum adreno_rb_copy_control_mode {
-        RB_COPY_RESOLVE = 1,
-        RB_COPY_DEPTH_STENCIL = 5,
+enum a3xx_rop_code {
+        ROP_CLEAR = 0,
+        ROP_NOR = 1,
+        ROP_AND_INVERTED = 2,
+        ROP_COPY_INVERTED = 3,
+        ROP_AND_REVERSE = 4,
+        ROP_INVERT = 5,
+        ROP_XOR = 6,
+        ROP_NAND = 7,
+        ROP_AND = 8,
+        ROP_EQUIV = 9,
+        ROP_NOOP = 10,
+        ROP_OR_INVERTED = 11,
+        ROP_COPY = 12,
+        ROP_OR_REVERSE = 13,
+        ROP_OR = 14,
+        ROP_SET = 15,
+};
+
+enum a3xx_rb_blend_opcode {
+        BLEND_DST_PLUS_SRC = 0,
+        BLEND_SRC_MINUS_DST = 1,
+        BLEND_DST_MINUS_SRC = 2,
+        BLEND_MIN_DST_SRC = 3,
+        BLEND_MAX_DST_SRC = 4,
 };
 
 enum a3xx_tex_filter {
         A3XX_TEX_NEAREST = 0,
         A3XX_TEX_LINEAR = 1,
+        A3XX_TEX_ANISO = 2,
 };
 
 enum a3xx_tex_clamp {
         A3XX_TEX_REPEAT = 0,
         A3XX_TEX_CLAMP_TO_EDGE = 1,
         A3XX_TEX_MIRROR_REPEAT = 2,
-        A3XX_TEX_CLAMP_NONE = 3,
+        A3XX_TEX_CLAMP_TO_BORDER = 3,
+        A3XX_TEX_MIRROR_CLAMP = 4,
 };
 
 enum a3xx_tex_swiz {
@@ -316,6 +316,7 @@ enum a3xx_tex_type {
 #define REG_A3XX_RBBM_INT_0_STATUS                              0x00000064
 
 #define REG_A3XX_RBBM_PERFCTR_CTL                               0x00000080
+#define A3XX_RBBM_PERFCTR_CTL_ENABLE                            0x00000001
 
 #define REG_A3XX_RBBM_PERFCTR_LOAD_CMD0                         0x00000081
 
@@ -549,6 +550,10 @@ static inline uint32_t REG_A3XX_CP_PROTECT_REG(uint32_t i0) { return 0x00000460
 
 #define REG_A3XX_CP_AHB_FAULT                                   0x0000054d
 
+#define REG_A3XX_SP_GLOBAL_MEM_SIZE                             0x00000e22
+
+#define REG_A3XX_SP_GLOBAL_MEM_ADDR                             0x00000e23
+
 #define REG_A3XX_GRAS_CL_CLIP_CNTL                              0x00002040
 #define A3XX_GRAS_CL_CLIP_CNTL_IJ_PERSP_CENTER                  0x00001000
 #define A3XX_GRAS_CL_CLIP_CNTL_CLIP_DISABLE                     0x00010000
@@ -556,6 +561,9 @@ static inline uint32_t REG_A3XX_CP_PROTECT_REG(uint32_t i0) { return 0x00000460
 #define A3XX_GRAS_CL_CLIP_CNTL_VP_CLIP_CODE_IGNORE              0x00080000
 #define A3XX_GRAS_CL_CLIP_CNTL_VP_XFORM_DISABLE                 0x00100000
 #define A3XX_GRAS_CL_CLIP_CNTL_PERSP_DIVISION_DISABLE           0x00200000
+#define A3XX_GRAS_CL_CLIP_CNTL_ZCOORD                           0x00800000
+#define A3XX_GRAS_CL_CLIP_CNTL_WCOORD                           0x01000000
+#define A3XX_GRAS_CL_CLIP_CNTL_ZCLIP_DISABLE                    0x02000000
 
 #define REG_A3XX_GRAS_CL_GB_CLIP_ADJ                            0x00002044
 #define A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ__MASK                     0x000003ff
@@ -620,8 +628,26 @@ static inline uint32_t A3XX_GRAS_CL_VPORT_ZSCALE(float val)
 }
 
 #define REG_A3XX_GRAS_SU_POINT_MINMAX                           0x00002068
+#define A3XX_GRAS_SU_POINT_MINMAX_MIN__MASK                     0x0000ffff
+#define A3XX_GRAS_SU_POINT_MINMAX_MIN__SHIFT                    0
+static inline uint32_t A3XX_GRAS_SU_POINT_MINMAX_MIN(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A3XX_GRAS_SU_POINT_MINMAX_MIN__SHIFT) & A3XX_GRAS_SU_POINT_MINMAX_MIN__MASK;
+}
+#define A3XX_GRAS_SU_POINT_MINMAX_MAX__MASK                     0xffff0000
+#define A3XX_GRAS_SU_POINT_MINMAX_MAX__SHIFT                    16
+static inline uint32_t A3XX_GRAS_SU_POINT_MINMAX_MAX(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A3XX_GRAS_SU_POINT_MINMAX_MAX__SHIFT) & A3XX_GRAS_SU_POINT_MINMAX_MAX__MASK;
+}
 
 #define REG_A3XX_GRAS_SU_POINT_SIZE                             0x00002069
+#define A3XX_GRAS_SU_POINT_SIZE__MASK                           0xffffffff
+#define A3XX_GRAS_SU_POINT_SIZE__SHIFT                          0
+static inline uint32_t A3XX_GRAS_SU_POINT_SIZE(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A3XX_GRAS_SU_POINT_SIZE__SHIFT) & A3XX_GRAS_SU_POINT_SIZE__MASK;
+}
 
 #define REG_A3XX_GRAS_SU_POLY_OFFSET_SCALE                      0x0000206c
 #define A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL__MASK                0x00ffffff
@@ -743,6 +769,7 @@ static inline uint32_t A3XX_RB_MODE_CONTROL_RENDER_MODE(enum a3xx_render_mode va
 #define A3XX_RB_MODE_CONTROL_PACKER_TIMER_ENABLE                0x00010000
 
 #define REG_A3XX_RB_RENDER_CONTROL                              0x000020c1
+#define A3XX_RB_RENDER_CONTROL_FACENESS                         0x00000008
 #define A3XX_RB_RENDER_CONTROL_BIN_WIDTH__MASK                  0x00000ff0
 #define A3XX_RB_RENDER_CONTROL_BIN_WIDTH__SHIFT                 4
 static inline uint32_t A3XX_RB_RENDER_CONTROL_BIN_WIDTH(uint32_t val)
@@ -751,6 +778,10 @@ static inline uint32_t A3XX_RB_RENDER_CONTROL_BIN_WIDTH(uint32_t val)
 }
 #define A3XX_RB_RENDER_CONTROL_DISABLE_COLOR_PIPE               0x00001000
 #define A3XX_RB_RENDER_CONTROL_ENABLE_GMEM                      0x00002000
+#define A3XX_RB_RENDER_CONTROL_XCOORD                           0x00004000
+#define A3XX_RB_RENDER_CONTROL_YCOORD                           0x00008000
+#define A3XX_RB_RENDER_CONTROL_ZCOORD                           0x00010000
+#define A3XX_RB_RENDER_CONTROL_WCOORD                           0x00020000
 #define A3XX_RB_RENDER_CONTROL_ALPHA_TEST                       0x00400000
 #define A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__MASK            0x07000000
 #define A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__SHIFT           24
@@ -796,7 +827,7 @@ static inline uint32_t REG_A3XX_RB_MRT_CONTROL(uint32_t i0) { return 0x000020c4
 #define A3XX_RB_MRT_CONTROL_BLEND2                              0x00000020
 #define A3XX_RB_MRT_CONTROL_ROP_CODE__MASK                      0x00000f00
 #define A3XX_RB_MRT_CONTROL_ROP_CODE__SHIFT                     8
-static inline uint32_t A3XX_RB_MRT_CONTROL_ROP_CODE(uint32_t val)
+static inline uint32_t A3XX_RB_MRT_CONTROL_ROP_CODE(enum a3xx_rop_code val)
 {
         return ((val) << A3XX_RB_MRT_CONTROL_ROP_CODE__SHIFT) & A3XX_RB_MRT_CONTROL_ROP_CODE__MASK;
 }
@@ -856,7 +887,7 @@ static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR(enum adreno_rb_b
 }
 #define A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__MASK        0x000000e0
 #define A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__SHIFT       5
-static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE(enum adreno_rb_blend_opcode val)
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE(enum a3xx_rb_blend_opcode val)
 {
         return ((val) << A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__MASK;
 }
@@ -874,7 +905,7 @@ static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR(enum adreno_rb
 }
 #define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__MASK      0x00e00000
 #define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__SHIFT     21
-static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE(enum adreno_rb_blend_opcode val)
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE(enum a3xx_rb_blend_opcode val)
 {
         return ((val) << A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__MASK;
 }
@@ -957,17 +988,24 @@ static inline uint32_t A3XX_RB_COPY_CONTROL_MSAA_RESOLVE(enum a3xx_msaa_samples
 {
         return ((val) << A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__SHIFT) & A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__MASK;
 }
+#define A3XX_RB_COPY_CONTROL_DEPTHCLEAR                         0x00000008
 #define A3XX_RB_COPY_CONTROL_MODE__MASK                         0x00000070
 #define A3XX_RB_COPY_CONTROL_MODE__SHIFT                        4
 static inline uint32_t A3XX_RB_COPY_CONTROL_MODE(enum adreno_rb_copy_control_mode val)
 {
         return ((val) << A3XX_RB_COPY_CONTROL_MODE__SHIFT) & A3XX_RB_COPY_CONTROL_MODE__MASK;
 }
-#define A3XX_RB_COPY_CONTROL_GMEM_BASE__MASK                    0xfffffc00
-#define A3XX_RB_COPY_CONTROL_GMEM_BASE__SHIFT                   10
+#define A3XX_RB_COPY_CONTROL_FASTCLEAR__MASK                    0x00000f00
+#define A3XX_RB_COPY_CONTROL_FASTCLEAR__SHIFT                   8
+static inline uint32_t A3XX_RB_COPY_CONTROL_FASTCLEAR(uint32_t val)
+{
+        return ((val) << A3XX_RB_COPY_CONTROL_FASTCLEAR__SHIFT) & A3XX_RB_COPY_CONTROL_FASTCLEAR__MASK;
+}
+#define A3XX_RB_COPY_CONTROL_GMEM_BASE__MASK                    0xffffc000
+#define A3XX_RB_COPY_CONTROL_GMEM_BASE__SHIFT                   14
 static inline uint32_t A3XX_RB_COPY_CONTROL_GMEM_BASE(uint32_t val)
 {
-        return ((val >> 10) << A3XX_RB_COPY_CONTROL_GMEM_BASE__SHIFT) & A3XX_RB_COPY_CONTROL_GMEM_BASE__MASK;
+        return ((val >> 14) << A3XX_RB_COPY_CONTROL_GMEM_BASE__SHIFT) & A3XX_RB_COPY_CONTROL_GMEM_BASE__MASK;
 }
 
 #define REG_A3XX_RB_COPY_DEST_BASE                              0x000020ed
@@ -1005,6 +1043,12 @@ static inline uint32_t A3XX_RB_COPY_DEST_INFO_SWAP(enum a3xx_color_swap val)
 {
         return ((val) << A3XX_RB_COPY_DEST_INFO_SWAP__SHIFT) & A3XX_RB_COPY_DEST_INFO_SWAP__MASK;
 }
+#define A3XX_RB_COPY_DEST_INFO_DITHER_MODE__MASK                0x00000c00
+#define A3XX_RB_COPY_DEST_INFO_DITHER_MODE__SHIFT               10
+static inline uint32_t A3XX_RB_COPY_DEST_INFO_DITHER_MODE(enum adreno_rb_dither_mode val)
+{
+        return ((val) << A3XX_RB_COPY_DEST_INFO_DITHER_MODE__SHIFT) & A3XX_RB_COPY_DEST_INFO_DITHER_MODE__MASK;
+}
 #define A3XX_RB_COPY_DEST_INFO_COMPONENT_ENABLE__MASK           0x0003c000
 #define A3XX_RB_COPY_DEST_INFO_COMPONENT_ENABLE__SHIFT          14
 static inline uint32_t A3XX_RB_COPY_DEST_INFO_COMPONENT_ENABLE(uint32_t val)
@@ -1019,6 +1063,7 @@ static inline uint32_t A3XX_RB_COPY_DEST_INFO_ENDIAN(enum adreno_rb_surface_endi
 }
 
 #define REG_A3XX_RB_DEPTH_CONTROL                               0x00002100
+#define A3XX_RB_DEPTH_CONTROL_FRAG_WRITES_Z                     0x00000001
 #define A3XX_RB_DEPTH_CONTROL_Z_ENABLE                          0x00000002
 #define A3XX_RB_DEPTH_CONTROL_Z_WRITE_ENABLE                    0x00000004
 #define A3XX_RB_DEPTH_CONTROL_EARLY_Z_DISABLE                   0x00000008
@@ -1044,7 +1089,7 @@ static inline uint32_t A3XX_RB_DEPTH_INFO_DEPTH_FORMAT(enum adreno_rb_depth_form
 #define A3XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT                    11
 static inline uint32_t A3XX_RB_DEPTH_INFO_DEPTH_BASE(uint32_t val)
 {
-        return ((val >> 10) << A3XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT) & A3XX_RB_DEPTH_INFO_DEPTH_BASE__MASK;
+        return ((val >> 12) << A3XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT) & A3XX_RB_DEPTH_INFO_DEPTH_BASE__MASK;
 }
 
 #define REG_A3XX_RB_DEPTH_PITCH                                 0x00002103
@@ -1172,6 +1217,8 @@ static inline uint32_t A3XX_RB_WINDOW_OFFSET_Y(uint32_t val)
 }
 
 #define REG_A3XX_RB_SAMPLE_COUNT_CONTROL                        0x00002110
+#define A3XX_RB_SAMPLE_COUNT_CONTROL_RESET                      0x00000001
+#define A3XX_RB_SAMPLE_COUNT_CONTROL_COPY                       0x00000002
 
 #define REG_A3XX_RB_SAMPLE_COUNT_ADDR                           0x00002111
 
@@ -1179,7 +1226,23 @@ static inline uint32_t A3XX_RB_WINDOW_OFFSET_Y(uint32_t val)
 
 #define REG_A3XX_RB_Z_CLAMP_MAX                                 0x00002115
 
+#define REG_A3XX_VGT_BIN_BASE                                   0x000021e1
+
+#define REG_A3XX_VGT_BIN_SIZE                                   0x000021e2
+
 #define REG_A3XX_PC_VSTREAM_CONTROL                             0x000021e4
+#define A3XX_PC_VSTREAM_CONTROL_SIZE__MASK                      0x003f0000
+#define A3XX_PC_VSTREAM_CONTROL_SIZE__SHIFT                     16
+static inline uint32_t A3XX_PC_VSTREAM_CONTROL_SIZE(uint32_t val)
+{
+        return ((val) << A3XX_PC_VSTREAM_CONTROL_SIZE__SHIFT) & A3XX_PC_VSTREAM_CONTROL_SIZE__MASK;
+}
+#define A3XX_PC_VSTREAM_CONTROL_N__MASK                         0x07c00000
+#define A3XX_PC_VSTREAM_CONTROL_N__SHIFT                        22
+static inline uint32_t A3XX_PC_VSTREAM_CONTROL_N(uint32_t val)
+{
+        return ((val) << A3XX_PC_VSTREAM_CONTROL_N__SHIFT) & A3XX_PC_VSTREAM_CONTROL_N__MASK;
+}
 
 #define REG_A3XX_PC_VERTEX_REUSE_BLOCK_CNTL                     0x000021ea
 
@@ -1203,6 +1266,7 @@ static inline uint32_t A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE(enum adreno_pa_
         return ((val) << A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE__SHIFT) & A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE__MASK;
 }
 #define A3XX_PC_PRIM_VTX_CNTL_PROVOKING_VTX_LAST                0x02000000
+#define A3XX_PC_PRIM_VTX_CNTL_PSIZE                             0x04000000
 
 #define REG_A3XX_PC_RESTART_INDEX                               0x000021ed
 
@@ -1232,6 +1296,7 @@ static inline uint32_t A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE(enum a3xx_threadsize
 }
 #define A3XX_HLSQ_CONTROL_1_REG_VSSUPERTHREADENABLE             0x00000100
 #define A3XX_HLSQ_CONTROL_1_REG_RESERVED1                       0x00000200
+#define A3XX_HLSQ_CONTROL_1_REG_ZWCOORD                         0x02000000
 
 #define REG_A3XX_HLSQ_CONTROL_2_REG                             0x00002202
 #define A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD__MASK        0xfc000000
@@ -1242,6 +1307,12 @@ static inline uint32_t A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD(uint32_t val)
 }
 
 #define REG_A3XX_HLSQ_CONTROL_3_REG                             0x00002203
+#define A3XX_HLSQ_CONTROL_3_REG_REGID__MASK                     0x000000ff
+#define A3XX_HLSQ_CONTROL_3_REG_REGID__SHIFT                    0
+static inline uint32_t A3XX_HLSQ_CONTROL_3_REG_REGID(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONTROL_3_REG_REGID__SHIFT) & A3XX_HLSQ_CONTROL_3_REG_REGID__MASK;
+}
 
 #define REG_A3XX_HLSQ_VS_CONTROL_REG                            0x00002204
 #define A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__MASK              0x00000fff
@@ -1312,10 +1383,36 @@ static inline uint32_t A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY(uint32_t val)
 }
 
 #define REG_A3XX_HLSQ_CL_NDRANGE_0_REG                          0x0000220a
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_WORKDIM__MASK                0x00000003
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_WORKDIM__SHIFT               0
+static inline uint32_t A3XX_HLSQ_CL_NDRANGE_0_REG_WORKDIM(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CL_NDRANGE_0_REG_WORKDIM__SHIFT) & A3XX_HLSQ_CL_NDRANGE_0_REG_WORKDIM__MASK;
+}
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE0__MASK             0x00000ffc
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE0__SHIFT            2
+static inline uint32_t A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE0(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE0__SHIFT) & A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE0__MASK;
+}
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE1__MASK             0x003ff000
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE1__SHIFT            12
+static inline uint32_t A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE1(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE1__SHIFT) & A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE1__MASK;
+}
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE2__MASK             0xffc00000
+#define A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE2__SHIFT            22
+static inline uint32_t A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE2(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE2__SHIFT) & A3XX_HLSQ_CL_NDRANGE_0_REG_LOCALSIZE2__MASK;
+}
+
+static inline uint32_t REG_A3XX_HLSQ_CL_GLOBAL_WORK(uint32_t i0) { return 0x0000220b + 0x2*i0; }
 
-#define REG_A3XX_HLSQ_CL_NDRANGE_1_REG                          0x0000220b
+static inline uint32_t REG_A3XX_HLSQ_CL_GLOBAL_WORK_SIZE(uint32_t i0) { return 0x0000220b + 0x2*i0; }
 
-#define REG_A3XX_HLSQ_CL_NDRANGE_2_REG                          0x0000220c
+static inline uint32_t REG_A3XX_HLSQ_CL_GLOBAL_WORK_OFFSET(uint32_t i0) { return 0x0000220c + 0x2*i0; }
 
 #define REG_A3XX_HLSQ_CL_CONTROL_0_REG                          0x00002211
 
@@ -1323,7 +1420,9 @@ static inline uint32_t A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY(uint32_t val)
 
 #define REG_A3XX_HLSQ_CL_KERNEL_CONST_REG                       0x00002214
 
-#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_X_REG                     0x00002215
+static inline uint32_t REG_A3XX_HLSQ_CL_KERNEL_GROUP(uint32_t i0) { return 0x00002215 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_HLSQ_CL_KERNEL_GROUP_RATIO(uint32_t i0) { return 0x00002215 + 0x1*i0; }
 
 #define REG_A3XX_HLSQ_CL_KERNEL_GROUP_Y_REG                     0x00002216
 
@@ -1438,6 +1537,12 @@ static inline uint32_t A3XX_VFD_DECODE_INSTR_REGID(uint32_t val)
 {
         return ((val) << A3XX_VFD_DECODE_INSTR_REGID__SHIFT) & A3XX_VFD_DECODE_INSTR_REGID__MASK;
 }
+#define A3XX_VFD_DECODE_INSTR_SWAP__MASK                        0x00c00000
+#define A3XX_VFD_DECODE_INSTR_SWAP__SHIFT                       22
+static inline uint32_t A3XX_VFD_DECODE_INSTR_SWAP(enum a3xx_color_swap val)
+{
+        return ((val) << A3XX_VFD_DECODE_INSTR_SWAP__SHIFT) & A3XX_VFD_DECODE_INSTR_SWAP__MASK;
+}
 #define A3XX_VFD_DECODE_INSTR_SHIFTCNT__MASK                    0x1f000000
 #define A3XX_VFD_DECODE_INSTR_SHIFTCNT__SHIFT                   24
 static inline uint32_t A3XX_VFD_DECODE_INSTR_SHIFTCNT(uint32_t val)
@@ -1462,12 +1567,13 @@ static inline uint32_t A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT(uint32_t val
 }
 
 #define REG_A3XX_VPC_ATTR                                       0x00002280
-#define A3XX_VPC_ATTR_TOTALATTR__MASK                           0x00000fff
+#define A3XX_VPC_ATTR_TOTALATTR__MASK                           0x000001ff
 #define A3XX_VPC_ATTR_TOTALATTR__SHIFT                          0
 static inline uint32_t A3XX_VPC_ATTR_TOTALATTR(uint32_t val)
 {
         return ((val) << A3XX_VPC_ATTR_TOTALATTR__SHIFT) & A3XX_VPC_ATTR_TOTALATTR__MASK;
 }
+#define A3XX_VPC_ATTR_PSIZE                                     0x00000200
 #define A3XX_VPC_ATTR_THRDASSIGN__MASK                          0x0ffff000
 #define A3XX_VPC_ATTR_THRDASSIGN__SHIFT                         12
 static inline uint32_t A3XX_VPC_ATTR_THRDASSIGN(uint32_t val)
@@ -1522,11 +1628,11 @@ static inline uint32_t A3XX_SP_SP_CTRL_REG_SLEEPMODE(uint32_t val)
 {
         return ((val) << A3XX_SP_SP_CTRL_REG_SLEEPMODE__SHIFT) & A3XX_SP_SP_CTRL_REG_SLEEPMODE__MASK;
 }
-#define A3XX_SP_SP_CTRL_REG_LOMODE__MASK                        0x00c00000
-#define A3XX_SP_SP_CTRL_REG_LOMODE__SHIFT                       22
-static inline uint32_t A3XX_SP_SP_CTRL_REG_LOMODE(uint32_t val)
+#define A3XX_SP_SP_CTRL_REG_L0MODE__MASK                        0x00c00000
+#define A3XX_SP_SP_CTRL_REG_L0MODE__SHIFT                       22
+static inline uint32_t A3XX_SP_SP_CTRL_REG_L0MODE(uint32_t val)
 {
-        return ((val) << A3XX_SP_SP_CTRL_REG_LOMODE__SHIFT) & A3XX_SP_SP_CTRL_REG_LOMODE__MASK;
+        return ((val) << A3XX_SP_SP_CTRL_REG_L0MODE__SHIFT) & A3XX_SP_SP_CTRL_REG_L0MODE__MASK;
 }
 
 #define REG_A3XX_SP_VS_CTRL_REG0                                0x000022c4
@@ -1569,6 +1675,7 @@ static inline uint32_t A3XX_SP_VS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)
 }
 #define A3XX_SP_VS_CTRL_REG0_SUPERTHREADMODE                    0x00200000
 #define A3XX_SP_VS_CTRL_REG0_PIXLODENABLE                       0x00400000
+#define A3XX_SP_VS_CTRL_REG0_COMPUTEMODE                        0x00800000
 #define A3XX_SP_VS_CTRL_REG0_LENGTH__MASK                       0xff000000
 #define A3XX_SP_VS_CTRL_REG0_LENGTH__SHIFT                      24
 static inline uint32_t A3XX_SP_VS_CTRL_REG0_LENGTH(uint32_t val)
@@ -1742,6 +1849,7 @@ static inline uint32_t A3XX_SP_FS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)
 }
 #define A3XX_SP_FS_CTRL_REG0_SUPERTHREADMODE                    0x00200000
 #define A3XX_SP_FS_CTRL_REG0_PIXLODENABLE                       0x00400000
+#define A3XX_SP_FS_CTRL_REG0_COMPUTEMODE                        0x00800000
 #define A3XX_SP_FS_CTRL_REG0_LENGTH__MASK                       0xff000000
 #define A3XX_SP_FS_CTRL_REG0_LENGTH__SHIFT                      24
 static inline uint32_t A3XX_SP_FS_CTRL_REG0_LENGTH(uint32_t val)
@@ -1802,6 +1910,13 @@ static inline uint32_t A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET(uint32_t val)
 #define REG_A3XX_SP_FS_FLAT_SHAD_MODE_REG_1                     0x000022e9
 
 #define REG_A3XX_SP_FS_OUTPUT_REG                               0x000022ec
+#define A3XX_SP_FS_OUTPUT_REG_DEPTH_ENABLE                      0x00000080
+#define A3XX_SP_FS_OUTPUT_REG_DEPTH_REGID__MASK                 0x0000ff00
+#define A3XX_SP_FS_OUTPUT_REG_DEPTH_REGID__SHIFT                8
+static inline uint32_t A3XX_SP_FS_OUTPUT_REG_DEPTH_REGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_OUTPUT_REG_DEPTH_REGID__SHIFT) & A3XX_SP_FS_OUTPUT_REG_DEPTH_REGID__MASK;
+}
 
 static inline uint32_t REG_A3XX_SP_FS_MRT(uint32_t i0) { return 0x000022f0 + 0x1*i0; }
 
@@ -1914,6 +2029,42 @@ static inline uint32_t A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR(uint32_t val)
 
 #define REG_A3XX_VBIF_OUT_AXI_AOOO                              0x0000305f
 
+#define REG_A3XX_VBIF_PERF_CNT_EN                               0x00003070
+#define A3XX_VBIF_PERF_CNT_EN_CNT0                              0x00000001
+#define A3XX_VBIF_PERF_CNT_EN_CNT1                              0x00000002
+#define A3XX_VBIF_PERF_CNT_EN_PWRCNT0                           0x00000004
+#define A3XX_VBIF_PERF_CNT_EN_PWRCNT1                           0x00000008
+#define A3XX_VBIF_PERF_CNT_EN_PWRCNT2                           0x00000010
+
+#define REG_A3XX_VBIF_PERF_CNT_CLR                              0x00003071
+#define A3XX_VBIF_PERF_CNT_CLR_CNT0                             0x00000001
+#define A3XX_VBIF_PERF_CNT_CLR_CNT1                             0x00000002
+#define A3XX_VBIF_PERF_CNT_CLR_PWRCNT0                          0x00000004
+#define A3XX_VBIF_PERF_CNT_CLR_PWRCNT1                          0x00000008
+#define A3XX_VBIF_PERF_CNT_CLR_PWRCNT2                          0x00000010
+
+#define REG_A3XX_VBIF_PERF_CNT_SEL                              0x00003072
+
+#define REG_A3XX_VBIF_PERF_CNT0_LO                              0x00003073
+
+#define REG_A3XX_VBIF_PERF_CNT0_HI                              0x00003074
+
+#define REG_A3XX_VBIF_PERF_CNT1_LO                              0x00003075
+
+#define REG_A3XX_VBIF_PERF_CNT1_HI                              0x00003076
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT0_LO                          0x00003077
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT0_HI                          0x00003078
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT1_LO                          0x00003079
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT1_HI                          0x0000307a
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT2_LO                          0x0000307b
+
+#define REG_A3XX_VBIF_PERF_PWR_CNT2_HI                          0x0000307c
+
 #define REG_A3XX_VSC_BIN_SIZE                                   0x00000c01
 #define A3XX_VSC_BIN_SIZE_WIDTH__MASK                           0x0000001f
 #define A3XX_VSC_BIN_SIZE_WIDTH__SHIFT                          0
@@ -2080,6 +2231,8 @@ static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE(enum a3xx_cache_op
 }
 #define A3XX_UCHE_CACHE_INVALIDATE1_REG_ENTIRE_CACHE            0x80000000
 
+#define REG_A3XX_UNKNOWN_0EA6                                   0x00000ea6
+
 #define REG_A3XX_SP_PERFCOUNTER0_SELECT                         0x00000ec4
 
 #define REG_A3XX_SP_PERFCOUNTER1_SELECT                         0x00000ec5
@@ -2117,6 +2270,39 @@ static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE(enum a3xx_cache_op
 #define REG_A3XX_VGT_EVENT_INITIATOR                            0x000021f9
 
 #define REG_A3XX_VGT_DRAW_INITIATOR                             0x000021fc
+#define A3XX_VGT_DRAW_INITIATOR_PRIM_TYPE__MASK                 0x0000003f
+#define A3XX_VGT_DRAW_INITIATOR_PRIM_TYPE__SHIFT                0
+static inline uint32_t A3XX_VGT_DRAW_INITIATOR_PRIM_TYPE(enum pc_di_primtype val)
+{
+        return ((val) << A3XX_VGT_DRAW_INITIATOR_PRIM_TYPE__SHIFT) & A3XX_VGT_DRAW_INITIATOR_PRIM_TYPE__MASK;
+}
+#define A3XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__MASK             0x000000c0
+#define A3XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__SHIFT            6
+static inline uint32_t A3XX_VGT_DRAW_INITIATOR_SOURCE_SELECT(enum pc_di_src_sel val)
+{
+        return ((val) << A3XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__SHIFT) & A3XX_VGT_DRAW_INITIATOR_SOURCE_SELECT__MASK;
+}
+#define A3XX_VGT_DRAW_INITIATOR_VIS_CULL__MASK                  0x00000600
+#define A3XX_VGT_DRAW_INITIATOR_VIS_CULL__SHIFT                 9
+static inline uint32_t A3XX_VGT_DRAW_INITIATOR_VIS_CULL(enum pc_di_vis_cull_mode val)
+{
+        return ((val) << A3XX_VGT_DRAW_INITIATOR_VIS_CULL__SHIFT) & A3XX_VGT_DRAW_INITIATOR_VIS_CULL__MASK;
+}
+#define A3XX_VGT_DRAW_INITIATOR_INDEX_SIZE__MASK                0x00000800
+#define A3XX_VGT_DRAW_INITIATOR_INDEX_SIZE__SHIFT               11
+static inline uint32_t A3XX_VGT_DRAW_INITIATOR_INDEX_SIZE(enum pc_di_index_size val)
+{
+        return ((val) << A3XX_VGT_DRAW_INITIATOR_INDEX_SIZE__SHIFT) & A3XX_VGT_DRAW_INITIATOR_INDEX_SIZE__MASK;
+}
+#define A3XX_VGT_DRAW_INITIATOR_NOT_EOP                         0x00001000
+#define A3XX_VGT_DRAW_INITIATOR_SMALL_INDEX                     0x00002000
+#define A3XX_VGT_DRAW_INITIATOR_PRE_DRAW_INITIATOR_ENABLE       0x00004000
+#define A3XX_VGT_DRAW_INITIATOR_NUM_INDICES__MASK               0xffff0000
+#define A3XX_VGT_DRAW_INITIATOR_NUM_INDICES__SHIFT              16
+static inline uint32_t A3XX_VGT_DRAW_INITIATOR_NUM_INDICES(uint32_t val)
+{
+        return ((val) << A3XX_VGT_DRAW_INITIATOR_NUM_INDICES__SHIFT) & A3XX_VGT_DRAW_INITIATOR_NUM_INDICES__MASK;
+}
 
 #define REG_A3XX_VGT_IMMED_DATA                                 0x000021fd
 
@@ -2152,6 +2338,12 @@ static inline uint32_t A3XX_TEX_SAMP_0_WRAP_R(enum a3xx_tex_clamp val)
 {
         return ((val) << A3XX_TEX_SAMP_0_WRAP_R__SHIFT) & A3XX_TEX_SAMP_0_WRAP_R__MASK;
 }
+#define A3XX_TEX_SAMP_0_COMPARE_FUNC__MASK                      0x00700000
+#define A3XX_TEX_SAMP_0_COMPARE_FUNC__SHIFT                     20
+static inline uint32_t A3XX_TEX_SAMP_0_COMPARE_FUNC(enum adreno_compare_func val)
+{
+        return ((val) << A3XX_TEX_SAMP_0_COMPARE_FUNC__SHIFT) & A3XX_TEX_SAMP_0_COMPARE_FUNC__MASK;
+}
 #define A3XX_TEX_SAMP_0_UNNORM_COORDS                           0x80000000
 
 #define REG_A3XX_TEX_SAMP_1                                     0x00000001
@@ -2170,6 +2362,7 @@ static inline uint32_t A3XX_TEX_SAMP_1_MIN_LOD(float val)
 
 #define REG_A3XX_TEX_CONST_0                                    0x00000000
 #define A3XX_TEX_CONST_0_TILED                                  0x00000001
+#define A3XX_TEX_CONST_0_SRGB                                   0x00000004
 #define A3XX_TEX_CONST_0_SWIZ_X__MASK                           0x00000070
 #define A3XX_TEX_CONST_0_SWIZ_X__SHIFT                          4
 static inline uint32_t A3XX_TEX_CONST_0_SWIZ_X(enum a3xx_tex_swiz val)
@@ -2206,6 +2399,7 @@ static inline uint32_t A3XX_TEX_CONST_0_FMT(enum a3xx_tex_fmt val)
 {
         return ((val) << A3XX_TEX_CONST_0_FMT__SHIFT) & A3XX_TEX_CONST_0_FMT__MASK;
 }
+#define A3XX_TEX_CONST_0_NOCONVERT                              0x20000000
 #define A3XX_TEX_CONST_0_TYPE__MASK                             0xc0000000
 #define A3XX_TEX_CONST_0_TYPE__SHIFT                            30
 static inline uint32_t A3XX_TEX_CONST_0_TYPE(enum a3xx_tex_type val)
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 942e09d898a8..2773600c9488 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -392,13 +392,10 @@ static const unsigned int a3xx_registers[] = {
 #ifdef CONFIG_DEBUG_FS
 static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
 {
-        struct drm_device *dev = gpu->dev;
         int i;
 
         adreno_show(gpu, m);
 
-        mutex_lock(&dev->struct_mutex);
-
         gpu->funcs->pm_resume(gpu);
 
         seq_printf(m, "status:   %08x\n",
@@ -418,8 +415,6 @@ static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
         }
 
         gpu->funcs->pm_suspend(gpu);
-
-        mutex_unlock(&dev->struct_mutex);
 }
 #endif
 
@@ -685,6 +680,8 @@ static int a3xx_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id dt_match[] = {
+        { .compatible = "qcom,adreno-3xx" },
+        /* for backwards compat w/ downstream kgsl DT files: */
         { .compatible = "qcom,kgsl-3d0" },
         {}
 };
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
index bb9a8ca0507b..85ff66cbddd6 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
@@ -19,6 +19,11 @@
 #define __A3XX_GPU_H__
 
 #include "adreno_gpu.h"
+
+/* arrg, somehow fb.h is getting pulled in: */
+#undef ROP_COPY
+#undef ROP_XOR
+
 #include "a3xx.xml.h"
 
 struct a3xx_gpu {
diff --git a/drivers/gpu/drm/msm/adreno/adreno_common.xml.h b/drivers/gpu/drm/msm/adreno/adreno_common.xml.h
index d6e6ce2d1abd..9de19ac2e86c 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_common.xml.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_common.xml.h
@@ -10,13 +10,13 @@ git clone https://github.com/freedreno/envytools.git
 The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   9859 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14477 bytes, from 2014-05-16 11:51:57)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  58020 bytes, from 2014-06-25 12:57:16)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  26602 bytes, from 2014-06-25 12:57:16)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -87,15 +87,6 @@ enum adreno_rb_blend_factor {
         FACTOR_SRC_ALPHA_SATURATE = 16,
 };
 
-enum adreno_rb_blend_opcode {
-        BLEND_DST_PLUS_SRC = 0,
-        BLEND_SRC_MINUS_DST = 1,
-        BLEND_MIN_DST_SRC = 2,
-        BLEND_MAX_DST_SRC = 3,
-        BLEND_DST_MINUS_SRC = 4,
-        BLEND_DST_PLUS_SRC_BIAS = 5,
-};
-
 enum adreno_rb_surface_endian {
         ENDIAN_NONE = 0,
         ENDIAN_8IN16 = 1,
@@ -116,6 +107,39 @@ enum adreno_rb_depth_format {
         DEPTHX_24_8 = 1,
 };
 
+enum adreno_rb_copy_control_mode {
+        RB_COPY_RESOLVE = 1,
+        RB_COPY_CLEAR = 2,
+        RB_COPY_DEPTH_STENCIL = 5,
+};
+
+enum a3xx_render_mode {
+        RB_RENDERING_PASS = 0,
+        RB_TILING_PASS = 1,
+        RB_RESOLVE_PASS = 2,
+        RB_COMPUTE_PASS = 3,
+};
+
+enum a3xx_msaa_samples {
+        MSAA_ONE = 0,
+        MSAA_TWO = 1,
+        MSAA_FOUR = 2,
+};
+
+enum a3xx_threadmode {
+        MULTI = 0,
+        SINGLE = 1,
+};
+
+enum a3xx_instrbuffermode {
+        BUFFER = 1,
+};
+
+enum a3xx_threadsize {
+        TWO_QUADS = 0,
+        FOUR_QUADS = 1,
+};
+
 #define REG_AXXX_CP_RB_BASE                                     0x000001c0
 
 #define REG_AXXX_CP_RB_CNTL                                     0x000001c1
@@ -264,6 +288,8 @@ static inline uint32_t AXXX_SCRATCH_UMSK_SWAP(uint32_t val)
 #define REG_AXXX_CP_INT_ACK                                     0x000001f4
 
 #define REG_AXXX_CP_ME_CNTL                                     0x000001f6
+#define AXXX_CP_ME_CNTL_BUSY                                    0x20000000
+#define AXXX_CP_ME_CNTL_HALT                                    0x10000000
 
 #define REG_AXXX_CP_ME_STATUS                                   0x000001f7
 
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 28ca8cd8b09e..655ce5b14ad0 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -91,9 +91,17 @@ int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
 int adreno_hw_init(struct msm_gpu *gpu)
 {
         struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        int ret;
 
         DBG("%s", gpu->name);
 
+        ret = msm_gem_get_iova(gpu->rb->bo, gpu->id, &gpu->rb_iova);
+        if (ret) {
+                gpu->rb_iova = 0;
+                dev_err(gpu->dev->dev, "could not map ringbuffer: %d\n", ret);
+                return ret;
+        }
+
         /* Setup REG_CP_RB_CNTL: */
         gpu_write(gpu, REG_AXXX_CP_RB_CNTL,
                         /* size is log2(quad-words): */
@@ -362,8 +370,10 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                         return ret;
         }
 
+        mutex_lock(&drm->struct_mutex);
         gpu->memptrs_bo = msm_gem_new(drm, sizeof(*gpu->memptrs),
                         MSM_BO_UNCACHED);
+        mutex_unlock(&drm->struct_mutex);
         if (IS_ERR(gpu->memptrs_bo)) {
                 ret = PTR_ERR(gpu->memptrs_bo);
                 gpu->memptrs_bo = NULL;
@@ -371,13 +381,13 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                 return ret;
         }
 
-        gpu->memptrs = msm_gem_vaddr_locked(gpu->memptrs_bo);
+        gpu->memptrs = msm_gem_vaddr(gpu->memptrs_bo);
         if (!gpu->memptrs) {
                 dev_err(drm->dev, "could not vmap memptrs\n");
                 return -ENOMEM;
         }
 
-        ret = msm_gem_get_iova_locked(gpu->memptrs_bo, gpu->base.id,
+        ret = msm_gem_get_iova(gpu->memptrs_bo, gpu->base.id,
                         &gpu->memptrs_iova);
         if (ret) {
                 dev_err(drm->dev, "could not map memptrs: %d\n", ret);
diff --git a/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h b/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h
index ae992c71703f..4eee0ec8f069 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h
@@ -10,13 +10,13 @@ git clone https://github.com/freedreno/envytools.git
 The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/adreno.xml               (    364 bytes, from 2013-11-30 14:47:15)
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml  (   1453 bytes, from 2013-03-31 16:51:27)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32814 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   8900 bytes, from 2013-10-22 23:57:49)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  10574 bytes, from 2013-11-13 05:44:45)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  53644 bytes, from 2013-11-30 15:07:33)
-- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (   8344 bytes, from 2013-11-30 14:49:47)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a2xx.xml          (  32901 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_common.xml (   9859 bytes, from 2014-06-02 15:21:30)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/adreno_pm4.xml    (  14477 bytes, from 2014-05-16 11:51:57)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a3xx.xml          (  58020 bytes, from 2014-06-25 12:57:16)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno/a4xx.xml          (  26602 bytes, from 2014-06-25 12:57:16)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -105,6 +105,7 @@ enum pc_di_index_size {
 
 enum pc_di_vis_cull_mode {
         IGNORE_VISIBILITY = 0,
+        USE_VISIBILITY = 1,
 };
 
 enum adreno_pm4_packet_type {
@@ -163,6 +164,11 @@ enum adreno_pm4_type3_packets {
         CP_SET_BIN = 76,
         CP_TEST_TWO_MEMS = 113,
         CP_WAIT_FOR_ME = 19,
+        CP_SET_DRAW_STATE = 67,
+        CP_DRAW_INDX_OFFSET = 56,
+        CP_DRAW_INDIRECT = 40,
+        CP_DRAW_INDX_INDIRECT = 41,
+        CP_DRAW_AUTO = 36,
         IN_IB_PREFETCH_END = 23,
         IN_SUBBLK_PREFETCH = 31,
         IN_INSTR_PREFETCH = 32,
@@ -232,6 +238,211 @@ static inline uint32_t CP_LOAD_STATE_1_EXT_SRC_ADDR(uint32_t val)
         return ((val >> 2) << CP_LOAD_STATE_1_EXT_SRC_ADDR__SHIFT) & CP_LOAD_STATE_1_EXT_SRC_ADDR__MASK;
 }
 
+#define REG_CP_DRAW_INDX_0                                      0x00000000
+#define CP_DRAW_INDX_0_VIZ_QUERY__MASK                          0xffffffff
+#define CP_DRAW_INDX_0_VIZ_QUERY__SHIFT                         0
+static inline uint32_t CP_DRAW_INDX_0_VIZ_QUERY(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_0_VIZ_QUERY__SHIFT) & CP_DRAW_INDX_0_VIZ_QUERY__MASK;
+}
+
+#define REG_CP_DRAW_INDX_1                                      0x00000001
+#define CP_DRAW_INDX_1_PRIM_TYPE__MASK                          0x0000003f
+#define CP_DRAW_INDX_1_PRIM_TYPE__SHIFT                         0
+static inline uint32_t CP_DRAW_INDX_1_PRIM_TYPE(enum pc_di_primtype val)
+{
+        return ((val) << CP_DRAW_INDX_1_PRIM_TYPE__SHIFT) & CP_DRAW_INDX_1_PRIM_TYPE__MASK;
+}
+#define CP_DRAW_INDX_1_SOURCE_SELECT__MASK                      0x000000c0
+#define CP_DRAW_INDX_1_SOURCE_SELECT__SHIFT                     6
+static inline uint32_t CP_DRAW_INDX_1_SOURCE_SELECT(enum pc_di_src_sel val)
+{
+        return ((val) << CP_DRAW_INDX_1_SOURCE_SELECT__SHIFT) & CP_DRAW_INDX_1_SOURCE_SELECT__MASK;
+}
+#define CP_DRAW_INDX_1_VIS_CULL__MASK                           0x00000600
+#define CP_DRAW_INDX_1_VIS_CULL__SHIFT                          9
+static inline uint32_t CP_DRAW_INDX_1_VIS_CULL(enum pc_di_vis_cull_mode val)
+{
+        return ((val) << CP_DRAW_INDX_1_VIS_CULL__SHIFT) & CP_DRAW_INDX_1_VIS_CULL__MASK;
+}
+#define CP_DRAW_INDX_1_INDEX_SIZE__MASK                         0x00000800
+#define CP_DRAW_INDX_1_INDEX_SIZE__SHIFT                        11
+static inline uint32_t CP_DRAW_INDX_1_INDEX_SIZE(enum pc_di_index_size val)
+{
+        return ((val) << CP_DRAW_INDX_1_INDEX_SIZE__SHIFT) & CP_DRAW_INDX_1_INDEX_SIZE__MASK;
+}
+#define CP_DRAW_INDX_1_NOT_EOP                                  0x00001000
+#define CP_DRAW_INDX_1_SMALL_INDEX                              0x00002000
+#define CP_DRAW_INDX_1_PRE_DRAW_INITIATOR_ENABLE                0x00004000
+#define CP_DRAW_INDX_1_NUM_INDICES__MASK                        0xffff0000
+#define CP_DRAW_INDX_1_NUM_INDICES__SHIFT                       16
+static inline uint32_t CP_DRAW_INDX_1_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_1_NUM_INDICES__SHIFT) & CP_DRAW_INDX_1_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2                                      0x00000002
+#define CP_DRAW_INDX_2_NUM_INDICES__MASK                        0xffffffff
+#define CP_DRAW_INDX_2_NUM_INDICES__SHIFT                       0
+static inline uint32_t CP_DRAW_INDX_2_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_NUM_INDICES__SHIFT) & CP_DRAW_INDX_2_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2                                      0x00000002
+#define CP_DRAW_INDX_2_INDX_BASE__MASK                          0xffffffff
+#define CP_DRAW_INDX_2_INDX_BASE__SHIFT                         0
+static inline uint32_t CP_DRAW_INDX_2_INDX_BASE(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_INDX_BASE__SHIFT) & CP_DRAW_INDX_2_INDX_BASE__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2                                      0x00000002
+#define CP_DRAW_INDX_2_INDX_SIZE__MASK                          0xffffffff
+#define CP_DRAW_INDX_2_INDX_SIZE__SHIFT                         0
+static inline uint32_t CP_DRAW_INDX_2_INDX_SIZE(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_INDX_SIZE__SHIFT) & CP_DRAW_INDX_2_INDX_SIZE__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2_0                                    0x00000000
+#define CP_DRAW_INDX_2_0_VIZ_QUERY__MASK                        0xffffffff
+#define CP_DRAW_INDX_2_0_VIZ_QUERY__SHIFT                       0
+static inline uint32_t CP_DRAW_INDX_2_0_VIZ_QUERY(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_0_VIZ_QUERY__SHIFT) & CP_DRAW_INDX_2_0_VIZ_QUERY__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2_1                                    0x00000001
+#define CP_DRAW_INDX_2_1_PRIM_TYPE__MASK                        0x0000003f
+#define CP_DRAW_INDX_2_1_PRIM_TYPE__SHIFT                       0
+static inline uint32_t CP_DRAW_INDX_2_1_PRIM_TYPE(enum pc_di_primtype val)
+{
+        return ((val) << CP_DRAW_INDX_2_1_PRIM_TYPE__SHIFT) & CP_DRAW_INDX_2_1_PRIM_TYPE__MASK;
+}
+#define CP_DRAW_INDX_2_1_SOURCE_SELECT__MASK                    0x000000c0
+#define CP_DRAW_INDX_2_1_SOURCE_SELECT__SHIFT                   6
+static inline uint32_t CP_DRAW_INDX_2_1_SOURCE_SELECT(enum pc_di_src_sel val)
+{
+        return ((val) << CP_DRAW_INDX_2_1_SOURCE_SELECT__SHIFT) & CP_DRAW_INDX_2_1_SOURCE_SELECT__MASK;
+}
+#define CP_DRAW_INDX_2_1_VIS_CULL__MASK                         0x00000600
+#define CP_DRAW_INDX_2_1_VIS_CULL__SHIFT                        9
+static inline uint32_t CP_DRAW_INDX_2_1_VIS_CULL(enum pc_di_vis_cull_mode val)
+{
+        return ((val) << CP_DRAW_INDX_2_1_VIS_CULL__SHIFT) & CP_DRAW_INDX_2_1_VIS_CULL__MASK;
+}
+#define CP_DRAW_INDX_2_1_INDEX_SIZE__MASK                       0x00000800
+#define CP_DRAW_INDX_2_1_INDEX_SIZE__SHIFT                      11
+static inline uint32_t CP_DRAW_INDX_2_1_INDEX_SIZE(enum pc_di_index_size val)
+{
+        return ((val) << CP_DRAW_INDX_2_1_INDEX_SIZE__SHIFT) & CP_DRAW_INDX_2_1_INDEX_SIZE__MASK;
+}
+#define CP_DRAW_INDX_2_1_NOT_EOP                                0x00001000
+#define CP_DRAW_INDX_2_1_SMALL_INDEX                            0x00002000
+#define CP_DRAW_INDX_2_1_PRE_DRAW_INITIATOR_ENABLE              0x00004000
+#define CP_DRAW_INDX_2_1_NUM_INDICES__MASK                      0xffff0000
+#define CP_DRAW_INDX_2_1_NUM_INDICES__SHIFT                     16
+static inline uint32_t CP_DRAW_INDX_2_1_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_1_NUM_INDICES__SHIFT) & CP_DRAW_INDX_2_1_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_2_2                                    0x00000002
+#define CP_DRAW_INDX_2_2_NUM_INDICES__MASK                      0xffffffff
+#define CP_DRAW_INDX_2_2_NUM_INDICES__SHIFT                     0
+static inline uint32_t CP_DRAW_INDX_2_2_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_2_2_NUM_INDICES__SHIFT) & CP_DRAW_INDX_2_2_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_OFFSET_0                               0x00000000
+#define CP_DRAW_INDX_OFFSET_0_PRIM_TYPE__MASK                   0x0000003f
+#define CP_DRAW_INDX_OFFSET_0_PRIM_TYPE__SHIFT                  0
+static inline uint32_t CP_DRAW_INDX_OFFSET_0_PRIM_TYPE(enum pc_di_primtype val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_0_PRIM_TYPE__SHIFT) & CP_DRAW_INDX_OFFSET_0_PRIM_TYPE__MASK;
+}
+#define CP_DRAW_INDX_OFFSET_0_SOURCE_SELECT__MASK               0x000000c0
+#define CP_DRAW_INDX_OFFSET_0_SOURCE_SELECT__SHIFT              6
+static inline uint32_t CP_DRAW_INDX_OFFSET_0_SOURCE_SELECT(enum pc_di_src_sel val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_0_SOURCE_SELECT__SHIFT) & CP_DRAW_INDX_OFFSET_0_SOURCE_SELECT__MASK;
+}
+#define CP_DRAW_INDX_OFFSET_0_VIS_CULL__MASK                    0x00000700
+#define CP_DRAW_INDX_OFFSET_0_VIS_CULL__SHIFT                   8
+static inline uint32_t CP_DRAW_INDX_OFFSET_0_VIS_CULL(enum pc_di_vis_cull_mode val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_0_VIS_CULL__SHIFT) & CP_DRAW_INDX_OFFSET_0_VIS_CULL__MASK;
+}
+#define CP_DRAW_INDX_OFFSET_0_INDEX_SIZE__MASK                  0x00000800
+#define CP_DRAW_INDX_OFFSET_0_INDEX_SIZE__SHIFT                 11
+static inline uint32_t CP_DRAW_INDX_OFFSET_0_INDEX_SIZE(enum pc_di_index_size val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_0_INDEX_SIZE__SHIFT) & CP_DRAW_INDX_OFFSET_0_INDEX_SIZE__MASK;
+}
+#define CP_DRAW_INDX_OFFSET_0_NOT_EOP                           0x00001000
+#define CP_DRAW_INDX_OFFSET_0_SMALL_INDEX                       0x00002000
+#define CP_DRAW_INDX_OFFSET_0_PRE_DRAW_INITIATOR_ENABLE         0x00004000
+#define CP_DRAW_INDX_OFFSET_0_NUM_INDICES__MASK                 0xffff0000
+#define CP_DRAW_INDX_OFFSET_0_NUM_INDICES__SHIFT                16
+static inline uint32_t CP_DRAW_INDX_OFFSET_0_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_0_NUM_INDICES__SHIFT) & CP_DRAW_INDX_OFFSET_0_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_OFFSET_1                               0x00000001
+
+#define REG_CP_DRAW_INDX_OFFSET_2                               0x00000002
+#define CP_DRAW_INDX_OFFSET_2_NUM_INDICES__MASK                 0xffffffff
+#define CP_DRAW_INDX_OFFSET_2_NUM_INDICES__SHIFT                0
+static inline uint32_t CP_DRAW_INDX_OFFSET_2_NUM_INDICES(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_2_NUM_INDICES__SHIFT) & CP_DRAW_INDX_OFFSET_2_NUM_INDICES__MASK;
+}
+
+#define REG_CP_DRAW_INDX_OFFSET_2                               0x00000002
+#define CP_DRAW_INDX_OFFSET_2_INDX_BASE__MASK                   0xffffffff
+#define CP_DRAW_INDX_OFFSET_2_INDX_BASE__SHIFT                  0
+static inline uint32_t CP_DRAW_INDX_OFFSET_2_INDX_BASE(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_2_INDX_BASE__SHIFT) & CP_DRAW_INDX_OFFSET_2_INDX_BASE__MASK;
+}
+
+#define REG_CP_DRAW_INDX_OFFSET_2                               0x00000002
+#define CP_DRAW_INDX_OFFSET_2_INDX_SIZE__MASK                   0xffffffff
+#define CP_DRAW_INDX_OFFSET_2_INDX_SIZE__SHIFT                  0
+static inline uint32_t CP_DRAW_INDX_OFFSET_2_INDX_SIZE(uint32_t val)
+{
+        return ((val) << CP_DRAW_INDX_OFFSET_2_INDX_SIZE__SHIFT) & CP_DRAW_INDX_OFFSET_2_INDX_SIZE__MASK;
+}
+
+#define REG_CP_SET_DRAW_STATE_0                                 0x00000000
+#define CP_SET_DRAW_STATE_0_COUNT__MASK                         0x0000ffff
+#define CP_SET_DRAW_STATE_0_COUNT__SHIFT                        0
+static inline uint32_t CP_SET_DRAW_STATE_0_COUNT(uint32_t val)
+{
+        return ((val) << CP_SET_DRAW_STATE_0_COUNT__SHIFT) & CP_SET_DRAW_STATE_0_COUNT__MASK;
+}
+#define CP_SET_DRAW_STATE_0_DIRTY                               0x00010000
+#define CP_SET_DRAW_STATE_0_DISABLE                             0x00020000
+#define CP_SET_DRAW_STATE_0_DISABLE_ALL_GROUPS                  0x00040000
+#define CP_SET_DRAW_STATE_0_LOAD_IMMED                          0x00080000
+#define CP_SET_DRAW_STATE_0_GROUP_ID__MASK                      0x1f000000
+#define CP_SET_DRAW_STATE_0_GROUP_ID__SHIFT                     24
+static inline uint32_t CP_SET_DRAW_STATE_0_GROUP_ID(uint32_t val)
+{
+        return ((val) << CP_SET_DRAW_STATE_0_GROUP_ID__SHIFT) & CP_SET_DRAW_STATE_0_GROUP_ID__MASK;
+}
+
+#define REG_CP_SET_DRAW_STATE_1                                 0x00000001
+#define CP_SET_DRAW_STATE_1_ADDR__MASK                          0xffffffff
+#define CP_SET_DRAW_STATE_1_ADDR__SHIFT                         0
+static inline uint32_t CP_SET_DRAW_STATE_1_ADDR(uint32_t val)
+{
+        return ((val) << CP_SET_DRAW_STATE_1_ADDR__SHIFT) & CP_SET_DRAW_STATE_1_ADDR__MASK;
+}
+
 #define REG_CP_SET_BIN_0                                        0x00000000
 
 #define REG_CP_SET_BIN_1                                        0x00000001
@@ -262,5 +473,21 @@ static inline uint32_t CP_SET_BIN_2_Y2(uint32_t val)
         return ((val) << CP_SET_BIN_2_Y2__SHIFT) & CP_SET_BIN_2_Y2__MASK;
 }
 
+#define REG_CP_SET_BIN_DATA_0                                   0x00000000
+#define CP_SET_BIN_DATA_0_BIN_DATA_ADDR__MASK                   0xffffffff
+#define CP_SET_BIN_DATA_0_BIN_DATA_ADDR__SHIFT                  0
+static inline uint32_t CP_SET_BIN_DATA_0_BIN_DATA_ADDR(uint32_t val)
+{
+        return ((val) << CP_SET_BIN_DATA_0_BIN_DATA_ADDR__SHIFT) & CP_SET_BIN_DATA_0_BIN_DATA_ADDR__MASK;
+}
+
+#define REG_CP_SET_BIN_DATA_1                                   0x00000001
+#define CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__MASK                0xffffffff
+#define CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__SHIFT               0
+static inline uint32_t CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS(uint32_t val)
+{
+        return ((val) << CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__SHIFT) & CP_SET_BIN_DATA_1_BIN_SIZE_ADDRESS__MASK;
+}
+
 
 #endif /* ADRENO_PM4_XML */
diff --git a/drivers/gpu/drm/msm/dsi/dsi.xml.h b/drivers/gpu/drm/msm/dsi/dsi.xml.h
index 87be647e3825..0f1f5b9459a5 100644
--- a/drivers/gpu/drm/msm/dsi/dsi.xml.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h b/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h
index 747a6ef4211f..d468f86f637c 100644
--- a/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h
+++ b/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/dsi/sfpb.xml.h b/drivers/gpu/drm/msm/dsi/sfpb.xml.h
index 48e03acf19bf..da8740054cdf 100644
--- a/drivers/gpu/drm/msm/dsi/sfpb.xml.h
+++ b/drivers/gpu/drm/msm/dsi/sfpb.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
index 7f7aadef8a82..a125a7e32742 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -123,7 +123,8 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder)
         for (i = 0; i < config->hpd_reg_cnt; i++) {
                 struct regulator *reg;
 
-                reg = devm_regulator_get(&pdev->dev, config->hpd_reg_names[i]);
+                reg = devm_regulator_get_exclusive(&pdev->dev,
+                                config->hpd_reg_names[i]);
                 if (IS_ERR(reg)) {
                         ret = PTR_ERR(reg);
                         dev_err(dev->dev, "failed to get hpd regulator: %s (%d)\n",
@@ -138,7 +139,8 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder)
         for (i = 0; i < config->pwr_reg_cnt; i++) {
                 struct regulator *reg;
 
-                reg = devm_regulator_get(&pdev->dev, config->pwr_reg_names[i]);
+                reg = devm_regulator_get_exclusive(&pdev->dev,
+                                config->pwr_reg_names[i]);
                 if (IS_ERR(reg)) {
                         ret = PTR_ERR(reg);
                         dev_err(dev->dev, "failed to get pwr regulator: %s (%d)\n",
@@ -266,37 +268,56 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data)
         {
                 int gpio = of_get_named_gpio(of_node, name, 0);
                 if (gpio < 0) {
-                        dev_err(dev, "failed to get gpio: %s (%d)\n",
-                                        name, gpio);
-                        gpio = -1;
+                        char name2[32];
+                        snprintf(name2, sizeof(name2), "%s-gpio", name);
+                        gpio = of_get_named_gpio(of_node, name2, 0);
+                        if (gpio < 0) {
+                                dev_err(dev, "failed to get gpio: %s (%d)\n",
+                                                name, gpio);
+                                gpio = -1;
+                        }
                 }
                 return gpio;
         }
 
-        /* TODO actually use DT.. */
-        static const char *hpd_reg_names[] = {"hpd-gdsc", "hpd-5v"};
-        static const char *pwr_reg_names[] = {"core-vdda", "core-vcc"};
-        static const char *hpd_clk_names[] = {"iface_clk", "core_clk", "mdp_core_clk"};
-        static unsigned long hpd_clk_freq[] = {0, 19200000, 0};
-        static const char *pwr_clk_names[] = {"extp_clk", "alt_iface_clk"};
+        if (of_device_is_compatible(of_node, "qcom,hdmi-tx-8074")) {
+                static const char *hpd_reg_names[] = {"hpd-gdsc", "hpd-5v"};
+                static const char *pwr_reg_names[] = {"core-vdda", "core-vcc"};
+                static const char *hpd_clk_names[] = {"iface_clk", "core_clk", "mdp_core_clk"};
+                static unsigned long hpd_clk_freq[] = {0, 19200000, 0};
+                static const char *pwr_clk_names[] = {"extp_clk", "alt_iface_clk"};
+                config.phy_init      = hdmi_phy_8x74_init;
+                config.hpd_reg_names = hpd_reg_names;
+                config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);
+                config.pwr_reg_names = pwr_reg_names;
+                config.pwr_reg_cnt   = ARRAY_SIZE(pwr_reg_names);
+                config.hpd_clk_names = hpd_clk_names;
+                config.hpd_freq      = hpd_clk_freq;
+                config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);
+                config.pwr_clk_names = pwr_clk_names;
+                config.pwr_clk_cnt   = ARRAY_SIZE(pwr_clk_names);
+                config.shared_irq    = true;
+        } else if (of_device_is_compatible(of_node, "qcom,hdmi-tx-8960")) {
+                static const char *hpd_clk_names[] = {"core_clk", "master_iface_clk", "slave_iface_clk"};
+                static const char *hpd_reg_names[] = {"core-vdda", "hdmi-mux"};
+                config.phy_init      = hdmi_phy_8960_init;
+                config.hpd_reg_names = hpd_reg_names;
+                config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);
+                config.hpd_clk_names = hpd_clk_names;
+                config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);
+        } else if (of_device_is_compatible(of_node, "qcom,hdmi-tx-8660")) {
+                config.phy_init      = hdmi_phy_8x60_init;
+        } else {
+                dev_err(dev, "unknown phy: %s\n", of_node->name);
+        }
 
-        config.phy_init      = hdmi_phy_8x74_init;
         config.mmio_name     = "core_physical";
-        config.hpd_reg_names = hpd_reg_names;
-        config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);
-        config.pwr_reg_names = pwr_reg_names;
-        config.pwr_reg_cnt   = ARRAY_SIZE(pwr_reg_names);
-        config.hpd_clk_names = hpd_clk_names;
-        config.hpd_freq      = hpd_clk_freq;
-        config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);
-        config.pwr_clk_names = pwr_clk_names;
-        config.pwr_clk_cnt   = ARRAY_SIZE(pwr_clk_names);
         config.ddc_clk_gpio  = get_gpio("qcom,hdmi-tx-ddc-clk");
         config.ddc_data_gpio = get_gpio("qcom,hdmi-tx-ddc-data");
         config.hpd_gpio      = get_gpio("qcom,hdmi-tx-hpd");
         config.mux_en_gpio   = get_gpio("qcom,hdmi-tx-mux-en");
         config.mux_sel_gpio  = get_gpio("qcom,hdmi-tx-mux-sel");
-        config.shared_irq    = true;
+        config.mux_lpm_gpio  = get_gpio("qcom,hdmi-tx-mux-lpm");
 
 #else
         static const char *hpd_clk_names[] = {
@@ -373,7 +394,9 @@ static int hdmi_dev_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id dt_match[] = {
-        { .compatible = "qcom,hdmi-tx" },
+        { .compatible = "qcom,hdmi-tx-8074" },
+        { .compatible = "qcom,hdmi-tx-8960" },
+        { .compatible = "qcom,hdmi-tx-8660" },
         {}
 };
 
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
index 9d7723c6528a..b981995410b5 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -96,6 +96,7 @@ struct hdmi_platform_config {
 
         /* gpio's: */
         int ddc_clk_gpio, ddc_data_gpio, hpd_gpio, mux_en_gpio, mux_sel_gpio;
+        int mux_lpm_gpio;
 
         /* older devices had their own irq, mdp5+ it is shared w/ mdp: */
         bool shared_irq;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.xml.h b/drivers/gpu/drm/msm/hdmi/hdmi.xml.h
index e2636582cfd7..e89fe053d375 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi.xml.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.xml.h
@@ -12,14 +12,14 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -148,9 +148,9 @@ static inline uint32_t REG_HDMI_GENERIC0(uint32_t i0) { return 0x00000088 + 0x4*
 
 static inline uint32_t REG_HDMI_GENERIC1(uint32_t i0) { return 0x000000a8 + 0x4*i0; }
 
-static inline uint32_t REG_HDMI_ACR(uint32_t i0) { return 0x000000c4 + 0x8*i0; }
+static inline uint32_t REG_HDMI_ACR(enum hdmi_acr_cts i0) { return 0x000000c4 + 0x8*i0; }
 
-static inline uint32_t REG_HDMI_ACR_0(uint32_t i0) { return 0x000000c4 + 0x8*i0; }
+static inline uint32_t REG_HDMI_ACR_0(enum hdmi_acr_cts i0) { return 0x000000c4 + 0x8*i0; }
 #define HDMI_ACR_0_CTS__MASK                                    0xfffff000
 #define HDMI_ACR_0_CTS__SHIFT                                   12
 static inline uint32_t HDMI_ACR_0_CTS(uint32_t val)
@@ -158,7 +158,7 @@ static inline uint32_t HDMI_ACR_0_CTS(uint32_t val)
         return ((val) << HDMI_ACR_0_CTS__SHIFT) & HDMI_ACR_0_CTS__MASK;
 }
 
-static inline uint32_t REG_HDMI_ACR_1(uint32_t i0) { return 0x000000c8 + 0x8*i0; }
+static inline uint32_t REG_HDMI_ACR_1(enum hdmi_acr_cts i0) { return 0x000000c8 + 0x8*i0; }
 #define HDMI_ACR_1_N__MASK                                      0xffffffff
 #define HDMI_ACR_1_N__SHIFT                                     0
 static inline uint32_t HDMI_ACR_1_N(uint32_t val)
@@ -552,6 +552,103 @@ static inline uint32_t HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL(uint32_t val)
 #define REG_HDMI_8960_PHY_REG11                                 0x0000042c
 
 #define REG_HDMI_8960_PHY_REG12                                 0x00000430
+#define HDMI_8960_PHY_REG12_SW_RESET                            0x00000020
+#define HDMI_8960_PHY_REG12_PWRDN_B                             0x00000080
+
+#define REG_HDMI_8960_PHY_REG_BIST_CFG                          0x00000434
+
+#define REG_HDMI_8960_PHY_DEBUG_BUS_SEL                         0x00000438
+
+#define REG_HDMI_8960_PHY_REG_MISC0                             0x0000043c
+
+#define REG_HDMI_8960_PHY_REG13                                 0x00000440
+
+#define REG_HDMI_8960_PHY_REG14                                 0x00000444
+
+#define REG_HDMI_8960_PHY_REG15                                 0x00000448
+
+#define REG_HDMI_8960_PHY_PLL_REFCLK_CFG                        0x00000500
+
+#define REG_HDMI_8960_PHY_PLL_CHRG_PUMP_CFG                     0x00000504
+
+#define REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0                     0x00000508
+
+#define REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1                     0x0000050c
+
+#define REG_HDMI_8960_PHY_PLL_IDAC_ADJ_CFG                      0x00000510
+
+#define REG_HDMI_8960_PHY_PLL_I_VI_KVCO_CFG                     0x00000514
+
+#define REG_HDMI_8960_PHY_PLL_PWRDN_B                           0x00000518
+#define HDMI_8960_PHY_PLL_PWRDN_B_PD_PLL                        0x00000002
+#define HDMI_8960_PHY_PLL_PWRDN_B_PLL_PWRDN_B                   0x00000008
+
+#define REG_HDMI_8960_PHY_PLL_SDM_CFG0                          0x0000051c
+
+#define REG_HDMI_8960_PHY_PLL_SDM_CFG1                          0x00000520
+
+#define REG_HDMI_8960_PHY_PLL_SDM_CFG2                          0x00000524
+
+#define REG_HDMI_8960_PHY_PLL_SDM_CFG3                          0x00000528
+
+#define REG_HDMI_8960_PHY_PLL_SDM_CFG4                          0x0000052c
+
+#define REG_HDMI_8960_PHY_PLL_SSC_CFG0                          0x00000530
+
+#define REG_HDMI_8960_PHY_PLL_SSC_CFG1                          0x00000534
+
+#define REG_HDMI_8960_PHY_PLL_SSC_CFG2                          0x00000538
+
+#define REG_HDMI_8960_PHY_PLL_SSC_CFG3                          0x0000053c
+
+#define REG_HDMI_8960_PHY_PLL_LOCKDET_CFG0                      0x00000540
+
+#define REG_HDMI_8960_PHY_PLL_LOCKDET_CFG1                      0x00000544
+
+#define REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2                      0x00000548
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0                       0x0000054c
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1                       0x00000550
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2                       0x00000554
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3                       0x00000558
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4                       0x0000055c
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5                       0x00000560
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG6                       0x00000564
+
+#define REG_HDMI_8960_PHY_PLL_VCOCAL_CFG7                       0x00000568
+
+#define REG_HDMI_8960_PHY_PLL_DEBUG_SEL                         0x0000056c
+
+#define REG_HDMI_8960_PHY_PLL_MISC0                             0x00000570
+
+#define REG_HDMI_8960_PHY_PLL_MISC1                             0x00000574
+
+#define REG_HDMI_8960_PHY_PLL_MISC2                             0x00000578
+
+#define REG_HDMI_8960_PHY_PLL_MISC3                             0x0000057c
+
+#define REG_HDMI_8960_PHY_PLL_MISC4                             0x00000580
+
+#define REG_HDMI_8960_PHY_PLL_MISC5                             0x00000584
+
+#define REG_HDMI_8960_PHY_PLL_MISC6                             0x00000588
+
+#define REG_HDMI_8960_PHY_PLL_DEBUG_BUS0                        0x0000058c
+
+#define REG_HDMI_8960_PHY_PLL_DEBUG_BUS1                        0x00000590
+
+#define REG_HDMI_8960_PHY_PLL_DEBUG_BUS2                        0x00000594
+
+#define REG_HDMI_8960_PHY_PLL_STATUS0                           0x00000598
+#define HDMI_8960_PHY_PLL_STATUS0_PLL_LOCK                      0x00000001
+
+#define REG_HDMI_8960_PHY_PLL_STATUS1                           0x0000059c
 
 #define REG_HDMI_8x74_ANA_CFG0                                  0x00000000
 
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 76960faae38f..4aca2a3c667c 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -63,7 +63,7 @@ static int gpio_config(struct hdmi *hdmi, bool on)
                         ret = gpio_request(config->mux_en_gpio, "HDMI_MUX_EN");
                         if (ret) {
                                 dev_err(dev->dev, "'%s'(%d) gpio_request failed: %d\n",
-                                        "HDMI_MUX_SEL", config->mux_en_gpio, ret);
+                                        "HDMI_MUX_EN", config->mux_en_gpio, ret);
                                 goto error4;
                         }
                         gpio_set_value_cansleep(config->mux_en_gpio, 1);
@@ -78,6 +78,19 @@ static int gpio_config(struct hdmi *hdmi, bool on)
                         }
                         gpio_set_value_cansleep(config->mux_sel_gpio, 0);
                 }
+
+                if (config->mux_lpm_gpio != -1) {
+                        ret = gpio_request(config->mux_lpm_gpio,
+                                        "HDMI_MUX_LPM");
+                        if (ret) {
+                                dev_err(dev->dev,
+                                        "'%s'(%d) gpio_request failed: %d\n",
+                                        "HDMI_MUX_LPM",
+                                        config->mux_lpm_gpio, ret);
+                                goto error6;
+                        }
+                        gpio_set_value_cansleep(config->mux_lpm_gpio, 1);
+                }
                 DBG("gpio on");
         } else {
                 gpio_free(config->ddc_clk_gpio);
@@ -93,11 +106,19 @@ static int gpio_config(struct hdmi *hdmi, bool on)
                         gpio_set_value_cansleep(config->mux_sel_gpio, 1);
                         gpio_free(config->mux_sel_gpio);
                 }
+
+                if (config->mux_lpm_gpio != -1) {
+                        gpio_set_value_cansleep(config->mux_lpm_gpio, 0);
+                        gpio_free(config->mux_lpm_gpio);
+                }
                 DBG("gpio off");
         }
 
         return 0;
 
+error6:
+        if (config->mux_sel_gpio != -1)
+                gpio_free(config->mux_sel_gpio);
 error5:
         if (config->mux_en_gpio != -1)
                 gpio_free(config->mux_en_gpio);
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
index e5b7ed5b8f01..902d7685d441 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
@@ -15,13 +15,370 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/clk.h>
+#include <linux/clk-provider.h>
+
 #include "hdmi.h"
 
 struct hdmi_phy_8960 {
         struct hdmi_phy base;
         struct hdmi *hdmi;
+        struct clk_hw pll_hw;
+        struct clk *pll;
+        unsigned long pixclk;
 };
 #define to_hdmi_phy_8960(x) container_of(x, struct hdmi_phy_8960, base)
+#define clk_to_phy(x) container_of(x, struct hdmi_phy_8960, pll_hw)
+
+/*
+ * HDMI PLL:
+ *
+ * To get the parent clock setup properly, we need to plug in hdmi pll
+ * configuration into common-clock-framework.
+ */
+
+struct pll_rate {
+        unsigned long rate;
+        struct {
+                uint32_t val;
+                uint32_t reg;
+        } conf[32];
+};
+
+/* NOTE: keep sorted highest freq to lowest: */
+static const struct pll_rate freqtbl[] = {
+        /* 1080p60/1080p50 case */
+        { 148500000, {
+                { 0x02, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x02, REG_HDMI_8960_PHY_PLL_CHRG_PUMP_CFG },
+                { 0x01, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0x33, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x2c, REG_HDMI_8960_PHY_PLL_IDAC_ADJ_CFG  },
+                { 0x06, REG_HDMI_8960_PHY_PLL_I_VI_KVCO_CFG },
+                { 0x0a, REG_HDMI_8960_PHY_PLL_PWRDN_B       },
+                { 0x76, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x01, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0x4c, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0xc0, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0x9a, REG_HDMI_8960_PHY_PLL_SSC_CFG0      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG1      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG2      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG3      },
+                { 0x10, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG0  },
+                { 0x1a, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG1  },
+                { 0x0d, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2  },
+                { 0xe6, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x02, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x33, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG6   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG7   },
+                { 0, 0 } }
+        },
+        { 108000000, {
+                { 0x08, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x21, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0xf9, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x1c, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x02, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x49, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x49, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0, 0 } }
+        },
+        /* 720p60/720p50/1080i60/1080i50/1080p24/1080p30/1080p25 */
+        { 74250000, {
+                { 0x0a, REG_HDMI_8960_PHY_PLL_PWRDN_B       },
+                { 0x12, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x01, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0x33, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x76, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0xe6, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x02, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0, 0 } }
+        },
+        { 65000000, {
+                { 0x18, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x20, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0xf9, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x8a, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x02, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x0b, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x4b, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0x7b, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0x09, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0, 0 } }
+        },
+        /* 480p60/480i60 */
+        { 27030000, {
+                { 0x0a, REG_HDMI_8960_PHY_PLL_PWRDN_B       },
+                { 0x38, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x02, REG_HDMI_8960_PHY_PLL_CHRG_PUMP_CFG },
+                { 0x20, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0xff, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x4e, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0xd7, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0x03, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0x2a, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x03, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x33, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG6   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG7   },
+                { 0, 0 } }
+        },
+        /* 576p50/576i50 */
+        { 27000000, {
+                { 0x32, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x02, REG_HDMI_8960_PHY_PLL_CHRG_PUMP_CFG },
+                { 0x01, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0x33, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x2c, REG_HDMI_8960_PHY_PLL_IDAC_ADJ_CFG  },
+                { 0x06, REG_HDMI_8960_PHY_PLL_I_VI_KVCO_CFG },
+                { 0x0a, REG_HDMI_8960_PHY_PLL_PWRDN_B       },
+                { 0x7b, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x01, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0x4c, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0xc0, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0x9a, REG_HDMI_8960_PHY_PLL_SSC_CFG0      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG1      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG2      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG3      },
+                { 0x10, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG0  },
+                { 0x1a, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG1  },
+                { 0x0d, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2  },
+                { 0x2a, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x03, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x33, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG6   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG7   },
+                { 0, 0 } }
+        },
+        /* 640x480p60 */
+        { 25200000, {
+                { 0x32, REG_HDMI_8960_PHY_PLL_REFCLK_CFG    },
+                { 0x02, REG_HDMI_8960_PHY_PLL_CHRG_PUMP_CFG },
+                { 0x01, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG0 },
+                { 0x33, REG_HDMI_8960_PHY_PLL_LOOP_FLT_CFG1 },
+                { 0x2c, REG_HDMI_8960_PHY_PLL_IDAC_ADJ_CFG  },
+                { 0x06, REG_HDMI_8960_PHY_PLL_I_VI_KVCO_CFG },
+                { 0x0a, REG_HDMI_8960_PHY_PLL_PWRDN_B       },
+                { 0x77, REG_HDMI_8960_PHY_PLL_SDM_CFG0      },
+                { 0x4c, REG_HDMI_8960_PHY_PLL_SDM_CFG1      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG2      },
+                { 0xc0, REG_HDMI_8960_PHY_PLL_SDM_CFG3      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SDM_CFG4      },
+                { 0x9a, REG_HDMI_8960_PHY_PLL_SSC_CFG0      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG1      },
+                { 0x00, REG_HDMI_8960_PHY_PLL_SSC_CFG2      },
+                { 0x20, REG_HDMI_8960_PHY_PLL_SSC_CFG3      },
+                { 0x10, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG0  },
+                { 0x1a, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG1  },
+                { 0x0d, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2  },
+                { 0xf4, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG0   },
+                { 0x02, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG1   },
+                { 0x3b, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG2   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG3   },
+                { 0x86, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG4   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG5   },
+                { 0x33, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG6   },
+                { 0x00, REG_HDMI_8960_PHY_PLL_VCOCAL_CFG7   },
+                { 0, 0 } }
+        },
+};
+
+static int hdmi_pll_enable(struct clk_hw *hw)
+{
+        struct hdmi_phy_8960 *phy_8960 = clk_to_phy(hw);
+        struct hdmi *hdmi = phy_8960->hdmi;
+        int timeout_count, pll_lock_retry = 10;
+        unsigned int val;
+
+        DBG("");
+
+        /* Assert PLL S/W reset */
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2, 0x8d);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG0, 0x10);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG1, 0x1a);
+
+        /* Wait for a short time before de-asserting
+         * to allow the hardware to complete its job.
+         * This much of delay should be fine for hardware
+         * to assert and de-assert.
+         */
+        udelay(10);
+
+        /* De-assert PLL S/W reset */
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2, 0x0d);
+
+        val = hdmi_read(hdmi, REG_HDMI_8960_PHY_REG12);
+        val |= HDMI_8960_PHY_REG12_SW_RESET;
+        /* Assert PHY S/W reset */
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG12, val);
+        val &= ~HDMI_8960_PHY_REG12_SW_RESET;
+        /* Wait for a short time before de-asserting
+           to allow the hardware to complete its job.
+           This much of delay should be fine for hardware
+           to assert and de-assert. */
+        udelay(10);
+        /* De-assert PHY S/W reset */
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG12, val);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG2,  0x3f);
+
+        val = hdmi_read(hdmi, REG_HDMI_8960_PHY_REG12);
+        val |= HDMI_8960_PHY_REG12_PWRDN_B;
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG12, val);
+        /* Wait 10 us for enabling global power for PHY */
+        mb();
+        udelay(10);
+
+        val = hdmi_read(hdmi, REG_HDMI_8960_PHY_PLL_PWRDN_B);
+        val |= HDMI_8960_PHY_PLL_PWRDN_B_PLL_PWRDN_B;
+        val &= ~HDMI_8960_PHY_PLL_PWRDN_B_PD_PLL;
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_PWRDN_B, val);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG2, 0x80);
+
+        timeout_count = 1000;
+        while (--pll_lock_retry > 0) {
+
+                /* are we there yet? */
+                val = hdmi_read(hdmi, REG_HDMI_8960_PHY_PLL_STATUS0);
+                if (val & HDMI_8960_PHY_PLL_STATUS0_PLL_LOCK)
+                        break;
+
+                udelay(1);
+
+                if (--timeout_count > 0)
+                        continue;
+
+                /*
+                 * PLL has still not locked.
+                 * Do a software reset and try again
+                 * Assert PLL S/W reset first
+                 */
+                hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2, 0x8d);
+                udelay(10);
+                hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_LOCKDET_CFG2, 0x0d);
+
+                /*
+                 * Wait for a short duration for the PLL calibration
+                 * before checking if the PLL gets locked
+                 */
+                udelay(350);
+
+                timeout_count = 1000;
+        }
+
+        return 0;
+}
+
+static void hdmi_pll_disable(struct clk_hw *hw)
+{
+        struct hdmi_phy_8960 *phy_8960 = clk_to_phy(hw);
+        struct hdmi *hdmi = phy_8960->hdmi;
+        unsigned int val;
+
+        DBG("");
+
+        val = hdmi_read(hdmi, REG_HDMI_8960_PHY_REG12);
+        val &= ~HDMI_8960_PHY_REG12_PWRDN_B;
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG12, val);
+
+        val = hdmi_read(hdmi, REG_HDMI_8960_PHY_PLL_PWRDN_B);
+        val |= HDMI_8960_PHY_REG12_SW_RESET;
+        val &= ~HDMI_8960_PHY_REG12_PWRDN_B;
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_PLL_PWRDN_B, val);
+        /* Make sure HDMI PHY/PLL are powered down */
+        mb();
+}
+
+static const struct pll_rate *find_rate(unsigned long rate)
+{
+        int i;
+        for (i = 1; i < ARRAY_SIZE(freqtbl); i++)
+                if (rate > freqtbl[i].rate)
+                        return &freqtbl[i-1];
+        return &freqtbl[i-1];
+}
+
+static unsigned long hdmi_pll_recalc_rate(struct clk_hw *hw,
+                                unsigned long parent_rate)
+{
+        struct hdmi_phy_8960 *phy_8960 = clk_to_phy(hw);
+        return phy_8960->pixclk;
+}
+
+static long hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate,
+                unsigned long *parent_rate)
+{
+        const struct pll_rate *pll_rate = find_rate(rate);
+        return pll_rate->rate;
+}
+
+static int hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate,
+                unsigned long parent_rate)
+{
+        struct hdmi_phy_8960 *phy_8960 = clk_to_phy(hw);
+        struct hdmi *hdmi = phy_8960->hdmi;
+        const struct pll_rate *pll_rate = find_rate(rate);
+        int i;
+
+        DBG("rate=%lu", rate);
+
+        for (i = 0; pll_rate->conf[i].reg; i++)
+                hdmi_write(hdmi, pll_rate->conf[i].reg, pll_rate->conf[i].val);
+
+        phy_8960->pixclk = rate;
+
+        return 0;
+}
+
+
+static const struct clk_ops hdmi_pll_ops = {
+        .enable = hdmi_pll_enable,
+        .disable = hdmi_pll_disable,
+        .recalc_rate = hdmi_pll_recalc_rate,
+        .round_rate = hdmi_pll_round_rate,
+        .set_rate = hdmi_pll_set_rate,
+};
+
+static const char *hdmi_pll_parents[] = {
+        "pxo",
+};
+
+static struct clk_init_data pll_init = {
+        .name = "hdmi_pll",
+        .ops = &hdmi_pll_ops,
+        .parent_names = hdmi_pll_parents,
+        .num_parents = ARRAY_SIZE(hdmi_pll_parents),
+};
+
+
+/*
+ * HDMI Phy:
+ */
 
 static void hdmi_phy_8960_destroy(struct hdmi_phy *phy)
 {
@@ -86,6 +443,9 @@ static void hdmi_phy_8960_powerup(struct hdmi_phy *phy,
         struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
         struct hdmi *hdmi = phy_8960->hdmi;
 
+        DBG("pixclock: %lu", pixclock);
+
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG2, 0x00);
         hdmi_write(hdmi, REG_HDMI_8960_PHY_REG0, 0x1b);
         hdmi_write(hdmi, REG_HDMI_8960_PHY_REG1, 0xf2);
         hdmi_write(hdmi, REG_HDMI_8960_PHY_REG4, 0x00);
@@ -104,6 +464,8 @@ static void hdmi_phy_8960_powerdown(struct hdmi_phy *phy)
         struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
         struct hdmi *hdmi = phy_8960->hdmi;
 
+        DBG("");
+
         hdmi_write(hdmi, REG_HDMI_8960_PHY_REG2, 0x7f);
 }
 
@@ -118,7 +480,12 @@ struct hdmi_phy *hdmi_phy_8960_init(struct hdmi *hdmi)
 {
         struct hdmi_phy_8960 *phy_8960;
         struct hdmi_phy *phy = NULL;
-        int ret;
+        int ret, i;
+
+        /* sanity check: */
+        for (i = 0; i < (ARRAY_SIZE(freqtbl) - 1); i++)
+                if (WARN_ON(freqtbl[i].rate < freqtbl[i+1].rate))
+                        return ERR_PTR(-EINVAL);
 
         phy_8960 = kzalloc(sizeof(*phy_8960), GFP_KERNEL);
         if (!phy_8960) {
@@ -132,6 +499,14 @@ struct hdmi_phy *hdmi_phy_8960_init(struct hdmi *hdmi)
 
         phy_8960->hdmi = hdmi;
 
+        phy_8960->pll_hw.init = &pll_init;
+        phy_8960->pll = devm_clk_register(hdmi->dev->dev, &phy_8960->pll_hw);
+        if (IS_ERR(phy_8960->pll)) {
+                ret = PTR_ERR(phy_8960->pll);
+                phy_8960->pll = NULL;
+                goto fail;
+        }
+
         return phy;
 
 fail:
diff --git a/drivers/gpu/drm/msm/hdmi/qfprom.xml.h b/drivers/gpu/drm/msm/hdmi/qfprom.xml.h
index d591567173c4..bd81db6a7829 100644
--- a/drivers/gpu/drm/msm/hdmi/qfprom.xml.h
+++ b/drivers/gpu/drm/msm/hdmi/qfprom.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h
index 416a26e1e58d..122208e8a2ee 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
index 0bb4faa17523..733646c0d3f8 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c
@@ -147,7 +147,7 @@ static void mdp4_destroy(struct msm_kms *kms)
         if (mdp4_kms->blank_cursor_iova)
                 msm_gem_put_iova(mdp4_kms->blank_cursor_bo, mdp4_kms->id);
         if (mdp4_kms->blank_cursor_bo)
-                drm_gem_object_unreference(mdp4_kms->blank_cursor_bo);
+                drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo);
         kfree(mdp4_kms);
 }
 
@@ -176,6 +176,8 @@ int mdp4_disable(struct mdp4_kms *mdp4_kms)
         if (mdp4_kms->pclk)
                 clk_disable_unprepare(mdp4_kms->pclk);
         clk_disable_unprepare(mdp4_kms->lut_clk);
+        if (mdp4_kms->axi_clk)
+                clk_disable_unprepare(mdp4_kms->axi_clk);
 
         return 0;
 }
@@ -188,6 +190,8 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms)
         if (mdp4_kms->pclk)
                 clk_prepare_enable(mdp4_kms->pclk);
         clk_prepare_enable(mdp4_kms->lut_clk);
+        if (mdp4_kms->axi_clk)
+                clk_prepare_enable(mdp4_kms->axi_clk);
 
         return 0;
 }
@@ -294,15 +298,17 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
                 goto fail;
         }
 
-        mdp4_kms->dsi_pll_vdda = devm_regulator_get(&pdev->dev, "dsi_pll_vdda");
+        mdp4_kms->dsi_pll_vdda =
+                        devm_regulator_get_optional(&pdev->dev, "dsi_pll_vdda");
         if (IS_ERR(mdp4_kms->dsi_pll_vdda))
                 mdp4_kms->dsi_pll_vdda = NULL;
 
-        mdp4_kms->dsi_pll_vddio = devm_regulator_get(&pdev->dev, "dsi_pll_vddio");
+        mdp4_kms->dsi_pll_vddio =
+                        devm_regulator_get_optional(&pdev->dev, "dsi_pll_vddio");
         if (IS_ERR(mdp4_kms->dsi_pll_vddio))
                 mdp4_kms->dsi_pll_vddio = NULL;
 
-        mdp4_kms->vdd = devm_regulator_get(&pdev->dev, "vdd");
+        mdp4_kms->vdd = devm_regulator_get_exclusive(&pdev->dev, "vdd");
         if (IS_ERR(mdp4_kms->vdd))
                 mdp4_kms->vdd = NULL;
 
@@ -333,6 +339,13 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
                 goto fail;
         }
 
+        mdp4_kms->axi_clk = devm_clk_get(&pdev->dev, "mdp_axi_clk");
+        if (IS_ERR(mdp4_kms->axi_clk)) {
+                dev_err(dev->dev, "failed to get axi_clk\n");
+                ret = PTR_ERR(mdp4_kms->axi_clk);
+                goto fail;
+        }
+
         clk_set_rate(mdp4_kms->clk, config->max_clk);
         clk_set_rate(mdp4_kms->lut_clk, config->max_clk);
 
@@ -348,7 +361,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
         mdelay(16);
 
         if (config->iommu) {
-                mmu = msm_iommu_new(dev, config->iommu);
+                mmu = msm_iommu_new(&pdev->dev, config->iommu);
                 if (IS_ERR(mmu)) {
                         ret = PTR_ERR(mmu);
                         goto fail;
@@ -406,6 +419,8 @@ static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev)
         static struct mdp4_platform_config config = {};
 #ifdef CONFIG_OF
         /* TODO */
+        config.max_clk = 266667000;
+        config.iommu = iommu_domain_alloc(&platform_bus_type);
 #else
         if (cpu_is_apq8064())
                 config.max_clk = 266667000;
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
index 715520c54cde..3225da804c61 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h
@@ -42,6 +42,7 @@ struct mdp4_kms {
         struct clk *clk;
         struct clk *pclk;
         struct clk *lut_clk;
+        struct clk *axi_clk;
 
         struct mdp_irq error_handler;
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h
index 0aa51517f826..67f4f896ba8c 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h
@@ -12,14 +12,14 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
-Copyright (C) 2013 by the following authors:
+Copyright (C) 2013-2014 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -68,6 +68,8 @@ enum mdp5_pipe {
         SSPP_RGB2 = 5,
         SSPP_DMA0 = 6,
         SSPP_DMA1 = 7,
+        SSPP_VIG3 = 8,
+        SSPP_RGB3 = 9,
 };
 
 enum mdp5_ctl_mode {
@@ -126,7 +128,11 @@ enum mdp5_client_id {
         CID_RGB0 = 16,
         CID_RGB1 = 17,
         CID_RGB2 = 18,
-        CID_MAX = 19,
+        CID_VIG3_Y = 19,
+        CID_VIG3_CR = 20,
+        CID_VIG3_CB = 21,
+        CID_RGB3 = 22,
+        CID_MAX = 23,
 };
 
 enum mdp5_igc_type {
@@ -299,11 +305,34 @@ static inline uint32_t MDP5_IGC_LUT_REG_VAL(uint32_t val)
 #define MDP5_IGC_LUT_REG_DISABLE_PIPE_1                         0x20000000
 #define MDP5_IGC_LUT_REG_DISABLE_PIPE_2                         0x40000000
 
-static inline uint32_t REG_MDP5_CTL(uint32_t i0) { return 0x00000600 + 0x100*i0; }
+static inline uint32_t __offset_CTL(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return (mdp5_cfg->ctl.base[0]);
+                case 1: return (mdp5_cfg->ctl.base[1]);
+                case 2: return (mdp5_cfg->ctl.base[2]);
+                case 3: return (mdp5_cfg->ctl.base[3]);
+                case 4: return (mdp5_cfg->ctl.base[4]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_CTL(uint32_t i0) { return 0x00000000 + __offset_CTL(i0); }
 
-static inline uint32_t REG_MDP5_CTL_LAYER(uint32_t i0, uint32_t i1) { return 0x00000600 + 0x100*i0 + 0x4*i1; }
+static inline uint32_t __offset_LAYER(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return 0x00000000;
+                case 1: return 0x00000004;
+                case 2: return 0x00000008;
+                case 3: return 0x0000000c;
+                case 4: return 0x00000010;
+                case 5: return 0x00000024;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_CTL_LAYER(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_CTL(i0) + __offset_LAYER(i1); }
 
-static inline uint32_t REG_MDP5_CTL_LAYER_REG(uint32_t i0, uint32_t i1) { return 0x00000600 + 0x100*i0 + 0x4*i1; }
+static inline uint32_t REG_MDP5_CTL_LAYER_REG(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_CTL(i0) + __offset_LAYER(i1); }
 #define MDP5_CTL_LAYER_REG_VIG0__MASK                           0x00000007
 #define MDP5_CTL_LAYER_REG_VIG0__SHIFT                          0
 static inline uint32_t MDP5_CTL_LAYER_REG_VIG0(enum mdp_mixer_stage_id val)
@@ -354,8 +383,20 @@ static inline uint32_t MDP5_CTL_LAYER_REG_DMA1(enum mdp_mixer_stage_id val)
 }
 #define MDP5_CTL_LAYER_REG_BORDER_COLOR                         0x01000000
 #define MDP5_CTL_LAYER_REG_CURSOR_OUT                           0x02000000
+#define MDP5_CTL_LAYER_REG_VIG3__MASK                           0x1c000000
+#define MDP5_CTL_LAYER_REG_VIG3__SHIFT                          26
+static inline uint32_t MDP5_CTL_LAYER_REG_VIG3(enum mdp_mixer_stage_id val)
+{
+        return ((val) << MDP5_CTL_LAYER_REG_VIG3__SHIFT) & MDP5_CTL_LAYER_REG_VIG3__MASK;
+}
+#define MDP5_CTL_LAYER_REG_RGB3__MASK                           0xe0000000
+#define MDP5_CTL_LAYER_REG_RGB3__SHIFT                          29
+static inline uint32_t MDP5_CTL_LAYER_REG_RGB3(enum mdp_mixer_stage_id val)
+{
+        return ((val) << MDP5_CTL_LAYER_REG_RGB3__SHIFT) & MDP5_CTL_LAYER_REG_RGB3__MASK;
+}
 
-static inline uint32_t REG_MDP5_CTL_OP(uint32_t i0) { return 0x00000614 + 0x100*i0; }
+static inline uint32_t REG_MDP5_CTL_OP(uint32_t i0) { return 0x00000014 + __offset_CTL(i0); }
 #define MDP5_CTL_OP_MODE__MASK                                  0x0000000f
 #define MDP5_CTL_OP_MODE__SHIFT                                 0
 static inline uint32_t MDP5_CTL_OP_MODE(enum mdp5_ctl_mode val)
@@ -377,7 +418,7 @@ static inline uint32_t MDP5_CTL_OP_PACK_3D(enum mdp5_pack_3d val)
         return ((val) << MDP5_CTL_OP_PACK_3D__SHIFT) & MDP5_CTL_OP_PACK_3D__MASK;
 }
 
-static inline uint32_t REG_MDP5_CTL_FLUSH(uint32_t i0) { return 0x00000618 + 0x100*i0; }
+static inline uint32_t REG_MDP5_CTL_FLUSH(uint32_t i0) { return 0x00000018 + __offset_CTL(i0); }
 #define MDP5_CTL_FLUSH_VIG0                                     0x00000001
 #define MDP5_CTL_FLUSH_VIG1                                     0x00000002
 #define MDP5_CTL_FLUSH_VIG2                                     0x00000004
@@ -387,26 +428,48 @@ static inline uint32_t REG_MDP5_CTL_FLUSH(uint32_t i0) { return 0x00000618 + 0x1
 #define MDP5_CTL_FLUSH_LM0                                      0x00000040
 #define MDP5_CTL_FLUSH_LM1                                      0x00000080
 #define MDP5_CTL_FLUSH_LM2                                      0x00000100
+#define MDP5_CTL_FLUSH_LM3                                      0x00000200
+#define MDP5_CTL_FLUSH_LM4                                      0x00000400
 #define MDP5_CTL_FLUSH_DMA0                                     0x00000800
 #define MDP5_CTL_FLUSH_DMA1                                     0x00001000
 #define MDP5_CTL_FLUSH_DSPP0                                    0x00002000
 #define MDP5_CTL_FLUSH_DSPP1                                    0x00004000
 #define MDP5_CTL_FLUSH_DSPP2                                    0x00008000
 #define MDP5_CTL_FLUSH_CTL                                      0x00020000
+#define MDP5_CTL_FLUSH_VIG3                                     0x00040000
+#define MDP5_CTL_FLUSH_RGB3                                     0x00080000
+#define MDP5_CTL_FLUSH_LM5                                      0x00100000
+#define MDP5_CTL_FLUSH_DSPP3                                    0x00200000
 
-static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000061c + 0x100*i0; }
+static inline uint32_t REG_MDP5_CTL_START(uint32_t i0) { return 0x0000001c + __offset_CTL(i0); }
 
-static inline uint32_t REG_MDP5_CTL_PACK_3D(uint32_t i0) { return 0x00000620 + 0x100*i0; }
+static inline uint32_t REG_MDP5_CTL_PACK_3D(uint32_t i0) { return 0x00000020 + __offset_CTL(i0); }
 
-static inline uint32_t REG_MDP5_PIPE(enum mdp5_pipe i0) { return 0x00001200 + 0x400*i0; }
+static inline uint32_t __offset_PIPE(enum mdp5_pipe idx)
+{
+        switch (idx) {
+                case SSPP_VIG0: return (mdp5_cfg->pipe_vig.base[0]);
+                case SSPP_VIG1: return (mdp5_cfg->pipe_vig.base[1]);
+                case SSPP_VIG2: return (mdp5_cfg->pipe_vig.base[2]);
+                case SSPP_RGB0: return (mdp5_cfg->pipe_rgb.base[0]);
+                case SSPP_RGB1: return (mdp5_cfg->pipe_rgb.base[1]);
+                case SSPP_RGB2: return (mdp5_cfg->pipe_rgb.base[2]);
+                case SSPP_DMA0: return (mdp5_cfg->pipe_dma.base[0]);
+                case SSPP_DMA1: return (mdp5_cfg->pipe_dma.base[1]);
+                case SSPP_VIG3: return (mdp5_cfg->pipe_vig.base[3]);
+                case SSPP_RGB3: return (mdp5_cfg->pipe_rgb.base[3]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_PIPE(enum mdp5_pipe i0) { return 0x00000000 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_HIST_CTL_BASE(enum mdp5_pipe i0) { return 0x000014c4 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_HIST_CTL_BASE(enum mdp5_pipe i0) { return 0x000002c4 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_HIST_LUT_BASE(enum mdp5_pipe i0) { return 0x000014f0 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_HIST_LUT_BASE(enum mdp5_pipe i0) { return 0x000002f0 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_HIST_LUT_SWAP(enum mdp5_pipe i0) { return 0x00001500 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_HIST_LUT_SWAP(enum mdp5_pipe i0) { return 0x00000300 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_SIZE(enum mdp5_pipe i0) { return 0x00001200 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_SIZE(enum mdp5_pipe i0) { return 0x00000000 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_SIZE_HEIGHT__MASK                         0xffff0000
 #define MDP5_PIPE_SRC_SIZE_HEIGHT__SHIFT                        16
 static inline uint32_t MDP5_PIPE_SRC_SIZE_HEIGHT(uint32_t val)
@@ -420,7 +483,7 @@ static inline uint32_t MDP5_PIPE_SRC_SIZE_WIDTH(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_SIZE_WIDTH__SHIFT) & MDP5_PIPE_SRC_SIZE_WIDTH__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_IMG_SIZE(enum mdp5_pipe i0) { return 0x00001204 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_IMG_SIZE(enum mdp5_pipe i0) { return 0x00000004 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_IMG_SIZE_HEIGHT__MASK                     0xffff0000
 #define MDP5_PIPE_SRC_IMG_SIZE_HEIGHT__SHIFT                    16
 static inline uint32_t MDP5_PIPE_SRC_IMG_SIZE_HEIGHT(uint32_t val)
@@ -434,7 +497,7 @@ static inline uint32_t MDP5_PIPE_SRC_IMG_SIZE_WIDTH(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_IMG_SIZE_WIDTH__SHIFT) & MDP5_PIPE_SRC_IMG_SIZE_WIDTH__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_XY(enum mdp5_pipe i0) { return 0x00001208 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_XY(enum mdp5_pipe i0) { return 0x00000008 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_XY_Y__MASK                                0xffff0000
 #define MDP5_PIPE_SRC_XY_Y__SHIFT                               16
 static inline uint32_t MDP5_PIPE_SRC_XY_Y(uint32_t val)
@@ -448,7 +511,7 @@ static inline uint32_t MDP5_PIPE_SRC_XY_X(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_XY_X__SHIFT) & MDP5_PIPE_SRC_XY_X__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_OUT_SIZE(enum mdp5_pipe i0) { return 0x0000120c + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_OUT_SIZE(enum mdp5_pipe i0) { return 0x0000000c + __offset_PIPE(i0); }
 #define MDP5_PIPE_OUT_SIZE_HEIGHT__MASK                         0xffff0000
 #define MDP5_PIPE_OUT_SIZE_HEIGHT__SHIFT                        16
 static inline uint32_t MDP5_PIPE_OUT_SIZE_HEIGHT(uint32_t val)
@@ -462,7 +525,7 @@ static inline uint32_t MDP5_PIPE_OUT_SIZE_WIDTH(uint32_t val)
         return ((val) << MDP5_PIPE_OUT_SIZE_WIDTH__SHIFT) & MDP5_PIPE_OUT_SIZE_WIDTH__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_OUT_XY(enum mdp5_pipe i0) { return 0x00001210 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_OUT_XY(enum mdp5_pipe i0) { return 0x00000010 + __offset_PIPE(i0); }
 #define MDP5_PIPE_OUT_XY_Y__MASK                                0xffff0000
 #define MDP5_PIPE_OUT_XY_Y__SHIFT                               16
 static inline uint32_t MDP5_PIPE_OUT_XY_Y(uint32_t val)
@@ -476,15 +539,15 @@ static inline uint32_t MDP5_PIPE_OUT_XY_X(uint32_t val)
         return ((val) << MDP5_PIPE_OUT_XY_X__SHIFT) & MDP5_PIPE_OUT_XY_X__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC0_ADDR(enum mdp5_pipe i0) { return 0x00001214 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC0_ADDR(enum mdp5_pipe i0) { return 0x00000014 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC1_ADDR(enum mdp5_pipe i0) { return 0x00001218 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC1_ADDR(enum mdp5_pipe i0) { return 0x00000018 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC2_ADDR(enum mdp5_pipe i0) { return 0x0000121c + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC2_ADDR(enum mdp5_pipe i0) { return 0x0000001c + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC3_ADDR(enum mdp5_pipe i0) { return 0x00001220 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC3_ADDR(enum mdp5_pipe i0) { return 0x00000020 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_STRIDE_A(enum mdp5_pipe i0) { return 0x00001224 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_STRIDE_A(enum mdp5_pipe i0) { return 0x00000024 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_STRIDE_A_P0__MASK                         0x0000ffff
 #define MDP5_PIPE_SRC_STRIDE_A_P0__SHIFT                        0
 static inline uint32_t MDP5_PIPE_SRC_STRIDE_A_P0(uint32_t val)
@@ -498,7 +561,7 @@ static inline uint32_t MDP5_PIPE_SRC_STRIDE_A_P1(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_STRIDE_A_P1__SHIFT) & MDP5_PIPE_SRC_STRIDE_A_P1__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_STRIDE_B(enum mdp5_pipe i0) { return 0x00001228 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_STRIDE_B(enum mdp5_pipe i0) { return 0x00000028 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_STRIDE_B_P2__MASK                         0x0000ffff
 #define MDP5_PIPE_SRC_STRIDE_B_P2__SHIFT                        0
 static inline uint32_t MDP5_PIPE_SRC_STRIDE_B_P2(uint32_t val)
@@ -512,9 +575,9 @@ static inline uint32_t MDP5_PIPE_SRC_STRIDE_B_P3(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_STRIDE_B_P3__SHIFT) & MDP5_PIPE_SRC_STRIDE_B_P3__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_STILE_FRAME_SIZE(enum mdp5_pipe i0) { return 0x0000122c + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_STILE_FRAME_SIZE(enum mdp5_pipe i0) { return 0x0000002c + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_FORMAT(enum mdp5_pipe i0) { return 0x00001230 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_FORMAT(enum mdp5_pipe i0) { return 0x00000030 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_FORMAT_G_BPC__MASK                        0x00000003
 #define MDP5_PIPE_SRC_FORMAT_G_BPC__SHIFT                       0
 static inline uint32_t MDP5_PIPE_SRC_FORMAT_G_BPC(enum mdp_bpc val)
@@ -568,7 +631,7 @@ static inline uint32_t MDP5_PIPE_SRC_FORMAT_CHROMA_SAMP(enum mdp5_chroma_samp_ty
         return ((val) << MDP5_PIPE_SRC_FORMAT_CHROMA_SAMP__SHIFT) & MDP5_PIPE_SRC_FORMAT_CHROMA_SAMP__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_UNPACK(enum mdp5_pipe i0) { return 0x00001234 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_UNPACK(enum mdp5_pipe i0) { return 0x00000034 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_UNPACK_ELEM0__MASK                        0x000000ff
 #define MDP5_PIPE_SRC_UNPACK_ELEM0__SHIFT                       0
 static inline uint32_t MDP5_PIPE_SRC_UNPACK_ELEM0(uint32_t val)
@@ -594,7 +657,7 @@ static inline uint32_t MDP5_PIPE_SRC_UNPACK_ELEM3(uint32_t val)
         return ((val) << MDP5_PIPE_SRC_UNPACK_ELEM3__SHIFT) & MDP5_PIPE_SRC_UNPACK_ELEM3__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_OP_MODE(enum mdp5_pipe i0) { return 0x00001238 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_OP_MODE(enum mdp5_pipe i0) { return 0x00000038 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SRC_OP_MODE_BWC_EN                            0x00000001
 #define MDP5_PIPE_SRC_OP_MODE_BWC__MASK                         0x00000006
 #define MDP5_PIPE_SRC_OP_MODE_BWC__SHIFT                        1
@@ -610,29 +673,29 @@ static inline uint32_t MDP5_PIPE_SRC_OP_MODE_BWC(enum mdp5_pipe_bwc val)
 #define MDP5_PIPE_SRC_OP_MODE_DEINTERLACE                       0x00400000
 #define MDP5_PIPE_SRC_OP_MODE_DEINTERLACE_ODD                   0x00800000
 
-static inline uint32_t REG_MDP5_PIPE_SRC_CONSTANT_COLOR(enum mdp5_pipe i0) { return 0x0000123c + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_CONSTANT_COLOR(enum mdp5_pipe i0) { return 0x0000003c + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_FETCH_CONFIG(enum mdp5_pipe i0) { return 0x00001248 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_FETCH_CONFIG(enum mdp5_pipe i0) { return 0x00000048 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_VC1_RANGE(enum mdp5_pipe i0) { return 0x0000124c + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_VC1_RANGE(enum mdp5_pipe i0) { return 0x0000004c + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_0(enum mdp5_pipe i0) { return 0x00001250 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_0(enum mdp5_pipe i0) { return 0x00000050 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_1(enum mdp5_pipe i0) { return 0x00001254 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_1(enum mdp5_pipe i0) { return 0x00000054 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_2(enum mdp5_pipe i0) { return 0x00001258 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_REQPRIO_FIFO_WM_2(enum mdp5_pipe i0) { return 0x00000058 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SRC_ADDR_SW_STATUS(enum mdp5_pipe i0) { return 0x00001270 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SRC_ADDR_SW_STATUS(enum mdp5_pipe i0) { return 0x00000070 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC0_ADDR(enum mdp5_pipe i0) { return 0x000012a4 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC0_ADDR(enum mdp5_pipe i0) { return 0x000000a4 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC1_ADDR(enum mdp5_pipe i0) { return 0x000012a8 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC1_ADDR(enum mdp5_pipe i0) { return 0x000000a8 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC2_ADDR(enum mdp5_pipe i0) { return 0x000012ac + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC2_ADDR(enum mdp5_pipe i0) { return 0x000000ac + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC3_ADDR(enum mdp5_pipe i0) { return 0x000012b0 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_CURRENT_SRC3_ADDR(enum mdp5_pipe i0) { return 0x000000b0 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_DECIMATION(enum mdp5_pipe i0) { return 0x000012b4 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_DECIMATION(enum mdp5_pipe i0) { return 0x000000b4 + __offset_PIPE(i0); }
 #define MDP5_PIPE_DECIMATION_VERT__MASK                         0x000000ff
 #define MDP5_PIPE_DECIMATION_VERT__SHIFT                        0
 static inline uint32_t MDP5_PIPE_DECIMATION_VERT(uint32_t val)
@@ -646,7 +709,7 @@ static inline uint32_t MDP5_PIPE_DECIMATION_HORZ(uint32_t val)
         return ((val) << MDP5_PIPE_DECIMATION_HORZ__SHIFT) & MDP5_PIPE_DECIMATION_HORZ__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SCALE_CONFIG(enum mdp5_pipe i0) { return 0x00001404 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SCALE_CONFIG(enum mdp5_pipe i0) { return 0x00000204 + __offset_PIPE(i0); }
 #define MDP5_PIPE_SCALE_CONFIG_SCALEX_EN                        0x00000001
 #define MDP5_PIPE_SCALE_CONFIG_SCALEY_EN                        0x00000002
 #define MDP5_PIPE_SCALE_CONFIG_SCALEX_MIN_FILTER__MASK          0x00000300
@@ -686,23 +749,34 @@ static inline uint32_t MDP5_PIPE_SCALE_CONFIG_SCALEY_MAX_FILTER(enum mdp5_scale_
         return ((val) << MDP5_PIPE_SCALE_CONFIG_SCALEY_MAX_FILTER__SHIFT) & MDP5_PIPE_SCALE_CONFIG_SCALEY_MAX_FILTER__MASK;
 }
 
-static inline uint32_t REG_MDP5_PIPE_SCALE_PHASE_STEP_X(enum mdp5_pipe i0) { return 0x00001410 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SCALE_PHASE_STEP_X(enum mdp5_pipe i0) { return 0x00000210 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SCALE_PHASE_STEP_Y(enum mdp5_pipe i0) { return 0x00001414 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SCALE_PHASE_STEP_Y(enum mdp5_pipe i0) { return 0x00000214 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SCALE_INIT_PHASE_X(enum mdp5_pipe i0) { return 0x00001420 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SCALE_INIT_PHASE_X(enum mdp5_pipe i0) { return 0x00000220 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_PIPE_SCALE_INIT_PHASE_Y(enum mdp5_pipe i0) { return 0x00001424 + 0x400*i0; }
+static inline uint32_t REG_MDP5_PIPE_SCALE_INIT_PHASE_Y(enum mdp5_pipe i0) { return 0x00000224 + __offset_PIPE(i0); }
 
-static inline uint32_t REG_MDP5_LM(uint32_t i0) { return 0x00003200 + 0x400*i0; }
+static inline uint32_t __offset_LM(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return (mdp5_cfg->lm.base[0]);
+                case 1: return (mdp5_cfg->lm.base[1]);
+                case 2: return (mdp5_cfg->lm.base[2]);
+                case 3: return (mdp5_cfg->lm.base[3]);
+                case 4: return (mdp5_cfg->lm.base[4]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_LM(uint32_t i0) { return 0x00000000 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_BLEND_COLOR_OUT(uint32_t i0) { return 0x00003200 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_BLEND_COLOR_OUT(uint32_t i0) { return 0x00000000 + __offset_LM(i0); }
 #define MDP5_LM_BLEND_COLOR_OUT_STAGE0_FG_ALPHA                 0x00000002
 #define MDP5_LM_BLEND_COLOR_OUT_STAGE1_FG_ALPHA                 0x00000004
 #define MDP5_LM_BLEND_COLOR_OUT_STAGE2_FG_ALPHA                 0x00000008
 #define MDP5_LM_BLEND_COLOR_OUT_STAGE3_FG_ALPHA                 0x00000010
 
-static inline uint32_t REG_MDP5_LM_OUT_SIZE(uint32_t i0) { return 0x00003204 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_OUT_SIZE(uint32_t i0) { return 0x00000004 + __offset_LM(i0); }
 #define MDP5_LM_OUT_SIZE_HEIGHT__MASK                           0xffff0000
 #define MDP5_LM_OUT_SIZE_HEIGHT__SHIFT                          16
 static inline uint32_t MDP5_LM_OUT_SIZE_HEIGHT(uint32_t val)
@@ -716,13 +790,13 @@ static inline uint32_t MDP5_LM_OUT_SIZE_WIDTH(uint32_t val)
         return ((val) << MDP5_LM_OUT_SIZE_WIDTH__SHIFT) & MDP5_LM_OUT_SIZE_WIDTH__MASK;
 }
 
-static inline uint32_t REG_MDP5_LM_BORDER_COLOR_0(uint32_t i0) { return 0x00003208 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_BORDER_COLOR_0(uint32_t i0) { return 0x00000008 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_BORDER_COLOR_1(uint32_t i0) { return 0x00003210 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_BORDER_COLOR_1(uint32_t i0) { return 0x00000010 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_BLEND(uint32_t i0, uint32_t i1) { return 0x00003220 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND(uint32_t i0, uint32_t i1) { return 0x00000020 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_OP_MODE(uint32_t i0, uint32_t i1) { return 0x00003220 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_OP_MODE(uint32_t i0, uint32_t i1) { return 0x00000020 + __offset_LM(i0) + 0x30*i1; }
 #define MDP5_LM_BLEND_OP_MODE_FG_ALPHA__MASK                    0x00000003
 #define MDP5_LM_BLEND_OP_MODE_FG_ALPHA__SHIFT                   0
 static inline uint32_t MDP5_LM_BLEND_OP_MODE_FG_ALPHA(enum mdp_alpha_type val)
@@ -744,57 +818,67 @@ static inline uint32_t MDP5_LM_BLEND_OP_MODE_BG_ALPHA(enum mdp_alpha_type val)
 #define MDP5_LM_BLEND_OP_MODE_BG_INV_MOD_ALPHA                  0x00001000
 #define MDP5_LM_BLEND_OP_MODE_BG_TRANSP_EN                      0x00002000
 
-static inline uint32_t REG_MDP5_LM_BLEND_FG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00003224 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_FG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00000024 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_BG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00003228 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_BG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00000028 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW0(uint32_t i0, uint32_t i1) { return 0x0000322c + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW0(uint32_t i0, uint32_t i1) { return 0x0000002c + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW1(uint32_t i0, uint32_t i1) { return 0x00003230 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_LOW1(uint32_t i0, uint32_t i1) { return 0x00000030 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH0(uint32_t i0, uint32_t i1) { return 0x00003234 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH0(uint32_t i0, uint32_t i1) { return 0x00000034 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH1(uint32_t i0, uint32_t i1) { return 0x00003238 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_FG_TRANSP_HIGH1(uint32_t i0, uint32_t i1) { return 0x00000038 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW0(uint32_t i0, uint32_t i1) { return 0x0000323c + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW0(uint32_t i0, uint32_t i1) { return 0x0000003c + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW1(uint32_t i0, uint32_t i1) { return 0x00003240 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_LOW1(uint32_t i0, uint32_t i1) { return 0x00000040 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH0(uint32_t i0, uint32_t i1) { return 0x00003244 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH0(uint32_t i0, uint32_t i1) { return 0x00000044 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH1(uint32_t i0, uint32_t i1) { return 0x00003248 + 0x400*i0 + 0x30*i1; }
+static inline uint32_t REG_MDP5_LM_BLEND_BG_TRANSP_HIGH1(uint32_t i0, uint32_t i1) { return 0x00000048 + __offset_LM(i0) + 0x30*i1; }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_IMG_SIZE(uint32_t i0) { return 0x000032e0 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_IMG_SIZE(uint32_t i0) { return 0x000000e0 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_SIZE(uint32_t i0) { return 0x000032e4 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_SIZE(uint32_t i0) { return 0x000000e4 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_XY(uint32_t i0) { return 0x000032e8 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_XY(uint32_t i0) { return 0x000000e8 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_STRIDE(uint32_t i0) { return 0x000032dc + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_STRIDE(uint32_t i0) { return 0x000000dc + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_FORMAT(uint32_t i0) { return 0x000032ec + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_FORMAT(uint32_t i0) { return 0x000000ec + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BASE_ADDR(uint32_t i0) { return 0x000032f0 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BASE_ADDR(uint32_t i0) { return 0x000000f0 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_START_XY(uint32_t i0) { return 0x000032f4 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_START_XY(uint32_t i0) { return 0x000000f4 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_CONFIG(uint32_t i0) { return 0x000032f8 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_CONFIG(uint32_t i0) { return 0x000000f8 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_PARAM(uint32_t i0) { return 0x000032fc + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_PARAM(uint32_t i0) { return 0x000000fc + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_LOW0(uint32_t i0) { return 0x00003300 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_LOW0(uint32_t i0) { return 0x00000100 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_LOW1(uint32_t i0) { return 0x00003304 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_LOW1(uint32_t i0) { return 0x00000104 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_HIGH0(uint32_t i0) { return 0x00003308 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_HIGH0(uint32_t i0) { return 0x00000108 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_HIGH1(uint32_t i0) { return 0x0000330c + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_CURSOR_BLEND_TRANSP_HIGH1(uint32_t i0) { return 0x0000010c + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_LM_GC_LUT_BASE(uint32_t i0) { return 0x00003310 + 0x400*i0; }
+static inline uint32_t REG_MDP5_LM_GC_LUT_BASE(uint32_t i0) { return 0x00000110 + __offset_LM(i0); }
 
-static inline uint32_t REG_MDP5_DSPP(uint32_t i0) { return 0x00004600 + 0x400*i0; }
+static inline uint32_t __offset_DSPP(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return (mdp5_cfg->dspp.base[0]);
+                case 1: return (mdp5_cfg->dspp.base[1]);
+                case 2: return (mdp5_cfg->dspp.base[2]);
+                case 3: return (mdp5_cfg->dspp.base[3]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_DSPP(uint32_t i0) { return 0x00000000 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_OP_MODE(uint32_t i0) { return 0x00004600 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_OP_MODE(uint32_t i0) { return 0x00000000 + __offset_DSPP(i0); }
 #define MDP5_DSPP_OP_MODE_IGC_LUT_EN                            0x00000001
 #define MDP5_DSPP_OP_MODE_IGC_TBL_IDX__MASK                     0x0000000e
 #define MDP5_DSPP_OP_MODE_IGC_TBL_IDX__SHIFT                    1
@@ -811,29 +895,40 @@ static inline uint32_t MDP5_DSPP_OP_MODE_IGC_TBL_IDX(uint32_t val)
 #define MDP5_DSPP_OP_MODE_GAMUT_EN                              0x00800000
 #define MDP5_DSPP_OP_MODE_GAMUT_ORDER                           0x01000000
 
-static inline uint32_t REG_MDP5_DSPP_PCC_BASE(uint32_t i0) { return 0x00004630 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_PCC_BASE(uint32_t i0) { return 0x00000030 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_DITHER_DEPTH(uint32_t i0) { return 0x00004750 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_DITHER_DEPTH(uint32_t i0) { return 0x00000150 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_HIST_CTL_BASE(uint32_t i0) { return 0x00004810 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_HIST_CTL_BASE(uint32_t i0) { return 0x00000210 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_HIST_LUT_BASE(uint32_t i0) { return 0x00004830 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_HIST_LUT_BASE(uint32_t i0) { return 0x00000230 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_HIST_LUT_SWAP(uint32_t i0) { return 0x00004834 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_HIST_LUT_SWAP(uint32_t i0) { return 0x00000234 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_PA_BASE(uint32_t i0) { return 0x00004838 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_PA_BASE(uint32_t i0) { return 0x00000238 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_GAMUT_BASE(uint32_t i0) { return 0x000048dc + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_GAMUT_BASE(uint32_t i0) { return 0x000002dc + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_DSPP_GC_BASE(uint32_t i0) { return 0x000048b0 + 0x400*i0; }
+static inline uint32_t REG_MDP5_DSPP_GC_BASE(uint32_t i0) { return 0x000002b0 + __offset_DSPP(i0); }
 
-static inline uint32_t REG_MDP5_INTF(uint32_t i0) { return 0x00012500 + 0x200*i0; }
+static inline uint32_t __offset_INTF(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return (mdp5_cfg->intf.base[0]);
+                case 1: return (mdp5_cfg->intf.base[1]);
+                case 2: return (mdp5_cfg->intf.base[2]);
+                case 3: return (mdp5_cfg->intf.base[3]);
+                case 4: return (mdp5_cfg->intf.base[4]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_INTF(uint32_t i0) { return 0x00000000 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TIMING_ENGINE_EN(uint32_t i0) { return 0x00012500 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TIMING_ENGINE_EN(uint32_t i0) { return 0x00000000 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_CONFIG(uint32_t i0) { return 0x00012504 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_CONFIG(uint32_t i0) { return 0x00000004 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_HSYNC_CTL(uint32_t i0) { return 0x00012508 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_HSYNC_CTL(uint32_t i0) { return 0x00000008 + __offset_INTF(i0); }
 #define MDP5_INTF_HSYNC_CTL_PULSEW__MASK                        0x0000ffff
 #define MDP5_INTF_HSYNC_CTL_PULSEW__SHIFT                       0
 static inline uint32_t MDP5_INTF_HSYNC_CTL_PULSEW(uint32_t val)
@@ -847,23 +942,23 @@ static inline uint32_t MDP5_INTF_HSYNC_CTL_PERIOD(uint32_t val)
         return ((val) << MDP5_INTF_HSYNC_CTL_PERIOD__SHIFT) & MDP5_INTF_HSYNC_CTL_PERIOD__MASK;
 }
 
-static inline uint32_t REG_MDP5_INTF_VSYNC_PERIOD_F0(uint32_t i0) { return 0x0001250c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_VSYNC_PERIOD_F0(uint32_t i0) { return 0x0000000c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_VSYNC_PERIOD_F1(uint32_t i0) { return 0x00012510 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_VSYNC_PERIOD_F1(uint32_t i0) { return 0x00000010 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_VSYNC_LEN_F0(uint32_t i0) { return 0x00012514 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_VSYNC_LEN_F0(uint32_t i0) { return 0x00000014 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_VSYNC_LEN_F1(uint32_t i0) { return 0x00012518 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_VSYNC_LEN_F1(uint32_t i0) { return 0x00000018 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DISPLAY_VSTART_F0(uint32_t i0) { return 0x0001251c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DISPLAY_VSTART_F0(uint32_t i0) { return 0x0000001c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DISPLAY_VSTART_F1(uint32_t i0) { return 0x00012520 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DISPLAY_VSTART_F1(uint32_t i0) { return 0x00000020 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DISPLAY_VEND_F0(uint32_t i0) { return 0x00012524 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DISPLAY_VEND_F0(uint32_t i0) { return 0x00000024 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DISPLAY_VEND_F1(uint32_t i0) { return 0x00012528 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DISPLAY_VEND_F1(uint32_t i0) { return 0x00000028 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_ACTIVE_VSTART_F0(uint32_t i0) { return 0x0001252c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_ACTIVE_VSTART_F0(uint32_t i0) { return 0x0000002c + __offset_INTF(i0); }
 #define MDP5_INTF_ACTIVE_VSTART_F0_VAL__MASK                    0x7fffffff
 #define MDP5_INTF_ACTIVE_VSTART_F0_VAL__SHIFT                   0
 static inline uint32_t MDP5_INTF_ACTIVE_VSTART_F0_VAL(uint32_t val)
@@ -872,7 +967,7 @@ static inline uint32_t MDP5_INTF_ACTIVE_VSTART_F0_VAL(uint32_t val)
 }
 #define MDP5_INTF_ACTIVE_VSTART_F0_ACTIVE_V_ENABLE              0x80000000
 
-static inline uint32_t REG_MDP5_INTF_ACTIVE_VSTART_F1(uint32_t i0) { return 0x00012530 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_ACTIVE_VSTART_F1(uint32_t i0) { return 0x00000030 + __offset_INTF(i0); }
 #define MDP5_INTF_ACTIVE_VSTART_F1_VAL__MASK                    0x7fffffff
 #define MDP5_INTF_ACTIVE_VSTART_F1_VAL__SHIFT                   0
 static inline uint32_t MDP5_INTF_ACTIVE_VSTART_F1_VAL(uint32_t val)
@@ -880,11 +975,11 @@ static inline uint32_t MDP5_INTF_ACTIVE_VSTART_F1_VAL(uint32_t val)
         return ((val) << MDP5_INTF_ACTIVE_VSTART_F1_VAL__SHIFT) & MDP5_INTF_ACTIVE_VSTART_F1_VAL__MASK;
 }
 
-static inline uint32_t REG_MDP5_INTF_ACTIVE_VEND_F0(uint32_t i0) { return 0x00012534 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_ACTIVE_VEND_F0(uint32_t i0) { return 0x00000034 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_ACTIVE_VEND_F1(uint32_t i0) { return 0x00012538 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_ACTIVE_VEND_F1(uint32_t i0) { return 0x00000038 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DISPLAY_HCTL(uint32_t i0) { return 0x0001253c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DISPLAY_HCTL(uint32_t i0) { return 0x0000003c + __offset_INTF(i0); }
 #define MDP5_INTF_DISPLAY_HCTL_START__MASK                      0x0000ffff
 #define MDP5_INTF_DISPLAY_HCTL_START__SHIFT                     0
 static inline uint32_t MDP5_INTF_DISPLAY_HCTL_START(uint32_t val)
@@ -898,7 +993,7 @@ static inline uint32_t MDP5_INTF_DISPLAY_HCTL_END(uint32_t val)
         return ((val) << MDP5_INTF_DISPLAY_HCTL_END__SHIFT) & MDP5_INTF_DISPLAY_HCTL_END__MASK;
 }
 
-static inline uint32_t REG_MDP5_INTF_ACTIVE_HCTL(uint32_t i0) { return 0x00012540 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_ACTIVE_HCTL(uint32_t i0) { return 0x00000040 + __offset_INTF(i0); }
 #define MDP5_INTF_ACTIVE_HCTL_START__MASK                       0x00007fff
 #define MDP5_INTF_ACTIVE_HCTL_START__SHIFT                      0
 static inline uint32_t MDP5_INTF_ACTIVE_HCTL_START(uint32_t val)
@@ -913,124 +1008,132 @@ static inline uint32_t MDP5_INTF_ACTIVE_HCTL_END(uint32_t val)
 }
 #define MDP5_INTF_ACTIVE_HCTL_ACTIVE_H_ENABLE                   0x80000000
 
-static inline uint32_t REG_MDP5_INTF_BORDER_COLOR(uint32_t i0) { return 0x00012544 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_BORDER_COLOR(uint32_t i0) { return 0x00000044 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_UNDERFLOW_COLOR(uint32_t i0) { return 0x00012548 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_UNDERFLOW_COLOR(uint32_t i0) { return 0x00000048 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_HSYNC_SKEW(uint32_t i0) { return 0x0001254c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_HSYNC_SKEW(uint32_t i0) { return 0x0000004c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_POLARITY_CTL(uint32_t i0) { return 0x00012550 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_POLARITY_CTL(uint32_t i0) { return 0x00000050 + __offset_INTF(i0); }
 #define MDP5_INTF_POLARITY_CTL_HSYNC_LOW                        0x00000001
 #define MDP5_INTF_POLARITY_CTL_VSYNC_LOW                        0x00000002
 #define MDP5_INTF_POLARITY_CTL_DATA_EN_LOW                      0x00000004
 
-static inline uint32_t REG_MDP5_INTF_TEST_CTL(uint32_t i0) { return 0x00012554 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TEST_CTL(uint32_t i0) { return 0x00000054 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TP_COLOR0(uint32_t i0) { return 0x00012558 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TP_COLOR0(uint32_t i0) { return 0x00000058 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TP_COLOR1(uint32_t i0) { return 0x0001255c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TP_COLOR1(uint32_t i0) { return 0x0000005c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DSI_CMD_MODE_TRIGGER_EN(uint32_t i0) { return 0x00012584 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DSI_CMD_MODE_TRIGGER_EN(uint32_t i0) { return 0x00000084 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_PANEL_FORMAT(uint32_t i0) { return 0x00012590 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_PANEL_FORMAT(uint32_t i0) { return 0x00000090 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_FRAME_LINE_COUNT_EN(uint32_t i0) { return 0x000125a8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_FRAME_LINE_COUNT_EN(uint32_t i0) { return 0x000000a8 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_FRAME_COUNT(uint32_t i0) { return 0x000125ac + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_FRAME_COUNT(uint32_t i0) { return 0x000000ac + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_LINE_COUNT(uint32_t i0) { return 0x000125b0 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_LINE_COUNT(uint32_t i0) { return 0x000000b0 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DEFLICKER_CONFIG(uint32_t i0) { return 0x000125f0 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DEFLICKER_CONFIG(uint32_t i0) { return 0x000000f0 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DEFLICKER_STRNG_COEFF(uint32_t i0) { return 0x000125f4 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DEFLICKER_STRNG_COEFF(uint32_t i0) { return 0x000000f4 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_DEFLICKER_WEAK_COEFF(uint32_t i0) { return 0x000125f8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_DEFLICKER_WEAK_COEFF(uint32_t i0) { return 0x000000f8 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_ENABLE(uint32_t i0) { return 0x00012600 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_ENABLE(uint32_t i0) { return 0x00000100 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_MAIN_CONTROL(uint32_t i0) { return 0x00012604 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_MAIN_CONTROL(uint32_t i0) { return 0x00000104 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_VIDEO_CONFIG(uint32_t i0) { return 0x00012608 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_VIDEO_CONFIG(uint32_t i0) { return 0x00000108 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_COMPONENT_LIMITS(uint32_t i0) { return 0x0001260c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_COMPONENT_LIMITS(uint32_t i0) { return 0x0000010c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_RECTANGLE(uint32_t i0) { return 0x00012610 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_RECTANGLE(uint32_t i0) { return 0x00000110 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_INITIAL_VALUE(uint32_t i0) { return 0x00012614 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_INITIAL_VALUE(uint32_t i0) { return 0x00000114 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_BLK_WHITE_PATTERN_FRAME(uint32_t i0) { return 0x00012618 + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_BLK_WHITE_PATTERN_FRAME(uint32_t i0) { return 0x00000118 + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_INTF_TPG_RGB_MAPPING(uint32_t i0) { return 0x0001261c + 0x200*i0; }
+static inline uint32_t REG_MDP5_INTF_TPG_RGB_MAPPING(uint32_t i0) { return 0x0000011c + __offset_INTF(i0); }
 
-static inline uint32_t REG_MDP5_AD(uint32_t i0) { return 0x00013100 + 0x200*i0; }
+static inline uint32_t __offset_AD(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return (mdp5_cfg->ad.base[0]);
+                case 1: return (mdp5_cfg->ad.base[1]);
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP5_AD(uint32_t i0) { return 0x00000000 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BYPASS(uint32_t i0) { return 0x00013100 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BYPASS(uint32_t i0) { return 0x00000000 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CTRL_0(uint32_t i0) { return 0x00013104 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CTRL_0(uint32_t i0) { return 0x00000004 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CTRL_1(uint32_t i0) { return 0x00013108 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CTRL_1(uint32_t i0) { return 0x00000008 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_FRAME_SIZE(uint32_t i0) { return 0x0001310c + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_FRAME_SIZE(uint32_t i0) { return 0x0000000c + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CON_CTRL_0(uint32_t i0) { return 0x00013110 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CON_CTRL_0(uint32_t i0) { return 0x00000010 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CON_CTRL_1(uint32_t i0) { return 0x00013114 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CON_CTRL_1(uint32_t i0) { return 0x00000014 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_STR_MAN(uint32_t i0) { return 0x00013118 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_STR_MAN(uint32_t i0) { return 0x00000018 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_VAR(uint32_t i0) { return 0x0001311c + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_VAR(uint32_t i0) { return 0x0000001c + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_DITH(uint32_t i0) { return 0x00013120 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_DITH(uint32_t i0) { return 0x00000020 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_DITH_CTRL(uint32_t i0) { return 0x00013124 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_DITH_CTRL(uint32_t i0) { return 0x00000024 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_AMP_LIM(uint32_t i0) { return 0x00013128 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_AMP_LIM(uint32_t i0) { return 0x00000028 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_SLOPE(uint32_t i0) { return 0x0001312c + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_SLOPE(uint32_t i0) { return 0x0000002c + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BW_LVL(uint32_t i0) { return 0x00013130 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BW_LVL(uint32_t i0) { return 0x00000030 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_LOGO_POS(uint32_t i0) { return 0x00013134 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_LOGO_POS(uint32_t i0) { return 0x00000034 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_LUT_FI(uint32_t i0) { return 0x00013138 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_LUT_FI(uint32_t i0) { return 0x00000038 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_LUT_CC(uint32_t i0) { return 0x0001317c + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_LUT_CC(uint32_t i0) { return 0x0000007c + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_STR_LIM(uint32_t i0) { return 0x000131c8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_STR_LIM(uint32_t i0) { return 0x000000c8 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CALIB_AB(uint32_t i0) { return 0x000131cc + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CALIB_AB(uint32_t i0) { return 0x000000cc + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CALIB_CD(uint32_t i0) { return 0x000131d0 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CALIB_CD(uint32_t i0) { return 0x000000d0 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_MODE_SEL(uint32_t i0) { return 0x000131d4 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_MODE_SEL(uint32_t i0) { return 0x000000d4 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_TFILT_CTRL(uint32_t i0) { return 0x000131d8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_TFILT_CTRL(uint32_t i0) { return 0x000000d8 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BL_MINMAX(uint32_t i0) { return 0x000131dc + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BL_MINMAX(uint32_t i0) { return 0x000000dc + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BL(uint32_t i0) { return 0x000131e0 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BL(uint32_t i0) { return 0x000000e0 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BL_MAX(uint32_t i0) { return 0x000131e8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BL_MAX(uint32_t i0) { return 0x000000e8 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_AL(uint32_t i0) { return 0x000131ec + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_AL(uint32_t i0) { return 0x000000ec + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_AL_MIN(uint32_t i0) { return 0x000131f0 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_AL_MIN(uint32_t i0) { return 0x000000f0 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_AL_FILT(uint32_t i0) { return 0x000131f4 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_AL_FILT(uint32_t i0) { return 0x000000f4 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CFG_BUF(uint32_t i0) { return 0x000131f8 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CFG_BUF(uint32_t i0) { return 0x000000f8 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_LUT_AL(uint32_t i0) { return 0x00013200 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_LUT_AL(uint32_t i0) { return 0x00000100 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_TARG_STR(uint32_t i0) { return 0x00013244 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_TARG_STR(uint32_t i0) { return 0x00000144 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_START_CALC(uint32_t i0) { return 0x00013248 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_START_CALC(uint32_t i0) { return 0x00000148 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_STR_OUT(uint32_t i0) { return 0x0001324c + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_STR_OUT(uint32_t i0) { return 0x0000014c + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_BL_OUT(uint32_t i0) { return 0x00013254 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_BL_OUT(uint32_t i0) { return 0x00000154 + __offset_AD(i0); }
 
-static inline uint32_t REG_MDP5_AD_CALC_DONE(uint32_t i0) { return 0x00013258 + 0x200*i0; }
+static inline uint32_t REG_MDP5_AD_CALC_DONE(uint32_t i0) { return 0x00000158 + __offset_AD(i0); }
 
 
 #endif /* MDP5_XML */
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 71510ee26e96..31a2c6331a1d 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -26,14 +26,98 @@ static const char *iommu_ports[] = {
 
 static struct mdp5_platform_config *mdp5_get_config(struct platform_device *dev);
 
-static int mdp5_hw_init(struct msm_kms *kms)
+const struct mdp5_config *mdp5_cfg;
+
+static const struct mdp5_config msm8x74_config = {
+        .name = "msm8x74",
+        .ctl = {
+                .count = 5,
+                .base = { 0x00600, 0x00700, 0x00800, 0x00900, 0x00a00 },
+        },
+        .pipe_vig = {
+                .count = 3,
+                .base = { 0x01200, 0x01600, 0x01a00 },
+        },
+        .pipe_rgb = {
+                .count = 3,
+                .base = { 0x01e00, 0x02200, 0x02600 },
+        },
+        .pipe_dma = {
+                .count = 2,
+                .base = { 0x02a00, 0x02e00 },
+        },
+        .lm = {
+                .count = 5,
+                .base = { 0x03200, 0x03600, 0x03a00, 0x03e00, 0x04200 },
+        },
+        .dspp = {
+                .count = 3,
+                .base = { 0x04600, 0x04a00, 0x04e00 },
+        },
+        .ad = {
+                .count = 2,
+                .base = { 0x13100, 0x13300 }, /* NOTE: no ad in v1.0 */
+        },
+        .intf = {
+                .count = 4,
+                .base = { 0x12500, 0x12700, 0x12900, 0x12b00 },
+        },
+};
+
+static const struct mdp5_config apq8084_config = {
+        .name = "apq8084",
+        .ctl = {
+                .count = 5,
+                .base = { 0x00600, 0x00700, 0x00800, 0x00900, 0x00a00 },
+        },
+        .pipe_vig = {
+                .count = 4,
+                .base = { 0x01200, 0x01600, 0x01a00, 0x01e00 },
+        },
+        .pipe_rgb = {
+                .count = 4,
+                .base = { 0x02200, 0x02600, 0x02a00, 0x02e00 },
+        },
+        .pipe_dma = {
+                .count = 2,
+                .base = { 0x03200, 0x03600 },
+        },
+        .lm = {
+                .count = 6,
+                .base = { 0x03a00, 0x03e00, 0x04200, 0x04600, 0x04a00, 0x04e00 },
+        },
+        .dspp = {
+                .count = 4,
+                .base = { 0x05200, 0x05600, 0x05a00, 0x05e00 },
+
+        },
+        .ad = {
+                .count = 3,
+                .base = { 0x13500, 0x13700, 0x13900 },
+        },
+        .intf = {
+                .count = 5,
+                .base = { 0x12500, 0x12700, 0x12900, 0x12b00, 0x12d00 },
+        },
+};
+
+struct mdp5_config_entry {
+        int revision;
+        const struct mdp5_config *config;
+};
+
+static const struct mdp5_config_entry mdp5_configs[] = {
+        { .revision = 0, .config = &msm8x74_config },
+        { .revision = 2, .config = &msm8x74_config },
+        { .revision = 3, .config = &apq8084_config },
+};
+
+static int mdp5_select_hw_cfg(struct msm_kms *kms)
 {
         struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
         struct drm_device *dev = mdp5_kms->dev;
         uint32_t version, major, minor;
-        int ret = 0;
-
-        pm_runtime_get_sync(dev->dev);
+        int i, ret = 0;
 
         mdp5_enable(mdp5_kms);
         version = mdp5_read(mdp5_kms, REG_MDP5_MDP_VERSION);
@@ -44,8 +128,8 @@ static int mdp5_hw_init(struct msm_kms *kms)
 
         DBG("found MDP5 version v%d.%d", major, minor);
 
-        if ((major != 1) || ((minor != 0) && (minor != 2))) {
-                dev_err(dev->dev, "unexpected MDP version: v%d.%d\n",
+        if (major != 1) {
+                dev_err(dev->dev, "unexpected MDP major version: v%d.%d\n",
                                 major, minor);
                 ret = -ENXIO;
                 goto out;
@@ -53,6 +137,35 @@ static int mdp5_hw_init(struct msm_kms *kms)
 
         mdp5_kms->rev = minor;
 
+        /* only after mdp5_cfg global pointer's init can we access the hw */
+        for (i = 0; i < ARRAY_SIZE(mdp5_configs); i++) {
+                if (mdp5_configs[i].revision != minor)
+                        continue;
+                mdp5_kms->hw_cfg = mdp5_cfg = mdp5_configs[i].config;
+                break;
+        }
+        if (unlikely(!mdp5_kms->hw_cfg)) {
+                dev_err(dev->dev, "unexpected MDP minor revision: v%d.%d\n",
+                                major, minor);
+                ret = -ENXIO;
+                goto out;
+        }
+
+        DBG("MDP5: %s config selected", mdp5_kms->hw_cfg->name);
+
+        return 0;
+out:
+        return ret;
+}
+
+static int mdp5_hw_init(struct msm_kms *kms)
+{
+        struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(kms));
+        struct drm_device *dev = mdp5_kms->dev;
+        int i;
+
+        pm_runtime_get_sync(dev->dev);
+
         /* Magic unknown register writes:
          *
          *    W VBIF:0x004 00000001      (mdss_mdp.c:839)
@@ -78,15 +191,13 @@ static int mdp5_hw_init(struct msm_kms *kms)
          */
 
         mdp5_write(mdp5_kms, REG_MDP5_DISP_INTF_SEL, 0);
-        mdp5_write(mdp5_kms, REG_MDP5_CTL_OP(0), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_CTL_OP(1), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_CTL_OP(2), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_CTL_OP(3), 0);
 
-out:
+        for (i = 0; i < mdp5_kms->hw_cfg->ctl.count; i++)
+                mdp5_write(mdp5_kms, REG_MDP5_CTL_OP(i), 0);
+
         pm_runtime_put_sync(dev->dev);
 
-        return ret;
+        return 0;
 }
 
 static long mdp5_round_pixclk(struct msm_kms *kms, unsigned long rate,
@@ -161,7 +272,7 @@ int mdp5_enable(struct mdp5_kms *mdp5_kms)
 static int modeset_init(struct mdp5_kms *mdp5_kms)
 {
         static const enum mdp5_pipe crtcs[] = {
-                        SSPP_RGB0, SSPP_RGB1, SSPP_RGB2,
+                        SSPP_RGB0, SSPP_RGB1, SSPP_RGB2, SSPP_RGB3,
         };
         struct drm_device *dev = mdp5_kms->dev;
         struct msm_drm_private *priv = dev->dev_private;
@@ -169,7 +280,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
         int i, ret;
 
         /* construct CRTCs: */
-        for (i = 0; i < ARRAY_SIZE(crtcs); i++) {
+        for (i = 0; i < mdp5_kms->hw_cfg->pipe_rgb.count; i++) {
                 struct drm_plane *plane;
                 struct drm_crtc *crtc;
 
@@ -246,7 +357,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
         struct mdp5_kms *mdp5_kms;
         struct msm_kms *kms = NULL;
         struct msm_mmu *mmu;
-        int ret;
+        int i, ret;
 
         mdp5_kms = kzalloc(sizeof(*mdp5_kms), GFP_KERNEL);
         if (!mdp5_kms) {
@@ -307,20 +418,22 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
 
         ret = clk_set_rate(mdp5_kms->src_clk, config->max_clk);
 
+        ret = mdp5_select_hw_cfg(kms);
+        if (ret)
+                goto fail;
+
         /* make sure things are off before attaching iommu (bootloader could
          * have left things on, in which case we'll start getting faults if
          * we don't disable):
          */
         mdp5_enable(mdp5_kms);
-        mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(0), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(1), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(2), 0);
-        mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(3), 0);
+        for (i = 0; i < mdp5_kms->hw_cfg->intf.count; i++)
+                mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(i), 0);
         mdp5_disable(mdp5_kms);
         mdelay(16);
 
         if (config->iommu) {
-                mmu = msm_iommu_new(dev, config->iommu);
+                mmu = msm_iommu_new(&pdev->dev, config->iommu);
                 if (IS_ERR(mmu)) {
                         ret = PTR_ERR(mmu);
                         dev_err(dev->dev, "failed to init iommu: %d\n", ret);
@@ -368,5 +481,11 @@ static struct mdp5_platform_config *mdp5_get_config(struct platform_device *dev)
 #ifdef CONFIG_OF
         /* TODO */
 #endif
+        config.iommu = iommu_domain_alloc(&platform_bus_type);
+        /* TODO hard-coded in downstream mdss, but should it be? */
+        config.max_clk = 200000000;
+        /* TODO get from DT: */
+        config.smp_blk_cnt = 22;
+
         return &config;
 }
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
index 6e981b692d1d..5bf340dd0f00 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h
@@ -21,6 +21,24 @@
 #include "msm_drv.h"
 #include "msm_kms.h"
 #include "mdp/mdp_kms.h"
+/* dynamic offsets used by mdp5.xml.h (initialized in mdp5_kms.c) */
+#define MDP5_MAX_BASES          8
+struct mdp5_sub_block {
+        int     count;
+        uint32_t base[MDP5_MAX_BASES];
+};
+struct mdp5_config {
+        char  *name;
+        struct mdp5_sub_block ctl;
+        struct mdp5_sub_block pipe_vig;
+        struct mdp5_sub_block pipe_rgb;
+        struct mdp5_sub_block pipe_dma;
+        struct mdp5_sub_block lm;
+        struct mdp5_sub_block dspp;
+        struct mdp5_sub_block ad;
+        struct mdp5_sub_block intf;
+};
+extern const struct mdp5_config *mdp5_cfg;
 #include "mdp5.xml.h"
 #include "mdp5_smp.h"
 
@@ -30,6 +48,7 @@ struct mdp5_kms {
         struct drm_device *dev;
 
         int rev;
+        const struct mdp5_config *hw_cfg;
 
         /* mapper-id used to request GEM buffer mapped for scanout: */
         int id;
@@ -82,6 +101,7 @@ static inline const char *pipe2name(enum mdp5_pipe pipe)
                 NAME(VIG0), NAME(VIG1), NAME(VIG2),
                 NAME(RGB0), NAME(RGB1), NAME(RGB2),
                 NAME(DMA0), NAME(DMA1),
+                NAME(VIG3), NAME(RGB3),
 #undef NAME
         };
         return names[pipe];
@@ -98,6 +118,8 @@ static inline uint32_t pipe2flush(enum mdp5_pipe pipe)
         case SSPP_RGB2: return MDP5_CTL_FLUSH_RGB2;
         case SSPP_DMA0: return MDP5_CTL_FLUSH_DMA0;
         case SSPP_DMA1: return MDP5_CTL_FLUSH_DMA1;
+        case SSPP_VIG3: return MDP5_CTL_FLUSH_VIG3;
+        case SSPP_RGB3: return MDP5_CTL_FLUSH_RGB3;
         default:        return 0;
         }
 }
@@ -108,6 +130,7 @@ static inline int pipe2nclients(enum mdp5_pipe pipe)
         case SSPP_RGB0:
         case SSPP_RGB1:
         case SSPP_RGB2:
+        case SSPP_RGB3:
                 return 1;
         default:
                 return 3;
@@ -126,6 +149,8 @@ static inline enum mdp5_client_id pipe2client(enum mdp5_pipe pipe, int plane)
         case SSPP_RGB2: return CID_RGB2;
         case SSPP_DMA0: return CID_DMA0_Y + plane;
         case SSPP_DMA1: return CID_DMA1_Y + plane;
+        case SSPP_VIG3: return CID_VIG3_Y + plane;
+        case SSPP_RGB3: return CID_RGB3;
         default:        return CID_UNUSED;
         }
 }
diff --git a/drivers/gpu/drm/msm/mdp/mdp_common.xml.h b/drivers/gpu/drm/msm/mdp/mdp_common.xml.h
index a9629b85b983..64c1afd6030a 100644
--- a/drivers/gpu/drm/msm/mdp/mdp_common.xml.h
+++ b/drivers/gpu/drm/msm/mdp/mdp_common.xml.h
@@ -12,12 +12,12 @@ The rules-ng-ng source files this header was generated from are:
 - /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml            (  17996 bytes, from 2013-12-01 19:10:31)
 - /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml      (   1615 bytes, from 2013-11-30 15:00:52)
-- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2013-12-03 20:59:13)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml            (  22517 bytes, from 2014-06-25 12:55:02)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml             (  11712 bytes, from 2013-08-17 17:13:43)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml            (    344 bytes, from 2013-08-11 19:26:32)
 - /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml         (   1544 bytes, from 2013-08-16 19:17:05)
 - /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml         (    600 bytes, from 2013-07-05 19:21:12)
-- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  20932 bytes, from 2013-12-01 15:13:04)
+- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml           (  23613 bytes, from 2014-06-25 12:53:44)
 
 Copyright (C) 2013 by the following authors:
 - Rob Clark <robdclark@gmail.com> (robclark)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index a322029983ce..b447c01ad89c 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -181,7 +181,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
         struct msm_kms *kms;
         int ret;
 
-
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv) {
                 dev_err(dev->dev, "failed to allocate private data\n");
@@ -314,13 +313,15 @@ fail:
 
 static void load_gpu(struct drm_device *dev)
 {
+        static DEFINE_MUTEX(init_lock);
         struct msm_drm_private *priv = dev->dev_private;
         struct msm_gpu *gpu;
 
+        mutex_lock(&init_lock);
+
         if (priv->gpu)
-                return;
+                goto out;
 
-        mutex_lock(&dev->struct_mutex);
         gpu = a3xx_gpu_init(dev);
         if (IS_ERR(gpu)) {
                 dev_warn(dev->dev, "failed to load a3xx gpu\n");
@@ -330,7 +331,9 @@ static void load_gpu(struct drm_device *dev)
 
         if (gpu) {
                 int ret;
+                mutex_lock(&dev->struct_mutex);
                 gpu->funcs->pm_resume(gpu);
+                mutex_unlock(&dev->struct_mutex);
                 ret = gpu->funcs->hw_init(gpu);
                 if (ret) {
                         dev_err(dev->dev, "gpu hw init failed: %d\n", ret);
@@ -340,12 +343,12 @@ static void load_gpu(struct drm_device *dev)
                         /* give inactive pm a chance to kick in: */
                         msm_gpu_retire(gpu);
                 }
-
         }
 
         priv->gpu = gpu;
 
-        mutex_unlock(&dev->struct_mutex);
+out:
+        mutex_unlock(&init_lock);
 }
 
 static int msm_open(struct drm_device *dev, struct drm_file *file)
@@ -905,6 +908,25 @@ static int compare_of(struct device *dev, void *data)
 {
         return dev->of_node == data;
 }
+
+static int add_components(struct device *dev, struct component_match **matchptr,
+                const char *name)
+{
+        struct device_node *np = dev->of_node;
+        unsigned i;
+
+        for (i = 0; ; i++) {
+                struct device_node *node;
+
+                node = of_parse_phandle(np, name, i);
+                if (!node)
+                        break;
+
+                component_match_add(dev, matchptr, compare_of, node);
+        }
+
+        return 0;
+}
 #else
 static int compare_dev(struct device *dev, void *data)
 {
@@ -935,21 +957,8 @@ static int msm_pdev_probe(struct platform_device *pdev)
 {
         struct component_match *match = NULL;
 #ifdef CONFIG_OF
-        /* NOTE: the CONFIG_OF case duplicates the same code as exynos or imx
-         * (or probably any other).. so probably some room for some helpers
-         */
-        struct device_node *np = pdev->dev.of_node;
-        unsigned i;
-
-        for (i = 0; ; i++) {
-                struct device_node *node;
-
-                node = of_parse_phandle(np, "connectors", i);
-                if (!node)
-                        break;
-
-                component_match_add(&pdev->dev, &match, compare_of, node);
-        }
+        add_components(&pdev->dev, &match, "connectors");
+        add_components(&pdev->dev, &match, "gpus");
 #else
         /* For non-DT case, it kinda sucks.  We don't actually have a way
          * to know whether or not we are waiting for certain devices (or if
@@ -995,7 +1004,8 @@ static const struct platform_device_id msm_id[] = {
 };
 
 static const struct of_device_id dt_match[] = {
-        { .compatible = "qcom,mdss_mdp" },
+        { .compatible = "qcom,mdp" },      /* mdp4 */
+        { .compatible = "qcom,mdss_mdp" }, /* mdp5 */
         {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index c437065933e3..9c5221ce391a 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -19,6 +19,11 @@
 
 #include "drm_crtc.h"
 #include "drm_fb_helper.h"
+#include "msm_gem.h"
+
+extern int msm_gem_mmap_obj(struct drm_gem_object *obj,
+                                        struct vm_area_struct *vma);
+static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma);
 
 /*
  * fbdev funcs, to implement legacy fbdev interface on top of drm driver
@@ -43,6 +48,7 @@ static struct fb_ops msm_fb_ops = {
         .fb_fillrect = sys_fillrect,
         .fb_copyarea = sys_copyarea,
         .fb_imageblit = sys_imageblit,
+        .fb_mmap = msm_fbdev_mmap,
 
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = drm_fb_helper_set_par,
@@ -51,6 +57,31 @@ static struct fb_ops msm_fb_ops = {
         .fb_setcmap = drm_fb_helper_setcmap,
 };
 
+static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+        struct drm_fb_helper *helper = (struct drm_fb_helper *)info->par;
+        struct msm_fbdev *fbdev = to_msm_fbdev(helper);
+        struct drm_gem_object *drm_obj = fbdev->bo;
+        struct drm_device *dev = helper->dev;
+        int ret = 0;
+
+        if (drm_device_is_unplugged(dev))
+                return -ENODEV;
+
+        mutex_lock(&dev->struct_mutex);
+
+        ret = drm_gem_mmap_obj(drm_obj, drm_obj->size, vma);
+
+        mutex_unlock(&dev->struct_mutex);
+
+        if (ret) {
+                pr_err("%s:drm_gem_mmap_obj fail\n", __func__);
+                return ret;
+        }
+
+        return msm_gem_mmap_obj(drm_obj, vma);
+}
+
 static int msm_fbdev_create(struct drm_fb_helper *helper,
                 struct drm_fb_helper_surface_size *sizes)
 {
@@ -104,8 +135,16 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
 
         mutex_lock(&dev->struct_mutex);
 
-        /* TODO implement our own fb_mmap so we don't need this: */
-        msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
+        /*
+         * NOTE: if we can be guaranteed to be able to map buffer
+         * in panic (ie. lock-safe, etc) we could avoid pinning the
+         * buffer now:
+         */
+        ret = msm_gem_get_iova_locked(fbdev->bo, 0, &paddr);
+        if (ret) {
+                dev_err(dev->dev, "failed to get buffer obj iova: %d\n", ret);
+                goto fail;
+        }
 
         fbi = framebuffer_alloc(0, dev->dev);
         if (!fbi) {
@@ -189,7 +228,7 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
         struct msm_drm_private *priv = dev->dev_private;
         struct msm_fbdev *fbdev = NULL;
         struct drm_fb_helper *helper;
-        int ret = 0;
+        int ret;
 
         fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
         if (!fbdev)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 713722b0ba78..4b1b82adabde 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -278,24 +278,23 @@ int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
                 uint32_t *iova)
 {
         struct msm_gem_object *msm_obj = to_msm_bo(obj);
-        struct drm_device *dev = obj->dev;
         int ret = 0;
 
         if (!msm_obj->domain[id].iova) {
                 struct msm_drm_private *priv = obj->dev->dev_private;
-                struct msm_mmu *mmu = priv->mmus[id];
                 struct page **pages = get_pages(obj);
 
-                if (!mmu) {
-                        dev_err(dev->dev, "null MMU pointer\n");
-                        return -EINVAL;
-                }
-
                 if (IS_ERR(pages))
                         return PTR_ERR(pages);
 
                 if (iommu_present(&platform_bus_type)) {
-                        uint32_t offset = (uint32_t)mmap_offset(obj);
+                        struct msm_mmu *mmu = priv->mmus[id];
+                        uint32_t offset;
+
+                        if (WARN_ON(!mmu))
+                                return -EINVAL;
+
+                        offset = (uint32_t)mmap_offset(obj);
                         ret = mmu->funcs->map(mmu, offset, msm_obj->sgt,
                                         obj->size, IOMMU_READ | IOMMU_WRITE);
                         msm_obj->domain[id].iova = offset;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index c6322197db8c..4a0dce587745 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -606,14 +606,17 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
         iommu = iommu_domain_alloc(&platform_bus_type);
         if (iommu) {
                 dev_info(drm->dev, "%s: using IOMMU\n", name);
-                gpu->mmu = msm_iommu_new(drm, iommu);
+                gpu->mmu = msm_iommu_new(&pdev->dev, iommu);
         } else {
                 dev_info(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name);
         }
         gpu->id = msm_register_mmu(drm, gpu->mmu);
 
+
         /* Create ringbuffer: */
+        mutex_lock(&drm->struct_mutex);
         gpu->rb = msm_ringbuffer_new(gpu, ringsz);
+        mutex_unlock(&drm->struct_mutex);
         if (IS_ERR(gpu->rb)) {
                 ret = PTR_ERR(gpu->rb);
                 gpu->rb = NULL;
@@ -621,13 +624,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
                 goto fail;
         }
 
-        ret = msm_gem_get_iova_locked(gpu->rb->bo, gpu->id, &gpu->rb_iova);
-        if (ret) {
-                gpu->rb_iova = 0;
-                dev_err(drm->dev, "could not map ringbuffer: %d\n", ret);
-                goto fail;
-        }
-
         bs_init(gpu);
 
         return 0;
diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c
index 4b2ad9181edf..099af483fdf0 100644
--- a/drivers/gpu/drm/msm/msm_iommu.c
+++ b/drivers/gpu/drm/msm/msm_iommu.c
@@ -33,39 +33,14 @@ static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,
 
 static int msm_iommu_attach(struct msm_mmu *mmu, const char **names, int cnt)
 {
-        struct drm_device *dev = mmu->dev;
         struct msm_iommu *iommu = to_msm_iommu(mmu);
-        int i, ret;
-
-        for (i = 0; i < cnt; i++) {
-                struct device *msm_iommu_get_ctx(const char *ctx_name);
-                struct device *ctx = msm_iommu_get_ctx(names[i]);
-                if (IS_ERR_OR_NULL(ctx)) {
-                        dev_warn(dev->dev, "couldn't get %s context", names[i]);
-                        continue;
-                }
-                ret = iommu_attach_device(iommu->domain, ctx);
-                if (ret) {
-                        dev_warn(dev->dev, "could not attach iommu to %s", names[i]);
-                        return ret;
-                }
-        }
-
-        return 0;
+        return iommu_attach_device(iommu->domain, mmu->dev);
 }
 
 static void msm_iommu_detach(struct msm_mmu *mmu, const char **names, int cnt)
 {
         struct msm_iommu *iommu = to_msm_iommu(mmu);
-        int i;
-
-        for (i = 0; i < cnt; i++) {
-                struct device *msm_iommu_get_ctx(const char *ctx_name);
-                struct device *ctx = msm_iommu_get_ctx(names[i]);
-                if (IS_ERR_OR_NULL(ctx))
-                        continue;
-                iommu_detach_device(iommu->domain, ctx);
-        }
+        iommu_detach_device(iommu->domain, mmu->dev);
 }
 
 static int msm_iommu_map(struct msm_mmu *mmu, uint32_t iova,
@@ -149,7 +124,7 @@ static const struct msm_mmu_funcs funcs = {
                 .destroy = msm_iommu_destroy,
 };
 
-struct msm_mmu *msm_iommu_new(struct drm_device *dev, struct iommu_domain *domain)
+struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain)
 {
         struct msm_iommu *iommu;
 
diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h
index 21da6d154f71..7cd88d9dc155 100644
--- a/drivers/gpu/drm/msm/msm_mmu.h
+++ b/drivers/gpu/drm/msm/msm_mmu.h
@@ -32,17 +32,17 @@ struct msm_mmu_funcs {
 
 struct msm_mmu {
         const struct msm_mmu_funcs *funcs;
-        struct drm_device *dev;
+        struct device *dev;
 };
 
-static inline void msm_mmu_init(struct msm_mmu *mmu, struct drm_device *dev,
+static inline void msm_mmu_init(struct msm_mmu *mmu, struct device *dev,
                 const struct msm_mmu_funcs *funcs)
 {
         mmu->dev = dev;
         mmu->funcs = funcs;
 }
 
-struct msm_mmu *msm_iommu_new(struct drm_device *dev, struct iommu_domain *domain);
-struct msm_mmu *msm_gpummu_new(struct drm_device *dev, struct msm_gpu *gpu);
+struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain);
+struct msm_mmu *msm_gpummu_new(struct device *dev, struct msm_gpu *gpu);
 
 #endif /* __MSM_MMU_H__ */