340 files changed, 22323 insertions, 6281 deletions

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 227aca77ee1e..5da44e81dd4d 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -169,10 +169,8 @@ int acpi_create_platform_device(struct acpi_device *adev,
   -------------------------------------------------------------------------- */
 #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
 bool acpi_video_backlight_quirks(void);
-bool acpi_video_verify_backlight_support(void);
 #else
 static inline bool acpi_video_backlight_quirks(void) { return false; }
-static inline bool acpi_video_verify_backlight_support(void) { return false; }
 #endif
 
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 6dd237e79b4f..0ec434d2586d 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -911,7 +911,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
         if (acpi_video_init_brightness(device))
                 return;
 
-        if (acpi_video_verify_backlight_support()) {
+        if (acpi_video_backlight_support()) {
                 struct backlight_properties props;
                 struct pci_dev *pdev;
                 acpi_handle acpi_parent;
@@ -1366,8 +1366,8 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event)
         unsigned long long level_current, level_next;
         int result = -EINVAL;
 
-        /* no warning message if acpi_backlight=vendor or a quirk is used */
-        if (!acpi_video_verify_backlight_support())
+        /* no warning message if acpi_backlight=vendor is used */
+        if (!acpi_video_backlight_support())
                 return 0;
 
         if (!device->brightness)
@@ -1875,46 +1875,6 @@ static int acpi_video_bus_remove(struct acpi_device *device)
         return 0;
 }
 
-static acpi_status video_unregister_backlight(acpi_handle handle, u32 lvl,
-                                              void *context, void **rv)
-{
-        struct acpi_device *acpi_dev;
-        struct acpi_video_bus *video;
-        struct acpi_video_device *dev, *next;
-
-        if (acpi_bus_get_device(handle, &acpi_dev))
-                return AE_OK;
-
-        if (acpi_match_device_ids(acpi_dev, video_device_ids))
-                return AE_OK;
-
-        video = acpi_driver_data(acpi_dev);
-        if (!video)
-                return AE_OK;
-
-        acpi_video_bus_stop_devices(video);
-        mutex_lock(&video->device_list_lock);
-        list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {
-                if (dev->backlight) {
-                        backlight_device_unregister(dev->backlight);
-                        dev->backlight = NULL;
-                        kfree(dev->brightness->levels);
-                        kfree(dev->brightness);
-                }
-                if (dev->cooling_dev) {
-                        sysfs_remove_link(&dev->dev->dev.kobj,
-                                          "thermal_cooling");
-                        sysfs_remove_link(&dev->cooling_dev->device.kobj,
-                                          "device");
-                        thermal_cooling_device_unregister(dev->cooling_dev);
-                        dev->cooling_dev = NULL;
-                }
-        }
-        mutex_unlock(&video->device_list_lock);
-        acpi_video_bus_start_devices(video);
-        return AE_OK;
-}
-
 static int __init is_i740(struct pci_dev *dev)
 {
         if (dev->device == 0x00D1)
@@ -1946,25 +1906,14 @@ static int __init intel_opregion_present(void)
         return opregion;
 }
 
-int __acpi_video_register(bool backlight_quirks)
+int acpi_video_register(void)
 {
-        bool no_backlight;
-        int result;
-
-        no_backlight = backlight_quirks ? acpi_video_backlight_quirks() : false;
-
+        int result = 0;
         if (register_count) {
                 /*
-                 * If acpi_video_register() has been called already, don't try
-                 * to register acpi_video_bus, but unregister backlight devices
-                 * if no backlight support is requested.
+                 * if the function of acpi_video_register is already called,
+                 * don't register the acpi_vide_bus again and return no error.
                  */
-                if (no_backlight)
-                        acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-                                            ACPI_UINT32_MAX,
-                                            video_unregister_backlight,
-                                            NULL, NULL, NULL);
-
                 return 0;
         }
 
@@ -1980,7 +1929,7 @@ int __acpi_video_register(bool backlight_quirks)
 
         return 0;
 }
-EXPORT_SYMBOL(__acpi_video_register);
+EXPORT_SYMBOL(acpi_video_register);
 
 void acpi_video_unregister(void)
 {
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 826e52def080..c3397748ba46 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -238,12 +238,7 @@ static void acpi_video_caps_check(void)
 
 bool acpi_video_backlight_quirks(void)
 {
-        if (acpi_gbl_osi_data >= ACPI_OSI_WIN_8) {
-                acpi_video_caps_check();
-                acpi_video_support |= ACPI_VIDEO_SKIP_BACKLIGHT;
-                return true;
-        }
-        return false;
+        return acpi_gbl_osi_data >= ACPI_OSI_WIN_8;
 }
 EXPORT_SYMBOL(acpi_video_backlight_quirks);
 
@@ -291,14 +286,6 @@ int acpi_video_backlight_support(void)
 }
 EXPORT_SYMBOL(acpi_video_backlight_support);
 
-/* For the ACPI video driver use only. */
-bool acpi_video_verify_backlight_support(void)
-{
-        return (acpi_video_support & ACPI_VIDEO_SKIP_BACKLIGHT) ?
-                false : acpi_video_backlight_support();
-}
-EXPORT_SYMBOL(acpi_video_verify_backlight_support);
-
 /*
  * Use acpi_backlight=vendor/video to force that backlight switching
  * is processed by vendor specific acpi drivers or video.ko driver.
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 80dc988f01e4..4e737728aee2 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -97,6 +97,15 @@ config SATA_AHCI_PLATFORM
 
           If unsure, say N.
 
+config AHCI_IMX
+        tristate "Freescale i.MX AHCI SATA support"
+        depends on SATA_AHCI_PLATFORM && MFD_SYSCON
+        help
+          This option enables support for the Freescale i.MX SoC's
+          onboard AHCI SATA.
+
+          If unsure, say N.
+
 config SATA_FSL
         tristate "Freescale 3.0Gbps SATA support"
         depends on FSL_SOC
@@ -107,7 +116,7 @@ config SATA_FSL
           If unsure, say N.
 
 config SATA_INIC162X
-        tristate "Initio 162x SATA support"
+        tristate "Initio 162x SATA support (Very Experimental)"
         depends on PCI
         help
           This option enables support for Initio 162x Serial ATA.
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index c04d0fd038a3..46518c622460 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SATA_INIC162X)	+= sata_inic162x.o
 obj-$(CONFIG_SATA_SIL24)        += sata_sil24.o
 obj-$(CONFIG_SATA_DWC)          += sata_dwc_460ex.o
 obj-$(CONFIG_SATA_HIGHBANK)     += sata_highbank.o libahci.o
+obj-$(CONFIG_AHCI_IMX)          += ahci_imx.o
 
 # SFF w/ custom DMA
 obj-$(CONFIG_PDC_ADMA)          += pdc_adma.o
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 5064f3ea20f1..db4380d70031 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1146,11 +1146,18 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis)
                 return rc;
 
         for (i = 0; i < host->n_ports; i++) {
+                const char* desc;
                 struct ahci_port_priv *pp = host->ports[i]->private_data;
 
+                /* pp is NULL for dummy ports */
+                if (pp)
+                        desc = pp->irq_desc;
+                else
+                        desc = dev_driver_string(host->dev);
+
                 rc = devm_request_threaded_irq(host->dev,
                         irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED,
-                        pp->irq_desc, host->ports[i]);
+                        desc, host->ports[i]);
                 if (rc)
                         goto out_free_irqs;
         }
diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c
new file mode 100644
index 000000000000..58debb0acc3a
--- /dev/null
+++ b/drivers/ata/ahci_imx.c
@@ -0,0 +1,236 @@
+/*
+ * Freescale IMX AHCI SATA platform driver
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * based on the AHCI SATA platform driver by Jeff Garzik and Anton Vorontsov
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/ahci_platform.h>
+#include <linux/of_device.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
+#include "ahci.h"
+
+enum {
+        HOST_TIMER1MS = 0xe0, /* Timer 1-ms */
+};
+
+struct imx_ahci_priv {
+        struct platform_device *ahci_pdev;
+        struct clk *sata_ref_clk;
+        struct clk *ahb_clk;
+        struct regmap *gpr;
+};
+
+static int imx6q_sata_init(struct device *dev, void __iomem *mmio)
+{
+        int ret = 0;
+        unsigned int reg_val;
+        struct imx_ahci_priv *imxpriv = dev_get_drvdata(dev->parent);
+
+        imxpriv->gpr =
+                syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
+        if (IS_ERR(imxpriv->gpr)) {
+                dev_err(dev, "failed to find fsl,imx6q-iomux-gpr regmap\n");
+                return PTR_ERR(imxpriv->gpr);
+        }
+
+        ret = clk_prepare_enable(imxpriv->sata_ref_clk);
+        if (ret < 0) {
+                dev_err(dev, "prepare-enable sata_ref clock err:%d\n", ret);
+                return ret;
+        }
+
+        /*
+         * set PHY Paremeters, two steps to configure the GPR13,
+         * one write for rest of parameters, mask of first write
+         * is 0x07fffffd, and the other one write for setting
+         * the mpll_clk_en.
+         */
+        regmap_update_bits(imxpriv->gpr, 0x34, IMX6Q_GPR13_SATA_RX_EQ_VAL_MASK
+                        | IMX6Q_GPR13_SATA_RX_LOS_LVL_MASK
+                        | IMX6Q_GPR13_SATA_RX_DPLL_MODE_MASK
+                        | IMX6Q_GPR13_SATA_SPD_MODE_MASK
+                        | IMX6Q_GPR13_SATA_MPLL_SS_EN
+                        | IMX6Q_GPR13_SATA_TX_ATTEN_MASK
+                        | IMX6Q_GPR13_SATA_TX_BOOST_MASK
+                        | IMX6Q_GPR13_SATA_TX_LVL_MASK
+                        | IMX6Q_GPR13_SATA_TX_EDGE_RATE
+                        , IMX6Q_GPR13_SATA_RX_EQ_VAL_3_0_DB
+                        | IMX6Q_GPR13_SATA_RX_LOS_LVL_SATA2M
+                        | IMX6Q_GPR13_SATA_RX_DPLL_MODE_2P_4F
+                        | IMX6Q_GPR13_SATA_SPD_MODE_3P0G
+                        | IMX6Q_GPR13_SATA_MPLL_SS_EN
+                        | IMX6Q_GPR13_SATA_TX_ATTEN_9_16
+                        | IMX6Q_GPR13_SATA_TX_BOOST_3_33_DB
+                        | IMX6Q_GPR13_SATA_TX_LVL_1_025_V);
+        regmap_update_bits(imxpriv->gpr, 0x34, IMX6Q_GPR13_SATA_MPLL_CLK_EN,
+                        IMX6Q_GPR13_SATA_MPLL_CLK_EN);
+        usleep_range(100, 200);
+
+        /*
+         * Configure the HWINIT bits of the HOST_CAP and HOST_PORTS_IMPL,
+         * and IP vendor specific register HOST_TIMER1MS.
+         * Configure CAP_SSS (support stagered spin up).
+         * Implement the port0.
+         * Get the ahb clock rate, and configure the TIMER1MS register.
+         */
+        reg_val = readl(mmio + HOST_CAP);
+        if (!(reg_val & HOST_CAP_SSS)) {
+                reg_val |= HOST_CAP_SSS;
+                writel(reg_val, mmio + HOST_CAP);
+        }
+        reg_val = readl(mmio + HOST_PORTS_IMPL);
+        if (!(reg_val & 0x1)) {
+                reg_val |= 0x1;
+                writel(reg_val, mmio + HOST_PORTS_IMPL);
+        }
+
+        reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000;
+        writel(reg_val, mmio + HOST_TIMER1MS);
+
+        return 0;
+}
+
+static void imx6q_sata_exit(struct device *dev)
+{
+        struct imx_ahci_priv *imxpriv =  dev_get_drvdata(dev->parent);
+
+        regmap_update_bits(imxpriv->gpr, 0x34, IMX6Q_GPR13_SATA_MPLL_CLK_EN,
+                        !IMX6Q_GPR13_SATA_MPLL_CLK_EN);
+        clk_disable_unprepare(imxpriv->sata_ref_clk);
+}
+
+static struct ahci_platform_data imx6q_sata_pdata = {
+        .init = imx6q_sata_init,
+        .exit = imx6q_sata_exit,
+};
+
+static const struct of_device_id imx_ahci_of_match[] = {
+        { .compatible = "fsl,imx6q-ahci", .data = &imx6q_sata_pdata},
+        {},
+};
+MODULE_DEVICE_TABLE(of, imx_ahci_of_match);
+
+static int imx_ahci_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct resource *mem, *irq, res[2];
+        const struct of_device_id *of_id;
+        const struct ahci_platform_data *pdata = NULL;
+        struct imx_ahci_priv *imxpriv;
+        struct device *ahci_dev;
+        struct platform_device *ahci_pdev;
+        int ret;
+
+        imxpriv = devm_kzalloc(dev, sizeof(*imxpriv), GFP_KERNEL);
+        if (!imxpriv) {
+                dev_err(dev, "can't alloc ahci_host_priv\n");
+                return -ENOMEM;
+        }
+
+        ahci_pdev = platform_device_alloc("ahci", -1);
+        if (!ahci_pdev)
+                return -ENODEV;
+
+        ahci_dev = &ahci_pdev->dev;
+        ahci_dev->parent = dev;
+
+        imxpriv->ahb_clk = devm_clk_get(dev, "ahb");
+        if (IS_ERR(imxpriv->ahb_clk)) {
+                dev_err(dev, "can't get ahb clock.\n");
+                ret = PTR_ERR(imxpriv->ahb_clk);
+                goto err_out;
+        }
+
+        imxpriv->sata_ref_clk = devm_clk_get(dev, "sata_ref");
+        if (IS_ERR(imxpriv->sata_ref_clk)) {
+                dev_err(dev, "can't get sata_ref clock.\n");
+                ret = PTR_ERR(imxpriv->sata_ref_clk);
+                goto err_out;
+        }
+
+        imxpriv->ahci_pdev = ahci_pdev;
+        platform_set_drvdata(pdev, imxpriv);
+
+        of_id = of_match_device(imx_ahci_of_match, dev);
+        if (of_id) {
+                pdata = of_id->data;
+        } else {
+                ret = -EINVAL;
+                goto err_out;
+        }
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (!mem || !irq) {
+                dev_err(dev, "no mmio/irq resource\n");
+                ret = -ENOMEM;
+                goto err_out;
+        }
+
+        res[0] = *mem;
+        res[1] = *irq;
+
+        ahci_dev->coherent_dma_mask = DMA_BIT_MASK(32);
+        ahci_dev->dma_mask = &ahci_dev->coherent_dma_mask;
+        ahci_dev->of_node = dev->of_node;
+
+        ret = platform_device_add_resources(ahci_pdev, res, 2);
+        if (ret)
+                goto err_out;
+
+        ret = platform_device_add_data(ahci_pdev, pdata, sizeof(*pdata));
+        if (ret)
+                goto err_out;
+
+        ret = platform_device_add(ahci_pdev);
+        if (ret) {
+err_out:
+                platform_device_put(ahci_pdev);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int imx_ahci_remove(struct platform_device *pdev)
+{
+        struct imx_ahci_priv *imxpriv = platform_get_drvdata(pdev);
+        struct platform_device *ahci_pdev = imxpriv->ahci_pdev;
+
+        platform_device_unregister(ahci_pdev);
+        return 0;
+}
+
+static struct platform_driver imx_ahci_driver = {
+        .probe = imx_ahci_probe,
+        .remove = imx_ahci_remove,
+        .driver = {
+                .name = "ahci-imx",
+                .owner = THIS_MODULE,
+                .of_match_table = imx_ahci_of_match,
+        },
+};
+module_platform_driver(imx_ahci_driver);
+
+MODULE_DESCRIPTION("Freescale i.MX AHCI SATA platform driver");
+MODULE_AUTHOR("Richard Zhu <Hong-Xing.Zhu@freescale.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ahci:imx");
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index b52a10c8eeb9..513ad7ed0c99 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -330,7 +330,7 @@ static const struct pci_device_id piix_pci_tbl[] = {
         /* SATA Controller IDE (Wellsburg) */
         { 0x8086, 0x8d00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
         /* SATA Controller IDE (Wellsburg) */
-        { 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        { 0x8086, 0x8d08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb },
         /* SATA Controller IDE (Wellsburg) */
         { 0x8086, 0x8d60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb },
         /* SATA Controller IDE (Wellsburg) */
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 83c08907e042..b1e880a3c3da 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -206,8 +206,10 @@ static ssize_t ata_scsi_park_store(struct device *device,
         unsigned long flags;
         int rc;
 
-        rc = strict_strtol(buf, 10, &input);
-        if (rc || input < -2)
+        rc = kstrtol(buf, 10, &input);
+        if (rc)
+                return rc;
+        if (input < -2)
                 return -EINVAL;
         if (input > ATA_TMOUT_MAX_PARK) {
                 rc = -EOVERFLOW;
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index e45131748248..5c54d957370a 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -6,6 +6,18 @@
  *
  * This file is released under GPL v2.
  *
+ * **** WARNING ****
+ *
+ * This driver never worked properly and unfortunately data corruption is
+ * relatively common.  There isn't anyone working on the driver and there's
+ * no support from the vendor.  Do not use this driver in any production
+ * environment.
+ *
+ * http://thread.gmane.org/gmane.linux.debian.devel.bugs.rc/378525/focus=54491
+ * https://bugzilla.kernel.org/show_bug.cgi?id=60565
+ *
+ * *****************
+ *
  * This controller is eccentric and easily locks up if something isn't
  * right.  Documentation is available at initio's website but it only
  * documents registers (not programming model).
@@ -807,6 +819,8 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         ata_print_version_once(&pdev->dev, DRV_VERSION);
 
+        dev_alert(&pdev->dev, "inic162x support is broken with common data corruption issues and will be disabled by default, contact linux-ide@vger.kernel.org if in production use\n");
+
         /* alloc host */
         host = ata_host_alloc_pinfo(&pdev->dev, ppi, NR_PORTS);
         hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index b012d7600e1a..7cde885011ed 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -103,10 +103,10 @@ struct pstate_adjust_policy {
 static struct pstate_adjust_policy default_policy = {
         .sample_rate_ms = 10,
         .deadband = 0,
-        .setpoint = 109,
-        .p_gain_pct = 17,
+        .setpoint = 97,
+        .p_gain_pct = 20,
         .d_gain_pct = 0,
-        .i_gain_pct = 4,
+        .i_gain_pct = 0,
 };
 
 struct perf_limits {
@@ -468,12 +468,12 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu)
 static inline int intel_pstate_get_scaled_busy(struct cpudata *cpu)
 {
         int32_t busy_scaled;
-        int32_t core_busy, turbo_pstate, current_pstate;
+        int32_t core_busy, max_pstate, current_pstate;
 
         core_busy = int_tofp(cpu->samples[cpu->sample_ptr].core_pct_busy);
-        turbo_pstate = int_tofp(cpu->pstate.turbo_pstate);
+        max_pstate = int_tofp(cpu->pstate.max_pstate);
         current_pstate = int_tofp(cpu->pstate.current_pstate);
-        busy_scaled = mul_fp(core_busy, div_fp(turbo_pstate, current_pstate));
+        busy_scaled = mul_fp(core_busy, div_fp(max_pstate, current_pstate));
 
         return fp_toint(busy_scaled);
 }
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
index 5996521a1caf..84573b4d6f92 100644
--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -429,7 +429,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, const u8 *key_in,
         dma_addr_t src_dma, dst_dma;
         int ret = 0;
 
-        desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);
+        desc = kmalloc(CAAM_CMD_SZ * 8 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);
         if (!desc) {
                 dev_err(jrdev, "unable to allocate key input memory\n");
                 return -ENOMEM;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 27e86d938262..89e109022d78 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -48,6 +48,8 @@ static LIST_HEAD(mc_devices);
  */
 static void const *edac_mc_owner;
 
+static struct bus_type mc_bus[EDAC_MAX_MCS];
+
 unsigned edac_dimm_info_location(struct dimm_info *dimm, char *buf,
                                  unsigned len)
 {
@@ -723,6 +725,11 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)
         int ret = -EINVAL;
         edac_dbg(0, "\n");
 
+        if (mci->mc_idx >= EDAC_MAX_MCS) {
+                pr_warn_once("Too many memory controllers: %d\n", mci->mc_idx);
+                return -ENODEV;
+        }
+
 #ifdef CONFIG_EDAC_DEBUG
         if (edac_debug_level >= 3)
                 edac_mc_dump_mci(mci);
@@ -762,6 +769,8 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)
         /* set load time so that error rate can be tracked */
         mci->start_time = jiffies;
 
+        mci->bus = &mc_bus[mci->mc_idx];
+
         if (edac_create_sysfs_mci_device(mci)) {
                 edac_mc_printk(mci, KERN_WARNING,
                         "failed to create sysfs device\n");
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index ef15a7e613bc..e7c32c4f7837 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -370,7 +370,7 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
                 return -ENODEV;
 
         csrow->dev.type = &csrow_attr_type;
-        csrow->dev.bus = &mci->bus;
+        csrow->dev.bus = mci->bus;
         device_initialize(&csrow->dev);
         csrow->dev.parent = &mci->dev;
         csrow->mci = mci;
@@ -605,7 +605,7 @@ static int edac_create_dimm_object(struct mem_ctl_info *mci,
         dimm->mci = mci;
 
         dimm->dev.type = &dimm_attr_type;
-        dimm->dev.bus = &mci->bus;
+        dimm->dev.bus = mci->bus;
         device_initialize(&dimm->dev);
 
         dimm->dev.parent = &mci->dev;
@@ -975,11 +975,13 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
          * The memory controller needs its own bus, in order to avoid
          * namespace conflicts at /sys/bus/edac.
          */
-        mci->bus.name = kasprintf(GFP_KERNEL, "mc%d", mci->mc_idx);
-        if (!mci->bus.name)
+        mci->bus->name = kasprintf(GFP_KERNEL, "mc%d", mci->mc_idx);
+        if (!mci->bus->name)
                 return -ENOMEM;
-        edac_dbg(0, "creating bus %s\n", mci->bus.name);
-        err = bus_register(&mci->bus);
+
+        edac_dbg(0, "creating bus %s\n", mci->bus->name);
+
+        err = bus_register(mci->bus);
         if (err < 0)
                 return err;
 
@@ -988,7 +990,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         device_initialize(&mci->dev);
 
         mci->dev.parent = mci_pdev;
-        mci->dev.bus = &mci->bus;
+        mci->dev.bus = mci->bus;
         dev_set_name(&mci->dev, "mc%d", mci->mc_idx);
         dev_set_drvdata(&mci->dev, mci);
         pm_runtime_forbid(&mci->dev);
@@ -997,8 +999,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
         err = device_add(&mci->dev);
         if (err < 0) {
                 edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev));
-                bus_unregister(&mci->bus);
-                kfree(mci->bus.name);
+                bus_unregister(mci->bus);
+                kfree(mci->bus->name);
                 return err;
         }
 
@@ -1064,8 +1066,8 @@ fail:
         }
 fail2:
         device_unregister(&mci->dev);
-        bus_unregister(&mci->bus);
-        kfree(mci->bus.name);
+        bus_unregister(mci->bus);
+        kfree(mci->bus->name);
         return err;
 }
 
@@ -1098,8 +1100,8 @@ void edac_unregister_sysfs(struct mem_ctl_info *mci)
 {
         edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev));
         device_unregister(&mci->dev);
-        bus_unregister(&mci->bus);
-        kfree(mci->bus.name);
+        bus_unregister(mci->bus);
+        kfree(mci->bus->name);
 }
 
 static void mc_attr_release(struct device *dev)
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
index 1b635178cc44..157b934e8ce3 100644
--- a/drivers/edac/i5100_edac.c
+++ b/drivers/edac/i5100_edac.c
@@ -974,7 +974,7 @@ static int i5100_setup_debugfs(struct mem_ctl_info *mci)
         if (!i5100_debugfs)
                 return -ENODEV;
 
-        priv->debugfs = debugfs_create_dir(mci->bus.name, i5100_debugfs);
+        priv->debugfs = debugfs_create_dir(mci->bus->name, i5100_debugfs);
 
         if (!priv->debugfs)
                 return -ENOMEM;
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index cd4246b480d4..955555d6ec88 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 menuconfig DRM
         tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-        depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU
+        depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU && HAS_DMA
         select HDMI
         select I2C
         select I2C_ALGOBIT
@@ -234,3 +234,5 @@ source "drivers/gpu/drm/omapdrm/Kconfig"
 source "drivers/gpu/drm/tilcdc/Kconfig"
 
 source "drivers/gpu/drm/qxl/Kconfig"
+
+source "drivers/gpu/drm/msm/Kconfig"
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 801bcafa3028..f089adfe70ee 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -7,13 +7,13 @@ ccflags-y := -Iinclude/drm
 drm-y       :=  drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
                 drm_context.o drm_dma.o \
                 drm_drv.o drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
-                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
+                drm_lock.o drm_memory.o drm_stub.o drm_vm.o \
                 drm_agpsupport.o drm_scatter.o drm_pci.o \
                 drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
                 drm_crtc.o drm_modes.o drm_edid.o \
                 drm_info.o drm_debugfs.o drm_encoder_slave.o \
                 drm_trace_points.o drm_global.o drm_prime.o \
-                drm_rect.o
+                drm_rect.o drm_vma_manager.o drm_flip_work.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
@@ -54,4 +54,5 @@ obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
 obj-$(CONFIG_DRM_OMAP)  += omapdrm/
 obj-$(CONFIG_DRM_TILCDC)        += tilcdc/
 obj-$(CONFIG_DRM_QXL) += qxl/
+obj-$(CONFIG_DRM_MSM) += msm/
 obj-y                   += i2c/
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index df0d0a08097a..32e270dc714e 100644
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -190,7 +190,6 @@ static const struct file_operations ast_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = ast_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -198,7 +197,7 @@ static const struct file_operations ast_fops = {
 };
 
 static struct drm_driver driver = {
-        .driver_features = DRIVER_USE_MTRR | DRIVER_MODESET | DRIVER_GEM,
+        .driver_features = DRIVER_MODESET | DRIVER_GEM,
         .dev_priv_size = 0,
 
         .load = ast_driver_load,
@@ -216,7 +215,7 @@ static struct drm_driver driver = {
         .gem_free_object = ast_gem_free_object,
         .dumb_create = ast_dumb_create,
         .dumb_map_offset = ast_dumb_mmap_offset,
-        .dumb_destroy = ast_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 
 };
 
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 622d4ae7eb9e..796dbb212a41 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -322,9 +322,6 @@ ast_bo(struct ttm_buffer_object *bo)
 extern int ast_dumb_create(struct drm_file *file,
                            struct drm_device *dev,
                            struct drm_mode_create_dumb *args);
-extern int ast_dumb_destroy(struct drm_file *file,
-                            struct drm_device *dev,
-                            uint32_t handle);
 
 extern int ast_gem_init_object(struct drm_gem_object *obj);
 extern void ast_gem_free_object(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index f60fd7bd1183..7f6152d374ca 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -449,13 +449,6 @@ int ast_dumb_create(struct drm_file *file,
         return 0;
 }
 
-int ast_dumb_destroy(struct drm_file *file,
-                     struct drm_device *dev,
-                     uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 int ast_gem_init_object(struct drm_gem_object *obj)
 {
         BUG();
@@ -487,7 +480,7 @@ void ast_gem_free_object(struct drm_gem_object *obj)
 
 static inline u64 ast_bo_mmap_offset(struct ast_bo *bo)
 {
-        return bo->bo.addr_space_offset;
+        return drm_vma_node_offset_addr(&bo->bo.vma_node);
 }
 int
 ast_dumb_mmap_offset(struct drm_file *file,
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 98d670825a1a..20fcf4ee3af0 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -148,7 +148,9 @@ ast_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 
 static int ast_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct ast_bo *astbo = ast_bo(bo);
+
+        return drm_vma_node_verify_access(&astbo->gem.vma_node, filp);
 }
 
 static int ast_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
@@ -321,7 +323,6 @@ int ast_bo_create(struct drm_device *dev, int size, int align,
                 return ret;
         }
 
-        astbo->gem.driver_private = NULL;
         astbo->bo.bdev = &ast->ttm.bdev;
 
         ast_ttm_placement(astbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c
index 8ecb601152ef..138364d91782 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.c
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.c
@@ -85,10 +85,9 @@ static const struct file_operations cirrus_driver_fops = {
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
-        .fasync = drm_fasync,
 };
 static struct drm_driver driver = {
-        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_USE_MTRR,
+        .driver_features = DRIVER_MODESET | DRIVER_GEM,
         .load = cirrus_driver_load,
         .unload = cirrus_driver_unload,
         .fops = &cirrus_driver_fops,
@@ -102,7 +101,7 @@ static struct drm_driver driver = {
         .gem_free_object = cirrus_gem_free_object,
         .dumb_create = cirrus_dumb_create,
         .dumb_map_offset = cirrus_dumb_mmap_offset,
-        .dumb_destroy = cirrus_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 };
 
 static struct pci_driver cirrus_pci_driver = {
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h
index bae55609e6c3..9b0bb9184afd 100644
--- a/drivers/gpu/drm/cirrus/cirrus_drv.h
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.h
@@ -203,9 +203,6 @@ int cirrus_gem_create(struct drm_device *dev,
 int cirrus_dumb_create(struct drm_file *file,
                     struct drm_device *dev,
                        struct drm_mode_create_dumb *args);
-int cirrus_dumb_destroy(struct drm_file *file,
-                     struct drm_device *dev,
-                        uint32_t handle);
 
 int cirrus_framebuffer_init(struct drm_device *dev,
                            struct cirrus_framebuffer *gfb,
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c
index 35cbae827771..f130a533a512 100644
--- a/drivers/gpu/drm/cirrus/cirrus_main.c
+++ b/drivers/gpu/drm/cirrus/cirrus_main.c
@@ -255,13 +255,6 @@ int cirrus_dumb_create(struct drm_file *file,
         return 0;
 }
 
-int cirrus_dumb_destroy(struct drm_file *file,
-                     struct drm_device *dev,
-                     uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 int cirrus_gem_init_object(struct drm_gem_object *obj)
 {
         BUG();
@@ -294,7 +287,7 @@ void cirrus_gem_free_object(struct drm_gem_object *obj)
 
 static inline u64 cirrus_bo_mmap_offset(struct cirrus_bo *bo)
 {
-        return bo->bo.addr_space_offset;
+        return drm_vma_node_offset_addr(&bo->bo.vma_node);
 }
 
 int
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 0047012045c2..ae2385cc71cb 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -148,7 +148,9 @@ cirrus_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 
 static int cirrus_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct cirrus_bo *cirrusbo = cirrus_bo(bo);
+
+        return drm_vma_node_verify_access(&cirrusbo->gem.vma_node, filp);
 }
 
 static int cirrus_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
@@ -326,7 +328,6 @@ int cirrus_bo_create(struct drm_device *dev, int size, int align,
                 return ret;
         }
 
-        cirrusbo->gem.driver_private = NULL;
         cirrusbo->bo.bdev = &cirrus->ttm.bdev;
 
         cirrus_ttm_placement(cirrusbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c
index 3d8fed179797..e301d653d97e 100644
--- a/drivers/gpu/drm/drm_agpsupport.c
+++ b/drivers/gpu/drm/drm_agpsupport.c
@@ -424,6 +424,57 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev)
 }
 
 /**
+ * drm_agp_clear - Clear AGP resource list
+ * @dev: DRM device
+ *
+ * Iterate over all AGP resources and remove them. But keep the AGP head
+ * intact so it can still be used. It is safe to call this if AGP is disabled or
+ * was already removed.
+ *
+ * If DRIVER_MODESET is active, nothing is done to protect the modesetting
+ * resources from getting destroyed. Drivers are responsible of cleaning them up
+ * during device shutdown.
+ */
+void drm_agp_clear(struct drm_device *dev)
+{
+        struct drm_agp_mem *entry, *tempe;
+
+        if (!drm_core_has_AGP(dev) || !dev->agp)
+                return;
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
+        list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
+                if (entry->bound)
+                        drm_unbind_agp(entry->memory);
+                drm_free_agp(entry->memory, entry->pages);
+                kfree(entry);
+        }
+        INIT_LIST_HEAD(&dev->agp->memory);
+
+        if (dev->agp->acquired)
+                drm_agp_release(dev);
+
+        dev->agp->acquired = 0;
+        dev->agp->enabled = 0;
+}
+
+/**
+ * drm_agp_destroy - Destroy AGP head
+ * @dev: DRM device
+ *
+ * Destroy resources that were previously allocated via drm_agp_initp. Caller
+ * must ensure to clean up all AGP resources before calling this. See
+ * drm_agp_clear().
+ *
+ * Call this to destroy AGP heads allocated via drm_agp_init().
+ */
+void drm_agp_destroy(struct drm_agp_head *agp)
+{
+        kfree(agp);
+}
+
+/**
  * Binds a collection of pages into AGP memory at the given offset, returning
  * the AGP memory structure containing them.
  *
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 5a4dbb410b71..471e051d295e 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -207,12 +207,10 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                         return 0;
                 }
 
-                if (drm_core_has_MTRR(dev)) {
-                        if (map->type == _DRM_FRAME_BUFFER ||
-                            (map->flags & _DRM_WRITE_COMBINING)) {
-                                map->mtrr =
-                                        arch_phys_wc_add(map->offset, map->size);
-                        }
+                if (map->type == _DRM_FRAME_BUFFER ||
+                    (map->flags & _DRM_WRITE_COMBINING)) {
+                        map->mtrr =
+                                arch_phys_wc_add(map->offset, map->size);
                 }
                 if (map->type == _DRM_REGISTERS) {
                         if (map->flags & _DRM_WRITE_COMBINING)
@@ -243,7 +241,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                 }
                 map->handle = vmalloc_user(map->size);
                 DRM_DEBUG("%lu %d %p\n",
-                          map->size, drm_order(map->size), map->handle);
+                          map->size, order_base_2(map->size), map->handle);
                 if (!map->handle) {
                         kfree(map);
                         return -ENOMEM;
@@ -464,8 +462,7 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map)
                 iounmap(map->handle);
                 /* FALLTHROUGH */
         case _DRM_FRAME_BUFFER:
-                if (drm_core_has_MTRR(dev))
-                        arch_phys_wc_del(map->mtrr);
+                arch_phys_wc_del(map->mtrr);
                 break;
         case _DRM_SHM:
                 vfree(map->handle);
@@ -630,7 +627,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
                 return -EINVAL;
 
         count = request->count;
-        order = drm_order(request->size);
+        order = order_base_2(request->size);
         size = 1 << order;
 
         alignment = (request->flags & _DRM_PAGE_ALIGN)
@@ -800,7 +797,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
                 return -EPERM;
 
         count = request->count;
-        order = drm_order(request->size);
+        order = order_base_2(request->size);
         size = 1 << order;
 
         DRM_DEBUG("count=%d, size=%d (%d), order=%d\n",
@@ -1002,7 +999,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
                 return -EPERM;
 
         count = request->count;
-        order = drm_order(request->size);
+        order = order_base_2(request->size);
         size = 1 << order;
 
         alignment = (request->flags & _DRM_PAGE_ALIGN)
@@ -1130,161 +1127,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
         return 0;
 }
 
-static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request)
-{
-        struct drm_device_dma *dma = dev->dma;
-        struct drm_buf_entry *entry;
-        struct drm_buf *buf;
-        unsigned long offset;
-        unsigned long agp_offset;
-        int count;
-        int order;
-        int size;
-        int alignment;
-        int page_order;
-        int total;
-        int byte_count;
-        int i;
-        struct drm_buf **temp_buflist;
-
-        if (!drm_core_check_feature(dev, DRIVER_FB_DMA))
-                return -EINVAL;
-
-        if (!dma)
-                return -EINVAL;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EPERM;
-
-        count = request->count;
-        order = drm_order(request->size);
-        size = 1 << order;
-
-        alignment = (request->flags & _DRM_PAGE_ALIGN)
-            ? PAGE_ALIGN(size) : size;
-        page_order = order - PAGE_SHIFT > 0 ? order - PAGE_SHIFT : 0;
-        total = PAGE_SIZE << page_order;
-
-        byte_count = 0;
-        agp_offset = request->agp_start;
-
-        DRM_DEBUG("count:      %d\n", count);
-        DRM_DEBUG("order:      %d\n", order);
-        DRM_DEBUG("size:       %d\n", size);
-        DRM_DEBUG("agp_offset: %lu\n", agp_offset);
-        DRM_DEBUG("alignment:  %d\n", alignment);
-        DRM_DEBUG("page_order: %d\n", page_order);
-        DRM_DEBUG("total:      %d\n", total);
-
-        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
-                return -EINVAL;
-
-        spin_lock(&dev->count_lock);
-        if (dev->buf_use) {
-                spin_unlock(&dev->count_lock);
-                return -EBUSY;
-        }
-        atomic_inc(&dev->buf_alloc);
-        spin_unlock(&dev->count_lock);
-
-        mutex_lock(&dev->struct_mutex);
-        entry = &dma->bufs[order];
-        if (entry->buf_count) {
-                mutex_unlock(&dev->struct_mutex);
-                atomic_dec(&dev->buf_alloc);
-                return -ENOMEM; /* May only call once for each order */
-        }
-
-        if (count < 0 || count > 4096) {
-                mutex_unlock(&dev->struct_mutex);
-                atomic_dec(&dev->buf_alloc);
-                return -EINVAL;
-        }
-
-        entry->buflist = kzalloc(count * sizeof(*entry->buflist),
-                                GFP_KERNEL);
-        if (!entry->buflist) {
-                mutex_unlock(&dev->struct_mutex);
-                atomic_dec(&dev->buf_alloc);
-                return -ENOMEM;
-        }
-
-        entry->buf_size = size;
-        entry->page_order = page_order;
-
-        offset = 0;
-
-        while (entry->buf_count < count) {
-                buf = &entry->buflist[entry->buf_count];
-                buf->idx = dma->buf_count + entry->buf_count;
-                buf->total = alignment;
-                buf->order = order;
-                buf->used = 0;
-
-                buf->offset = (dma->byte_count + offset);
-                buf->bus_address = agp_offset + offset;
-                buf->address = (void *)(agp_offset + offset);
-                buf->next = NULL;
-                buf->waiting = 0;
-                buf->pending = 0;
-                buf->file_priv = NULL;
-
-                buf->dev_priv_size = dev->driver->dev_priv_size;
-                buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);
-                if (!buf->dev_private) {
-                        /* Set count correctly so we free the proper amount. */
-                        entry->buf_count = count;
-                        drm_cleanup_buf_error(dev, entry);
-                        mutex_unlock(&dev->struct_mutex);
-                        atomic_dec(&dev->buf_alloc);
-                        return -ENOMEM;
-                }
-
-                DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
-
-                offset += alignment;
-                entry->buf_count++;
-                byte_count += PAGE_SIZE << page_order;
-        }
-
-        DRM_DEBUG("byte_count: %d\n", byte_count);
-
-        temp_buflist = krealloc(dma->buflist,
-                                (dma->buf_count + entry->buf_count) *
-                                sizeof(*dma->buflist), GFP_KERNEL);
-        if (!temp_buflist) {
-                /* Free the entry because it isn't valid */
-                drm_cleanup_buf_error(dev, entry);
-                mutex_unlock(&dev->struct_mutex);
-                atomic_dec(&dev->buf_alloc);
-                return -ENOMEM;
-        }
-        dma->buflist = temp_buflist;
-
-        for (i = 0; i < entry->buf_count; i++) {
-                dma->buflist[i + dma->buf_count] = &entry->buflist[i];
-        }
-
-        dma->buf_count += entry->buf_count;
-        dma->seg_count += entry->seg_count;
-        dma->page_count += byte_count >> PAGE_SHIFT;
-        dma->byte_count += byte_count;
-
-        DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count);
-        DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count);
-
-        mutex_unlock(&dev->struct_mutex);
-
-        request->count = entry->buf_count;
-        request->size = size;
-
-        dma->flags = _DRM_DMA_USE_FB;
-
-        atomic_dec(&dev->buf_alloc);
-        return 0;
-}
-
-
 /**
  * Add buffers for DMA transfers (ioctl).
  *
@@ -1305,6 +1147,9 @@ int drm_addbufs(struct drm_device *dev, void *data,
         struct drm_buf_desc *request = data;
         int ret;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
@@ -1316,7 +1161,7 @@ int drm_addbufs(struct drm_device *dev, void *data,
         if (request->flags & _DRM_SG_BUFFER)
                 ret = drm_addbufs_sg(dev, request);
         else if (request->flags & _DRM_FB_BUFFER)
-                ret = drm_addbufs_fb(dev, request);
+                ret = -EINVAL;
         else
                 ret = drm_addbufs_pci(dev, request);
 
@@ -1348,6 +1193,9 @@ int drm_infobufs(struct drm_device *dev, void *data,
         int i;
         int count;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
@@ -1427,6 +1275,9 @@ int drm_markbufs(struct drm_device *dev, void *data,
         int order;
         struct drm_buf_entry *entry;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
@@ -1435,7 +1286,7 @@ int drm_markbufs(struct drm_device *dev, void *data,
 
         DRM_DEBUG("%d, %d, %d\n",
                   request->size, request->low_mark, request->high_mark);
-        order = drm_order(request->size);
+        order = order_base_2(request->size);
         if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
                 return -EINVAL;
         entry = &dma->bufs[order];
@@ -1472,6 +1323,9 @@ int drm_freebufs(struct drm_device *dev, void *data,
         int idx;
         struct drm_buf *buf;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
@@ -1524,6 +1378,9 @@ int drm_mapbufs(struct drm_device *dev, void *data,
         struct drm_buf_map *request = data;
         int i;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                 return -EINVAL;
 
@@ -1541,9 +1398,7 @@ int drm_mapbufs(struct drm_device *dev, void *data,
         if (request->count >= dma->buf_count) {
                 if ((drm_core_has_AGP(dev) && (dma->flags & _DRM_DMA_USE_AGP))
                     || (drm_core_check_feature(dev, DRIVER_SG)
-                        && (dma->flags & _DRM_DMA_USE_SG))
-                    || (drm_core_check_feature(dev, DRIVER_FB_DMA)
-                        && (dma->flags & _DRM_DMA_USE_FB))) {
+                        && (dma->flags & _DRM_DMA_USE_SG))) {
                         struct drm_local_map *map = dev->agp_buffer_map;
                         unsigned long token = dev->agp_buffer_token;
 
@@ -1600,25 +1455,28 @@ int drm_mapbufs(struct drm_device *dev, void *data,
         return retcode;
 }
 
-/**
- * Compute size order.  Returns the exponent of the smaller power of two which
- * is greater or equal to given number.
- *
- * \param size size.
- * \return order.
- *
- * \todo Can be made faster.
- */
-int drm_order(unsigned long size)
+int drm_dma_ioctl(struct drm_device *dev, void *data,
+                  struct drm_file *file_priv)
 {
-        int order;
-        unsigned long tmp;
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
 
-        for (order = 0, tmp = size >> 1; tmp; tmp >>= 1, order++) ;
+        if (dev->driver->dma_ioctl)
+                return dev->driver->dma_ioctl(dev, data, file_priv);
+        else
+                return -EINVAL;
+}
 
-        if (size & (size - 1))
-                ++order;
+struct drm_local_map *drm_getsarea(struct drm_device *dev)
+{
+        struct drm_map_list *entry;
 
-        return order;
+        list_for_each_entry(entry, &dev->maplist, head) {
+                if (entry->map && entry->map->type == _DRM_SHM &&
+                    (entry->map->flags & _DRM_CONTAINS_LOCK)) {
+                        return entry->map;
+                }
+        }
+        return NULL;
 }
-EXPORT_SYMBOL(drm_order);
+EXPORT_SYMBOL(drm_getsarea);
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
index 725968d38976..b4fb86d89850 100644
--- a/drivers/gpu/drm/drm_context.c
+++ b/drivers/gpu/drm/drm_context.c
@@ -42,10 +42,6 @@
 
 #include <drm/drmP.h>
 
-/******************************************************************/
-/** \name Context bitmap support */
-/*@{*/
-
 /**
  * Free a handle from the context bitmap.
  *
@@ -56,13 +52,48 @@
  * in drm_device::ctx_idr, while holding the drm_device::struct_mutex
  * lock.
  */
-void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
+static void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
 {
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
         mutex_lock(&dev->struct_mutex);
         idr_remove(&dev->ctx_idr, ctx_handle);
         mutex_unlock(&dev->struct_mutex);
 }
 
+/******************************************************************/
+/** \name Context bitmap support */
+/*@{*/
+
+void drm_legacy_ctxbitmap_release(struct drm_device *dev,
+                                  struct drm_file *file_priv)
+{
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
+        mutex_lock(&dev->ctxlist_mutex);
+        if (!list_empty(&dev->ctxlist)) {
+                struct drm_ctx_list *pos, *n;
+
+                list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {
+                        if (pos->tag == file_priv &&
+                            pos->handle != DRM_KERNEL_CONTEXT) {
+                                if (dev->driver->context_dtor)
+                                        dev->driver->context_dtor(dev,
+                                                                  pos->handle);
+
+                                drm_ctxbitmap_free(dev, pos->handle);
+
+                                list_del(&pos->head);
+                                kfree(pos);
+                                --dev->ctx_count;
+                        }
+                }
+        }
+        mutex_unlock(&dev->ctxlist_mutex);
+}
+
 /**
  * Context bitmap allocation.
  *
@@ -90,10 +121,12 @@ static int drm_ctxbitmap_next(struct drm_device * dev)
  *
  * Initialise the drm_device::ctx_idr
  */
-int drm_ctxbitmap_init(struct drm_device * dev)
+void drm_legacy_ctxbitmap_init(struct drm_device * dev)
 {
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
         idr_init(&dev->ctx_idr);
-        return 0;
 }
 
 /**
@@ -104,7 +137,7 @@ int drm_ctxbitmap_init(struct drm_device * dev)
  * Free all idr members using drm_ctx_sarea_free helper function
  * while holding the drm_device::struct_mutex lock.
  */
-void drm_ctxbitmap_cleanup(struct drm_device * dev)
+void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
 {
         mutex_lock(&dev->struct_mutex);
         idr_destroy(&dev->ctx_idr);
@@ -136,6 +169,9 @@ int drm_getsareactx(struct drm_device *dev, void *data,
         struct drm_local_map *map;
         struct drm_map_list *_entry;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         mutex_lock(&dev->struct_mutex);
 
         map = idr_find(&dev->ctx_idr, request->ctx_id);
@@ -180,6 +216,9 @@ int drm_setsareactx(struct drm_device *dev, void *data,
         struct drm_local_map *map = NULL;
         struct drm_map_list *r_list = NULL;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         mutex_lock(&dev->struct_mutex);
         list_for_each_entry(r_list, &dev->maplist, head) {
                 if (r_list->map
@@ -251,7 +290,6 @@ static int drm_context_switch_complete(struct drm_device *dev,
                                        struct drm_file *file_priv, int new)
 {
         dev->last_context = new;        /* PRE/POST: This is the _only_ writer. */
-        dev->last_switch = jiffies;
 
         if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
                 DRM_ERROR("Lock isn't held after context switch\n");
@@ -261,7 +299,6 @@ static int drm_context_switch_complete(struct drm_device *dev,
            when the kernel holds the lock, release
            that lock here. */
         clear_bit(0, &dev->context_flag);
-        wake_up(&dev->context_wait);
 
         return 0;
 }
@@ -282,6 +319,9 @@ int drm_resctx(struct drm_device *dev, void *data,
         struct drm_ctx ctx;
         int i;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (res->count >= DRM_RESERVED_CONTEXTS) {
                 memset(&ctx, 0, sizeof(ctx));
                 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
@@ -312,6 +352,9 @@ int drm_addctx(struct drm_device *dev, void *data,
         struct drm_ctx_list *ctx_entry;
         struct drm_ctx *ctx = data;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         ctx->handle = drm_ctxbitmap_next(dev);
         if (ctx->handle == DRM_KERNEL_CONTEXT) {
                 /* Skip kernel's context and get a new one. */
@@ -342,12 +385,6 @@ int drm_addctx(struct drm_device *dev, void *data,
         return 0;
 }
 
-int drm_modctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
-{
-        /* This does nothing */
-        return 0;
-}
-
 /**
  * Get context.
  *
@@ -361,6 +398,9 @@ int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         struct drm_ctx *ctx = data;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         /* This is 0, because we don't handle any context flags */
         ctx->flags = 0;
 
@@ -383,6 +423,9 @@ int drm_switchctx(struct drm_device *dev, void *data,
 {
         struct drm_ctx *ctx = data;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         DRM_DEBUG("%d\n", ctx->handle);
         return drm_context_switch(dev, dev->last_context, ctx->handle);
 }
@@ -403,6 +446,9 @@ int drm_newctx(struct drm_device *dev, void *data,
 {
         struct drm_ctx *ctx = data;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         DRM_DEBUG("%d\n", ctx->handle);
         drm_context_switch_complete(dev, file_priv, ctx->handle);
 
@@ -425,6 +471,9 @@ int drm_rmctx(struct drm_device *dev, void *data,
 {
         struct drm_ctx *ctx = data;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         DRM_DEBUG("%d\n", ctx->handle);
         if (ctx->handle != DRM_KERNEL_CONTEXT) {
                 if (dev->driver->context_dtor)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index fc83bb9eb514..452591b67996 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -125,13 +125,6 @@ static const struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
         { DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
-static const struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
-{
-        { DRM_MODE_DITHERING_OFF, "Off" },
-        { DRM_MODE_DITHERING_ON, "On" },
-        { DRM_MODE_DITHERING_AUTO, "Automatic" },
-};
-
 /*
  * Non-global properties, but "required" for certain connectors.
  */
@@ -186,29 +179,29 @@ static const struct drm_prop_enum_list drm_dirty_info_enum_list[] = {
 struct drm_conn_prop_enum_list {
         int type;
         const char *name;
-        int count;
+        struct ida ida;
 };
 
 /*
  * Connector and encoder types.
  */
 static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
-{       { DRM_MODE_CONNECTOR_Unknown, "Unknown", 0 },
-        { DRM_MODE_CONNECTOR_VGA, "VGA", 0 },
-        { DRM_MODE_CONNECTOR_DVII, "DVI-I", 0 },
-        { DRM_MODE_CONNECTOR_DVID, "DVI-D", 0 },
-        { DRM_MODE_CONNECTOR_DVIA, "DVI-A", 0 },
-        { DRM_MODE_CONNECTOR_Composite, "Composite", 0 },
-        { DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO", 0 },
-        { DRM_MODE_CONNECTOR_LVDS, "LVDS", 0 },
-        { DRM_MODE_CONNECTOR_Component, "Component", 0 },
-        { DRM_MODE_CONNECTOR_9PinDIN, "DIN", 0 },
-        { DRM_MODE_CONNECTOR_DisplayPort, "DP", 0 },
-        { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A", 0 },
-        { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },
-        { DRM_MODE_CONNECTOR_TV, "TV", 0 },
-        { DRM_MODE_CONNECTOR_eDP, "eDP", 0 },
-        { DRM_MODE_CONNECTOR_VIRTUAL, "Virtual", 0},
+{       { DRM_MODE_CONNECTOR_Unknown, "Unknown" },
+        { DRM_MODE_CONNECTOR_VGA, "VGA" },
+        { DRM_MODE_CONNECTOR_DVII, "DVI-I" },
+        { DRM_MODE_CONNECTOR_DVID, "DVI-D" },
+        { DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
+        { DRM_MODE_CONNECTOR_Composite, "Composite" },
+        { DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO" },
+        { DRM_MODE_CONNECTOR_LVDS, "LVDS" },
+        { DRM_MODE_CONNECTOR_Component, "Component" },
+        { DRM_MODE_CONNECTOR_9PinDIN, "DIN" },
+        { DRM_MODE_CONNECTOR_DisplayPort, "DP" },
+        { DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
+        { DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
+        { DRM_MODE_CONNECTOR_TV, "TV" },
+        { DRM_MODE_CONNECTOR_eDP, "eDP" },
+        { DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
 };
 
 static const struct drm_prop_enum_list drm_encoder_enum_list[] =
@@ -220,6 +213,22 @@ static const struct drm_prop_enum_list drm_encoder_enum_list[] =
         { DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
 };
 
+void drm_connector_ida_init(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++)
+                ida_init(&drm_connector_enum_list[i].ida);
+}
+
+void drm_connector_ida_destroy(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++)
+                ida_destroy(&drm_connector_enum_list[i].ida);
+}
+
 const char *drm_get_encoder_name(const struct drm_encoder *encoder)
 {
         static char buf[32];
@@ -677,20 +686,19 @@ void drm_mode_probed_add(struct drm_connector *connector,
 }
 EXPORT_SYMBOL(drm_mode_probed_add);
 
-/**
+/*
  * drm_mode_remove - remove and free a mode
  * @connector: connector list to modify
  * @mode: mode to remove
  *
  * Remove @mode from @connector's mode list, then free it.
  */
-void drm_mode_remove(struct drm_connector *connector,
-                     struct drm_display_mode *mode)
+static void drm_mode_remove(struct drm_connector *connector,
+                            struct drm_display_mode *mode)
 {
         list_del(&mode->head);
         drm_mode_destroy(connector->dev, mode);
 }
-EXPORT_SYMBOL(drm_mode_remove);
 
 /**
  * drm_connector_init - Init a preallocated connector
@@ -711,6 +719,8 @@ int drm_connector_init(struct drm_device *dev,
                        int connector_type)
 {
         int ret;
+        struct ida *connector_ida =
+                &drm_connector_enum_list[connector_type].ida;
 
         drm_modeset_lock_all(dev);
 
@@ -723,7 +733,12 @@ int drm_connector_init(struct drm_device *dev,
         connector->funcs = funcs;
         connector->connector_type = connector_type;
         connector->connector_type_id =
-                ++drm_connector_enum_list[connector_type].count; /* TODO */
+                ida_simple_get(connector_ida, 1, 0, GFP_KERNEL);
+        if (connector->connector_type_id < 0) {
+                ret = connector->connector_type_id;
+                drm_mode_object_put(dev, &connector->base);
+                goto out;
+        }
         INIT_LIST_HEAD(&connector->probed_modes);
         INIT_LIST_HEAD(&connector->modes);
         connector->edid_blob_ptr = NULL;
@@ -764,6 +779,9 @@ void drm_connector_cleanup(struct drm_connector *connector)
         list_for_each_entry_safe(mode, t, &connector->modes, head)
                 drm_mode_remove(connector, mode);
 
+        ida_remove(&drm_connector_enum_list[connector->connector_type].ida,
+                   connector->connector_type_id);
+
         drm_mode_object_put(dev, &connector->base);
         list_del(&connector->head);
         dev->mode_config.num_connector--;
@@ -1135,30 +1153,6 @@ int drm_mode_create_scaling_mode_property(struct drm_device *dev)
 EXPORT_SYMBOL(drm_mode_create_scaling_mode_property);
 
 /**
- * drm_mode_create_dithering_property - create dithering property
- * @dev: DRM device
- *
- * Called by a driver the first time it's needed, must be attached to desired
- * connectors.
- */
-int drm_mode_create_dithering_property(struct drm_device *dev)
-{
-        struct drm_property *dithering_mode;
-
-        if (dev->mode_config.dithering_mode_property)
-                return 0;
-
-        dithering_mode =
-                drm_property_create_enum(dev, 0, "dithering",
-                                drm_dithering_mode_enum_list,
-                                    ARRAY_SIZE(drm_dithering_mode_enum_list));
-        dev->mode_config.dithering_mode_property = dithering_mode;
-
-        return 0;
-}
-EXPORT_SYMBOL(drm_mode_create_dithering_property);
-
-/**
  * drm_mode_create_dirty_property - create dirty property
  * @dev: DRM device
  *
@@ -3514,6 +3508,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
             page_flip->reserved != 0)
                 return -EINVAL;
 
+        if ((page_flip->flags & DRM_MODE_PAGE_FLIP_ASYNC) && !dev->mode_config.async_page_flip)
+                return -EINVAL;
+
         obj = drm_mode_object_find(dev, page_flip->crtc_id, DRM_MODE_OBJECT_CRTC);
         if (!obj)
                 return -EINVAL;
@@ -3587,7 +3584,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
         }
 
         old_fb = crtc->fb;
-        ret = crtc->funcs->page_flip(crtc, fb, e);
+        ret = crtc->funcs->page_flip(crtc, fb, e, page_flip->flags);
         if (ret) {
                 if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {
                         spin_lock_irqsave(&dev->event_lock, flags);
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 495b5fd2787c..8a140a953754 100644
--- a/drivers/gpu/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c
@@ -44,10 +44,18 @@
  *
  * Allocate and initialize a drm_device_dma structure.
  */
-int drm_dma_setup(struct drm_device *dev)
+int drm_legacy_dma_setup(struct drm_device *dev)
 {
         int i;
 
+        if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) ||
+            drm_core_check_feature(dev, DRIVER_MODESET)) {
+                return 0;
+        }
+
+        dev->buf_use = 0;
+        atomic_set(&dev->buf_alloc, 0);
+
         dev->dma = kzalloc(sizeof(*dev->dma), GFP_KERNEL);
         if (!dev->dma)
                 return -ENOMEM;
@@ -66,11 +74,16 @@ int drm_dma_setup(struct drm_device *dev)
  * Free all pages associated with DMA buffers, the buffers and pages lists, and
  * finally the drm_device::dma structure itself.
  */
-void drm_dma_takedown(struct drm_device *dev)
+void drm_legacy_dma_takedown(struct drm_device *dev)
 {
         struct drm_device_dma *dma = dev->dma;
         int i, j;
 
+        if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) ||
+            drm_core_check_feature(dev, DRIVER_MODESET)) {
+                return;
+        }
+
         if (!dma)
                 return;
 
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 99fcd7c32ea2..e572dd20bdee 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -68,7 +68,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap, DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap, DRM_UNLOCKED|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
 
         DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
@@ -87,7 +87,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 
         DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-        DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH),
         DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
@@ -106,8 +106,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_INFO_BUFS, drm_infobufs, DRM_AUTH),
         DRM_IOCTL_DEF(DRM_IOCTL_MAP_BUFS, drm_mapbufs, DRM_AUTH),
         DRM_IOCTL_DEF(DRM_IOCTL_FREE_BUFS, drm_freebufs, DRM_AUTH),
-        /* The DRM_IOCTL_DMA ioctl should be defined by the driver. */
-        DRM_IOCTL_DEF(DRM_IOCTL_DMA, NULL, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_IOCTL_DMA, drm_dma_ioctl, DRM_AUTH),
 
         DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 
@@ -122,7 +121,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
         DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 #endif
 
-        DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 
         DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),
@@ -131,14 +130,14 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 
         DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 
-        DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, DRM_UNLOCKED|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED),
 
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
 
-        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED),
-        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),
+        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
 
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
         DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),
@@ -172,6 +171,31 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 #define DRM_CORE_IOCTL_COUNT    ARRAY_SIZE( drm_ioctls )
 
 /**
+ * drm_legacy_dev_reinit
+ *
+ * Reinitializes a legacy/ums drm device in it's lastclose function.
+ */
+static void drm_legacy_dev_reinit(struct drm_device *dev)
+{
+        int i;
+
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return;
+
+        atomic_set(&dev->ioctl_count, 0);
+        atomic_set(&dev->vma_count, 0);
+
+        for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
+                atomic_set(&dev->counts[i], 0);
+
+        dev->sigdata.lock = NULL;
+
+        dev->context_flag = 0;
+        dev->last_context = 0;
+        dev->if_version = 0;
+}
+
+/**
  * Take down the DRM device.
  *
  * \param dev DRM device structure.
@@ -195,32 +219,9 @@ int drm_lastclose(struct drm_device * dev)
 
         mutex_lock(&dev->struct_mutex);
 
-        /* Clear AGP information */
-        if (drm_core_has_AGP(dev) && dev->agp &&
-                        !drm_core_check_feature(dev, DRIVER_MODESET)) {
-                struct drm_agp_mem *entry, *tempe;
-
-                /* Remove AGP resources, but leave dev->agp
-                   intact until drv_cleanup is called. */
-                list_for_each_entry_safe(entry, tempe, &dev->agp->memory, head) {
-                        if (entry->bound)
-                                drm_unbind_agp(entry->memory);
-                        drm_free_agp(entry->memory, entry->pages);
-                        kfree(entry);
-                }
-                INIT_LIST_HEAD(&dev->agp->memory);
+        drm_agp_clear(dev);
 
-                if (dev->agp->acquired)
-                        drm_agp_release(dev);
-
-                dev->agp->acquired = 0;
-                dev->agp->enabled = 0;
-        }
-        if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg &&
-            !drm_core_check_feature(dev, DRIVER_MODESET)) {
-                drm_sg_cleanup(dev->sg);
-                dev->sg = NULL;
-        }
+        drm_legacy_sg_cleanup(dev);
 
         /* Clear vma list (only built for debugging) */
         list_for_each_entry_safe(vma, vma_temp, &dev->vmalist, head) {
@@ -228,13 +229,13 @@ int drm_lastclose(struct drm_device * dev)
                 kfree(vma);
         }
 
-        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
-            !drm_core_check_feature(dev, DRIVER_MODESET))
-                drm_dma_takedown(dev);
+        drm_legacy_dma_takedown(dev);
 
         dev->dev_mapping = NULL;
         mutex_unlock(&dev->struct_mutex);
 
+        drm_legacy_dev_reinit(dev);
+
         DRM_DEBUG("lastclose completed\n");
         return 0;
 }
@@ -251,6 +252,7 @@ static int __init drm_core_init(void)
         int ret = -ENOMEM;
 
         drm_global_init();
+        drm_connector_ida_init();
         idr_init(&drm_minors_idr);
 
         if (register_chrdev(DRM_MAJOR, "drm", &drm_stub_fops))
@@ -263,13 +265,6 @@ static int __init drm_core_init(void)
                 goto err_p2;
         }
 
-        drm_proc_root = proc_mkdir("dri", NULL);
-        if (!drm_proc_root) {
-                DRM_ERROR("Cannot create /proc/dri\n");
-                ret = -1;
-                goto err_p3;
-        }
-
         drm_debugfs_root = debugfs_create_dir("dri", NULL);
         if (!drm_debugfs_root) {
                 DRM_ERROR("Cannot create /sys/kernel/debug/dri\n");
@@ -292,12 +287,12 @@ err_p1:
 
 static void __exit drm_core_exit(void)
 {
-        remove_proc_entry("dri", NULL);
         debugfs_remove(drm_debugfs_root);
         drm_sysfs_destroy();
 
         unregister_chrdev(DRM_MAJOR, "drm");
 
+        drm_connector_ida_destroy();
         idr_destroy(&drm_minors_idr);
 }
 
@@ -420,17 +415,15 @@ long drm_ioctl(struct file *filp,
 
         /* Do not trust userspace, use our own definition */
         func = ioctl->func;
-        /* is there a local override? */
-        if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl)
-                func = dev->driver->dma_ioctl;
 
         if (!func) {
                 DRM_DEBUG("no function\n");
                 retcode = -EINVAL;
         } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) ||
-                   ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) ||
+                   ((ioctl->flags & DRM_AUTH) && !drm_is_render_client(file_priv) && !file_priv->authenticated) ||
                    ((ioctl->flags & DRM_MASTER) && !file_priv->is_master) ||
-                   (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL))) {
+                   (!(ioctl->flags & DRM_CONTROL_ALLOW) && (file_priv->minor->type == DRM_MINOR_CONTROL)) ||
+                   (!(ioctl->flags & DRM_RENDER_ALLOW) && drm_is_render_client(file_priv))) {
                 retcode = -EACCES;
         } else {
                 if (cmd & (IOC_IN | IOC_OUT)) {
@@ -485,19 +478,4 @@ long drm_ioctl(struct file *filp,
                 DRM_DEBUG("ret = %d\n", retcode);
         return retcode;
 }
-
 EXPORT_SYMBOL(drm_ioctl);
-
-struct drm_local_map *drm_getsarea(struct drm_device *dev)
-{
-        struct drm_map_list *entry;
-
-        list_for_each_entry(entry, &dev->maplist, head) {
-                if (entry->map && entry->map->type == _DRM_SHM &&
-                    (entry->map->flags & _DRM_CONTAINS_LOCK)) {
-                        return entry->map;
-                }
-        }
-        return NULL;
-}
-EXPORT_SYMBOL(drm_getsarea);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dfc7a1ba9360..a207cc3f2c57 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -931,6 +931,36 @@ static const struct drm_display_mode edid_cea_modes[] = {
          .vrefresh = 100, },
 };
 
+/*
+ * HDMI 1.4 4k modes.
+ */
+static const struct drm_display_mode edid_4k_modes[] = {
+        /* 1 - 3840x2160@30Hz */
+        { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
+                   3840, 4016, 4104, 4400, 0,
+                   2160, 2168, 2178, 2250, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
+          .vrefresh = 30, },
+        /* 2 - 3840x2160@25Hz */
+        { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
+                   3840, 4896, 4984, 5280, 0,
+                   2160, 2168, 2178, 2250, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
+          .vrefresh = 25, },
+        /* 3 - 3840x2160@24Hz */
+        { DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
+                   3840, 5116, 5204, 5500, 0,
+                   2160, 2168, 2178, 2250, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
+          .vrefresh = 24, },
+        /* 4 - 4096x2160@24Hz (SMPTE) */
+        { DRM_MODE("4096x2160", DRM_MODE_TYPE_DRIVER, 297000,
+                   4096, 5116, 5204, 5500, 0,
+                   2160, 2168, 2178, 2250, 0,
+                   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
+          .vrefresh = 24, },
+};
+
 /*** DDC fetch and block validation ***/
 
 static const u8 edid_header[] = {
@@ -2287,7 +2317,6 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
         return closure.modes;
 }
 
-#define HDMI_IDENTIFIER 0x000C03
 #define AUDIO_BLOCK     0x01
 #define VIDEO_BLOCK     0x02
 #define VENDOR_BLOCK    0x03
@@ -2298,10 +2327,10 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
 #define EDID_CEA_YCRCB422       (1 << 4)
 #define EDID_CEA_VCDB_QS        (1 << 6)
 
-/**
+/*
  * Search EDID for CEA extension block.
  */
-u8 *drm_find_cea_extension(struct edid *edid)
+static u8 *drm_find_cea_extension(struct edid *edid)
 {
         u8 *edid_ext = NULL;
         int i;
@@ -2322,7 +2351,6 @@ u8 *drm_find_cea_extension(struct edid *edid)
 
         return edid_ext;
 }
-EXPORT_SYMBOL(drm_find_cea_extension);
 
 /*
  * Calculate the alternate clock for the CEA mode
@@ -2380,6 +2408,54 @@ u8 drm_match_cea_mode(const struct drm_display_mode *to_match)
 }
 EXPORT_SYMBOL(drm_match_cea_mode);
 
+/*
+ * Calculate the alternate clock for HDMI modes (those from the HDMI vendor
+ * specific block).
+ *
+ * It's almost like cea_mode_alternate_clock(), we just need to add an
+ * exception for the VIC 4 mode (4096x2160@24Hz): no alternate clock for this
+ * one.
+ */
+static unsigned int
+hdmi_mode_alternate_clock(const struct drm_display_mode *hdmi_mode)
+{
+        if (hdmi_mode->vdisplay == 4096 && hdmi_mode->hdisplay == 2160)
+                return hdmi_mode->clock;
+
+        return cea_mode_alternate_clock(hdmi_mode);
+}
+
+/*
+ * drm_match_hdmi_mode - look for a HDMI mode matching given mode
+ * @to_match: display mode
+ *
+ * An HDMI mode is one defined in the HDMI vendor specific block.
+ *
+ * Returns the HDMI Video ID (VIC) of the mode or 0 if it isn't one.
+ */
+static u8 drm_match_hdmi_mode(const struct drm_display_mode *to_match)
+{
+        u8 mode;
+
+        if (!to_match->clock)
+                return 0;
+
+        for (mode = 0; mode < ARRAY_SIZE(edid_4k_modes); mode++) {
+                const struct drm_display_mode *hdmi_mode = &edid_4k_modes[mode];
+                unsigned int clock1, clock2;
+
+                /* Make sure to also match alternate clocks */
+                clock1 = hdmi_mode->clock;
+                clock2 = hdmi_mode_alternate_clock(hdmi_mode);
+
+                if ((KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock1) ||
+                     KHZ2PICOS(to_match->clock) == KHZ2PICOS(clock2)) &&
+                    drm_mode_equal_no_clocks(to_match, hdmi_mode))
+                        return mode + 1;
+        }
+        return 0;
+}
+
 static int
 add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
 {
@@ -2397,18 +2473,26 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
          * with the alternate clock for certain CEA modes.
          */
         list_for_each_entry(mode, &connector->probed_modes, head) {
-                const struct drm_display_mode *cea_mode;
+                const struct drm_display_mode *cea_mode = NULL;
                 struct drm_display_mode *newmode;
-                u8 cea_mode_idx = drm_match_cea_mode(mode) - 1;
+                u8 mode_idx = drm_match_cea_mode(mode) - 1;
                 unsigned int clock1, clock2;
 
-                if (cea_mode_idx >= ARRAY_SIZE(edid_cea_modes))
-                        continue;
+                if (mode_idx < ARRAY_SIZE(edid_cea_modes)) {
+                        cea_mode = &edid_cea_modes[mode_idx];
+                        clock2 = cea_mode_alternate_clock(cea_mode);
+                } else {
+                        mode_idx = drm_match_hdmi_mode(mode) - 1;
+                        if (mode_idx < ARRAY_SIZE(edid_4k_modes)) {
+                                cea_mode = &edid_4k_modes[mode_idx];
+                                clock2 = hdmi_mode_alternate_clock(cea_mode);
+                        }
+                }
 
-                cea_mode = &edid_cea_modes[cea_mode_idx];
+                if (!cea_mode)
+                        continue;
 
                 clock1 = cea_mode->clock;
-                clock2 = cea_mode_alternate_clock(cea_mode);
 
                 if (clock1 == clock2)
                         continue;
@@ -2442,10 +2526,11 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
 }
 
 static int
-do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
+do_cea_modes(struct drm_connector *connector, const u8 *db, u8 len)
 {
         struct drm_device *dev = connector->dev;
-        u8 * mode, cea_mode;
+        const u8 *mode;
+        u8 cea_mode;
         int modes = 0;
 
         for (mode = db; mode < db + len; mode++) {
@@ -2465,6 +2550,68 @@ do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
         return modes;
 }
 
+/*
+ * do_hdmi_vsdb_modes - Parse the HDMI Vendor Specific data block
+ * @connector: connector corresponding to the HDMI sink
+ * @db: start of the CEA vendor specific block
+ * @len: length of the CEA block payload, ie. one can access up to db[len]
+ *
+ * Parses the HDMI VSDB looking for modes to add to @connector.
+ */
+static int
+do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len)
+{
+        struct drm_device *dev = connector->dev;
+        int modes = 0, offset = 0, i;
+        u8 vic_len;
+
+        if (len < 8)
+                goto out;
+
+        /* no HDMI_Video_Present */
+        if (!(db[8] & (1 << 5)))
+                goto out;
+
+        /* Latency_Fields_Present */
+        if (db[8] & (1 << 7))
+                offset += 2;
+
+        /* I_Latency_Fields_Present */
+        if (db[8] & (1 << 6))
+                offset += 2;
+
+        /* the declared length is not long enough for the 2 first bytes
+         * of additional video format capabilities */
+        offset += 2;
+        if (len < (8 + offset))
+                goto out;
+
+        vic_len = db[8 + offset] >> 5;
+
+        for (i = 0; i < vic_len && len >= (9 + offset + i); i++) {
+                struct drm_display_mode *newmode;
+                u8 vic;
+
+                vic = db[9 + offset + i];
+
+                vic--; /* VICs start at 1 */
+                if (vic >= ARRAY_SIZE(edid_4k_modes)) {
+                        DRM_ERROR("Unknown HDMI VIC: %d\n", vic);
+                        continue;
+                }
+
+                newmode = drm_mode_duplicate(dev, &edid_4k_modes[vic]);
+                if (!newmode)
+                        continue;
+
+                drm_mode_probed_add(connector, newmode);
+                modes++;
+        }
+
+out:
+        return modes;
+}
+
 static int
 cea_db_payload_len(const u8 *db)
 {
@@ -2496,14 +2643,30 @@ cea_db_offsets(const u8 *cea, int *start, int *end)
         return 0;
 }
 
+static bool cea_db_is_hdmi_vsdb(const u8 *db)
+{
+        int hdmi_id;
+
+        if (cea_db_tag(db) != VENDOR_BLOCK)
+                return false;
+
+        if (cea_db_payload_len(db) < 5)
+                return false;
+
+        hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
+
+        return hdmi_id == HDMI_IEEE_OUI;
+}
+
 #define for_each_cea_db(cea, i, start, end) \
         for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1)
 
 static int
 add_cea_modes(struct drm_connector *connector, struct edid *edid)
 {
-        u8 * cea = drm_find_cea_extension(edid);
-        u8 * db, dbl;
+        const u8 *cea = drm_find_cea_extension(edid);
+        const u8 *db;
+        u8 dbl;
         int modes = 0;
 
         if (cea && cea_revision(cea) >= 3) {
@@ -2517,7 +2680,9 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid)
                         dbl = cea_db_payload_len(db);
 
                         if (cea_db_tag(db) == VIDEO_BLOCK)
-                                modes += do_cea_modes (connector, db+1, dbl);
+                                modes += do_cea_modes(connector, db + 1, dbl);
+                        else if (cea_db_is_hdmi_vsdb(db))
+                                modes += do_hdmi_vsdb_modes(connector, db, dbl);
                 }
         }
 
@@ -2570,21 +2735,6 @@ monitor_name(struct detailed_timing *t, void *data)
                 *(u8 **)data = t->data.other_data.data.str.str;
 }
 
-static bool cea_db_is_hdmi_vsdb(const u8 *db)
-{
-        int hdmi_id;
-
-        if (cea_db_tag(db) != VENDOR_BLOCK)
-                return false;
-
-        if (cea_db_payload_len(db) < 5)
-                return false;
-
-        hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
-
-        return hdmi_id == HDMI_IDENTIFIER;
-}
-
 /**
  * drm_edid_to_eld - build ELD from EDID
  * @connector: connector corresponding to the HDMI/DP sink
@@ -3108,9 +3258,44 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,
         frame->video_code = drm_match_cea_mode(mode);
 
         frame->picture_aspect = HDMI_PICTURE_ASPECT_NONE;
-        frame->active_info_valid = 1;
         frame->active_aspect = HDMI_ACTIVE_ASPECT_PICTURE;
 
         return 0;
 }
 EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);
+
+/**
+ * drm_hdmi_vendor_infoframe_from_display_mode() - fill an HDMI infoframe with
+ * data from a DRM display mode
+ * @frame: HDMI vendor infoframe
+ * @mode: DRM display mode
+ *
+ * Note that there's is a need to send HDMI vendor infoframes only when using a
+ * 4k or stereoscopic 3D mode. So when giving any other mode as input this
+ * function will return -EINVAL, error that can be safely ignored.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int
+drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame,
+                                            const struct drm_display_mode *mode)
+{
+        int err;
+        u8 vic;
+
+        if (!frame || !mode)
+                return -EINVAL;
+
+        vic = drm_match_hdmi_mode(mode);
+        if (!vic)
+                return -EINVAL;
+
+        err = hdmi_vendor_infoframe_init(frame);
+        if (err < 0)
+                return err;
+
+        frame->vic = vic;
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_hdmi_vendor_infoframe_from_display_mode);
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index c385cc5e730e..61b5a47ad239 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -181,11 +181,11 @@ struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
 EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_obj);
 
 #ifdef CONFIG_DEBUG_FS
-/**
+/*
  * drm_fb_cma_describe() - Helper to dump information about a single
  * CMA framebuffer object
  */
-void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)
+static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)
 {
         struct drm_fb_cma *fb_cma = to_fb_cma(fb);
         int i, n = drm_format_num_planes(fb->pixel_format);
@@ -199,7 +199,6 @@ void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)
                 drm_gem_cma_describe(fb_cma->obj[i], m);
         }
 }
-EXPORT_SYMBOL_GPL(drm_fb_cma_describe);
 
 /**
  * drm_fb_cma_debugfs_show() - Helper to list CMA framebuffer objects
diff --git a/drivers/gpu/drm/drm_flip_work.c b/drivers/gpu/drm/drm_flip_work.c
new file mode 100644
index 000000000000..e788882d9021
--- /dev/null
+++ b/drivers/gpu/drm/drm_flip_work.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "drmP.h"
+#include "drm_flip_work.h"
+
+/**
+ * drm_flip_work_queue - queue work
+ * @work: the flip-work
+ * @val: the value to queue
+ *
+ * Queues work, that will later be run (passed back to drm_flip_func_t
+ * func) on a work queue after drm_flip_work_commit() is called.
+ */
+void drm_flip_work_queue(struct drm_flip_work *work, void *val)
+{
+        if (kfifo_put(&work->fifo, (const void **)&val)) {
+                atomic_inc(&work->pending);
+        } else {
+                DRM_ERROR("%s fifo full!\n", work->name);
+                work->func(work, val);
+        }
+}
+EXPORT_SYMBOL(drm_flip_work_queue);
+
+/**
+ * drm_flip_work_commit - commit queued work
+ * @work: the flip-work
+ * @wq: the work-queue to run the queued work on
+ *
+ * Trigger work previously queued by drm_flip_work_queue() to run
+ * on a workqueue.  The typical usage would be to queue work (via
+ * drm_flip_work_queue()) at any point (from vblank irq and/or
+ * prior), and then from vblank irq commit the queued work.
+ */
+void drm_flip_work_commit(struct drm_flip_work *work,
+                struct workqueue_struct *wq)
+{
+        uint32_t pending = atomic_read(&work->pending);
+        atomic_add(pending, &work->count);
+        atomic_sub(pending, &work->pending);
+        queue_work(wq, &work->worker);
+}
+EXPORT_SYMBOL(drm_flip_work_commit);
+
+static void flip_worker(struct work_struct *w)
+{
+        struct drm_flip_work *work = container_of(w, struct drm_flip_work, worker);
+        uint32_t count = atomic_read(&work->count);
+        void *val = NULL;
+
+        atomic_sub(count, &work->count);
+
+        while(count--)
+                if (!WARN_ON(!kfifo_get(&work->fifo, &val)))
+                        work->func(work, val);
+}
+
+/**
+ * drm_flip_work_init - initialize flip-work
+ * @work: the flip-work to initialize
+ * @size: the max queue depth
+ * @name: debug name
+ * @func: the callback work function
+ *
+ * Initializes/allocates resources for the flip-work
+ *
+ * RETURNS:
+ * Zero on success, error code on failure.
+ */
+int drm_flip_work_init(struct drm_flip_work *work, int size,
+                const char *name, drm_flip_func_t func)
+{
+        int ret;
+
+        work->name = name;
+        atomic_set(&work->count, 0);
+        atomic_set(&work->pending, 0);
+        work->func = func;
+
+        ret = kfifo_alloc(&work->fifo, size, GFP_KERNEL);
+        if (ret) {
+                DRM_ERROR("could not allocate %s fifo\n", name);
+                return ret;
+        }
+
+        INIT_WORK(&work->worker, flip_worker);
+
+        return 0;
+}
+EXPORT_SYMBOL(drm_flip_work_init);
+
+/**
+ * drm_flip_work_cleanup - cleans up flip-work
+ * @work: the flip-work to cleanup
+ *
+ * Destroy resources allocated for the flip-work
+ */
+void drm_flip_work_cleanup(struct drm_flip_work *work)
+{
+        WARN_ON(!kfifo_is_empty(&work->fifo));
+        kfifo_free(&work->fifo);
+}
+EXPORT_SYMBOL(drm_flip_work_cleanup);
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 3a24385e0368..4be8e09a32ef 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -48,59 +48,21 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
 
 static int drm_setup(struct drm_device * dev)
 {
-        int i;
         int ret;
 
-        if (dev->driver->firstopen) {
+        if (dev->driver->firstopen &&
+            !drm_core_check_feature(dev, DRIVER_MODESET)) {
                 ret = dev->driver->firstopen(dev);
                 if (ret != 0)
                         return ret;
         }
 
-        atomic_set(&dev->ioctl_count, 0);
-        atomic_set(&dev->vma_count, 0);
-
-        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
-            !drm_core_check_feature(dev, DRIVER_MODESET)) {
-                dev->buf_use = 0;
-                atomic_set(&dev->buf_alloc, 0);
-
-                i = drm_dma_setup(dev);
-                if (i < 0)
-                        return i;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
-                atomic_set(&dev->counts[i], 0);
-
-        dev->sigdata.lock = NULL;
-
-        dev->context_flag = 0;
-        dev->interrupt_flag = 0;
-        dev->dma_flag = 0;
-        dev->last_context = 0;
-        dev->last_switch = 0;
-        dev->last_checked = 0;
-        init_waitqueue_head(&dev->context_wait);
-        dev->if_version = 0;
-
-        dev->ctx_start = 0;
-        dev->lck_start = 0;
+        ret = drm_legacy_dma_setup(dev);
+        if (ret < 0)
+                return ret;
 
-        dev->buf_async = NULL;
-        init_waitqueue_head(&dev->buf_readers);
-        init_waitqueue_head(&dev->buf_writers);
 
         DRM_DEBUG("\n");
-
-        /*
-         * The kernel's context could be created here, but is now created
-         * in drm_dma_enqueue.  This is more resource-efficient for
-         * hardware that does not do DMA, but may mean that
-         * drm_select_queue fails between the time the interrupt is
-         * initialized and the time the queues are initialized.
-         */
-
         return 0;
 }
 
@@ -257,7 +219,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                 return -EBUSY;  /* No exclusive opens */
         if (!drm_cpu_valid())
                 return -EINVAL;
-        if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
+        if (dev->switch_power_state != DRM_SWITCH_POWER_ON && dev->switch_power_state != DRM_SWITCH_POWER_DYNAMIC_OFF)
                 return -EINVAL;
 
         DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);
@@ -300,10 +262,10 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                         goto out_prime_destroy;
         }
 
-
-        /* if there is no current master make this fd it */
+        /* if there is no current master make this fd it, but do not create
+         * any master object for render clients */
         mutex_lock(&dev->struct_mutex);
-        if (!priv->minor->master) {
+        if (!priv->minor->master && !drm_is_render_client(priv)) {
                 /* create a new master */
                 priv->minor->master = drm_master_create(priv->minor);
                 if (!priv->minor->master) {
@@ -341,12 +303,11 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
                                 goto out_close;
                         }
                 }
-                mutex_unlock(&dev->struct_mutex);
-        } else {
+        } else if (!drm_is_render_client(priv)) {
                 /* get a reference to the master */
                 priv->master = drm_master_get(priv->minor->master);
-                mutex_unlock(&dev->struct_mutex);
         }
+        mutex_unlock(&dev->struct_mutex);
 
         mutex_lock(&dev->struct_mutex);
         list_add(&priv->lhead, &dev->filelist);
@@ -388,18 +349,6 @@ out_put_pid:
         return ret;
 }
 
-/** No-op. */
-int drm_fasync(int fd, struct file *filp, int on)
-{
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->minor->dev;
-
-        DRM_DEBUG("fd = %d, device = 0x%lx\n", fd,
-                  (long)old_encode_dev(priv->minor->device));
-        return fasync_helper(fd, filp, on, &dev->buf_async);
-}
-EXPORT_SYMBOL(drm_fasync);
-
 static void drm_master_release(struct drm_device *dev, struct file *filp)
 {
         struct drm_file *file_priv = filp->private_data;
@@ -490,26 +439,7 @@ int drm_release(struct inode *inode, struct file *filp)
         if (dev->driver->driver_features & DRIVER_GEM)
                 drm_gem_release(dev, file_priv);
 
-        mutex_lock(&dev->ctxlist_mutex);
-        if (!list_empty(&dev->ctxlist)) {
-                struct drm_ctx_list *pos, *n;
-
-                list_for_each_entry_safe(pos, n, &dev->ctxlist, head) {
-                        if (pos->tag == file_priv &&
-                            pos->handle != DRM_KERNEL_CONTEXT) {
-                                if (dev->driver->context_dtor)
-                                        dev->driver->context_dtor(dev,
-                                                                  pos->handle);
-
-                                drm_ctxbitmap_free(dev, pos->handle);
-
-                                list_del(&pos->head);
-                                kfree(pos);
-                                --dev->ctx_count;
-                        }
-                }
-        }
-        mutex_unlock(&dev->ctxlist_mutex);
+        drm_legacy_ctxbitmap_release(dev, file_priv);
 
         mutex_lock(&dev->struct_mutex);
 
@@ -547,7 +477,8 @@ int drm_release(struct inode *inode, struct file *filp)
         iput(container_of(dev->dev_mapping, struct inode, i_data));
 
         /* drop the reference held my the file priv */
-        drm_master_put(&file_priv->master);
+        if (file_priv->master)
+                drm_master_put(&file_priv->master);
         file_priv->is_master = 0;
         list_del(&file_priv->lhead);
         mutex_unlock(&dev->struct_mutex);
@@ -555,6 +486,7 @@ int drm_release(struct inode *inode, struct file *filp)
         if (dev->driver->postclose)
                 dev->driver->postclose(dev, file_priv);
 
+
         if (drm_core_check_feature(dev, DRIVER_PRIME))
                 drm_prime_destroy_file_private(&file_priv->prime);
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 603f256152ef..49293bdc972a 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -37,6 +37,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/dma-buf.h>
 #include <drm/drmP.h>
+#include <drm/drm_vma_manager.h>
 
 /** @file drm_gem.c
  *
@@ -92,7 +93,7 @@ drm_gem_init(struct drm_device *dev)
 {
         struct drm_gem_mm *mm;
 
-        spin_lock_init(&dev->object_name_lock);
+        mutex_init(&dev->object_name_lock);
         idr_init(&dev->object_name_idr);
 
         mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
@@ -102,14 +103,9 @@ drm_gem_init(struct drm_device *dev)
         }
 
         dev->mm_private = mm;
-
-        if (drm_ht_create(&mm->offset_hash, 12)) {
-                kfree(mm);
-                return -ENOMEM;
-        }
-
-        drm_mm_init(&mm->offset_manager, DRM_FILE_PAGE_OFFSET_START,
-                    DRM_FILE_PAGE_OFFSET_SIZE);
+        drm_vma_offset_manager_init(&mm->vma_manager,
+                                    DRM_FILE_PAGE_OFFSET_START,
+                                    DRM_FILE_PAGE_OFFSET_SIZE);
 
         return 0;
 }
@@ -119,8 +115,7 @@ drm_gem_destroy(struct drm_device *dev)
 {
         struct drm_gem_mm *mm = dev->mm_private;
 
-        drm_mm_takedown(&mm->offset_manager);
-        drm_ht_remove(&mm->offset_hash);
+        drm_vma_offset_manager_destroy(&mm->vma_manager);
         kfree(mm);
         dev->mm_private = NULL;
 }
@@ -132,16 +127,14 @@ drm_gem_destroy(struct drm_device *dev)
 int drm_gem_object_init(struct drm_device *dev,
                         struct drm_gem_object *obj, size_t size)
 {
-        BUG_ON((size & (PAGE_SIZE - 1)) != 0);
+        struct file *filp;
 
-        obj->dev = dev;
-        obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
-        if (IS_ERR(obj->filp))
-                return PTR_ERR(obj->filp);
+        filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
+        if (IS_ERR(filp))
+                return PTR_ERR(filp);
 
-        kref_init(&obj->refcount);
-        atomic_set(&obj->handle_count, 0);
-        obj->size = size;
+        drm_gem_private_object_init(dev, obj, size);
+        obj->filp = filp;
 
         return 0;
 }
@@ -152,8 +145,8 @@ EXPORT_SYMBOL(drm_gem_object_init);
  * no GEM provided backing store. Instead the caller is responsible for
  * backing the object and handling it.
  */
-int drm_gem_private_object_init(struct drm_device *dev,
-                        struct drm_gem_object *obj, size_t size)
+void drm_gem_private_object_init(struct drm_device *dev,
+                                 struct drm_gem_object *obj, size_t size)
 {
         BUG_ON((size & (PAGE_SIZE - 1)) != 0);
 
@@ -161,10 +154,9 @@ int drm_gem_private_object_init(struct drm_device *dev,
         obj->filp = NULL;
 
         kref_init(&obj->refcount);
-        atomic_set(&obj->handle_count, 0);
+        obj->handle_count = 0;
         obj->size = size;
-
-        return 0;
+        drm_vma_node_reset(&obj->vma_node);
 }
 EXPORT_SYMBOL(drm_gem_private_object_init);
 
@@ -200,16 +192,79 @@ EXPORT_SYMBOL(drm_gem_object_alloc);
 static void
 drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
 {
-        if (obj->import_attach) {
-                drm_prime_remove_buf_handle(&filp->prime,
-                                obj->import_attach->dmabuf);
+        /*
+         * Note: obj->dma_buf can't disappear as long as we still hold a
+         * handle reference in obj->handle_count.
+         */
+        mutex_lock(&filp->prime.lock);
+        if (obj->dma_buf) {
+                drm_prime_remove_buf_handle_locked(&filp->prime,
+                                                   obj->dma_buf);
         }
-        if (obj->export_dma_buf) {
-                drm_prime_remove_buf_handle(&filp->prime,
-                                obj->export_dma_buf);
+        mutex_unlock(&filp->prime.lock);
+}
+
+static void drm_gem_object_ref_bug(struct kref *list_kref)
+{
+        BUG();
+}
+
+/**
+ * Called after the last handle to the object has been closed
+ *
+ * Removes any name for the object. Note that this must be
+ * called before drm_gem_object_free or we'll be touching
+ * freed memory
+ */
+static void drm_gem_object_handle_free(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+
+        /* Remove any name for this object */
+        if (obj->name) {
+                idr_remove(&dev->object_name_idr, obj->name);
+                obj->name = 0;
+                /*
+                 * The object name held a reference to this object, drop
+                 * that now.
+                *
+                * This cannot be the last reference, since the handle holds one too.
+                 */
+                kref_put(&obj->refcount, drm_gem_object_ref_bug);
         }
 }
 
+static void drm_gem_object_exported_dma_buf_free(struct drm_gem_object *obj)
+{
+        /* Unbreak the reference cycle if we have an exported dma_buf. */
+        if (obj->dma_buf) {
+                dma_buf_put(obj->dma_buf);
+                obj->dma_buf = NULL;
+        }
+}
+
+static void
+drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj)
+{
+        if (WARN_ON(obj->handle_count == 0))
+                return;
+
+        /*
+        * Must bump handle count first as this may be the last
+        * ref, in which case the object would disappear before we
+        * checked for a name
+        */
+
+        mutex_lock(&obj->dev->object_name_lock);
+        if (--obj->handle_count == 0) {
+                drm_gem_object_handle_free(obj);
+                drm_gem_object_exported_dma_buf_free(obj);
+        }
+        mutex_unlock(&obj->dev->object_name_lock);
+
+        drm_gem_object_unreference_unlocked(obj);
+}
+
 /**
  * Removes the mapping from handle to filp for this object.
  */
@@ -242,7 +297,9 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
         idr_remove(&filp->object_idr, handle);
         spin_unlock(&filp->table_lock);
 
-        drm_gem_remove_prime_handles(obj, filp);
+        if (drm_core_check_feature(dev, DRIVER_PRIME))
+                drm_gem_remove_prime_handles(obj, filp);
+        drm_vma_node_revoke(&obj->vma_node, filp->filp);
 
         if (dev->driver->gem_close_object)
                 dev->driver->gem_close_object(obj, filp);
@@ -253,18 +310,36 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle)
 EXPORT_SYMBOL(drm_gem_handle_delete);
 
 /**
- * Create a handle for this object. This adds a handle reference
- * to the object, which includes a regular reference count. Callers
- * will likely want to dereference the object afterwards.
+ * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
+ * 
+ * This implements the ->dumb_destroy kms driver callback for drivers which use
+ * gem to manage their backing storage.
+ */
+int drm_gem_dumb_destroy(struct drm_file *file,
+                         struct drm_device *dev,
+                         uint32_t handle)
+{
+        return drm_gem_handle_delete(file, handle);
+}
+EXPORT_SYMBOL(drm_gem_dumb_destroy);
+
+/**
+ * drm_gem_handle_create_tail - internal functions to create a handle
+ * 
+ * This expects the dev->object_name_lock to be held already and will drop it
+ * before returning. Used to avoid races in establishing new handles when
+ * importing an object from either an flink name or a dma-buf.
  */
 int
-drm_gem_handle_create(struct drm_file *file_priv,
-                       struct drm_gem_object *obj,
-                       u32 *handlep)
+drm_gem_handle_create_tail(struct drm_file *file_priv,
+                           struct drm_gem_object *obj,
+                           u32 *handlep)
 {
         struct drm_device *dev = obj->dev;
         int ret;
 
+        WARN_ON(!mutex_is_locked(&dev->object_name_lock));
+
         /*
          * Get the user-visible handle using idr.  Preload and perform
          * allocation under our spinlock.
@@ -273,14 +348,22 @@ drm_gem_handle_create(struct drm_file *file_priv,
         spin_lock(&file_priv->table_lock);
 
         ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_NOWAIT);
-
+        drm_gem_object_reference(obj);
+        obj->handle_count++;
         spin_unlock(&file_priv->table_lock);
         idr_preload_end();
-        if (ret < 0)
+        mutex_unlock(&dev->object_name_lock);
+        if (ret < 0) {
+                drm_gem_object_handle_unreference_unlocked(obj);
                 return ret;
+        }
         *handlep = ret;
 
-        drm_gem_object_handle_reference(obj);
+        ret = drm_vma_node_allow(&obj->vma_node, file_priv->filp);
+        if (ret) {
+                drm_gem_handle_delete(file_priv, *handlep);
+                return ret;
+        }
 
         if (dev->driver->gem_open_object) {
                 ret = dev->driver->gem_open_object(obj, file_priv);
@@ -292,6 +375,21 @@ drm_gem_handle_create(struct drm_file *file_priv,
 
         return 0;
 }
+
+/**
+ * Create a handle for this object. This adds a handle reference
+ * to the object, which includes a regular reference count. Callers
+ * will likely want to dereference the object afterwards.
+ */
+int
+drm_gem_handle_create(struct drm_file *file_priv,
+                       struct drm_gem_object *obj,
+                       u32 *handlep)
+{
+        mutex_lock(&obj->dev->object_name_lock);
+
+        return drm_gem_handle_create_tail(file_priv, obj, handlep);
+}
 EXPORT_SYMBOL(drm_gem_handle_create);
 
 
@@ -306,81 +404,155 @@ drm_gem_free_mmap_offset(struct drm_gem_object *obj)
 {
         struct drm_device *dev = obj->dev;
         struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_map_list *list = &obj->map_list;
 
-        drm_ht_remove_item(&mm->offset_hash, &list->hash);
-        drm_mm_put_block(list->file_offset_node);
-        kfree(list->map);
-        list->map = NULL;
+        drm_vma_offset_remove(&mm->vma_manager, &obj->vma_node);
 }
 EXPORT_SYMBOL(drm_gem_free_mmap_offset);
 
 /**
- * drm_gem_create_mmap_offset - create a fake mmap offset for an object
+ * drm_gem_create_mmap_offset_size - create a fake mmap offset for an object
  * @obj: obj in question
+ * @size: the virtual size
  *
  * GEM memory mapping works by handing back to userspace a fake mmap offset
  * it can use in a subsequent mmap(2) call.  The DRM core code then looks
  * up the object based on the offset and sets up the various memory mapping
  * structures.
  *
- * This routine allocates and attaches a fake offset for @obj.
+ * This routine allocates and attaches a fake offset for @obj, in cases where
+ * the virtual size differs from the physical size (ie. obj->size).  Otherwise
+ * just use drm_gem_create_mmap_offset().
  */
 int
-drm_gem_create_mmap_offset(struct drm_gem_object *obj)
+drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
 {
         struct drm_device *dev = obj->dev;
         struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_map_list *list;
-        struct drm_local_map *map;
-        int ret;
 
-        /* Set the object up for mmap'ing */
-        list = &obj->map_list;
-        list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
-        if (!list->map)
-                return -ENOMEM;
-
-        map = list->map;
-        map->type = _DRM_GEM;
-        map->size = obj->size;
-        map->handle = obj;
+        return drm_vma_offset_add(&mm->vma_manager, &obj->vma_node,
+                                  size / PAGE_SIZE);
+}
+EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);
 
-        /* Get a DRM GEM mmap offset allocated... */
-        list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
-                        obj->size / PAGE_SIZE, 0, false);
+/**
+ * drm_gem_create_mmap_offset - create a fake mmap offset for an object
+ * @obj: obj in question
+ *
+ * GEM memory mapping works by handing back to userspace a fake mmap offset
+ * it can use in a subsequent mmap(2) call.  The DRM core code then looks
+ * up the object based on the offset and sets up the various memory mapping
+ * structures.
+ *
+ * This routine allocates and attaches a fake offset for @obj.
+ */
+int drm_gem_create_mmap_offset(struct drm_gem_object *obj)
+{
+        return drm_gem_create_mmap_offset_size(obj, obj->size);
+}
+EXPORT_SYMBOL(drm_gem_create_mmap_offset);
 
-        if (!list->file_offset_node) {
-                DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
-                ret = -ENOSPC;
-                goto out_free_list;
+/**
+ * drm_gem_get_pages - helper to allocate backing pages for a GEM object
+ * from shmem
+ * @obj: obj in question
+ * @gfpmask: gfp mask of requested pages
+ */
+struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
+{
+        struct inode *inode;
+        struct address_space *mapping;
+        struct page *p, **pages;
+        int i, npages;
+
+        /* This is the shared memory object that backs the GEM resource */
+        inode = file_inode(obj->filp);
+        mapping = inode->i_mapping;
+
+        /* We already BUG_ON() for non-page-aligned sizes in
+         * drm_gem_object_init(), so we should never hit this unless
+         * driver author is doing something really wrong:
+         */
+        WARN_ON((obj->size & (PAGE_SIZE - 1)) != 0);
+
+        npages = obj->size >> PAGE_SHIFT;
+
+        pages = drm_malloc_ab(npages, sizeof(struct page *));
+        if (pages == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        gfpmask |= mapping_gfp_mask(mapping);
+
+        for (i = 0; i < npages; i++) {
+                p = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
+                if (IS_ERR(p))
+                        goto fail;
+                pages[i] = p;
+
+                /* There is a hypothetical issue w/ drivers that require
+                 * buffer memory in the low 4GB.. if the pages are un-
+                 * pinned, and swapped out, they can end up swapped back
+                 * in above 4GB.  If pages are already in memory, then
+                 * shmem_read_mapping_page_gfp will ignore the gfpmask,
+                 * even if the already in-memory page disobeys the mask.
+                 *
+                 * It is only a theoretical issue today, because none of
+                 * the devices with this limitation can be populated with
+                 * enough memory to trigger the issue.  But this BUG_ON()
+                 * is here as a reminder in case the problem with
+                 * shmem_read_mapping_page_gfp() isn't solved by the time
+                 * it does become a real issue.
+                 *
+                 * See this thread: http://lkml.org/lkml/2011/7/11/238
+                 */
+                BUG_ON((gfpmask & __GFP_DMA32) &&
+                                (page_to_pfn(p) >= 0x00100000UL));
         }
 
-        list->file_offset_node = drm_mm_get_block(list->file_offset_node,
-                        obj->size / PAGE_SIZE, 0);
-        if (!list->file_offset_node) {
-                ret = -ENOMEM;
-                goto out_free_list;
-        }
+        return pages;
 
-        list->hash.key = list->file_offset_node->start;
-        ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
-        if (ret) {
-                DRM_ERROR("failed to add to map hash\n");
-                goto out_free_mm;
-        }
+fail:
+        while (i--)
+                page_cache_release(pages[i]);
 
-        return 0;
+        drm_free_large(pages);
+        return ERR_CAST(p);
+}
+EXPORT_SYMBOL(drm_gem_get_pages);
 
-out_free_mm:
-        drm_mm_put_block(list->file_offset_node);
-out_free_list:
-        kfree(list->map);
-        list->map = NULL;
+/**
+ * drm_gem_put_pages - helper to free backing pages for a GEM object
+ * @obj: obj in question
+ * @pages: pages to free
+ * @dirty: if true, pages will be marked as dirty
+ * @accessed: if true, the pages will be marked as accessed
+ */
+void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
+                bool dirty, bool accessed)
+{
+        int i, npages;
 
-        return ret;
+        /* We already BUG_ON() for non-page-aligned sizes in
+         * drm_gem_object_init(), so we should never hit this unless
+         * driver author is doing something really wrong:
+         */
+        WARN_ON((obj->size & (PAGE_SIZE - 1)) != 0);
+
+        npages = obj->size >> PAGE_SHIFT;
+
+        for (i = 0; i < npages; i++) {
+                if (dirty)
+                        set_page_dirty(pages[i]);
+
+                if (accessed)
+                        mark_page_accessed(pages[i]);
+
+                /* Undo the reference we took when populating the table */
+                page_cache_release(pages[i]);
+        }
+
+        drm_free_large(pages);
 }
-EXPORT_SYMBOL(drm_gem_create_mmap_offset);
+EXPORT_SYMBOL(drm_gem_put_pages);
 
 /** Returns a reference to the object named by the handle. */
 struct drm_gem_object *
@@ -445,8 +617,14 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
         if (obj == NULL)
                 return -ENOENT;
 
+        mutex_lock(&dev->object_name_lock);
         idr_preload(GFP_KERNEL);
-        spin_lock(&dev->object_name_lock);
+        /* prevent races with concurrent gem_close. */
+        if (obj->handle_count == 0) {
+                ret = -ENOENT;
+                goto err;
+        }
+
         if (!obj->name) {
                 ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);
                 if (ret < 0)
@@ -462,8 +640,8 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
         ret = 0;
 
 err:
-        spin_unlock(&dev->object_name_lock);
         idr_preload_end();
+        mutex_unlock(&dev->object_name_lock);
         drm_gem_object_unreference_unlocked(obj);
         return ret;
 }
@@ -486,15 +664,17 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
         if (!(dev->driver->driver_features & DRIVER_GEM))
                 return -ENODEV;
 
-        spin_lock(&dev->object_name_lock);
+        mutex_lock(&dev->object_name_lock);
         obj = idr_find(&dev->object_name_idr, (int) args->name);
-        if (obj)
+        if (obj) {
                 drm_gem_object_reference(obj);
-        spin_unlock(&dev->object_name_lock);
-        if (!obj)
+        } else {
+                mutex_unlock(&dev->object_name_lock);
                 return -ENOENT;
+        }
 
-        ret = drm_gem_handle_create(file_priv, obj, &handle);
+        /* drm_gem_handle_create_tail unlocks dev->object_name_lock. */
+        ret = drm_gem_handle_create_tail(file_priv, obj, &handle);
         drm_gem_object_unreference_unlocked(obj);
         if (ret)
                 return ret;
@@ -527,7 +707,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)
         struct drm_gem_object *obj = ptr;
         struct drm_device *dev = obj->dev;
 
-        drm_gem_remove_prime_handles(obj, file_priv);
+        if (drm_core_check_feature(dev, DRIVER_PRIME))
+                drm_gem_remove_prime_handles(obj, file_priv);
+        drm_vma_node_revoke(&obj->vma_node, file_priv->filp);
 
         if (dev->driver->gem_close_object)
                 dev->driver->gem_close_object(obj, file_priv);
@@ -553,6 +735,8 @@ drm_gem_release(struct drm_device *dev, struct drm_file *file_private)
 void
 drm_gem_object_release(struct drm_gem_object *obj)
 {
+        WARN_ON(obj->dma_buf);
+
         if (obj->filp)
             fput(obj->filp);
 }
@@ -577,41 +761,6 @@ drm_gem_object_free(struct kref *kref)
 }
 EXPORT_SYMBOL(drm_gem_object_free);
 
-static void drm_gem_object_ref_bug(struct kref *list_kref)
-{
-        BUG();
-}
-
-/**
- * Called after the last handle to the object has been closed
- *
- * Removes any name for the object. Note that this must be
- * called before drm_gem_object_free or we'll be touching
- * freed memory
- */
-void drm_gem_object_handle_free(struct drm_gem_object *obj)
-{
-        struct drm_device *dev = obj->dev;
-
-        /* Remove any name for this object */
-        spin_lock(&dev->object_name_lock);
-        if (obj->name) {
-                idr_remove(&dev->object_name_idr, obj->name);
-                obj->name = 0;
-                spin_unlock(&dev->object_name_lock);
-                /*
-                 * The object name held a reference to this object, drop
-                 * that now.
-                *
-                * This cannot be the last reference, since the handle holds one too.
-                 */
-                kref_put(&obj->refcount, drm_gem_object_ref_bug);
-        } else
-                spin_unlock(&dev->object_name_lock);
-
-}
-EXPORT_SYMBOL(drm_gem_object_handle_free);
-
 void drm_gem_vm_open(struct vm_area_struct *vma)
 {
         struct drm_gem_object *obj = vma->vm_private_data;
@@ -653,6 +802,10 @@ EXPORT_SYMBOL(drm_gem_vm_close);
  * the GEM object is not looked up based on its fake offset. To implement the
  * DRM mmap operation, drivers should use the drm_gem_mmap() function.
  *
+ * drm_gem_mmap_obj() assumes the user is granted access to the buffer while
+ * drm_gem_mmap() prevents unprivileged users from mapping random objects. So
+ * callers must verify access restrictions before calling this helper.
+ *
  * NOTE: This function has to be protected with dev->struct_mutex
  *
  * Return 0 or success or -EINVAL if the object size is smaller than the VMA
@@ -701,14 +854,17 @@ EXPORT_SYMBOL(drm_gem_mmap_obj);
  * Look up the GEM object based on the offset passed in (vma->vm_pgoff will
  * contain the fake offset we created when the GTT map ioctl was called on
  * the object) and map it with a call to drm_gem_mmap_obj().
+ *
+ * If the caller is not granted access to the buffer object, the mmap will fail
+ * with EACCES. Please see the vma manager for more information.
  */
 int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         struct drm_file *priv = filp->private_data;
         struct drm_device *dev = priv->minor->dev;
         struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_local_map *map = NULL;
-        struct drm_hash_item *hash;
+        struct drm_gem_object *obj;
+        struct drm_vma_offset_node *node;
         int ret = 0;
 
         if (drm_device_is_unplugged(dev))
@@ -716,21 +872,19 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 
         mutex_lock(&dev->struct_mutex);
 
-        if (drm_ht_find_item(&mm->offset_hash, vma->vm_pgoff, &hash)) {
+        node = drm_vma_offset_exact_lookup(&mm->vma_manager, vma->vm_pgoff,
+                                           vma_pages(vma));
+        if (!node) {
                 mutex_unlock(&dev->struct_mutex);
                 return drm_mmap(filp, vma);
+        } else if (!drm_vma_node_is_allowed(node, filp)) {
+                mutex_unlock(&dev->struct_mutex);
+                return -EACCES;
         }
 
-        map = drm_hash_entry(hash, struct drm_map_list, hash)->map;
-        if (!map ||
-            ((map->flags & _DRM_RESTRICTED) && !capable(CAP_SYS_ADMIN))) {
-                ret =  -EPERM;
-                goto out_unlock;
-        }
-
-        ret = drm_gem_mmap_obj(map->handle, map->size, vma);
+        obj = container_of(node, struct drm_gem_object, vma_node);
+        ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, vma);
 
-out_unlock:
         mutex_unlock(&dev->struct_mutex);
 
         return ret;
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index ece72a8ac245..0a4f80574eb4 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -27,11 +27,7 @@
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/drm_gem_cma_helper.h>
-
-static unsigned int get_gem_mmap_offset(struct drm_gem_object *obj)
-{
-        return (unsigned int)obj->map_list.hash.key << PAGE_SHIFT;
-}
+#include <drm/drm_vma_manager.h>
 
 /*
  * __drm_gem_cma_create - Create a GEM CMA object without allocating memory
@@ -172,8 +168,7 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj)
 {
         struct drm_gem_cma_object *cma_obj;
 
-        if (gem_obj->map_list.map)
-                drm_gem_free_mmap_offset(gem_obj);
+        drm_gem_free_mmap_offset(gem_obj);
 
         cma_obj = to_drm_gem_cma_obj(gem_obj);
 
@@ -237,7 +232,7 @@ int drm_gem_cma_dumb_map_offset(struct drm_file *file_priv,
                 return -EINVAL;
         }
 
-        *offset = get_gem_mmap_offset(gem_obj);
+        *offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
 
         drm_gem_object_unreference(gem_obj);
 
@@ -286,27 +281,16 @@ int drm_gem_cma_mmap(struct file *filp, struct vm_area_struct *vma)
 }
 EXPORT_SYMBOL_GPL(drm_gem_cma_mmap);
 
-/*
- * drm_gem_cma_dumb_destroy - (struct drm_driver)->dumb_destroy callback function
- */
-int drm_gem_cma_dumb_destroy(struct drm_file *file_priv,
-                struct drm_device *drm, unsigned int handle)
-{
-        return drm_gem_handle_delete(file_priv, handle);
-}
-EXPORT_SYMBOL_GPL(drm_gem_cma_dumb_destroy);
-
 #ifdef CONFIG_DEBUG_FS
 void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, struct seq_file *m)
 {
         struct drm_gem_object *obj = &cma_obj->base;
         struct drm_device *dev = obj->dev;
-        uint64_t off = 0;
+        uint64_t off;
 
         WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
-        if (obj->map_list.map)
-                off = (uint64_t)obj->map_list.hash.key;
+        off = drm_vma_node_start(&obj->vma_node);
 
         seq_printf(m, "%2d (%2d) %08llx %08Zx %p %d",
                         obj->name, obj->refcount.refcount.counter,
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index d4b20ceda3fb..53298320080b 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -207,7 +207,7 @@ static int drm_gem_one_name_info(int id, void *ptr, void *data)
 
         seq_printf(m, "%6d %8zd %7d %8d\n",
                    obj->name, obj->size,
-                   atomic_read(&obj->handle_count),
+                   obj->handle_count,
                    atomic_read(&obj->refcount.refcount));
         return 0;
 }
@@ -218,7 +218,11 @@ int drm_gem_name_info(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
 
         seq_printf(m, "  name     size handles refcount\n");
+
+        mutex_lock(&dev->object_name_lock);
         idr_for_each(&dev->object_name_idr, drm_gem_one_name_info, m);
+        mutex_unlock(&dev->object_name_lock);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index ffd7a7ba70d4..07247e2855a2 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -217,29 +217,30 @@ int drm_getclient(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
         struct drm_client *client = data;
-        struct drm_file *pt;
-        int idx;
-        int i;
 
-        idx = client->idx;
-        i = 0;
-
-        mutex_lock(&dev->struct_mutex);
-        list_for_each_entry(pt, &dev->filelist, lhead) {
-                if (i++ >= idx) {
-                        client->auth = pt->authenticated;
-                        client->pid = pid_vnr(pt->pid);
-                        client->uid = from_kuid_munged(current_user_ns(), pt->uid);
-                        client->magic = pt->magic;
-                        client->iocs = pt->ioctl_count;
-                        mutex_unlock(&dev->struct_mutex);
-
-                        return 0;
-                }
+        /*
+         * Hollowed-out getclient ioctl to keep some dead old drm tests/tools
+         * not breaking completely. Userspace tools stop enumerating one they
+         * get -EINVAL, hence this is the return value we need to hand back for
+         * no clients tracked.
+         *
+         * Unfortunately some clients (*cough* libva *cough*) use this in a fun
+         * attempt to figure out whether they're authenticated or not. Since
+         * that's the only thing they care about, give it to the directly
+         * instead of walking one giant list.
+         */
+        if (client->idx == 0) {
+                client->auth = file_priv->authenticated;
+                client->pid = pid_vnr(file_priv->pid);
+                client->uid = from_kuid_munged(current_user_ns(),
+                                               file_priv->uid);
+                client->magic = 0;
+                client->iocs = 0;
+
+                return 0;
+        } else {
+                return -EINVAL;
         }
-        mutex_unlock(&dev->struct_mutex);
-
-        return -EINVAL;
 }
 
 /**
@@ -256,21 +257,10 @@ int drm_getstats(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
 {
         struct drm_stats *stats = data;
-        int i;
 
+        /* Clear stats to prevent userspace from eating its stack garbage. */
         memset(stats, 0, sizeof(*stats));
 
-        for (i = 0; i < dev->counters; i++) {
-                if (dev->types[i] == _DRM_STAT_LOCK)
-                        stats->data[i].value =
-                            (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
-                else
-                        stats->data[i].value = atomic_read(&dev->counts[i]);
-                stats->data[i].type = dev->types[i];
-        }
-
-        stats->count = dev->counters;
-
         return 0;
 }
 
@@ -303,6 +293,9 @@ int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_priv)
         case DRM_CAP_TIMESTAMP_MONOTONIC:
                 req->value = drm_timestamp_monotonic;
                 break;
+        case DRM_CAP_ASYNC_PAGE_FLIP:
+                req->value = dev->mode_config.async_page_flip;
+                break;
         default:
                 return -EINVAL;
         }
@@ -352,9 +345,6 @@ int drm_setversion(struct drm_device *dev, void *data, struct drm_file *file_pri
                         retcode = -EINVAL;
                         goto done;
                 }
-
-                if (dev->driver->set_version)
-                        dev->driver->set_version(dev, sv);
         }
 
 done:
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c
index 126d50ea181f..64e44fad8ae8 100644
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@ -86,7 +86,6 @@ void drm_free_agp(DRM_AGP_MEM * handle, int pages)
 {
         agp_free_memory(handle);
 }
-EXPORT_SYMBOL(drm_free_agp);
 
 /** Wrapper around agp_bind_memory() */
 int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
@@ -99,7 +98,6 @@ int drm_unbind_agp(DRM_AGP_MEM * handle)
 {
         return agp_unbind_memory(handle);
 }
-EXPORT_SYMBOL(drm_unbind_agp);
 
 #else  /*  __OS_HAS_AGP  */
 static inline void *agp_remap(unsigned long offset, unsigned long size,
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index feb267f37e21..af93cc55259f 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -49,58 +49,18 @@
 
 #define MM_UNUSED_TARGET 4
 
-static struct drm_mm_node *drm_mm_kmalloc(struct drm_mm *mm, int atomic)
-{
-        struct drm_mm_node *child;
-
-        if (atomic)
-                child = kzalloc(sizeof(*child), GFP_ATOMIC);
-        else
-                child = kzalloc(sizeof(*child), GFP_KERNEL);
-
-        if (unlikely(child == NULL)) {
-                spin_lock(&mm->unused_lock);
-                if (list_empty(&mm->unused_nodes))
-                        child = NULL;
-                else {
-                        child =
-                            list_entry(mm->unused_nodes.next,
-                                       struct drm_mm_node, node_list);
-                        list_del(&child->node_list);
-                        --mm->num_unused;
-                }
-                spin_unlock(&mm->unused_lock);
-        }
-        return child;
-}
-
-/* drm_mm_pre_get() - pre allocate drm_mm_node structure
- * drm_mm:      memory manager struct we are pre-allocating for
- *
- * Returns 0 on success or -ENOMEM if allocation fails.
- */
-int drm_mm_pre_get(struct drm_mm *mm)
-{
-        struct drm_mm_node *node;
-
-        spin_lock(&mm->unused_lock);
-        while (mm->num_unused < MM_UNUSED_TARGET) {
-                spin_unlock(&mm->unused_lock);
-                node = kzalloc(sizeof(*node), GFP_KERNEL);
-                spin_lock(&mm->unused_lock);
-
-                if (unlikely(node == NULL)) {
-                        int ret = (mm->num_unused < 2) ? -ENOMEM : 0;
-                        spin_unlock(&mm->unused_lock);
-                        return ret;
-                }
-                ++mm->num_unused;
-                list_add_tail(&node->node_list, &mm->unused_nodes);
-        }
-        spin_unlock(&mm->unused_lock);
-        return 0;
-}
-EXPORT_SYMBOL(drm_mm_pre_get);
+static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
+                                                unsigned long size,
+                                                unsigned alignment,
+                                                unsigned long color,
+                                                enum drm_mm_search_flags flags);
+static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
+                                                unsigned long size,
+                                                unsigned alignment,
+                                                unsigned long color,
+                                                unsigned long start,
+                                                unsigned long end,
+                                                enum drm_mm_search_flags flags);
 
 static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
                                  struct drm_mm_node *node,
@@ -187,24 +147,6 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
 }
 EXPORT_SYMBOL(drm_mm_reserve_node);
 
-struct drm_mm_node *drm_mm_get_block_generic(struct drm_mm_node *hole_node,
-                                             unsigned long size,
-                                             unsigned alignment,
-                                             unsigned long color,
-                                             int atomic)
-{
-        struct drm_mm_node *node;
-
-        node = drm_mm_kmalloc(hole_node->mm, atomic);
-        if (unlikely(node == NULL))
-                return NULL;
-
-        drm_mm_insert_helper(hole_node, node, size, alignment, color);
-
-        return node;
-}
-EXPORT_SYMBOL(drm_mm_get_block_generic);
-
 /**
  * Search for free space and insert a preallocated memory node. Returns
  * -ENOSPC if no suitable free area is available. The preallocated memory node
@@ -212,12 +154,13 @@ EXPORT_SYMBOL(drm_mm_get_block_generic);
  */
 int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node,
                                unsigned long size, unsigned alignment,
-                               unsigned long color)
+                               unsigned long color,
+                               enum drm_mm_search_flags flags)
 {
         struct drm_mm_node *hole_node;
 
         hole_node = drm_mm_search_free_generic(mm, size, alignment,
-                                               color, 0);
+                                               color, flags);
         if (!hole_node)
                 return -ENOSPC;
 
@@ -226,13 +169,6 @@ int drm_mm_insert_node_generic(struct drm_mm *mm, struct drm_mm_node *node,
 }
 EXPORT_SYMBOL(drm_mm_insert_node_generic);
 
-int drm_mm_insert_node(struct drm_mm *mm, struct drm_mm_node *node,
-                       unsigned long size, unsigned alignment)
-{
-        return drm_mm_insert_node_generic(mm, node, size, alignment, 0);
-}
-EXPORT_SYMBOL(drm_mm_insert_node);
-
 static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
                                        struct drm_mm_node *node,
                                        unsigned long size, unsigned alignment,
@@ -285,27 +221,6 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
         }
 }
 
-struct drm_mm_node *drm_mm_get_block_range_generic(struct drm_mm_node *hole_node,
-                                                unsigned long size,
-                                                unsigned alignment,
-                                                unsigned long color,
-                                                unsigned long start,
-                                                unsigned long end,
-                                                int atomic)
-{
-        struct drm_mm_node *node;
-
-        node = drm_mm_kmalloc(hole_node->mm, atomic);
-        if (unlikely(node == NULL))
-                return NULL;
-
-        drm_mm_insert_helper_range(hole_node, node, size, alignment, color,
-                                   start, end);
-
-        return node;
-}
-EXPORT_SYMBOL(drm_mm_get_block_range_generic);
-
 /**
  * Search for free space and insert a preallocated memory node. Returns
  * -ENOSPC if no suitable free area is available. This is for range
@@ -313,13 +228,14 @@ EXPORT_SYMBOL(drm_mm_get_block_range_generic);
  */
 int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, struct drm_mm_node *node,
                                         unsigned long size, unsigned alignment, unsigned long color,
-                                        unsigned long start, unsigned long end)
+                                        unsigned long start, unsigned long end,
+                                        enum drm_mm_search_flags flags)
 {
         struct drm_mm_node *hole_node;
 
         hole_node = drm_mm_search_free_in_range_generic(mm,
                                                         size, alignment, color,
-                                                        start, end, 0);
+                                                        start, end, flags);
         if (!hole_node)
                 return -ENOSPC;
 
@@ -330,14 +246,6 @@ int drm_mm_insert_node_in_range_generic(struct drm_mm *mm, struct drm_mm_node *n
 }
 EXPORT_SYMBOL(drm_mm_insert_node_in_range_generic);
 
-int drm_mm_insert_node_in_range(struct drm_mm *mm, struct drm_mm_node *node,
-                                unsigned long size, unsigned alignment,
-                                unsigned long start, unsigned long end)
-{
-        return drm_mm_insert_node_in_range_generic(mm, node, size, alignment, 0, start, end);
-}
-EXPORT_SYMBOL(drm_mm_insert_node_in_range);
-
 /**
  * Remove a memory node from the allocator.
  */
@@ -375,28 +283,6 @@ void drm_mm_remove_node(struct drm_mm_node *node)
 }
 EXPORT_SYMBOL(drm_mm_remove_node);
 
-/*
- * Remove a memory node from the allocator and free the allocated struct
- * drm_mm_node. Only to be used on a struct drm_mm_node obtained by one of the
- * drm_mm_get_block functions.
- */
-void drm_mm_put_block(struct drm_mm_node *node)
-{
-
-        struct drm_mm *mm = node->mm;
-
-        drm_mm_remove_node(node);
-
-        spin_lock(&mm->unused_lock);
-        if (mm->num_unused < MM_UNUSED_TARGET) {
-                list_add(&node->node_list, &mm->unused_nodes);
-                ++mm->num_unused;
-        } else
-                kfree(node);
-        spin_unlock(&mm->unused_lock);
-}
-EXPORT_SYMBOL(drm_mm_put_block);
-
 static int check_free_hole(unsigned long start, unsigned long end,
                            unsigned long size, unsigned alignment)
 {
@@ -412,11 +298,11 @@ static int check_free_hole(unsigned long start, unsigned long end,
         return end >= start + size;
 }
 
-struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
-                                               unsigned long size,
-                                               unsigned alignment,
-                                               unsigned long color,
-                                               bool best_match)
+static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
+                                                      unsigned long size,
+                                                      unsigned alignment,
+                                                      unsigned long color,
+                                                      enum drm_mm_search_flags flags)
 {
         struct drm_mm_node *entry;
         struct drm_mm_node *best;
@@ -439,7 +325,7 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
                 if (!check_free_hole(adj_start, adj_end, size, alignment))
                         continue;
 
-                if (!best_match)
+                if (!(flags & DRM_MM_SEARCH_BEST))
                         return entry;
 
                 if (entry->size < best_size) {
@@ -450,15 +336,14 @@ struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
 
         return best;
 }
-EXPORT_SYMBOL(drm_mm_search_free_generic);
 
-struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
+static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
                                                         unsigned long size,
                                                         unsigned alignment,
                                                         unsigned long color,
                                                         unsigned long start,
                                                         unsigned long end,
-                                                        bool best_match)
+                                                        enum drm_mm_search_flags flags)
 {
         struct drm_mm_node *entry;
         struct drm_mm_node *best;
@@ -486,7 +371,7 @@ struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
                 if (!check_free_hole(adj_start, adj_end, size, alignment))
                         continue;
 
-                if (!best_match)
+                if (!(flags & DRM_MM_SEARCH_BEST))
                         return entry;
 
                 if (entry->size < best_size) {
@@ -497,7 +382,6 @@ struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_mm *mm,
 
         return best;
 }
-EXPORT_SYMBOL(drm_mm_search_free_in_range_generic);
 
 /**
  * Moves an allocation. To be used with embedded struct drm_mm_node.
@@ -632,8 +516,8 @@ EXPORT_SYMBOL(drm_mm_scan_add_block);
  * corrupted.
  *
  * When the scan list is empty, the selected memory nodes can be freed. An
- * immediately following drm_mm_search_free with best_match = 0 will then return
- * the just freed block (because its at the top of the free_stack list).
+ * immediately following drm_mm_search_free with !DRM_MM_SEARCH_BEST will then
+ * return the just freed block (because its at the top of the free_stack list).
  *
  * Returns one if this block should be evicted, zero otherwise. Will always
  * return zero when no hole has been found.
@@ -670,10 +554,7 @@ EXPORT_SYMBOL(drm_mm_clean);
 void drm_mm_init(struct drm_mm * mm, unsigned long start, unsigned long size)
 {
         INIT_LIST_HEAD(&mm->hole_stack);
-        INIT_LIST_HEAD(&mm->unused_nodes);
-        mm->num_unused = 0;
         mm->scanned_blocks = 0;
-        spin_lock_init(&mm->unused_lock);
 
         /* Clever trick to avoid a special case in the free hole tracking. */
         INIT_LIST_HEAD(&mm->head_node.node_list);
@@ -693,22 +574,8 @@ EXPORT_SYMBOL(drm_mm_init);
 
 void drm_mm_takedown(struct drm_mm * mm)
 {
-        struct drm_mm_node *entry, *next;
-
-        if (WARN(!list_empty(&mm->head_node.node_list),
-                 "Memory manager not clean. Delaying takedown\n")) {
-                return;
-        }
-
-        spin_lock(&mm->unused_lock);
-        list_for_each_entry_safe(entry, next, &mm->unused_nodes, node_list) {
-                list_del(&entry->node_list);
-                kfree(entry);
-                --mm->num_unused;
-        }
-        spin_unlock(&mm->unused_lock);
-
-        BUG_ON(mm->num_unused != 0);
+        WARN(!list_empty(&mm->head_node.node_list),
+             "Memory manager not clean during takedown.\n");
 }
 EXPORT_SYMBOL(drm_mm_takedown);
 
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index a6729bfe6860..fc2adb62b757 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -596,27 +596,6 @@ void drm_mode_set_name(struct drm_display_mode *mode)
 EXPORT_SYMBOL(drm_mode_set_name);
 
 /**
- * drm_mode_list_concat - move modes from one list to another
- * @head: source list
- * @new: dst list
- *
- * LOCKING:
- * Caller must ensure both lists are locked.
- *
- * Move all the modes from @head to @new.
- */
-void drm_mode_list_concat(struct list_head *head, struct list_head *new)
-{
-
-        struct list_head *entry, *tmp;
-
-        list_for_each_safe(entry, tmp, head) {
-                list_move_tail(entry, new);
-        }
-}
-EXPORT_SYMBOL(drm_mode_list_concat);
-
-/**
  * drm_mode_width - get the width of a mode
  * @mode: mode
  *
@@ -923,43 +902,6 @@ void drm_mode_validate_size(struct drm_device *dev,
 EXPORT_SYMBOL(drm_mode_validate_size);
 
 /**
- * drm_mode_validate_clocks - validate modes against clock limits
- * @dev: DRM device
- * @mode_list: list of modes to check
- * @min: minimum clock rate array
- * @max: maximum clock rate array
- * @n_ranges: number of clock ranges (size of arrays)
- *
- * LOCKING:
- * Caller must hold a lock protecting @mode_list.
- *
- * Some code may need to check a mode list against the clock limits of the
- * device in question.  This function walks the mode list, testing to make
- * sure each mode falls within a given range (defined by @min and @max
- * arrays) and sets @mode->status as needed.
- */
-void drm_mode_validate_clocks(struct drm_device *dev,
-                              struct list_head *mode_list,
-                              int *min, int *max, int n_ranges)
-{
-        struct drm_display_mode *mode;
-        int i;
-
-        list_for_each_entry(mode, mode_list, head) {
-                bool good = false;
-                for (i = 0; i < n_ranges; i++) {
-                        if (mode->clock >= min[i] && mode->clock <= max[i]) {
-                                good = true;
-                                break;
-                        }
-                }
-                if (!good)
-                        mode->status = MODE_CLOCK_RANGE;
-        }
-}
-EXPORT_SYMBOL(drm_mode_validate_clocks);
-
-/**
  * drm_mode_prune_invalid - remove invalid modes from mode list
  * @dev: DRM device
  * @mode_list: list of modes to check
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 80c0b2b29801..1f96cee6eee8 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -52,10 +52,8 @@
 drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
 {
         drm_dma_handle_t *dmah;
-#if 1
         unsigned long addr;
         size_t sz;
-#endif
 
         /* pci_alloc_consistent only guarantees alignment to the smallest
          * PAGE_SIZE order which is greater than or equal to the requested size.
@@ -97,10 +95,8 @@ EXPORT_SYMBOL(drm_pci_alloc);
  */
 void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
 {
-#if 1
         unsigned long addr;
         size_t sz;
-#endif
 
         if (dmah->vaddr) {
                 /* XXX - Is virt_to_page() legal for consistent mem? */
@@ -276,17 +272,26 @@ static int drm_pci_agp_init(struct drm_device *dev)
                         DRM_ERROR("Cannot initialize the agpgart module.\n");
                         return -EINVAL;
                 }
-                if (drm_core_has_MTRR(dev)) {
-                        if (dev->agp)
-                                dev->agp->agp_mtrr = arch_phys_wc_add(
-                                        dev->agp->agp_info.aper_base,
-                                        dev->agp->agp_info.aper_size *
-                                        1024 * 1024);
+                if (dev->agp) {
+                        dev->agp->agp_mtrr = arch_phys_wc_add(
+                                dev->agp->agp_info.aper_base,
+                                dev->agp->agp_info.aper_size *
+                                1024 * 1024);
                 }
         }
         return 0;
 }
 
+static void drm_pci_agp_destroy(struct drm_device *dev)
+{
+        if (drm_core_has_AGP(dev) && dev->agp) {
+                arch_phys_wc_del(dev->agp->agp_mtrr);
+                drm_agp_clear(dev);
+                drm_agp_destroy(dev->agp);
+                dev->agp = NULL;
+        }
+}
+
 static struct drm_bus drm_pci_bus = {
         .bus_type = DRIVER_BUS_PCI,
         .get_irq = drm_pci_get_irq,
@@ -295,6 +300,7 @@ static struct drm_bus drm_pci_bus = {
         .set_unique = drm_pci_set_unique,
         .irq_by_busid = drm_pci_irq_by_busid,
         .agp_init = drm_pci_agp_init,
+        .agp_destroy = drm_pci_agp_destroy,
 };
 
 /**
@@ -348,6 +354,12 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
                         goto err_g2;
         }
 
+        if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {
+                ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);
+                if (ret)
+                        goto err_g21;
+        }
+
         if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
                 goto err_g3;
 
@@ -377,6 +389,9 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
 err_g4:
         drm_put_minor(&dev->primary);
 err_g3:
+        if (dev->render)
+                drm_put_minor(&dev->render);
+err_g21:
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 drm_put_minor(&dev->control);
 err_g2:
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index b8a282ea8751..f7a18c6ba4c4 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -28,7 +28,7 @@
 #include <linux/export.h>
 #include <drm/drmP.h>
 
-/**
+/*
  * Register.
  *
  * \param platdev - Platform device struture
@@ -39,8 +39,8 @@
  * Try and register, if we fail to register, backout previous work.
  */
 
-int drm_get_platform_dev(struct platform_device *platdev,
-                         struct drm_driver *driver)
+static int drm_get_platform_dev(struct platform_device *platdev,
+                                struct drm_driver *driver)
 {
         struct drm_device *dev;
         int ret;
@@ -69,6 +69,12 @@ int drm_get_platform_dev(struct platform_device *platdev,
                         goto err_g1;
         }
 
+        if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {
+                ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);
+                if (ret)
+                        goto err_g11;
+        }
+
         ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);
         if (ret)
                 goto err_g2;
@@ -100,6 +106,9 @@ int drm_get_platform_dev(struct platform_device *platdev,
 err_g3:
         drm_put_minor(&dev->primary);
 err_g2:
+        if (dev->render)
+                drm_put_minor(&dev->render);
+err_g11:
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 drm_put_minor(&dev->control);
 err_g1:
@@ -107,7 +116,6 @@ err_g1:
         mutex_unlock(&drm_global_mutex);
         return ret;
 }
-EXPORT_SYMBOL(drm_get_platform_dev);
 
 static int drm_platform_get_irq(struct drm_device *dev)
 {
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 85e450e3241c..276d470f7b3e 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -83,6 +83,34 @@ static int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv,
         return 0;
 }
 
+static struct dma_buf *drm_prime_lookup_buf_by_handle(struct drm_prime_file_private *prime_fpriv,
+                                                      uint32_t handle)
+{
+        struct drm_prime_member *member;
+
+        list_for_each_entry(member, &prime_fpriv->head, entry) {
+                if (member->handle == handle)
+                        return member->dma_buf;
+        }
+
+        return NULL;
+}
+
+static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpriv,
+                                       struct dma_buf *dma_buf,
+                                       uint32_t *handle)
+{
+        struct drm_prime_member *member;
+
+        list_for_each_entry(member, &prime_fpriv->head, entry) {
+                if (member->dma_buf == dma_buf) {
+                        *handle = member->handle;
+                        return 0;
+                }
+        }
+        return -ENOENT;
+}
+
 static int drm_gem_map_attach(struct dma_buf *dma_buf,
                               struct device *target_dev,
                               struct dma_buf_attachment *attach)
@@ -131,9 +159,8 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf,
         attach->priv = NULL;
 }
 
-static void drm_prime_remove_buf_handle_locked(
-                struct drm_prime_file_private *prime_fpriv,
-                struct dma_buf *dma_buf)
+void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
+                                        struct dma_buf *dma_buf)
 {
         struct drm_prime_member *member, *safe;
 
@@ -167,8 +194,6 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
         if (WARN_ON(prime_attach->dir != DMA_NONE))
                 return ERR_PTR(-EBUSY);
 
-        mutex_lock(&obj->dev->struct_mutex);
-
         sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
 
         if (!IS_ERR(sgt)) {
@@ -182,7 +207,6 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
                 }
         }
 
-        mutex_unlock(&obj->dev->struct_mutex);
         return sgt;
 }
 
@@ -192,16 +216,14 @@ static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
         /* nothing to be done here */
 }
 
-static void drm_gem_dmabuf_release(struct dma_buf *dma_buf)
+void drm_gem_dmabuf_release(struct dma_buf *dma_buf)
 {
         struct drm_gem_object *obj = dma_buf->priv;
 
-        if (obj->export_dma_buf == dma_buf) {
-                /* drop the reference on the export fd holds */
-                obj->export_dma_buf = NULL;
-                drm_gem_object_unreference_unlocked(obj);
-        }
+        /* drop the reference on the export fd holds */
+        drm_gem_object_unreference_unlocked(obj);
 }
+EXPORT_SYMBOL(drm_gem_dmabuf_release);
 
 static void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf)
 {
@@ -300,62 +322,107 @@ struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
 }
 EXPORT_SYMBOL(drm_gem_prime_export);
 
+static struct dma_buf *export_and_register_object(struct drm_device *dev,
+                                                  struct drm_gem_object *obj,
+                                                  uint32_t flags)
+{
+        struct dma_buf *dmabuf;
+
+        /* prevent races with concurrent gem_close. */
+        if (obj->handle_count == 0) {
+                dmabuf = ERR_PTR(-ENOENT);
+                return dmabuf;
+        }
+
+        dmabuf = dev->driver->gem_prime_export(dev, obj, flags);
+        if (IS_ERR(dmabuf)) {
+                /* normally the created dma-buf takes ownership of the ref,
+                 * but if that fails then drop the ref
+                 */
+                return dmabuf;
+        }
+
+        /*
+         * Note that callers do not need to clean up the export cache
+         * since the check for obj->handle_count guarantees that someone
+         * will clean it up.
+         */
+        obj->dma_buf = dmabuf;
+        get_dma_buf(obj->dma_buf);
+        /* Grab a new ref since the callers is now used by the dma-buf */
+        drm_gem_object_reference(obj);
+
+        return dmabuf;
+}
+
 int drm_gem_prime_handle_to_fd(struct drm_device *dev,
                 struct drm_file *file_priv, uint32_t handle, uint32_t flags,
                 int *prime_fd)
 {
         struct drm_gem_object *obj;
-        void *buf;
         int ret = 0;
         struct dma_buf *dmabuf;
 
+        mutex_lock(&file_priv->prime.lock);
         obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
+        if (!obj)  {
+                ret = -ENOENT;
+                goto out_unlock;
+        }
 
-        mutex_lock(&file_priv->prime.lock);
+        dmabuf = drm_prime_lookup_buf_by_handle(&file_priv->prime, handle);
+        if (dmabuf) {
+                get_dma_buf(dmabuf);
+                goto out_have_handle;
+        }
+
+        mutex_lock(&dev->object_name_lock);
         /* re-export the original imported object */
         if (obj->import_attach) {
                 dmabuf = obj->import_attach->dmabuf;
+                get_dma_buf(dmabuf);
                 goto out_have_obj;
         }
 
-        if (obj->export_dma_buf) {
-                dmabuf = obj->export_dma_buf;
+        if (obj->dma_buf) {
+                get_dma_buf(obj->dma_buf);
+                dmabuf = obj->dma_buf;
                 goto out_have_obj;
         }
 
-        buf = dev->driver->gem_prime_export(dev, obj, flags);
-        if (IS_ERR(buf)) {
+        dmabuf = export_and_register_object(dev, obj, flags);
+        if (IS_ERR(dmabuf)) {
                 /* normally the created dma-buf takes ownership of the ref,
                  * but if that fails then drop the ref
                  */
-                ret = PTR_ERR(buf);
+                ret = PTR_ERR(dmabuf);
+                mutex_unlock(&dev->object_name_lock);
                 goto out;
         }
-        obj->export_dma_buf = buf;
 
-        /* if we've exported this buffer the cheat and add it to the import list
-         * so we get the correct handle back
+out_have_obj:
+        /*
+         * If we've exported this buffer then cheat and add it to the import list
+         * so we get the correct handle back. We must do this under the
+         * protection of dev->object_name_lock to ensure that a racing gem close
+         * ioctl doesn't miss to remove this buffer handle from the cache.
          */
         ret = drm_prime_add_buf_handle(&file_priv->prime,
-                                       obj->export_dma_buf, handle);
+                                       dmabuf, handle);
+        mutex_unlock(&dev->object_name_lock);
         if (ret)
                 goto fail_put_dmabuf;
 
-        ret = dma_buf_fd(buf, flags);
-        if (ret < 0)
-                goto fail_rm_handle;
-
-        *prime_fd = ret;
-        mutex_unlock(&file_priv->prime.lock);
-        return 0;
-
-out_have_obj:
-        get_dma_buf(dmabuf);
+out_have_handle:
         ret = dma_buf_fd(dmabuf, flags);
+        /*
+         * We must _not_ remove the buffer from the handle cache since the newly
+         * created dma buf is already linked in the global obj->dma_buf pointer,
+         * and that is invariant as long as a userspace gem handle exists.
+         * Closing the handle will clean out the cache anyway, so we don't leak.
+         */
         if (ret < 0) {
-                dma_buf_put(dmabuf);
+                goto fail_put_dmabuf;
         } else {
                 *prime_fd = ret;
                 ret = 0;
@@ -363,15 +430,13 @@ out_have_obj:
 
         goto out;
 
-fail_rm_handle:
-        drm_prime_remove_buf_handle_locked(&file_priv->prime, buf);
 fail_put_dmabuf:
-        /* clear NOT to be checked when releasing dma_buf */
-        obj->export_dma_buf = NULL;
-        dma_buf_put(buf);
+        dma_buf_put(dmabuf);
 out:
         drm_gem_object_unreference_unlocked(obj);
+out_unlock:
         mutex_unlock(&file_priv->prime.lock);
+
         return ret;
 }
 EXPORT_SYMBOL(drm_gem_prime_handle_to_fd);
@@ -446,19 +511,26 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,
 
         ret = drm_prime_lookup_buf_handle(&file_priv->prime,
                         dma_buf, handle);
-        if (!ret) {
-                ret = 0;
+        if (ret == 0)
                 goto out_put;
-        }
 
         /* never seen this one, need to import */
+        mutex_lock(&dev->object_name_lock);
         obj = dev->driver->gem_prime_import(dev, dma_buf);
         if (IS_ERR(obj)) {
                 ret = PTR_ERR(obj);
-                goto out_put;
+                goto out_unlock;
         }
 
-        ret = drm_gem_handle_create(file_priv, obj, handle);
+        if (obj->dma_buf) {
+                WARN_ON(obj->dma_buf != dma_buf);
+        } else {
+                obj->dma_buf = dma_buf;
+                get_dma_buf(dma_buf);
+        }
+
+        /* drm_gem_handle_create_tail unlocks dev->object_name_lock. */
+        ret = drm_gem_handle_create_tail(file_priv, obj, handle);
         drm_gem_object_unreference_unlocked(obj);
         if (ret)
                 goto out_put;
@@ -478,7 +550,9 @@ fail:
         /* hmm, if driver attached, we are relying on the free-object path
          * to detach.. which seems ok..
          */
-        drm_gem_object_handle_unreference_unlocked(obj);
+        drm_gem_handle_delete(file_priv, *handle);
+out_unlock:
+        mutex_unlock(&dev->object_name_lock);
 out_put:
         dma_buf_put(dma_buf);
         mutex_unlock(&file_priv->prime.lock);
@@ -618,25 +692,3 @@ void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv)
         WARN_ON(!list_empty(&prime_fpriv->head));
 }
 EXPORT_SYMBOL(drm_prime_destroy_file_private);
-
-int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t *handle)
-{
-        struct drm_prime_member *member;
-
-        list_for_each_entry(member, &prime_fpriv->head, entry) {
-                if (member->dma_buf == dma_buf) {
-                        *handle = member->handle;
-                        return 0;
-                }
-        }
-        return -ENOENT;
-}
-EXPORT_SYMBOL(drm_prime_lookup_buf_handle);
-
-void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf)
-{
-        mutex_lock(&prime_fpriv->lock);
-        drm_prime_remove_buf_handle_locked(prime_fpriv, dma_buf);
-        mutex_unlock(&prime_fpriv->lock);
-}
-EXPORT_SYMBOL(drm_prime_remove_buf_handle);
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
deleted file mode 100644
index d7f2324b4fb1..000000000000
--- a/drivers/gpu/drm/drm_proc.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
- * \file drm_proc.c
- * /proc support for DRM
- *
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- * \author Gareth Hughes <gareth@valinux.com>
- *
- * \par Acknowledgements:
- *    Matthew J Sottek <matthew.j.sottek@intel.com> sent in a patch to fix
- *    the problem with the proc files not outputting all their information.
- */
-
-/*
- * Created: Mon Jan 11 09:48:47 1999 by faith@valinux.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/export.h>
-#include <drm/drmP.h>
-
-/***************************************************
- * Initialization, etc.
- **************************************************/
-
-/**
- * Proc file list.
- */
-static const struct drm_info_list drm_proc_list[] = {
-        {"name", drm_name_info, 0},
-        {"vm", drm_vm_info, 0},
-        {"clients", drm_clients_info, 0},
-        {"bufs", drm_bufs_info, 0},
-        {"gem_names", drm_gem_name_info, DRIVER_GEM},
-#if DRM_DEBUG_CODE
-        {"vma", drm_vma_info, 0},
-#endif
-};
-#define DRM_PROC_ENTRIES ARRAY_SIZE(drm_proc_list)
-
-static int drm_proc_open(struct inode *inode, struct file *file)
-{
-        struct drm_info_node* node = PDE_DATA(inode);
-
-        return single_open(file, node->info_ent->show, node);
-}
-
-static const struct file_operations drm_proc_fops = {
-        .owner = THIS_MODULE,
-        .open = drm_proc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-
-/**
- * Initialize a given set of proc files for a device
- *
- * \param files The array of files to create
- * \param count The number of files given
- * \param root DRI proc dir entry.
- * \param minor device minor number
- * \return Zero on success, non-zero on failure
- *
- * Create a given set of proc files represented by an array of
- * gdm_proc_lists in the given root directory.
- */
-static int drm_proc_create_files(const struct drm_info_list *files, int count,
-                          struct proc_dir_entry *root, struct drm_minor *minor)
-{
-        struct drm_device *dev = minor->dev;
-        struct proc_dir_entry *ent;
-        struct drm_info_node *tmp;
-        int i;
-
-        for (i = 0; i < count; i++) {
-                u32 features = files[i].driver_features;
-
-                if (features != 0 &&
-                    (dev->driver->driver_features & features) != features)
-                        continue;
-
-                tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);
-                if (!tmp)
-                        return -1;
-
-                tmp->minor = minor;
-                tmp->info_ent = &files[i];
-                list_add(&tmp->list, &minor->proc_nodes.list);
-
-                ent = proc_create_data(files[i].name, S_IRUGO, root,
-                                       &drm_proc_fops, tmp);
-                if (!ent) {
-                        DRM_ERROR("Cannot create /proc/dri/%u/%s\n",
-                                  minor->index, files[i].name);
-                        list_del(&tmp->list);
-                        kfree(tmp);
-                        return -1;
-                }
-        }
-        return 0;
-}
-
-/**
- * Initialize the DRI proc filesystem for a device
- *
- * \param dev DRM device
- * \param root DRI proc dir entry.
- * \param dev_root resulting DRI device proc dir entry.
- * \return root entry pointer on success, or NULL on failure.
- *
- * Create the DRI proc root entry "/proc/dri", the device proc root entry
- * "/proc/dri/%minor%/", and each entry in proc_list as
- * "/proc/dri/%minor%/%name%".
- */
-int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root)
-{
-        char name[12];
-        int ret;
-
-        INIT_LIST_HEAD(&minor->proc_nodes.list);
-        sprintf(name, "%u", minor->index);
-        minor->proc_root = proc_mkdir(name, root);
-        if (!minor->proc_root) {
-                DRM_ERROR("Cannot create /proc/dri/%s\n", name);
-                return -1;
-        }
-
-        ret = drm_proc_create_files(drm_proc_list, DRM_PROC_ENTRIES,
-                                    minor->proc_root, minor);
-        if (ret) {
-                remove_proc_subtree(name, root);
-                minor->proc_root = NULL;
-                DRM_ERROR("Failed to create core drm proc files\n");
-                return ret;
-        }
-
-        return 0;
-}
-
-static int drm_proc_remove_files(const struct drm_info_list *files, int count,
-                          struct drm_minor *minor)
-{
-        struct list_head *pos, *q;
-        struct drm_info_node *tmp;
-        int i;
-
-        for (i = 0; i < count; i++) {
-                list_for_each_safe(pos, q, &minor->proc_nodes.list) {
-                        tmp = list_entry(pos, struct drm_info_node, list);
-                        if (tmp->info_ent == &files[i]) {
-                                remove_proc_entry(files[i].name,
-                                                  minor->proc_root);
-                                list_del(pos);
-                                kfree(tmp);
-                        }
-                }
-        }
-        return 0;
-}
-
-/**
- * Cleanup the proc filesystem resources.
- *
- * \param minor device minor number.
- * \param root DRI proc dir entry.
- * \param dev_root DRI device proc dir entry.
- * \return always zero.
- *
- * Remove all proc entries created by proc_init().
- */
-int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root)
-{
-        char name[64];
-
-        if (!root || !minor->proc_root)
-                return 0;
-
-        drm_proc_remove_files(drm_proc_list, DRM_PROC_ENTRIES, minor);
-
-        sprintf(name, "%d", minor->index);
-        remove_proc_subtree(name, root);
-        return 0;
-}
-
diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c
index d87f60bbc330..1c78406f6e71 100644
--- a/drivers/gpu/drm/drm_scatter.c
+++ b/drivers/gpu/drm/drm_scatter.c
@@ -46,7 +46,7 @@ static inline void *drm_vmalloc_dma(unsigned long size)
 #endif
 }
 
-void drm_sg_cleanup(struct drm_sg_mem * entry)
+static void drm_sg_cleanup(struct drm_sg_mem * entry)
 {
         struct page *page;
         int i;
@@ -64,19 +64,32 @@ void drm_sg_cleanup(struct drm_sg_mem * entry)
         kfree(entry);
 }
 
+void drm_legacy_sg_cleanup(struct drm_device *dev)
+{
+        if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg &&
+            !drm_core_check_feature(dev, DRIVER_MODESET)) {
+                drm_sg_cleanup(dev->sg);
+                dev->sg = NULL;
+        }
+}
 #ifdef _LP64
 # define ScatterHandle(x) (unsigned int)((x >> 32) + (x & ((1L << 32) - 1)))
 #else
 # define ScatterHandle(x) (unsigned int)(x)
 #endif
 
-int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
+int drm_sg_alloc(struct drm_device *dev, void *data,
+                 struct drm_file *file_priv)
 {
+        struct drm_scatter_gather *request = data;
         struct drm_sg_mem *entry;
         unsigned long pages, i, j;
 
         DRM_DEBUG("\n");
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_SG))
                 return -EINVAL;
 
@@ -181,21 +194,15 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
         return -ENOMEM;
 }
 
-int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
-                       struct drm_file *file_priv)
-{
-        struct drm_scatter_gather *request = data;
-
-        return drm_sg_alloc(dev, request);
-
-}
-
 int drm_sg_free(struct drm_device *dev, void *data,
                 struct drm_file *file_priv)
 {
         struct drm_scatter_gather *request = data;
         struct drm_sg_mem *entry;
 
+        if (drm_core_check_feature(dev, DRIVER_MODESET))
+                return -EINVAL;
+
         if (!drm_core_check_feature(dev, DRIVER_SG))
                 return -EINVAL;
 
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 327ca19cda85..e7eb0276f7f1 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -40,6 +40,9 @@
 unsigned int drm_debug = 0;     /* 1 to enable debug output */
 EXPORT_SYMBOL(drm_debug);
 
+unsigned int drm_rnodes = 0;    /* 1 to enable experimental render nodes API */
+EXPORT_SYMBOL(drm_rnodes);
+
 unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
 EXPORT_SYMBOL(drm_vblank_offdelay);
 
@@ -56,11 +59,13 @@ MODULE_AUTHOR(CORE_AUTHOR);
 MODULE_DESCRIPTION(CORE_DESC);
 MODULE_LICENSE("GPL and additional rights");
 MODULE_PARM_DESC(debug, "Enable debug output");
+MODULE_PARM_DESC(rnodes, "Enable experimental render nodes API");
 MODULE_PARM_DESC(vblankoffdelay, "Delay until vblank irq auto-disable [msecs]");
 MODULE_PARM_DESC(timestamp_precision_usec, "Max. error on timestamps [usecs]");
 MODULE_PARM_DESC(timestamp_monotonic, "Use monotonic timestamps");
 
 module_param_named(debug, drm_debug, int, 0600);
+module_param_named(rnodes, drm_rnodes, int, 0600);
 module_param_named(vblankoffdelay, drm_vblank_offdelay, int, 0600);
 module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600);
 module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
@@ -68,7 +73,6 @@ module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600);
 struct idr drm_minors_idr;
 
 struct class *drm_class;
-struct proc_dir_entry *drm_proc_root;
 struct dentry *drm_debugfs_root;
 
 int drm_err(const char *func, const char *format, ...)
@@ -113,12 +117,12 @@ static int drm_minor_get_id(struct drm_device *dev, int type)
         int base = 0, limit = 63;
 
         if (type == DRM_MINOR_CONTROL) {
-                base += 64;
-                limit = base + 127;
-        } else if (type == DRM_MINOR_RENDER) {
-                base += 128;
-                limit = base + 255;
-        }
+                base += 64;
+                limit = base + 63;
+        } else if (type == DRM_MINOR_RENDER) {
+                base += 128;
+                limit = base + 63;
+        }
 
         mutex_lock(&dev->struct_mutex);
         ret = idr_alloc(&drm_minors_idr, NULL, base, limit, GFP_KERNEL);
@@ -288,13 +292,7 @@ int drm_fill_in_dev(struct drm_device *dev,
                         goto error_out_unreg;
         }
 
-
-
-        retcode = drm_ctxbitmap_init(dev);
-        if (retcode) {
-                DRM_ERROR("Cannot allocate memory for context bitmap.\n");
-                goto error_out_unreg;
-        }
+        drm_legacy_ctxbitmap_init(dev);
 
         if (driver->driver_features & DRIVER_GEM) {
                 retcode = drm_gem_init(dev);
@@ -321,9 +319,8 @@ EXPORT_SYMBOL(drm_fill_in_dev);
  * \param sec-minor structure to hold the assigned minor
  * \return negative number on failure.
  *
- * Search an empty entry and initialize it to the given parameters, and
- * create the proc init entry via proc_init(). This routines assigns
- * minor numbers to secondary heads of multi-headed cards
+ * Search an empty entry and initialize it to the given parameters. This
+ * routines assigns minor numbers to secondary heads of multi-headed cards
  */
 int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
 {
@@ -351,20 +348,11 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
 
         idr_replace(&drm_minors_idr, new_minor, minor_id);
 
-        if (type == DRM_MINOR_LEGACY) {
-                ret = drm_proc_init(new_minor, drm_proc_root);
-                if (ret) {
-                        DRM_ERROR("DRM: Failed to initialize /proc/dri.\n");
-                        goto err_mem;
-                }
-        } else
-                new_minor->proc_root = NULL;
-
 #if defined(CONFIG_DEBUG_FS)
         ret = drm_debugfs_init(new_minor, minor_id, drm_debugfs_root);
         if (ret) {
                 DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n");
-                goto err_g2;
+                goto err_mem;
         }
 #endif
 
@@ -372,7 +360,7 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
         if (ret) {
                 printk(KERN_ERR
                        "DRM: Error sysfs_device_add.\n");
-                goto err_g2;
+                goto err_debugfs;
         }
         *minor = new_minor;
 
@@ -380,10 +368,11 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
         return 0;
 
 
-err_g2:
-        if (new_minor->type == DRM_MINOR_LEGACY)
-                drm_proc_cleanup(new_minor, drm_proc_root);
+err_debugfs:
+#if defined(CONFIG_DEBUG_FS)
+        drm_debugfs_cleanup(new_minor);
 err_mem:
+#endif
         kfree(new_minor);
 err_idr:
         idr_remove(&drm_minors_idr, minor_id);
@@ -397,10 +386,6 @@ EXPORT_SYMBOL(drm_get_minor);
  *
  * \param sec_minor - structure to be released
  * \return always zero
- *
- * Cleans up the proc resources. Not legal for this to be the
- * last minor released.
- *
  */
 int drm_put_minor(struct drm_minor **minor_p)
 {
@@ -408,8 +393,6 @@ int drm_put_minor(struct drm_minor **minor_p)
 
         DRM_DEBUG("release secondary minor %d\n", minor->index);
 
-        if (minor->type == DRM_MINOR_LEGACY)
-                drm_proc_cleanup(minor, drm_proc_root);
 #if defined(CONFIG_DEBUG_FS)
         drm_debugfs_cleanup(minor);
 #endif
@@ -451,16 +434,11 @@ void drm_put_dev(struct drm_device *dev)
 
         drm_lastclose(dev);
 
-        if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && dev->agp)
-                arch_phys_wc_del(dev->agp->agp_mtrr);
-
         if (dev->driver->unload)
                 dev->driver->unload(dev);
 
-        if (drm_core_has_AGP(dev) && dev->agp) {
-                kfree(dev->agp);
-                dev->agp = NULL;
-        }
+        if (dev->driver->bus->agp_destroy)
+                dev->driver->bus->agp_destroy(dev);
 
         drm_vblank_cleanup(dev);
 
@@ -468,11 +446,14 @@ void drm_put_dev(struct drm_device *dev)
                 drm_rmmap(dev, r_list->map);
         drm_ht_remove(&dev->map_hash);
 
-        drm_ctxbitmap_cleanup(dev);
+        drm_legacy_ctxbitmap_cleanup(dev);
 
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 drm_put_minor(&dev->control);
 
+        if (dev->render)
+                drm_put_minor(&dev->render);
+
         if (driver->driver_features & DRIVER_GEM)
                 drm_gem_destroy(dev);
 
@@ -489,6 +470,8 @@ void drm_unplug_dev(struct drm_device *dev)
         /* for a USB device */
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 drm_unplug_minor(dev->control);
+        if (dev->render)
+                drm_unplug_minor(dev->render);
         drm_unplug_minor(dev->primary);
 
         mutex_lock(&drm_global_mutex);
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c
index 34a156f0c336..87664723b9ce 100644
--- a/drivers/gpu/drm/drm_usb.c
+++ b/drivers/gpu/drm/drm_usb.c
@@ -33,6 +33,12 @@ int drm_get_usb_dev(struct usb_interface *interface,
         if (ret)
                 goto err_g1;
 
+        if (drm_core_check_feature(dev, DRIVER_RENDER) && drm_rnodes) {
+                ret = drm_get_minor(dev, &dev->render, DRM_MINOR_RENDER);
+                if (ret)
+                        goto err_g11;
+        }
+
         ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY);
         if (ret)
                 goto err_g2;
@@ -62,6 +68,9 @@ int drm_get_usb_dev(struct usb_interface *interface,
 err_g3:
         drm_put_minor(&dev->primary);
 err_g2:
+        if (dev->render)
+                drm_put_minor(&dev->render);
+err_g11:
         drm_put_minor(&dev->control);
 err_g1:
         kfree(dev);
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index feb20035b2c4..b5c5af7328df 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -251,8 +251,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                         switch (map->type) {
                         case _DRM_REGISTERS:
                         case _DRM_FRAME_BUFFER:
-                                if (drm_core_has_MTRR(dev))
-                                        arch_phys_wc_del(map->mtrr);
+                                arch_phys_wc_del(map->mtrr);
                                 iounmap(map->handle);
                                 break;
                         case _DRM_SHM:
diff --git a/drivers/gpu/drm/drm_vma_manager.c b/drivers/gpu/drm/drm_vma_manager.c
new file mode 100644
index 000000000000..63b471205072
--- /dev/null
+++ b/drivers/gpu/drm/drm_vma_manager.c
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
+ * Copyright (c) 2012 David Airlie <airlied@linux.ie>
+ * Copyright (c) 2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm_mm.h>
+#include <drm/drm_vma_manager.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/rbtree.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+/**
+ * DOC: vma offset manager
+ *
+ * The vma-manager is responsible to map arbitrary driver-dependent memory
+ * regions into the linear user address-space. It provides offsets to the
+ * caller which can then be used on the address_space of the drm-device. It
+ * takes care to not overlap regions, size them appropriately and to not
+ * confuse mm-core by inconsistent fake vm_pgoff fields.
+ * Drivers shouldn't use this for object placement in VMEM. This manager should
+ * only be used to manage mappings into linear user-space VMs.
+ *
+ * We use drm_mm as backend to manage object allocations. But it is highly
+ * optimized for alloc/free calls, not lookups. Hence, we use an rb-tree to
+ * speed up offset lookups.
+ *
+ * You must not use multiple offset managers on a single address_space.
+ * Otherwise, mm-core will be unable to tear down memory mappings as the VM will
+ * no longer be linear. Please use VM_NONLINEAR in that case and implement your
+ * own offset managers.
+ *
+ * This offset manager works on page-based addresses. That is, every argument
+ * and return code (with the exception of drm_vma_node_offset_addr()) is given
+ * in number of pages, not number of bytes. That means, object sizes and offsets
+ * must always be page-aligned (as usual).
+ * If you want to get a valid byte-based user-space address for a given offset,
+ * please see drm_vma_node_offset_addr().
+ *
+ * Additionally to offset management, the vma offset manager also handles access
+ * management. For every open-file context that is allowed to access a given
+ * node, you must call drm_vma_node_allow(). Otherwise, an mmap() call on this
+ * open-file with the offset of the node will fail with -EACCES. To revoke
+ * access again, use drm_vma_node_revoke(). However, the caller is responsible
+ * for destroying already existing mappings, if required.
+ */
+
+/**
+ * drm_vma_offset_manager_init - Initialize new offset-manager
+ * @mgr: Manager object
+ * @page_offset: Offset of available memory area (page-based)
+ * @size: Size of available address space range (page-based)
+ *
+ * Initialize a new offset-manager. The offset and area size available for the
+ * manager are given as @page_offset and @size. Both are interpreted as
+ * page-numbers, not bytes.
+ *
+ * Adding/removing nodes from the manager is locked internally and protected
+ * against concurrent access. However, node allocation and destruction is left
+ * for the caller. While calling into the vma-manager, a given node must
+ * always be guaranteed to be referenced.
+ */
+void drm_vma_offset_manager_init(struct drm_vma_offset_manager *mgr,
+                                 unsigned long page_offset, unsigned long size)
+{
+        rwlock_init(&mgr->vm_lock);
+        mgr->vm_addr_space_rb = RB_ROOT;
+        drm_mm_init(&mgr->vm_addr_space_mm, page_offset, size);
+}
+EXPORT_SYMBOL(drm_vma_offset_manager_init);
+
+/**
+ * drm_vma_offset_manager_destroy() - Destroy offset manager
+ * @mgr: Manager object
+ *
+ * Destroy an object manager which was previously created via
+ * drm_vma_offset_manager_init(). The caller must remove all allocated nodes
+ * before destroying the manager. Otherwise, drm_mm will refuse to free the
+ * requested resources.
+ *
+ * The manager must not be accessed after this function is called.
+ */
+void drm_vma_offset_manager_destroy(struct drm_vma_offset_manager *mgr)
+{
+        /* take the lock to protect against buggy drivers */
+        write_lock(&mgr->vm_lock);
+        drm_mm_takedown(&mgr->vm_addr_space_mm);
+        write_unlock(&mgr->vm_lock);
+}
+EXPORT_SYMBOL(drm_vma_offset_manager_destroy);
+
+/**
+ * drm_vma_offset_lookup() - Find node in offset space
+ * @mgr: Manager object
+ * @start: Start address for object (page-based)
+ * @pages: Size of object (page-based)
+ *
+ * Find a node given a start address and object size. This returns the _best_
+ * match for the given node. That is, @start may point somewhere into a valid
+ * region and the given node will be returned, as long as the node spans the
+ * whole requested area (given the size in number of pages as @pages).
+ *
+ * RETURNS:
+ * Returns NULL if no suitable node can be found. Otherwise, the best match
+ * is returned. It's the caller's responsibility to make sure the node doesn't
+ * get destroyed before the caller can access it.
+ */
+struct drm_vma_offset_node *drm_vma_offset_lookup(struct drm_vma_offset_manager *mgr,
+                                                  unsigned long start,
+                                                  unsigned long pages)
+{
+        struct drm_vma_offset_node *node;
+
+        read_lock(&mgr->vm_lock);
+        node = drm_vma_offset_lookup_locked(mgr, start, pages);
+        read_unlock(&mgr->vm_lock);
+
+        return node;
+}
+EXPORT_SYMBOL(drm_vma_offset_lookup);
+
+/**
+ * drm_vma_offset_lookup_locked() - Find node in offset space
+ * @mgr: Manager object
+ * @start: Start address for object (page-based)
+ * @pages: Size of object (page-based)
+ *
+ * Same as drm_vma_offset_lookup() but requires the caller to lock offset lookup
+ * manually. See drm_vma_offset_lock_lookup() for an example.
+ *
+ * RETURNS:
+ * Returns NULL if no suitable node can be found. Otherwise, the best match
+ * is returned.
+ */
+struct drm_vma_offset_node *drm_vma_offset_lookup_locked(struct drm_vma_offset_manager *mgr,
+                                                         unsigned long start,
+                                                         unsigned long pages)
+{
+        struct drm_vma_offset_node *node, *best;
+        struct rb_node *iter;
+        unsigned long offset;
+
+        iter = mgr->vm_addr_space_rb.rb_node;
+        best = NULL;
+
+        while (likely(iter)) {
+                node = rb_entry(iter, struct drm_vma_offset_node, vm_rb);
+                offset = node->vm_node.start;
+                if (start >= offset) {
+                        iter = iter->rb_right;
+                        best = node;
+                        if (start == offset)
+                                break;
+                } else {
+                        iter = iter->rb_left;
+                }
+        }
+
+        /* verify that the node spans the requested area */
+        if (best) {
+                offset = best->vm_node.start + best->vm_node.size;
+                if (offset < start + pages)
+                        best = NULL;
+        }
+
+        return best;
+}
+EXPORT_SYMBOL(drm_vma_offset_lookup_locked);
+
+/* internal helper to link @node into the rb-tree */
+static void _drm_vma_offset_add_rb(struct drm_vma_offset_manager *mgr,
+                                   struct drm_vma_offset_node *node)
+{
+        struct rb_node **iter = &mgr->vm_addr_space_rb.rb_node;
+        struct rb_node *parent = NULL;
+        struct drm_vma_offset_node *iter_node;
+
+        while (likely(*iter)) {
+                parent = *iter;
+                iter_node = rb_entry(*iter, struct drm_vma_offset_node, vm_rb);
+
+                if (node->vm_node.start < iter_node->vm_node.start)
+                        iter = &(*iter)->rb_left;
+                else if (node->vm_node.start > iter_node->vm_node.start)
+                        iter = &(*iter)->rb_right;
+                else
+                        BUG();
+        }
+
+        rb_link_node(&node->vm_rb, parent, iter);
+        rb_insert_color(&node->vm_rb, &mgr->vm_addr_space_rb);
+}
+
+/**
+ * drm_vma_offset_add() - Add offset node to manager
+ * @mgr: Manager object
+ * @node: Node to be added
+ * @pages: Allocation size visible to user-space (in number of pages)
+ *
+ * Add a node to the offset-manager. If the node was already added, this does
+ * nothing and return 0. @pages is the size of the object given in number of
+ * pages.
+ * After this call succeeds, you can access the offset of the node until it
+ * is removed again.
+ *
+ * If this call fails, it is safe to retry the operation or call
+ * drm_vma_offset_remove(), anyway. However, no cleanup is required in that
+ * case.
+ *
+ * @pages is not required to be the same size as the underlying memory object
+ * that you want to map. It only limits the size that user-space can map into
+ * their address space.
+ *
+ * RETURNS:
+ * 0 on success, negative error code on failure.
+ */
+int drm_vma_offset_add(struct drm_vma_offset_manager *mgr,
+                       struct drm_vma_offset_node *node, unsigned long pages)
+{
+        int ret;
+
+        write_lock(&mgr->vm_lock);
+
+        if (drm_mm_node_allocated(&node->vm_node)) {
+                ret = 0;
+                goto out_unlock;
+        }
+
+        ret = drm_mm_insert_node(&mgr->vm_addr_space_mm, &node->vm_node,
+                                 pages, 0, DRM_MM_SEARCH_DEFAULT);
+        if (ret)
+                goto out_unlock;
+
+        _drm_vma_offset_add_rb(mgr, node);
+
+out_unlock:
+        write_unlock(&mgr->vm_lock);
+        return ret;
+}
+EXPORT_SYMBOL(drm_vma_offset_add);
+
+/**
+ * drm_vma_offset_remove() - Remove offset node from manager
+ * @mgr: Manager object
+ * @node: Node to be removed
+ *
+ * Remove a node from the offset manager. If the node wasn't added before, this
+ * does nothing. After this call returns, the offset and size will be 0 until a
+ * new offset is allocated via drm_vma_offset_add() again. Helper functions like
+ * drm_vma_node_start() and drm_vma_node_offset_addr() will return 0 if no
+ * offset is allocated.
+ */
+void drm_vma_offset_remove(struct drm_vma_offset_manager *mgr,
+                           struct drm_vma_offset_node *node)
+{
+        write_lock(&mgr->vm_lock);
+
+        if (drm_mm_node_allocated(&node->vm_node)) {
+                rb_erase(&node->vm_rb, &mgr->vm_addr_space_rb);
+                drm_mm_remove_node(&node->vm_node);
+                memset(&node->vm_node, 0, sizeof(node->vm_node));
+        }
+
+        write_unlock(&mgr->vm_lock);
+}
+EXPORT_SYMBOL(drm_vma_offset_remove);
+
+/**
+ * drm_vma_node_allow - Add open-file to list of allowed users
+ * @node: Node to modify
+ * @filp: Open file to add
+ *
+ * Add @filp to the list of allowed open-files for this node. If @filp is
+ * already on this list, the ref-count is incremented.
+ *
+ * The list of allowed-users is preserved across drm_vma_offset_add() and
+ * drm_vma_offset_remove() calls. You may even call it if the node is currently
+ * not added to any offset-manager.
+ *
+ * You must remove all open-files the same number of times as you added them
+ * before destroying the node. Otherwise, you will leak memory.
+ *
+ * This is locked against concurrent access internally.
+ *
+ * RETURNS:
+ * 0 on success, negative error code on internal failure (out-of-mem)
+ */
+int drm_vma_node_allow(struct drm_vma_offset_node *node, struct file *filp)
+{
+        struct rb_node **iter;
+        struct rb_node *parent = NULL;
+        struct drm_vma_offset_file *new, *entry;
+        int ret = 0;
+
+        /* Preallocate entry to avoid atomic allocations below. It is quite
+         * unlikely that an open-file is added twice to a single node so we
+         * don't optimize for this case. OOM is checked below only if the entry
+         * is actually used. */
+        new = kmalloc(sizeof(*entry), GFP_KERNEL);
+
+        write_lock(&node->vm_lock);
+
+        iter = &node->vm_files.rb_node;
+
+        while (likely(*iter)) {
+                parent = *iter;
+                entry = rb_entry(*iter, struct drm_vma_offset_file, vm_rb);
+
+                if (filp == entry->vm_filp) {
+                        entry->vm_count++;
+                        goto unlock;
+                } else if (filp > entry->vm_filp) {
+                        iter = &(*iter)->rb_right;
+                } else {
+                        iter = &(*iter)->rb_left;
+                }
+        }
+
+        if (!new) {
+                ret = -ENOMEM;
+                goto unlock;
+        }
+
+        new->vm_filp = filp;
+        new->vm_count = 1;
+        rb_link_node(&new->vm_rb, parent, iter);
+        rb_insert_color(&new->vm_rb, &node->vm_files);
+        new = NULL;
+
+unlock:
+        write_unlock(&node->vm_lock);
+        kfree(new);
+        return ret;
+}
+EXPORT_SYMBOL(drm_vma_node_allow);
+
+/**
+ * drm_vma_node_revoke - Remove open-file from list of allowed users
+ * @node: Node to modify
+ * @filp: Open file to remove
+ *
+ * Decrement the ref-count of @filp in the list of allowed open-files on @node.
+ * If the ref-count drops to zero, remove @filp from the list. You must call
+ * this once for every drm_vma_node_allow() on @filp.
+ *
+ * This is locked against concurrent access internally.
+ *
+ * If @filp is not on the list, nothing is done.
+ */
+void drm_vma_node_revoke(struct drm_vma_offset_node *node, struct file *filp)
+{
+        struct drm_vma_offset_file *entry;
+        struct rb_node *iter;
+
+        write_lock(&node->vm_lock);
+
+        iter = node->vm_files.rb_node;
+        while (likely(iter)) {
+                entry = rb_entry(iter, struct drm_vma_offset_file, vm_rb);
+                if (filp == entry->vm_filp) {
+                        if (!--entry->vm_count) {
+                                rb_erase(&entry->vm_rb, &node->vm_files);
+                                kfree(entry);
+                        }
+                        break;
+                } else if (filp > entry->vm_filp) {
+                        iter = iter->rb_right;
+                } else {
+                        iter = iter->rb_left;
+                }
+        }
+
+        write_unlock(&node->vm_lock);
+}
+EXPORT_SYMBOL(drm_vma_node_revoke);
+
+/**
+ * drm_vma_node_is_allowed - Check whether an open-file is granted access
+ * @node: Node to check
+ * @filp: Open-file to check for
+ *
+ * Search the list in @node whether @filp is currently on the list of allowed
+ * open-files (see drm_vma_node_allow()).
+ *
+ * This is locked against concurrent access internally.
+ *
+ * RETURNS:
+ * true iff @filp is on the list
+ */
+bool drm_vma_node_is_allowed(struct drm_vma_offset_node *node,
+                             struct file *filp)
+{
+        struct drm_vma_offset_file *entry;
+        struct rb_node *iter;
+
+        read_lock(&node->vm_lock);
+
+        iter = node->vm_files.rb_node;
+        while (likely(iter)) {
+                entry = rb_entry(iter, struct drm_vma_offset_file, vm_rb);
+                if (filp == entry->vm_filp)
+                        break;
+                else if (filp > entry->vm_filp)
+                        iter = iter->rb_right;
+                else
+                        iter = iter->rb_left;
+        }
+
+        read_unlock(&node->vm_lock);
+
+        return iter;
+}
+EXPORT_SYMBOL(drm_vma_node_is_allowed);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 9a35d171a6d3..14f5c1d34028 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -184,8 +184,9 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
 };
 
 static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
-                                      struct drm_framebuffer *fb,
-                                      struct drm_pending_vblank_event *event)
+                                     struct drm_framebuffer *fb,
+                                     struct drm_pending_vblank_event *event,
+                                     uint32_t page_flip_flags)
 {
         struct drm_device *dev = crtc->dev;
         struct exynos_drm_private *dev_priv = dev->dev_private;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index a0f997e0cbdf..fd76449cf452 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@ -22,6 +22,11 @@ struct exynos_drm_dmabuf_attachment {
         bool is_mapped;
 };
 
+static struct exynos_drm_gem_obj *dma_buf_to_obj(struct dma_buf *buf)
+{
+        return to_exynos_gem_obj(buf->priv);
+}
+
 static int exynos_gem_attach_dma_buf(struct dma_buf *dmabuf,
                                         struct device *dev,
                                         struct dma_buf_attachment *attach)
@@ -63,7 +68,7 @@ static struct sg_table *
                                         enum dma_data_direction dir)
 {
         struct exynos_drm_dmabuf_attachment *exynos_attach = attach->priv;
-        struct exynos_drm_gem_obj *gem_obj = attach->dmabuf->priv;
+        struct exynos_drm_gem_obj *gem_obj = dma_buf_to_obj(attach->dmabuf);
         struct drm_device *dev = gem_obj->base.dev;
         struct exynos_drm_gem_buf *buf;
         struct scatterlist *rd, *wr;
@@ -127,27 +132,6 @@ static void exynos_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
         /* Nothing to do. */
 }
 
-static void exynos_dmabuf_release(struct dma_buf *dmabuf)
-{
-        struct exynos_drm_gem_obj *exynos_gem_obj = dmabuf->priv;
-
-        /*
-         * exynos_dmabuf_release() call means that file object's
-         * f_count is 0 and it calls drm_gem_object_handle_unreference()
-         * to drop the references that these values had been increased
-         * at drm_prime_handle_to_fd()
-         */
-        if (exynos_gem_obj->base.export_dma_buf == dmabuf) {
-                exynos_gem_obj->base.export_dma_buf = NULL;
-
-                /*
-                 * drop this gem object refcount to release allocated buffer
-                 * and resources.
-                 */
-                drm_gem_object_unreference_unlocked(&exynos_gem_obj->base);
-        }
-}
-
 static void *exynos_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf,
                                                 unsigned long page_num)
 {
@@ -193,7 +177,7 @@ static struct dma_buf_ops exynos_dmabuf_ops = {
         .kunmap                 = exynos_gem_dmabuf_kunmap,
         .kunmap_atomic          = exynos_gem_dmabuf_kunmap_atomic,
         .mmap                   = exynos_gem_dmabuf_mmap,
-        .release                = exynos_dmabuf_release,
+        .release                = drm_gem_dmabuf_release,
 };
 
 struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
@@ -201,7 +185,7 @@ struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
 {
         struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
 
-        return dma_buf_export(exynos_gem_obj, &exynos_dmabuf_ops,
+        return dma_buf_export(obj, &exynos_dmabuf_ops,
                                 exynos_gem_obj->base.size, flags);
 }
 
@@ -219,8 +203,7 @@ struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
         if (dma_buf->ops == &exynos_dmabuf_ops) {
                 struct drm_gem_object *obj;
 
-                exynos_gem_obj = dma_buf->priv;
-                obj = &exynos_gem_obj->base;
+                obj = dma_buf->priv;
 
                 /* is it from our device? */
                 if (obj->dev == drm_dev) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index ca2729a85129..df81d3c959b4 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -213,7 +213,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = {
         .close = drm_gem_vm_close,
 };
 
-static struct drm_ioctl_desc exynos_ioctls[] = {
+static const struct drm_ioctl_desc exynos_ioctls[] = {
         DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl,
                         DRM_UNLOCKED | DRM_AUTH),
         DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET,
@@ -271,12 +271,13 @@ static struct drm_driver exynos_drm_driver = {
         .gem_vm_ops             = &exynos_drm_gem_vm_ops,
         .dumb_create            = exynos_drm_gem_dumb_create,
         .dumb_map_offset        = exynos_drm_gem_dumb_map_offset,
-        .dumb_destroy           = exynos_drm_gem_dumb_destroy,
+        .dumb_destroy           = drm_gem_dumb_destroy,
         .prime_handle_to_fd     = drm_gem_prime_handle_to_fd,
         .prime_fd_to_handle     = drm_gem_prime_fd_to_handle,
         .gem_prime_export       = exynos_dmabuf_prime_export,
         .gem_prime_import       = exynos_dmabuf_prime_import,
         .ioctls                 = exynos_ioctls,
+        .num_ioctls             = ARRAY_SIZE(exynos_ioctls),
         .fops                   = &exynos_drm_driver_fops,
         .name   = DRIVER_NAME,
         .desc   = DRIVER_DESC,
@@ -288,7 +289,6 @@ static struct drm_driver exynos_drm_driver = {
 static int exynos_drm_platform_probe(struct platform_device *pdev)
 {
         pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-        exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);
 
         return drm_platform_init(&exynos_drm_driver, pdev);
 }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 24c22a8c3364..f3c6f40666e1 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -10,6 +10,7 @@
  */
 
 #include <drm/drmP.h>
+#include <drm/drm_vma_manager.h>
 
 #include <linux/shmem_fs.h>
 #include <drm/exynos_drm.h>
@@ -135,7 +136,7 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem_obj *exynos_gem_obj)
         obj = &exynos_gem_obj->base;
         buf = exynos_gem_obj->buffer;
 
-        DRM_DEBUG_KMS("handle count = %d\n", atomic_read(&obj->handle_count));
+        DRM_DEBUG_KMS("handle count = %d\n", obj->handle_count);
 
         /*
          * do not release memory region from exporter.
@@ -152,8 +153,7 @@ out:
         exynos_drm_fini_buf(obj->dev, buf);
         exynos_gem_obj->buffer = NULL;
 
-        if (obj->map_list.map)
-                drm_gem_free_mmap_offset(obj);
+        drm_gem_free_mmap_offset(obj);
 
         /* release file pointer to gem object. */
         drm_gem_object_release(obj);
@@ -703,13 +703,11 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
                 goto unlock;
         }
 
-        if (!obj->map_list.map) {
-                ret = drm_gem_create_mmap_offset(obj);
-                if (ret)
-                        goto out;
-        }
+        ret = drm_gem_create_mmap_offset(obj);
+        if (ret)
+                goto out;
 
-        *offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
+        *offset = drm_vma_node_offset_addr(&obj->vma_node);
         DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset);
 
 out:
@@ -719,26 +717,6 @@ unlock:
         return ret;
 }
 
-int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,
-                                struct drm_device *dev,
-                                unsigned int handle)
-{
-        int ret;
-
-        /*
-         * obj->refcount and obj->handle_count are decreased and
-         * if both them are 0 then exynos_drm_gem_free_object()
-         * would be called by callback to release resources.
-         */
-        ret = drm_gem_handle_delete(file_priv, handle);
-        if (ret < 0) {
-                DRM_ERROR("failed to delete drm_gem_handle.\n");
-                return ret;
-        }
-
-        return 0;
-}
-
 int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct drm_gem_object *obj = vma->vm_private_data;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h
index 468766bee450..09555afdfe9c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h
@@ -151,15 +151,6 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
                                    struct drm_device *dev, uint32_t handle,
                                    uint64_t *offset);
 
-/*
- * destroy memory region allocated.
- *      - a gem handle and physical memory region pointed by a gem object
- *      would be released by drm_gem_handle_delete().
- */
-int exynos_drm_gem_dumb_destroy(struct drm_file *file_priv,
-                                struct drm_device *dev,
-                                unsigned int handle);
-
 /* page fault handler and mmap fault address(virtual) to physical memory. */
 int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile
index 7a2d40a5c1e1..e9064dd9045d 100644
--- a/drivers/gpu/drm/gma500/Makefile
+++ b/drivers/gpu/drm/gma500/Makefile
@@ -15,6 +15,7 @@ gma500_gfx-y += \
           mmu.o \
           power.o \
           psb_drv.o \
+          gma_display.o \
           psb_intel_display.o \
           psb_intel_lvds.o \
           psb_intel_modes.o \
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
index 23e14e93991f..162f686c532d 100644
--- a/drivers/gpu/drm/gma500/cdv_device.c
+++ b/drivers/gpu/drm/gma500/cdv_device.c
@@ -641,6 +641,7 @@ const struct psb_ops cdv_chip_ops = {
 
         .crtc_helper = &cdv_intel_helper_funcs,
         .crtc_funcs = &cdv_intel_crtc_funcs,
+        .clock_funcs = &cdv_clock_funcs,
 
         .output_init = cdv_output_init,
         .hotplug = cdv_hotplug_event,
@@ -655,4 +656,6 @@ const struct psb_ops cdv_chip_ops = {
         .restore_regs = cdv_restore_display_registers,
         .power_down = cdv_power_down,
         .power_up = cdv_power_up,
+        .update_wm = cdv_update_wm,
+        .disable_sr = cdv_disable_sr,
 };
diff --git a/drivers/gpu/drm/gma500/cdv_device.h b/drivers/gpu/drm/gma500/cdv_device.h
index 9561e17621b3..705c11d47d45 100644
--- a/drivers/gpu/drm/gma500/cdv_device.h
+++ b/drivers/gpu/drm/gma500/cdv_device.h
@@ -17,6 +17,7 @@
 
 extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;
 extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;
+extern const struct gma_clock_funcs cdv_clock_funcs;
 extern void cdv_intel_crt_init(struct drm_device *dev,
                         struct psb_intel_mode_device *mode_dev);
 extern void cdv_intel_lvds_init(struct drm_device *dev,
@@ -25,12 +26,5 @@ extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *
                         int reg);
 extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
                                              struct drm_crtc *crtc);
-
-static inline void cdv_intel_wait_for_vblank(struct drm_device *dev)
-{
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        /* FIXME: msleep ?? */
-        mdelay(20);
-}
-
-
+extern void cdv_update_wm(struct drm_device *dev, struct drm_crtc *crtc);
+extern void cdv_disable_sr(struct drm_device *dev);
diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index 7b8386fc3024..661af492173d 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -95,13 +95,12 @@ static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,
 
         struct drm_device *dev = encoder->dev;
         struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *psb_intel_crtc =
-                                        to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         int dpll_md_reg;
         u32 adpa, dpll_md;
         u32 adpa_reg;
 
-        if (psb_intel_crtc->pipe == 0)
+        if (gma_crtc->pipe == 0)
                 dpll_md_reg = DPLL_A_MD;
         else
                 dpll_md_reg = DPLL_B_MD;
@@ -124,7 +123,7 @@ static void cdv_intel_crt_mode_set(struct drm_encoder *encoder,
         if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
                 adpa |= ADPA_VSYNC_ACTIVE_HIGH;
 
-        if (psb_intel_crtc->pipe == 0)
+        if (gma_crtc->pipe == 0)
                 adpa |= ADPA_PIPE_A_SELECT;
         else
                 adpa |= ADPA_PIPE_B_SELECT;
@@ -197,10 +196,9 @@ static enum drm_connector_status cdv_intel_crt_detect(
 
 static void cdv_intel_crt_destroy(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
 
-        psb_intel_i2c_destroy(psb_intel_encoder->ddc_bus);
+        psb_intel_i2c_destroy(gma_encoder->ddc_bus);
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
@@ -208,9 +206,9 @@ static void cdv_intel_crt_destroy(struct drm_connector *connector)
 
 static int cdv_intel_crt_get_modes(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                psb_intel_attached_encoder(connector);
-        return psb_intel_ddc_get_modes(connector, &psb_intel_encoder->ddc_bus->adapter);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        return psb_intel_ddc_get_modes(connector,
+                                       &gma_encoder->ddc_bus->adapter);
 }
 
 static int cdv_intel_crt_set_property(struct drm_connector *connector,
@@ -227,8 +225,8 @@ static int cdv_intel_crt_set_property(struct drm_connector *connector,
 static const struct drm_encoder_helper_funcs cdv_intel_crt_helper_funcs = {
         .dpms = cdv_intel_crt_dpms,
         .mode_fixup = cdv_intel_crt_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
-        .commit = psb_intel_encoder_commit,
+        .prepare = gma_encoder_prepare,
+        .commit = gma_encoder_commit,
         .mode_set = cdv_intel_crt_mode_set,
 };
 
@@ -244,7 +242,7 @@ static const struct drm_connector_helper_funcs
                                 cdv_intel_crt_connector_helper_funcs = {
         .mode_valid = cdv_intel_crt_mode_valid,
         .get_modes = cdv_intel_crt_get_modes,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static void cdv_intel_crt_enc_destroy(struct drm_encoder *encoder)
@@ -260,32 +258,31 @@ void cdv_intel_crt_init(struct drm_device *dev,
                         struct psb_intel_mode_device *mode_dev)
 {
 
-        struct psb_intel_connector *psb_intel_connector;
-        struct psb_intel_encoder *psb_intel_encoder;
+        struct gma_connector *gma_connector;
+        struct gma_encoder *gma_encoder;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
 
         u32 i2c_reg;
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-        if (!psb_intel_encoder)
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+        if (!gma_encoder)
                 return;
 
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-        if (!psb_intel_connector)
+        gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+        if (!gma_connector)
                 goto failed_connector;
 
-        connector = &psb_intel_connector->base;
+        connector = &gma_connector->base;
         connector->polled = DRM_CONNECTOR_POLL_HPD;
         drm_connector_init(dev, connector,
                 &cdv_intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
 
-        encoder = &psb_intel_encoder->base;
+        encoder = &gma_encoder->base;
         drm_encoder_init(dev, encoder,
                 &cdv_intel_crt_enc_funcs, DRM_MODE_ENCODER_DAC);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
 
         /* Set up the DDC bus. */
         i2c_reg = GPIOA;
@@ -294,15 +291,15 @@ void cdv_intel_crt_init(struct drm_device *dev,
         if (dev_priv->crt_ddc_bus != 0)
                 i2c_reg = dev_priv->crt_ddc_bus;
         }*/
-        psb_intel_encoder->ddc_bus = psb_intel_i2c_create(dev,
+        gma_encoder->ddc_bus = psb_intel_i2c_create(dev,
                                                           i2c_reg, "CRTDDC_A");
-        if (!psb_intel_encoder->ddc_bus) {
+        if (!gma_encoder->ddc_bus) {
                 dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "
                            "failed.\n");
                 goto failed_ddc;
         }
 
-        psb_intel_encoder->type = INTEL_OUTPUT_ANALOG;
+        gma_encoder->type = INTEL_OUTPUT_ANALOG;
         /*
         psb_intel_output->clone_mask = (1 << INTEL_ANALOG_CLONE_BIT);
         psb_intel_output->crtc_mask = (1 << 0) | (1 << 1);
@@ -318,10 +315,10 @@ void cdv_intel_crt_init(struct drm_device *dev,
 
         return;
 failed_ddc:
-        drm_encoder_cleanup(&psb_intel_encoder->base);
-        drm_connector_cleanup(&psb_intel_connector->base);
-        kfree(psb_intel_connector);
+        drm_encoder_cleanup(&gma_encoder->base);
+        drm_connector_cleanup(&gma_connector->base);
+        kfree(gma_connector);
 failed_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
         return;
 }
diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 82430ad8ba62..8fbfa06da62d 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -19,54 +19,20 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/pm_runtime.h>
 
 #include <drm/drmP.h>
 #include "framebuffer.h"
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"
-#include "psb_intel_display.h"
+#include "gma_display.h"
 #include "power.h"
 #include "cdv_device.h"
 
+static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit,
+                                  struct drm_crtc *crtc, int target,
+                                  int refclk, struct gma_clock_t *best_clock);
 
-struct cdv_intel_range_t {
-        int min, max;
-};
-
-struct cdv_intel_p2_t {
-        int dot_limit;
-        int p2_slow, p2_fast;
-};
-
-struct cdv_intel_clock_t {
-        /* given values */
-        int n;
-        int m1, m2;
-        int p1, p2;
-        /* derived values */
-        int dot;
-        int vco;
-        int m;
-        int p;
-};
-
-#define INTEL_P2_NUM                  2
-
-struct cdv_intel_limit_t {
-        struct cdv_intel_range_t dot, vco, n, m, m1, m2, p, p1;
-        struct cdv_intel_p2_t p2;
-        bool (*find_pll)(const struct cdv_intel_limit_t *, struct drm_crtc *,
-                        int, int, struct cdv_intel_clock_t *);
-};
-
-static bool cdv_intel_find_best_PLL(const struct cdv_intel_limit_t *limit,
-        struct drm_crtc *crtc, int target, int refclk,
-        struct cdv_intel_clock_t *best_clock);
-static bool cdv_intel_find_dp_pll(const struct cdv_intel_limit_t *limit, struct drm_crtc *crtc, int target,
-                                int refclk,
-                                struct cdv_intel_clock_t *best_clock);
 
 #define CDV_LIMIT_SINGLE_LVDS_96        0
 #define CDV_LIMIT_SINGLE_LVDS_100       1
@@ -75,7 +41,7 @@ static bool cdv_intel_find_dp_pll(const struct cdv_intel_limit_t *limit, struct
 #define CDV_LIMIT_DP_27                 4
 #define CDV_LIMIT_DP_100                5
 
-static const struct cdv_intel_limit_t cdv_intel_limits[] = {
+static const struct gma_limit_t cdv_intel_limits[] = {
         {                       /* CDV_SINGLE_LVDS_96MHz */
          .dot = {.min = 20000, .max = 115500},
          .vco = {.min = 1800000, .max = 3600000},
@@ -85,9 +51,8 @@ static const struct cdv_intel_limit_t cdv_intel_limits[] = {
          .m2 = {.min = 58, .max = 158},
          .p = {.min = 28, .max = 140},
          .p1 = {.min = 2, .max = 10},
-         .p2 = {.dot_limit = 200000,
-                .p2_slow = 14, .p2_fast = 14},
-                .find_pll = cdv_intel_find_best_PLL,
+         .p2 = {.dot_limit = 200000, .p2_slow = 14, .p2_fast = 14},
+         .find_pll = gma_find_best_pll,
          },
         {                       /* CDV_SINGLE_LVDS_100MHz */
          .dot = {.min = 20000, .max = 115500},
@@ -102,7 +67,7 @@ static const struct cdv_intel_limit_t cdv_intel_limits[] = {
           * is 80-224Mhz.  Prefer single channel as much as possible.
           */
          .p2 = {.dot_limit = 200000, .p2_slow = 14, .p2_fast = 14},
-        .find_pll = cdv_intel_find_best_PLL,
+         .find_pll = gma_find_best_pll,
          },
         {                       /* CDV_DAC_HDMI_27MHz */
          .dot = {.min = 20000, .max = 400000},
@@ -114,7 +79,7 @@ static const struct cdv_intel_limit_t cdv_intel_limits[] = {
          .p = {.min = 5, .max = 90},
          .p1 = {.min = 1, .max = 9},
          .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},
-        .find_pll = cdv_intel_find_best_PLL,
+         .find_pll = gma_find_best_pll,
          },
         {                       /* CDV_DAC_HDMI_96MHz */
          .dot = {.min = 20000, .max = 400000},
@@ -126,7 +91,7 @@ static const struct cdv_intel_limit_t cdv_intel_limits[] = {
          .p = {.min = 5, .max = 100},
          .p1 = {.min = 1, .max = 10},
          .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 5},
-        .find_pll = cdv_intel_find_best_PLL,
+         .find_pll = gma_find_best_pll,
          },
         {                       /* CDV_DP_27MHz */
          .dot = {.min = 160000, .max = 272000},
@@ -255,10 +220,10 @@ void cdv_sb_reset(struct drm_device *dev)
  */
 static int
 cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,
-                               struct cdv_intel_clock_t *clock, bool is_lvds, u32 ddi_select)
+                       struct gma_clock_t *clock, bool is_lvds, u32 ddi_select)
 {
-        struct psb_intel_crtc *psb_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         u32 m, n_vco, p;
         int ret = 0;
         int dpll_reg = (pipe == 0) ? DPLL_A : DPLL_B;
@@ -405,31 +370,11 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,
         return 0;
 }
 
-/*
- * Returns whether any encoder on the specified pipe is of the specified type
- */
-static bool cdv_intel_pipe_has_type(struct drm_crtc *crtc, int type)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *l_entry;
-
-        list_for_each_entry(l_entry, &mode_config->connector_list, head) {
-                if (l_entry->encoder && l_entry->encoder->crtc == crtc) {
-                        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(l_entry);
-                        if (psb_intel_encoder->type == type)
-                                return true;
-                }
-        }
-        return false;
-}
-
-static const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
-                                                        int refclk)
+static const struct gma_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
+                                                 int refclk)
 {
-        const struct cdv_intel_limit_t *limit;
-        if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
+        const struct gma_limit_t *limit;
+        if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
                 /*
                  * Now only single-channel LVDS is supported on CDV. If it is
                  * incorrect, please add the dual-channel LVDS.
@@ -438,8 +383,8 @@ static const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
                         limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_96];
                 else
                         limit = &cdv_intel_limits[CDV_LIMIT_SINGLE_LVDS_100];
-        } else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
-                        psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
+        } else if (gma_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT) ||
+                        gma_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
                 if (refclk == 27000)
                         limit = &cdv_intel_limits[CDV_LIMIT_DP_27];
                 else
@@ -454,8 +399,7 @@ static const struct cdv_intel_limit_t *cdv_intel_limit(struct drm_crtc *crtc,
 }
 
 /* m1 is reserved as 0 in CDV, n is a ring counter */
-static void cdv_intel_clock(struct drm_device *dev,
-                        int refclk, struct cdv_intel_clock_t *clock)
+static void cdv_intel_clock(int refclk, struct gma_clock_t *clock)
 {
         clock->m = clock->m2 + 2;
         clock->p = clock->p1 * clock->p2;
@@ -463,93 +407,12 @@ static void cdv_intel_clock(struct drm_device *dev,
         clock->dot = clock->vco / clock->p;
 }
 
-
-#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }
-static bool cdv_intel_PLL_is_valid(struct drm_crtc *crtc,
-                                const struct cdv_intel_limit_t *limit,
-                               struct cdv_intel_clock_t *clock)
-{
-        if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1)
-                INTELPllInvalid("p1 out of range\n");
-        if (clock->p < limit->p.min || limit->p.max < clock->p)
-                INTELPllInvalid("p out of range\n");
-        /* unnecessary to check the range of m(m1/M2)/n again */
-        if (clock->vco < limit->vco.min || limit->vco.max < clock->vco)
-                INTELPllInvalid("vco out of range\n");
-        /* XXX: We may need to be checking "Dot clock"
-         * depending on the multiplier, connector, etc.,
-         * rather than just a single range.
-         */
-        if (clock->dot < limit->dot.min || limit->dot.max < clock->dot)
-                INTELPllInvalid("dot out of range\n");
-
-        return true;
-}
-
-static bool cdv_intel_find_best_PLL(const struct cdv_intel_limit_t *limit,
-        struct drm_crtc *crtc, int target, int refclk,
-        struct cdv_intel_clock_t *best_clock)
+static bool cdv_intel_find_dp_pll(const struct gma_limit_t *limit,
+                                  struct drm_crtc *crtc, int target,
+                                  int refclk,
+                                  struct gma_clock_t *best_clock)
 {
-        struct drm_device *dev = crtc->dev;
-        struct cdv_intel_clock_t clock;
-        int err = target;
-
-
-        if (cdv_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-            (REG_READ(LVDS) & LVDS_PORT_EN) != 0) {
-                /*
-                 * For LVDS, if the panel is on, just rely on its current
-                 * settings for dual-channel.  We haven't figured out how to
-                 * reliably set up different single/dual channel state, if we
-                 * even can.
-                 */
-                if ((REG_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
-                    LVDS_CLKB_POWER_UP)
-                        clock.p2 = limit->p2.p2_fast;
-                else
-                        clock.p2 = limit->p2.p2_slow;
-        } else {
-                if (target < limit->p2.dot_limit)
-                        clock.p2 = limit->p2.p2_slow;
-                else
-                        clock.p2 = limit->p2.p2_fast;
-        }
-
-        memset(best_clock, 0, sizeof(*best_clock));
-        clock.m1 = 0;
-        /* m1 is reserved as 0 in CDV, n is a ring counter.
-           So skip the m1 loop */
-        for (clock.n = limit->n.min; clock.n <= limit->n.max; clock.n++) {
-                for (clock.m2 = limit->m2.min; clock.m2 <= limit->m2.max;
-                                             clock.m2++) {
-                        for (clock.p1 = limit->p1.min;
-                                        clock.p1 <= limit->p1.max;
-                                        clock.p1++) {
-                                int this_err;
-
-                                cdv_intel_clock(dev, refclk, &clock);
-
-                                if (!cdv_intel_PLL_is_valid(crtc,
-                                                                limit, &clock))
-                                                continue;
-
-                                this_err = abs(clock.dot - target);
-                                if (this_err < err) {
-                                        *best_clock = clock;
-                                        err = this_err;
-                                }
-                        }
-                }
-        }
-
-        return err != target;
-}
-
-static bool cdv_intel_find_dp_pll(const struct cdv_intel_limit_t *limit, struct drm_crtc *crtc, int target,
-                                int refclk,
-                                struct cdv_intel_clock_t *best_clock)
-{
-        struct cdv_intel_clock_t clock;
+        struct gma_clock_t clock;
         if (refclk == 27000) {
                 if (target < 200000) {
                         clock.p1 = 2;
@@ -584,85 +447,10 @@ static bool cdv_intel_find_dp_pll(const struct cdv_intel_limit_t *limit, struct
         clock.p = clock.p1 * clock.p2;
         clock.vco = (refclk * clock.m) / clock.n;
         clock.dot = clock.vco / clock.p;
-        memcpy(best_clock, &clock, sizeof(struct cdv_intel_clock_t));
+        memcpy(best_clock, &clock, sizeof(struct gma_clock_t));
         return true;
 }
 
-static int cdv_intel_pipe_set_base(struct drm_crtc *crtc,
-                            int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        const struct psb_offset *map = &dev_priv->regmap[pipe];
-        unsigned long start, offset;
-        u32 dspcntr;
-        int ret = 0;
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_err(dev->dev, "No FB bound\n");
-                goto psb_intel_pipe_cleaner;
-        }
-
-
-        /* We are displaying this buffer, make sure it is actually loaded
-           into the GTT */
-        ret = psb_gtt_pin(psbfb->gtt);
-        if (ret < 0)
-                goto psb_intel_pipe_set_base_exit;
-        start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(map->stride, crtc->fb->pitches[0]);
-
-        dspcntr = REG_READ(map->cntr);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                goto psb_intel_pipe_set_base_exit;
-        }
-        REG_WRITE(map->cntr, dspcntr);
-
-        dev_dbg(dev->dev,
-                "Writing base %08lX %08lX %d %d\n", start, offset, x, y);
-
-        REG_WRITE(map->base, offset);
-        REG_READ(map->base);
-        REG_WRITE(map->surf, start);
-        REG_READ(map->surf);
-
-psb_intel_pipe_cleaner:
-        /* If there was a previous display we can now unpin it */
-        if (old_fb)
-                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
-
-psb_intel_pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
 #define         FIFO_PIPEA              (1 << 0)
 #define         FIFO_PIPEB              (1 << 1)
 
@@ -670,12 +458,12 @@ static bool cdv_intel_pipe_enabled(struct drm_device *dev, int pipe)
 {
         struct drm_crtc *crtc;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = NULL;
+        struct gma_crtc *gma_crtc = NULL;
 
         crtc = dev_priv->pipe_to_crtc_mapping[pipe];
-        psb_intel_crtc = to_psb_intel_crtc(crtc);
+        gma_crtc = to_gma_crtc(crtc);
 
-        if (crtc->fb == NULL || !psb_intel_crtc->active)
+        if (crtc->fb == NULL || !gma_crtc->active)
                 return false;
         return true;
 }
@@ -701,29 +489,29 @@ static bool cdv_intel_single_pipe_active (struct drm_device *dev)
 
 static bool is_pipeb_lvds(struct drm_device *dev, struct drm_crtc *crtc)
 {
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct drm_mode_config *mode_config = &dev->mode_config;
         struct drm_connector *connector;
 
-        if (psb_intel_crtc->pipe != 1)
+        if (gma_crtc->pipe != 1)
                 return false;
 
         list_for_each_entry(connector, &mode_config->connector_list, head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+                struct gma_encoder *gma_encoder =
+                                        gma_attached_encoder(connector);
 
                 if (!connector->encoder
                     || connector->encoder->crtc != crtc)
                         continue;
 
-                if (psb_intel_encoder->type == INTEL_OUTPUT_LVDS)
+                if (gma_encoder->type == INTEL_OUTPUT_LVDS)
                         return true;
         }
 
         return false;
 }
 
-static void cdv_intel_disable_self_refresh (struct drm_device *dev)
+void cdv_disable_sr(struct drm_device *dev)
 {
         if (REG_READ(FW_BLC_SELF) & FW_BLC_SELF_EN) {
 
@@ -731,7 +519,7 @@ static void cdv_intel_disable_self_refresh (struct drm_device *dev)
                 REG_WRITE(FW_BLC_SELF, (REG_READ(FW_BLC_SELF) & ~FW_BLC_SELF_EN));
                 REG_READ(FW_BLC_SELF);
 
-                cdv_intel_wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
 
                 /* Cedarview workaround to write ovelay plane, which force to leave
                  * MAX_FIFO state.
@@ -739,13 +527,14 @@ static void cdv_intel_disable_self_refresh (struct drm_device *dev)
                 REG_WRITE(OV_OVADD, 0/*dev_priv->ovl_offset*/);
                 REG_READ(OV_OVADD);
 
-                cdv_intel_wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
         }
 
 }
 
-static void cdv_intel_update_watermark (struct drm_device *dev, struct drm_crtc *crtc)
+void cdv_update_wm(struct drm_device *dev, struct drm_crtc *crtc)
 {
+        struct drm_psb_private *dev_priv = dev->dev_private;
 
         if (cdv_intel_single_pipe_active(dev)) {
                 u32 fw;
@@ -780,12 +569,12 @@ static void cdv_intel_update_watermark (struct drm_device *dev, struct drm_crtc
 
                 REG_WRITE(DSPFW6, 0x10);
 
-                cdv_intel_wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
 
                 /* enable self-refresh for single pipe active */
                 REG_WRITE(FW_BLC_SELF, FW_BLC_SELF_EN);
                 REG_READ(FW_BLC_SELF);
-                cdv_intel_wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
 
         } else {
 
@@ -797,216 +586,12 @@ static void cdv_intel_update_watermark (struct drm_device *dev, struct drm_crtc
                 REG_WRITE(DSPFW5, 0x01010101);
                 REG_WRITE(DSPFW6, 0x1d0);
 
-                cdv_intel_wait_for_vblank(dev);
-
-                cdv_intel_disable_self_refresh(dev);
-        
-        }
-}
-
-/** Loads the palette/gamma unit for the CRTC with the prepared values */
-static void cdv_intel_crtc_load_lut(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int palreg = PALETTE_A;
-        int i;
-
-        /* The clocks have to be on to load the palette. */
-        if (!crtc->enabled)
-                return;
-
-        switch (psb_intel_crtc->pipe) {
-        case 0:
-                break;
-        case 1:
-                palreg = PALETTE_B;
-                break;
-        case 2:
-                palreg = PALETTE_C;
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        if (gma_power_begin(dev, false)) {
-                for (i = 0; i < 256; i++) {
-                        REG_WRITE(palreg + 4 * i,
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]));
-                }
-                gma_power_end(dev);
-        } else {
-                for (i = 0; i < 256; i++) {
-                        dev_priv->regs.pipe[0].palette[i] =
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]);
-                }
-
-        }
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void cdv_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        const struct psb_offset *map = &dev_priv->regmap[pipe];
-        u32 temp;
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        cdv_intel_disable_self_refresh(dev);
-
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                if (psb_intel_crtc->active)
-                        break;
-
-                psb_intel_crtc->active = true;
-
-                /* Enable the DPLL */
-                temp = REG_READ(map->dpll);
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        REG_WRITE(map->dpll, temp);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                }
-
-                /* Jim Bish - switch plan and pipe per scott */
-                /* Enable the plane */
-                temp = REG_READ(map->cntr);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(map->cntr,
-                                  temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(map->base, REG_READ(map->base));
-                }
-
-                udelay(150);
-
-                /* Enable the pipe */
-                temp = REG_READ(map->conf);
-                if ((temp & PIPEACONF_ENABLE) == 0)
-                        REG_WRITE(map->conf, temp | PIPEACONF_ENABLE);
-
-                temp = REG_READ(map->status);
-                temp &= ~(0xFFFF);
-                temp |= PIPE_FIFO_UNDERRUN;
-                REG_WRITE(map->status, temp);
-                REG_READ(map->status);
-
-                cdv_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-                break;
-        case DRM_MODE_DPMS_OFF:
-                if (!psb_intel_crtc->active)
-                        break;
-
-                psb_intel_crtc->active = false;
-
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-                /* Jim Bish - changed pipe/plane here as well. */
-
-                drm_vblank_off(dev, pipe);
-                /* Wait for vblank for the disable to take effect */
-                cdv_intel_wait_for_vblank(dev);
-
-                /* Next, disable display pipes */
-                temp = REG_READ(map->conf);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(map->conf, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(map->conf);
-                }
-
-                /* Wait for vblank for the disable to take effect. */
-                cdv_intel_wait_for_vblank(dev);
-
-                udelay(150);
-
-                /* Disable display plane */
-                temp = REG_READ(map->cntr);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(map->cntr,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(map->base, REG_READ(map->base));
-                        REG_READ(map->base);
-                }
-
-                temp = REG_READ(map->dpll);
-                if ((temp & DPLL_VCO_ENABLE) != 0) {
-                        REG_WRITE(map->dpll, temp & ~DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                }
+                gma_wait_for_vblank(dev);
 
-                /* Wait for the clocks to turn off. */
-                udelay(150);
-                break;
+                dev_priv->ops->disable_sr(dev);
         }
-        cdv_intel_update_watermark(dev, crtc);
-        /*Set FIFO Watermarks*/
-        REG_WRITE(DSPARB, 0x3F3E);
-}
-
-static void cdv_intel_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void cdv_intel_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-static bool cdv_intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  const struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
 }
 
-
 /**
  * Return the pipe currently connected to the panel fitter,
  * or -1 if the panel fitter is not present or not in use
@@ -1031,31 +616,31 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         int refclk;
-        struct cdv_intel_clock_t clock;
+        struct gma_clock_t clock;
         u32 dpll = 0, dspcntr, pipeconf;
         bool ok;
         bool is_crt = false, is_lvds = false, is_tv = false;
         bool is_hdmi = false, is_dp = false;
         struct drm_mode_config *mode_config = &dev->mode_config;
         struct drm_connector *connector;
-        const struct cdv_intel_limit_t *limit;
+        const struct gma_limit_t *limit;
         u32 ddi_select = 0;
         bool is_edp = false;
 
         list_for_each_entry(connector, &mode_config->connector_list, head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+                struct gma_encoder *gma_encoder =
+                                        gma_attached_encoder(connector);
 
                 if (!connector->encoder
                     || connector->encoder->crtc != crtc)
                         continue;
 
-                ddi_select = psb_intel_encoder->ddi_select;
-                switch (psb_intel_encoder->type) {
+                ddi_select = gma_encoder->ddi_select;
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_LVDS:
                         is_lvds = true;
                         break;
@@ -1108,12 +693,13 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
 
         drm_mode_debug_printmodeline(adjusted_mode);
         
-        limit = cdv_intel_limit(crtc, refclk);
+        limit = gma_crtc->clock_funcs->limit(crtc, refclk);
 
         ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk,
                                  &clock);
         if (!ok) {
-                dev_err(dev->dev, "Couldn't find PLL settings for mode!\n");
+                DRM_ERROR("Couldn't find PLL settings for mode! target: %d, actual: %d",
+                          adjusted_mode->clock, clock.dot);
                 return 0;
         }
 
@@ -1264,7 +850,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
         REG_WRITE(map->conf, pipeconf);
         REG_READ(map->conf);
 
-        cdv_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         REG_WRITE(map->cntr, dspcntr);
 
@@ -1275,344 +861,16 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
                 crtc_funcs->mode_set_base(crtc, x, y, old_fb);
         }
 
-        cdv_intel_wait_for_vblank(dev);
-
-        return 0;
-}
-
-
-/**
- * Save HW states of giving crtc
- */
-static void cdv_intel_crtc_save(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        const struct psb_offset *map = &dev_priv->regmap[psb_intel_crtc->pipe];
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_dbg(dev->dev, "No CRTC state found\n");
-                return;
-        }
-
-        crtc_state->saveDSPCNTR = REG_READ(map->cntr);
-        crtc_state->savePIPECONF = REG_READ(map->conf);
-        crtc_state->savePIPESRC = REG_READ(map->src);
-        crtc_state->saveFP0 = REG_READ(map->fp0);
-        crtc_state->saveFP1 = REG_READ(map->fp1);
-        crtc_state->saveDPLL = REG_READ(map->dpll);
-        crtc_state->saveHTOTAL = REG_READ(map->htotal);
-        crtc_state->saveHBLANK = REG_READ(map->hblank);
-        crtc_state->saveHSYNC = REG_READ(map->hsync);
-        crtc_state->saveVTOTAL = REG_READ(map->vtotal);
-        crtc_state->saveVBLANK = REG_READ(map->vblank);
-        crtc_state->saveVSYNC = REG_READ(map->vsync);
-        crtc_state->saveDSPSTRIDE = REG_READ(map->stride);
-
-        /*NOTE: DSPSIZE DSPPOS only for psb*/
-        crtc_state->saveDSPSIZE = REG_READ(map->size);
-        crtc_state->saveDSPPOS = REG_READ(map->pos);
-
-        crtc_state->saveDSPBASE = REG_READ(map->base);
-
-        DRM_DEBUG("(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                        crtc_state->saveDSPCNTR,
-                        crtc_state->savePIPECONF,
-                        crtc_state->savePIPESRC,
-                        crtc_state->saveFP0,
-                        crtc_state->saveFP1,
-                        crtc_state->saveDPLL,
-                        crtc_state->saveHTOTAL,
-                        crtc_state->saveHBLANK,
-                        crtc_state->saveHSYNC,
-                        crtc_state->saveVTOTAL,
-                        crtc_state->saveVBLANK,
-                        crtc_state->saveVSYNC,
-                        crtc_state->saveDSPSTRIDE,
-                        crtc_state->saveDSPSIZE,
-                        crtc_state->saveDSPPOS,
-                        crtc_state->saveDSPBASE
-                );
-
-        paletteReg = map->palette;
-        for (i = 0; i < 256; ++i)
-                crtc_state->savePalette[i] = REG_READ(paletteReg + (i << 2));
-}
-
-/**
- * Restore HW states of giving crtc
- */
-static void cdv_intel_crtc_restore(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        const struct psb_offset *map = &dev_priv->regmap[psb_intel_crtc->pipe];
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_dbg(dev->dev, "No crtc state\n");
-                return;
-        }
-
-        DRM_DEBUG(
-                "current:(%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                REG_READ(map->cntr),
-                REG_READ(map->conf),
-                REG_READ(map->src),
-                REG_READ(map->fp0),
-                REG_READ(map->fp1),
-                REG_READ(map->dpll),
-                REG_READ(map->htotal),
-                REG_READ(map->hblank),
-                REG_READ(map->hsync),
-                REG_READ(map->vtotal),
-                REG_READ(map->vblank),
-                REG_READ(map->vsync),
-                REG_READ(map->stride),
-                REG_READ(map->size),
-                REG_READ(map->pos),
-                REG_READ(map->base)
-        );
-
-        DRM_DEBUG(
-                "saved: (%x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x)\n",
-                crtc_state->saveDSPCNTR,
-                crtc_state->savePIPECONF,
-                crtc_state->savePIPESRC,
-                crtc_state->saveFP0,
-                crtc_state->saveFP1,
-                crtc_state->saveDPLL,
-                crtc_state->saveHTOTAL,
-                crtc_state->saveHBLANK,
-                crtc_state->saveHSYNC,
-                crtc_state->saveVTOTAL,
-                crtc_state->saveVBLANK,
-                crtc_state->saveVSYNC,
-                crtc_state->saveDSPSTRIDE,
-                crtc_state->saveDSPSIZE,
-                crtc_state->saveDSPPOS,
-                crtc_state->saveDSPBASE
-        );
-
-
-        if (crtc_state->saveDPLL & DPLL_VCO_ENABLE) {
-                REG_WRITE(map->dpll,
-                                crtc_state->saveDPLL & ~DPLL_VCO_ENABLE);
-                REG_READ(map->dpll);
-                DRM_DEBUG("write dpll: %x\n",
-                                REG_READ(map->dpll));
-                udelay(150);
-        }
-
-        REG_WRITE(map->fp0, crtc_state->saveFP0);
-        REG_READ(map->fp0);
-
-        REG_WRITE(map->fp1, crtc_state->saveFP1);
-        REG_READ(map->fp1);
-
-        REG_WRITE(map->dpll, crtc_state->saveDPLL);
-        REG_READ(map->dpll);
-        udelay(150);
-
-        REG_WRITE(map->htotal, crtc_state->saveHTOTAL);
-        REG_WRITE(map->hblank, crtc_state->saveHBLANK);
-        REG_WRITE(map->hsync, crtc_state->saveHSYNC);
-        REG_WRITE(map->vtotal, crtc_state->saveVTOTAL);
-        REG_WRITE(map->vblank, crtc_state->saveVBLANK);
-        REG_WRITE(map->vsync, crtc_state->saveVSYNC);
-        REG_WRITE(map->stride, crtc_state->saveDSPSTRIDE);
-
-        REG_WRITE(map->size, crtc_state->saveDSPSIZE);
-        REG_WRITE(map->pos, crtc_state->saveDSPPOS);
-
-        REG_WRITE(map->src, crtc_state->savePIPESRC);
-        REG_WRITE(map->base, crtc_state->saveDSPBASE);
-        REG_WRITE(map->conf, crtc_state->savePIPECONF);
-
-        cdv_intel_wait_for_vblank(dev);
-
-        REG_WRITE(map->cntr, crtc_state->saveDSPCNTR);
-        REG_WRITE(map->base, crtc_state->saveDSPBASE);
-
-        cdv_intel_wait_for_vblank(dev);
-
-        paletteReg = map->palette;
-        for (i = 0; i < 256; ++i)
-                REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]);
-}
-
-static int cdv_intel_crtc_cursor_set(struct drm_crtc *crtc,
-                                 struct drm_file *file_priv,
-                                 uint32_t handle,
-                                 uint32_t width, uint32_t height)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
-        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp;
-        size_t addr = 0;
-        struct gtt_range *gt;
-        struct drm_gem_object *obj;
-        int ret = 0;
-
-        /* if we want to turn of the cursor ignore width and height */
-        if (!handle) {
-                /* turn off the cursor */
-                temp = CURSOR_MODE_DISABLE;
-
-                if (gma_power_begin(dev, false)) {
-                        REG_WRITE(control, temp);
-                        REG_WRITE(base, 0);
-                        gma_power_end(dev);
-                }
-
-                /* unpin the old GEM object */
-                if (psb_intel_crtc->cursor_obj) {
-                        gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                        psb_gtt_unpin(gt);
-                        drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                        psb_intel_crtc->cursor_obj = NULL;
-                }
-
-                return 0;
-        }
-
-        /* Currently we only support 64x64 cursors */
-        if (width != 64 || height != 64) {
-                dev_dbg(dev->dev, "we currently only support 64x64 cursors\n");
-                return -EINVAL;
-        }
-
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (obj->size < width * height * 4) {
-                dev_dbg(dev->dev, "buffer is to small\n");
-                ret = -ENOMEM;
-                goto unref_cursor;
-        }
-
-        gt = container_of(obj, struct gtt_range, gem);
-
-        /* Pin the memory into the GTT */
-        ret = psb_gtt_pin(gt);
-        if (ret) {
-                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
-                goto unref_cursor;
-        }
-
-        addr = gt->offset;      /* Or resource.start ??? */
-
-        psb_intel_crtc->cursor_addr = addr;
-
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE(control, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-
-        /* unpin the old GEM object */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-        }
-
-        psb_intel_crtc->cursor_obj = obj;
-        return ret;
-
-unref_cursor:
-        drm_gem_object_unreference(obj);
-        return ret;
-}
-
-static int cdv_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t temp = 0;
-        uint32_t adder;
-
-
-        if (x < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
-                y = -y;
-        }
-
-        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
+        gma_wait_for_vblank(dev);
 
-        adder = psb_intel_crtc->cursor_addr;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
-                REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, adder);
-                gma_power_end(dev);
-        }
         return 0;
 }
 
-static void cdv_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                         u16 *green, u16 *blue, uint32_t start, uint32_t size)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int i;
-        int end = (start + size > 256) ? 256 : start + size;
-
-        for (i = start; i < end; i++) {
-                psb_intel_crtc->lut_r[i] = red[i] >> 8;
-                psb_intel_crtc->lut_g[i] = green[i] >> 8;
-                psb_intel_crtc->lut_b[i] = blue[i] >> 8;
-        }
-
-        cdv_intel_crtc_load_lut(crtc);
-}
-
-static int cdv_crtc_set_config(struct drm_mode_set *set)
-{
-        int ret = 0;
-        struct drm_device *dev = set->crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->rpm_enabled)
-                return drm_crtc_helper_set_config(set);
-
-        pm_runtime_forbid(&dev->pdev->dev);
-
-        ret = drm_crtc_helper_set_config(set);
-
-        pm_runtime_allow(&dev->pdev->dev);
-
-        return ret;
-}
-
 /** Derive the pixel clock for the given refclk and divisors for 8xx chips. */
 
 /* FIXME: why are we using this, should it be cdv_ in this tree ? */
 
-static void i8xx_clock(int refclk, struct cdv_intel_clock_t *clock)
+static void i8xx_clock(int refclk, struct gma_clock_t *clock)
 {
         clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
         clock->p = clock->p1 * clock->p2;
@@ -1625,12 +883,12 @@ static int cdv_intel_crtc_clock_get(struct drm_device *dev,
                                 struct drm_crtc *crtc)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         u32 dpll;
         u32 fp;
-        struct cdv_intel_clock_t clock;
+        struct gma_clock_t clock;
         bool is_lvds;
         struct psb_pipe *p = &dev_priv->regs.pipe[pipe];
 
@@ -1703,8 +961,8 @@ static int cdv_intel_crtc_clock_get(struct drm_device *dev,
 struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
                                              struct drm_crtc *crtc)
 {
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct psb_pipe *p = &dev_priv->regs.pipe[pipe];
         const struct psb_offset *map = &dev_priv->regmap[pipe];
@@ -1747,44 +1005,28 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
         return mode;
 }
 
-static void cdv_intel_crtc_destroy(struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-
-        kfree(psb_intel_crtc->crtc_state);
-        drm_crtc_cleanup(crtc);
-        kfree(psb_intel_crtc);
-}
-
-static void cdv_intel_crtc_disable(struct drm_crtc *crtc)
-{
-        struct gtt_range *gt;
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-
-        if (crtc->fb) {
-                gt = to_psb_fb(crtc->fb)->gtt;
-                psb_gtt_unpin(gt);
-        }
-}
-
 const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {
-        .dpms = cdv_intel_crtc_dpms,
-        .mode_fixup = cdv_intel_crtc_mode_fixup,
+        .dpms = gma_crtc_dpms,
+        .mode_fixup = gma_crtc_mode_fixup,
         .mode_set = cdv_intel_crtc_mode_set,
-        .mode_set_base = cdv_intel_pipe_set_base,
-        .prepare = cdv_intel_crtc_prepare,
-        .commit = cdv_intel_crtc_commit,
-        .disable = cdv_intel_crtc_disable,
+        .mode_set_base = gma_pipe_set_base,
+        .prepare = gma_crtc_prepare,
+        .commit = gma_crtc_commit,
+        .disable = gma_crtc_disable,
 };
 
 const struct drm_crtc_funcs cdv_intel_crtc_funcs = {
-        .save = cdv_intel_crtc_save,
-        .restore = cdv_intel_crtc_restore,
-        .cursor_set = cdv_intel_crtc_cursor_set,
-        .cursor_move = cdv_intel_crtc_cursor_move,
-        .gamma_set = cdv_intel_crtc_gamma_set,
-        .set_config = cdv_crtc_set_config,
-        .destroy = cdv_intel_crtc_destroy,
+        .save = gma_crtc_save,
+        .restore = gma_crtc_restore,
+        .cursor_set = gma_crtc_cursor_set,
+        .cursor_move = gma_crtc_cursor_move,
+        .gamma_set = gma_crtc_gamma_set,
+        .set_config = gma_crtc_set_config,
+        .destroy = gma_crtc_destroy,
+};
+
+const struct gma_clock_funcs cdv_clock_funcs = {
+        .clock = cdv_intel_clock,
+        .limit = cdv_intel_limit,
+        .pll_is_valid = gma_pll_is_valid,
 };
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 88d9ef6b5b4a..f4eb43573cad 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -34,6 +34,7 @@
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"
+#include "gma_display.h"
 #include <drm/drm_dp_helper.h>
 
 #define _wait_for(COND, MS, W) ({ \
@@ -68,7 +69,7 @@ struct cdv_intel_dp {
         uint8_t link_bw;
         uint8_t lane_count;
         uint8_t dpcd[4];
-        struct psb_intel_encoder *encoder;
+        struct gma_encoder *encoder;
         struct i2c_adapter adapter;
         struct i2c_algo_dp_aux_data algo;
         uint8_t train_set[4];
@@ -114,18 +115,18 @@ static uint32_t dp_vswing_premph_table[] = {
  * If a CPU or PCH DP output is attached to an eDP panel, this function
  * will return true, and false otherwise.
  */
-static bool is_edp(struct psb_intel_encoder *encoder)
+static bool is_edp(struct gma_encoder *encoder)
 {
         return encoder->type == INTEL_OUTPUT_EDP;
 }
 
 
-static void cdv_intel_dp_start_link_train(struct psb_intel_encoder *encoder);
-static void cdv_intel_dp_complete_link_train(struct psb_intel_encoder *encoder);
-static void cdv_intel_dp_link_down(struct psb_intel_encoder *encoder);
+static void cdv_intel_dp_start_link_train(struct gma_encoder *encoder);
+static void cdv_intel_dp_complete_link_train(struct gma_encoder *encoder);
+static void cdv_intel_dp_link_down(struct gma_encoder *encoder);
 
 static int
-cdv_intel_dp_max_lane_count(struct psb_intel_encoder *encoder)
+cdv_intel_dp_max_lane_count(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int max_lane_count = 4;
@@ -143,7 +144,7 @@ cdv_intel_dp_max_lane_count(struct psb_intel_encoder *encoder)
 }
 
 static int
-cdv_intel_dp_max_link_bw(struct psb_intel_encoder *encoder)
+cdv_intel_dp_max_link_bw(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int max_link_bw = intel_dp->dpcd[DP_MAX_LINK_RATE];
@@ -180,7 +181,7 @@ cdv_intel_dp_max_data_rate(int max_link_clock, int max_lanes)
         return (max_link_clock * max_lanes * 19) / 20;
 }
 
-static void cdv_intel_edp_panel_vdd_on(struct psb_intel_encoder *intel_encoder)
+static void cdv_intel_edp_panel_vdd_on(struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
@@ -200,7 +201,7 @@ static void cdv_intel_edp_panel_vdd_on(struct psb_intel_encoder *intel_encoder)
         msleep(intel_dp->panel_power_up_delay);
 }
 
-static void cdv_intel_edp_panel_vdd_off(struct psb_intel_encoder *intel_encoder)
+static void cdv_intel_edp_panel_vdd_off(struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         u32 pp;
@@ -215,7 +216,7 @@ static void cdv_intel_edp_panel_vdd_off(struct psb_intel_encoder *intel_encoder)
 }
 
 /* Returns true if the panel was already on when called */
-static bool cdv_intel_edp_panel_on(struct psb_intel_encoder *intel_encoder)
+static bool cdv_intel_edp_panel_on(struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
@@ -242,7 +243,7 @@ static bool cdv_intel_edp_panel_on(struct psb_intel_encoder *intel_encoder)
         return false;
 }
 
-static void cdv_intel_edp_panel_off (struct psb_intel_encoder *intel_encoder)
+static void cdv_intel_edp_panel_off (struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         u32 pp, idle_off_mask = PP_ON ;
@@ -274,7 +275,7 @@ static void cdv_intel_edp_panel_off (struct psb_intel_encoder *intel_encoder)
         DRM_DEBUG_KMS("Over\n");
 }
 
-static void cdv_intel_edp_backlight_on (struct psb_intel_encoder *intel_encoder)
+static void cdv_intel_edp_backlight_on (struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         u32 pp;
@@ -294,7 +295,7 @@ static void cdv_intel_edp_backlight_on (struct psb_intel_encoder *intel_encoder)
         gma_backlight_enable(dev);
 }
 
-static void cdv_intel_edp_backlight_off (struct psb_intel_encoder *intel_encoder)
+static void cdv_intel_edp_backlight_off (struct gma_encoder *intel_encoder)
 {
         struct drm_device *dev = intel_encoder->base.dev;
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
@@ -314,7 +315,7 @@ static int
 cdv_intel_dp_mode_valid(struct drm_connector *connector,
                     struct drm_display_mode *mode)
 {
-        struct psb_intel_encoder *encoder = psb_intel_attached_encoder(connector);
+        struct gma_encoder *encoder = gma_attached_encoder(connector);
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int max_link_clock = cdv_intel_dp_link_clock(cdv_intel_dp_max_link_bw(encoder));
         int max_lanes = cdv_intel_dp_max_lane_count(encoder);
@@ -370,7 +371,7 @@ unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes)
 }
 
 static int
-cdv_intel_dp_aux_ch(struct psb_intel_encoder *encoder,
+cdv_intel_dp_aux_ch(struct gma_encoder *encoder,
                 uint8_t *send, int send_bytes,
                 uint8_t *recv, int recv_size)
 {
@@ -472,7 +473,7 @@ cdv_intel_dp_aux_ch(struct psb_intel_encoder *encoder,
 
 /* Write data to the aux channel in native mode */
 static int
-cdv_intel_dp_aux_native_write(struct psb_intel_encoder *encoder,
+cdv_intel_dp_aux_native_write(struct gma_encoder *encoder,
                           uint16_t address, uint8_t *send, int send_bytes)
 {
         int ret;
@@ -504,7 +505,7 @@ cdv_intel_dp_aux_native_write(struct psb_intel_encoder *encoder,
 
 /* Write a single byte to the aux channel in native mode */
 static int
-cdv_intel_dp_aux_native_write_1(struct psb_intel_encoder *encoder,
+cdv_intel_dp_aux_native_write_1(struct gma_encoder *encoder,
                             uint16_t address, uint8_t byte)
 {
         return cdv_intel_dp_aux_native_write(encoder, address, &byte, 1);
@@ -512,7 +513,7 @@ cdv_intel_dp_aux_native_write_1(struct psb_intel_encoder *encoder,
 
 /* read bytes from a native aux channel */
 static int
-cdv_intel_dp_aux_native_read(struct psb_intel_encoder *encoder,
+cdv_intel_dp_aux_native_read(struct gma_encoder *encoder,
                          uint16_t address, uint8_t *recv, int recv_bytes)
 {
         uint8_t msg[4];
@@ -557,7 +558,7 @@ cdv_intel_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
         struct cdv_intel_dp *intel_dp = container_of(adapter,
                                                 struct cdv_intel_dp,
                                                 adapter);
-        struct psb_intel_encoder *encoder = intel_dp->encoder;
+        struct gma_encoder *encoder = intel_dp->encoder;
         uint16_t address = algo_data->address;
         uint8_t msg[5];
         uint8_t reply[2];
@@ -647,7 +648,8 @@ cdv_intel_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
 }
 
 static int
-cdv_intel_dp_i2c_init(struct psb_intel_connector *connector, struct psb_intel_encoder *encoder, const char *name)
+cdv_intel_dp_i2c_init(struct gma_connector *connector,
+                      struct gma_encoder *encoder, const char *name)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int ret;
@@ -698,7 +700,7 @@ cdv_intel_dp_mode_fixup(struct drm_encoder *encoder, const struct drm_display_mo
                     struct drm_display_mode *adjusted_mode)
 {
         struct drm_psb_private *dev_priv = encoder->dev->dev_private;
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
         int lane_count, clock;
         int max_lane_count = cdv_intel_dp_max_lane_count(intel_encoder);
@@ -792,22 +794,22 @@ cdv_intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct drm_mode_config *mode_config = &dev->mode_config;
         struct drm_encoder *encoder;
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         int lane_count = 4, bpp = 24;
         struct cdv_intel_dp_m_n m_n;
-        int pipe = intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
 
         /*
          * Find the lane count in the intel_encoder private
          */
         list_for_each_entry(encoder, &mode_config->encoder_list, head) {
-                struct psb_intel_encoder *intel_encoder;
+                struct gma_encoder *intel_encoder;
                 struct cdv_intel_dp *intel_dp;
 
                 if (encoder->crtc != crtc)
                         continue;
 
-                intel_encoder = to_psb_intel_encoder(encoder);
+                intel_encoder = to_gma_encoder(encoder);
                 intel_dp = intel_encoder->dev_priv;
                 if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) {
                         lane_count = intel_dp->lane_count;
@@ -841,9 +843,9 @@ static void
 cdv_intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
                   struct drm_display_mode *adjusted_mode)
 {
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
         struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
         struct drm_device *dev = encoder->dev;
 
@@ -885,7 +887,7 @@ cdv_intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode
         }
 
         /* CPT DP's pipe select is decided in TRANS_DP_CTL */
-        if (intel_crtc->pipe == 1)
+        if (gma_crtc->pipe == 1)
                 intel_dp->DP |= DP_PIPEB_SELECT;
 
         REG_WRITE(intel_dp->output_reg, (intel_dp->DP | DP_PORT_EN));
@@ -900,7 +902,7 @@ cdv_intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode
                 else
                         pfit_control = 0;
 
-                pfit_control |= intel_crtc->pipe << PFIT_PIPE_SHIFT;
+                pfit_control |= gma_crtc->pipe << PFIT_PIPE_SHIFT;
 
                 REG_WRITE(PFIT_CONTROL, pfit_control);
         }
@@ -908,7 +910,7 @@ cdv_intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode
 
 
 /* If the sink supports it, try to set the power state appropriately */
-static void cdv_intel_dp_sink_dpms(struct psb_intel_encoder *encoder, int mode)
+static void cdv_intel_dp_sink_dpms(struct gma_encoder *encoder, int mode)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int ret, i;
@@ -940,7 +942,7 @@ static void cdv_intel_dp_sink_dpms(struct psb_intel_encoder *encoder, int mode)
 
 static void cdv_intel_dp_prepare(struct drm_encoder *encoder)
 {
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
         int edp = is_edp(intel_encoder);
 
         if (edp) {
@@ -957,7 +959,7 @@ static void cdv_intel_dp_prepare(struct drm_encoder *encoder)
 
 static void cdv_intel_dp_commit(struct drm_encoder *encoder)
 {
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
         int edp = is_edp(intel_encoder);
 
         if (edp)
@@ -971,7 +973,7 @@ static void cdv_intel_dp_commit(struct drm_encoder *encoder)
 static void
 cdv_intel_dp_dpms(struct drm_encoder *encoder, int mode)
 {
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
         struct drm_device *dev = encoder->dev;
         uint32_t dp_reg = REG_READ(intel_dp->output_reg);
@@ -1006,7 +1008,7 @@ cdv_intel_dp_dpms(struct drm_encoder *encoder, int mode)
  * cases where the sink may still be asleep.
  */
 static bool
-cdv_intel_dp_aux_native_read_retry(struct psb_intel_encoder *encoder, uint16_t address,
+cdv_intel_dp_aux_native_read_retry(struct gma_encoder *encoder, uint16_t address,
                                uint8_t *recv, int recv_bytes)
 {
         int ret, i;
@@ -1031,7 +1033,7 @@ cdv_intel_dp_aux_native_read_retry(struct psb_intel_encoder *encoder, uint16_t a
  * link status information
  */
 static bool
-cdv_intel_dp_get_link_status(struct psb_intel_encoder *encoder)
+cdv_intel_dp_get_link_status(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         return cdv_intel_dp_aux_native_read_retry(encoder,
@@ -1105,7 +1107,7 @@ cdv_intel_dp_pre_emphasis_max(uint8_t voltage_swing)
 }
 */
 static void
-cdv_intel_get_adjust_train(struct psb_intel_encoder *encoder)
+cdv_intel_get_adjust_train(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         uint8_t v = 0;
@@ -1164,7 +1166,7 @@ cdv_intel_clock_recovery_ok(uint8_t link_status[DP_LINK_STATUS_SIZE], int lane_c
                          DP_LANE_CHANNEL_EQ_DONE|\
                          DP_LANE_SYMBOL_LOCKED)
 static bool
-cdv_intel_channel_eq_ok(struct psb_intel_encoder *encoder)
+cdv_intel_channel_eq_ok(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         uint8_t lane_align;
@@ -1184,7 +1186,7 @@ cdv_intel_channel_eq_ok(struct psb_intel_encoder *encoder)
 }
 
 static bool
-cdv_intel_dp_set_link_train(struct psb_intel_encoder *encoder,
+cdv_intel_dp_set_link_train(struct gma_encoder *encoder,
                         uint32_t dp_reg_value,
                         uint8_t dp_train_pat)
 {
@@ -1211,7 +1213,7 @@ cdv_intel_dp_set_link_train(struct psb_intel_encoder *encoder,
 
 
 static bool
-cdv_intel_dplink_set_level(struct psb_intel_encoder *encoder,
+cdv_intel_dplink_set_level(struct gma_encoder *encoder,
                         uint8_t dp_train_pat)
 {
         
@@ -1232,7 +1234,7 @@ cdv_intel_dplink_set_level(struct psb_intel_encoder *encoder,
 }
 
 static void
-cdv_intel_dp_set_vswing_premph(struct psb_intel_encoder *encoder, uint8_t signal_level)
+cdv_intel_dp_set_vswing_premph(struct gma_encoder *encoder, uint8_t signal_level)
 {
         struct drm_device *dev = encoder->base.dev;
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
@@ -1298,7 +1300,7 @@ cdv_intel_dp_set_vswing_premph(struct psb_intel_encoder *encoder, uint8_t signal
 
 /* Enable corresponding port and start training pattern 1 */
 static void
-cdv_intel_dp_start_link_train(struct psb_intel_encoder *encoder)
+cdv_intel_dp_start_link_train(struct gma_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
@@ -1317,7 +1319,7 @@ cdv_intel_dp_start_link_train(struct psb_intel_encoder *encoder)
         /* Enable output, wait for it to become active */
         REG_WRITE(intel_dp->output_reg, reg);
         REG_READ(intel_dp->output_reg);
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         DRM_DEBUG_KMS("Link config\n");
         /* Write the link configuration data */
@@ -1392,7 +1394,7 @@ cdv_intel_dp_start_link_train(struct psb_intel_encoder *encoder)
 }
 
 static void
-cdv_intel_dp_complete_link_train(struct psb_intel_encoder *encoder)
+cdv_intel_dp_complete_link_train(struct gma_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
@@ -1478,7 +1480,7 @@ cdv_intel_dp_complete_link_train(struct psb_intel_encoder *encoder)
 }
 
 static void
-cdv_intel_dp_link_down(struct psb_intel_encoder *encoder)
+cdv_intel_dp_link_down(struct gma_encoder *encoder)
 {
         struct drm_device *dev = encoder->base.dev;
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
@@ -1502,8 +1504,7 @@ cdv_intel_dp_link_down(struct psb_intel_encoder *encoder)
         REG_READ(intel_dp->output_reg);
 }
 
-static enum drm_connector_status
-cdv_dp_detect(struct psb_intel_encoder *encoder)
+static enum drm_connector_status cdv_dp_detect(struct gma_encoder *encoder)
 {
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         enum drm_connector_status status;
@@ -1531,7 +1532,7 @@ cdv_dp_detect(struct psb_intel_encoder *encoder)
 static enum drm_connector_status
 cdv_intel_dp_detect(struct drm_connector *connector, bool force)
 {
-        struct psb_intel_encoder *encoder = psb_intel_attached_encoder(connector);
+        struct gma_encoder *encoder = gma_attached_encoder(connector);
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         enum drm_connector_status status;
         struct edid *edid = NULL;
@@ -1565,7 +1566,7 @@ cdv_intel_dp_detect(struct drm_connector *connector, bool force)
 
 static int cdv_intel_dp_get_modes(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *intel_encoder = psb_intel_attached_encoder(connector);
+        struct gma_encoder *intel_encoder = gma_attached_encoder(connector);
         struct cdv_intel_dp *intel_dp = intel_encoder->dev_priv;
         struct edid *edid = NULL;
         int ret = 0;
@@ -1621,7 +1622,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
 static bool
 cdv_intel_dp_detect_audio(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *encoder = psb_intel_attached_encoder(connector);
+        struct gma_encoder *encoder = gma_attached_encoder(connector);
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         struct edid *edid;
         bool has_audio = false;
@@ -1647,7 +1648,7 @@ cdv_intel_dp_set_property(struct drm_connector *connector,
                       uint64_t val)
 {
         struct drm_psb_private *dev_priv = connector->dev->dev_private;
-        struct psb_intel_encoder *encoder = psb_intel_attached_encoder(connector);
+        struct gma_encoder *encoder = gma_attached_encoder(connector);
         struct cdv_intel_dp *intel_dp = encoder->dev_priv;
         int ret;
 
@@ -1700,11 +1701,10 @@ done:
 static void
 cdv_intel_dp_destroy(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct cdv_intel_dp *intel_dp = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct cdv_intel_dp *intel_dp = gma_encoder->dev_priv;
 
-        if (is_edp(psb_intel_encoder)) {
+        if (is_edp(gma_encoder)) {
         /*      cdv_intel_panel_destroy_backlight(connector->dev); */
                 if (intel_dp->panel_fixed_mode) {
                         kfree(intel_dp->panel_fixed_mode);
@@ -1741,7 +1741,7 @@ static const struct drm_connector_funcs cdv_intel_dp_connector_funcs = {
 static const struct drm_connector_helper_funcs cdv_intel_dp_connector_helper_funcs = {
         .get_modes = cdv_intel_dp_get_modes,
         .mode_valid = cdv_intel_dp_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static const struct drm_encoder_funcs cdv_intel_dp_enc_funcs = {
@@ -1800,19 +1800,19 @@ static void cdv_disable_intel_clock_gating(struct drm_device *dev)
 void
 cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev, int output_reg)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
         struct cdv_intel_dp *intel_dp;
         const char *name = NULL;
         int type = DRM_MODE_CONNECTOR_DisplayPort;
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-        if (!psb_intel_encoder)
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+        if (!gma_encoder)
                 return;
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-        if (!psb_intel_connector)
+        gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+        if (!gma_connector)
                 goto err_connector;
         intel_dp = kzalloc(sizeof(struct cdv_intel_dp), GFP_KERNEL);
         if (!intel_dp)
@@ -1821,22 +1821,22 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
         if ((output_reg == DP_C) && cdv_intel_dpc_is_edp(dev))
                 type = DRM_MODE_CONNECTOR_eDP;
 
-        connector = &psb_intel_connector->base;
-        encoder = &psb_intel_encoder->base;
+        connector = &gma_connector->base;
+        encoder = &gma_encoder->base;
 
         drm_connector_init(dev, connector, &cdv_intel_dp_connector_funcs, type);
         drm_encoder_init(dev, encoder, &cdv_intel_dp_enc_funcs, DRM_MODE_ENCODER_TMDS);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector, psb_intel_encoder);
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
 
         if (type == DRM_MODE_CONNECTOR_DisplayPort)
-                psb_intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
+                gma_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
         else
-                psb_intel_encoder->type = INTEL_OUTPUT_EDP;
+                gma_encoder->type = INTEL_OUTPUT_EDP;
 
 
-        psb_intel_encoder->dev_priv=intel_dp;
-        intel_dp->encoder = psb_intel_encoder;
+        gma_encoder->dev_priv=intel_dp;
+        intel_dp->encoder = gma_encoder;
         intel_dp->output_reg = output_reg;
         
         drm_encoder_helper_add(encoder, &cdv_intel_dp_helper_funcs);
@@ -1852,21 +1852,21 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
         switch (output_reg) {
                 case DP_B:
                         name = "DPDDC-B";
-                        psb_intel_encoder->ddi_select = (DP_MASK | DDI0_SELECT);
+                        gma_encoder->ddi_select = (DP_MASK | DDI0_SELECT);
                         break;
                 case DP_C:
                         name = "DPDDC-C";
-                        psb_intel_encoder->ddi_select = (DP_MASK | DDI1_SELECT);
+                        gma_encoder->ddi_select = (DP_MASK | DDI1_SELECT);
                         break;
         }
 
         cdv_disable_intel_clock_gating(dev);
 
-        cdv_intel_dp_i2c_init(psb_intel_connector, psb_intel_encoder, name);
+        cdv_intel_dp_i2c_init(gma_connector, gma_encoder, name);
         /* FIXME:fail check */
         cdv_intel_dp_add_properties(connector);
 
-        if (is_edp(psb_intel_encoder)) {
+        if (is_edp(gma_encoder)) {
                 int ret;
                 struct edp_power_seq cur;
                 u32 pp_on, pp_off, pp_div;
@@ -1920,11 +1920,11 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
                               intel_dp->backlight_on_delay, intel_dp->backlight_off_delay);
 
 
-                cdv_intel_edp_panel_vdd_on(psb_intel_encoder);
-                ret = cdv_intel_dp_aux_native_read(psb_intel_encoder, DP_DPCD_REV,
+                cdv_intel_edp_panel_vdd_on(gma_encoder);
+                ret = cdv_intel_dp_aux_native_read(gma_encoder, DP_DPCD_REV,
                                                intel_dp->dpcd,
                                                sizeof(intel_dp->dpcd));
-                cdv_intel_edp_panel_vdd_off(psb_intel_encoder);
+                cdv_intel_edp_panel_vdd_off(gma_encoder);
                 if (ret == 0) {
                         /* if this fails, presume the device is a ghost */
                         DRM_INFO("failed to retrieve link info, disabling eDP\n");
@@ -1945,7 +1945,7 @@ cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev
         return;
 
 err_priv:
-        kfree(psb_intel_connector);
+        kfree(gma_connector);
 err_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 464153d9d2df..1c0d723b8d24 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -64,11 +64,11 @@ static void cdv_hdmi_mode_set(struct drm_encoder *encoder,
                         struct drm_display_mode *adjusted_mode)
 {
         struct drm_device *dev = encoder->dev;
-        struct psb_intel_encoder *psb_intel_encoder = to_psb_intel_encoder(encoder);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
+        struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv;
         u32 hdmib;
         struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
 
         hdmib = (2 << 10);
 
@@ -77,7 +77,7 @@ static void cdv_hdmi_mode_set(struct drm_encoder *encoder,
         if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
                 hdmib |= HDMI_HSYNC_ACTIVE_HIGH;
 
-        if (intel_crtc->pipe == 1)
+        if (gma_crtc->pipe == 1)
                 hdmib |= HDMIB_PIPE_B_SELECT;
 
         if (hdmi_priv->has_hdmi_audio) {
@@ -99,9 +99,8 @@ static bool cdv_hdmi_mode_fixup(struct drm_encoder *encoder,
 static void cdv_hdmi_dpms(struct drm_encoder *encoder, int mode)
 {
         struct drm_device *dev = encoder->dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                                to_psb_intel_encoder(encoder);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
+        struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv;
         u32 hdmib;
 
         hdmib = REG_READ(hdmi_priv->hdmi_reg);
@@ -116,9 +115,8 @@ static void cdv_hdmi_dpms(struct drm_encoder *encoder, int mode)
 static void cdv_hdmi_save(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv;
 
         hdmi_priv->save_HDMIB = REG_READ(hdmi_priv->hdmi_reg);
 }
@@ -126,9 +124,8 @@ static void cdv_hdmi_save(struct drm_connector *connector)
 static void cdv_hdmi_restore(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv;
 
         REG_WRITE(hdmi_priv->hdmi_reg, hdmi_priv->save_HDMIB);
         REG_READ(hdmi_priv->hdmi_reg);
@@ -137,13 +134,12 @@ static void cdv_hdmi_restore(struct drm_connector *connector)
 static enum drm_connector_status cdv_hdmi_detect(
                                 struct drm_connector *connector, bool force)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct mid_intel_hdmi_priv *hdmi_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct mid_intel_hdmi_priv *hdmi_priv = gma_encoder->dev_priv;
         struct edid *edid = NULL;
         enum drm_connector_status status = connector_status_disconnected;
 
-        edid = drm_get_edid(connector, &psb_intel_encoder->i2c_bus->adapter);
+        edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
 
         hdmi_priv->has_hdmi_sink = false;
         hdmi_priv->has_hdmi_audio = false;
@@ -167,7 +163,7 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,
         struct drm_encoder *encoder = connector->encoder;
 
         if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc *crtc = to_psb_intel_crtc(encoder->crtc);
+                struct gma_crtc *crtc = to_gma_crtc(encoder->crtc);
                 bool centre;
                 uint64_t curValue;
 
@@ -221,12 +217,11 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,
  */
 static int cdv_hdmi_get_modes(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
         struct edid *edid = NULL;
         int ret = 0;
 
-        edid = drm_get_edid(connector, &psb_intel_encoder->i2c_bus->adapter);
+        edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
         if (edid) {
                 drm_mode_connector_update_edid_property(connector, edid);
                 ret = drm_add_edid_modes(connector, edid);
@@ -256,11 +251,10 @@ static int cdv_hdmi_mode_valid(struct drm_connector *connector,
 
 static void cdv_hdmi_destroy(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
 
-        if (psb_intel_encoder->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_encoder->i2c_bus);
+        if (gma_encoder->i2c_bus)
+                psb_intel_i2c_destroy(gma_encoder->i2c_bus);
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
@@ -269,16 +263,16 @@ static void cdv_hdmi_destroy(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs cdv_hdmi_helper_funcs = {
         .dpms = cdv_hdmi_dpms,
         .mode_fixup = cdv_hdmi_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
+        .prepare = gma_encoder_prepare,
         .mode_set = cdv_hdmi_mode_set,
-        .commit = psb_intel_encoder_commit,
+        .commit = gma_encoder_commit,
 };
 
 static const struct drm_connector_helper_funcs
                                         cdv_hdmi_connector_helper_funcs = {
         .get_modes = cdv_hdmi_get_modes,
         .mode_valid = cdv_hdmi_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static const struct drm_connector_funcs cdv_hdmi_connector_funcs = {
@@ -294,23 +288,22 @@ static const struct drm_connector_funcs cdv_hdmi_connector_funcs = {
 void cdv_hdmi_init(struct drm_device *dev,
                         struct psb_intel_mode_device *mode_dev, int reg)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
         struct mid_intel_hdmi_priv *hdmi_priv;
         int ddc_bus;
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder),
-                                    GFP_KERNEL);
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
 
-        if (!psb_intel_encoder)
+        if (!gma_encoder)
                 return;
 
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),
+        gma_connector = kzalloc(sizeof(struct gma_connector),
                                       GFP_KERNEL);
 
-        if (!psb_intel_connector)
+        if (!gma_connector)
                 goto err_connector;
 
         hdmi_priv = kzalloc(sizeof(struct mid_intel_hdmi_priv), GFP_KERNEL);
@@ -318,9 +311,9 @@ void cdv_hdmi_init(struct drm_device *dev,
         if (!hdmi_priv)
                 goto err_priv;
 
-        connector = &psb_intel_connector->base;
+        connector = &gma_connector->base;
         connector->polled = DRM_CONNECTOR_POLL_HPD;
-        encoder = &psb_intel_encoder->base;
+        encoder = &gma_encoder->base;
         drm_connector_init(dev, connector,
                            &cdv_hdmi_connector_funcs,
                            DRM_MODE_CONNECTOR_DVID);
@@ -328,12 +321,11 @@ void cdv_hdmi_init(struct drm_device *dev,
         drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs,
                          DRM_MODE_ENCODER_TMDS);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
-        psb_intel_encoder->type = INTEL_OUTPUT_HDMI;
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
+        gma_encoder->type = INTEL_OUTPUT_HDMI;
         hdmi_priv->hdmi_reg = reg;
         hdmi_priv->has_hdmi_sink = false;
-        psb_intel_encoder->dev_priv = hdmi_priv;
+        gma_encoder->dev_priv = hdmi_priv;
 
         drm_encoder_helper_add(encoder, &cdv_hdmi_helper_funcs);
         drm_connector_helper_add(connector,
@@ -349,11 +341,11 @@ void cdv_hdmi_init(struct drm_device *dev,
         switch (reg) {
         case SDVOB:
                 ddc_bus = GPIOE;
-                psb_intel_encoder->ddi_select = DDI0_SELECT;
+                gma_encoder->ddi_select = DDI0_SELECT;
                 break;
         case SDVOC:
                 ddc_bus = GPIOD;
-                psb_intel_encoder->ddi_select = DDI1_SELECT;
+                gma_encoder->ddi_select = DDI1_SELECT;
                 break;
         default:
                 DRM_ERROR("unknown reg 0x%x for HDMI\n", reg);
@@ -361,16 +353,15 @@ void cdv_hdmi_init(struct drm_device *dev,
                 break;
         }
 
-        psb_intel_encoder->i2c_bus = psb_intel_i2c_create(dev,
+        gma_encoder->i2c_bus = psb_intel_i2c_create(dev,
                                 ddc_bus, (reg == SDVOB) ? "HDMIB" : "HDMIC");
 
-        if (!psb_intel_encoder->i2c_bus) {
+        if (!gma_encoder->i2c_bus) {
                 dev_err(dev->dev, "No ddc adapter available!\n");
                 goto failed_ddc;
         }
 
-        hdmi_priv->hdmi_i2c_adapter =
-                                &(psb_intel_encoder->i2c_bus->adapter);
+        hdmi_priv->hdmi_i2c_adapter = &(gma_encoder->i2c_bus->adapter);
         hdmi_priv->dev = dev;
         drm_sysfs_connector_add(connector);
         return;
@@ -379,7 +370,7 @@ failed_ddc:
         drm_encoder_cleanup(encoder);
         drm_connector_cleanup(connector);
 err_priv:
-        kfree(psb_intel_connector);
+        kfree(gma_connector);
 err_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index d81dbc3368f0..20e08e65d46c 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -356,8 +356,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,
 {
         struct drm_device *dev = encoder->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(
-                                                        encoder->crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(encoder->crtc);
         u32 pfit_control;
 
         /*
@@ -379,7 +378,7 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder,
         else
                 pfit_control = 0;
 
-        pfit_control |= psb_intel_crtc->pipe << PFIT_PIPE_SHIFT;
+        pfit_control |= gma_crtc->pipe << PFIT_PIPE_SHIFT;
 
         if (dev_priv->lvds_dither)
                 pfit_control |= PANEL_8TO6_DITHER_ENABLE;
@@ -407,12 +406,11 @@ static int cdv_intel_lvds_get_modes(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
         struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
         int ret;
 
-        ret = psb_intel_ddc_get_modes(connector, &psb_intel_encoder->i2c_bus->adapter);
+        ret = psb_intel_ddc_get_modes(connector, &gma_encoder->i2c_bus->adapter);
 
         if (ret)
                 return ret;
@@ -444,11 +442,10 @@ static int cdv_intel_lvds_get_modes(struct drm_connector *connector)
  */
 static void cdv_intel_lvds_destroy(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
 
-        if (psb_intel_encoder->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_encoder->i2c_bus);
+        if (gma_encoder->i2c_bus)
+                psb_intel_i2c_destroy(gma_encoder->i2c_bus);
         drm_sysfs_connector_remove(connector);
         drm_connector_cleanup(connector);
         kfree(connector);
@@ -461,8 +458,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
         struct drm_encoder *encoder = connector->encoder;
 
         if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc *crtc =
-                                        to_psb_intel_crtc(encoder->crtc);
+                struct gma_crtc *crtc = to_gma_crtc(encoder->crtc);
                 uint64_t curValue;
 
                 if (!crtc)
@@ -529,7 +525,7 @@ static const struct drm_connector_helper_funcs
                                 cdv_intel_lvds_connector_helper_funcs = {
         .get_modes = cdv_intel_lvds_get_modes,
         .mode_valid = cdv_intel_lvds_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = {
@@ -612,8 +608,8 @@ static bool lvds_is_present_in_vbt(struct drm_device *dev,
 void cdv_intel_lvds_init(struct drm_device *dev,
                      struct psb_intel_mode_device *mode_dev)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct cdv_intel_lvds_priv *lvds_priv;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
@@ -630,24 +626,24 @@ void cdv_intel_lvds_init(struct drm_device *dev,
                 return;
         }
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder),
+        gma_encoder = kzalloc(sizeof(struct gma_encoder),
                                     GFP_KERNEL);
-        if (!psb_intel_encoder)
+        if (!gma_encoder)
                 return;
 
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector),
+        gma_connector = kzalloc(sizeof(struct gma_connector),
                                       GFP_KERNEL);
-        if (!psb_intel_connector)
+        if (!gma_connector)
                 goto failed_connector;
 
         lvds_priv = kzalloc(sizeof(struct cdv_intel_lvds_priv), GFP_KERNEL);
         if (!lvds_priv)
                 goto failed_lvds_priv;
 
-        psb_intel_encoder->dev_priv = lvds_priv;
+        gma_encoder->dev_priv = lvds_priv;
 
-        connector = &psb_intel_connector->base;
-        encoder = &psb_intel_encoder->base;
+        connector = &gma_connector->base;
+        encoder = &gma_encoder->base;
 
 
         drm_connector_init(dev, connector,
@@ -659,9 +655,8 @@ void cdv_intel_lvds_init(struct drm_device *dev,
                          DRM_MODE_ENCODER_LVDS);
 
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
-        psb_intel_encoder->type = INTEL_OUTPUT_LVDS;
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
+        gma_encoder->type = INTEL_OUTPUT_LVDS;
 
         drm_encoder_helper_add(encoder, &cdv_intel_lvds_helper_funcs);
         drm_connector_helper_add(connector,
@@ -682,16 +677,16 @@ void cdv_intel_lvds_init(struct drm_device *dev,
          * Set up I2C bus
          * FIXME: distroy i2c_bus when exit
          */
-        psb_intel_encoder->i2c_bus = psb_intel_i2c_create(dev,
+        gma_encoder->i2c_bus = psb_intel_i2c_create(dev,
                                                          GPIOB,
                                                          "LVDSBLC_B");
-        if (!psb_intel_encoder->i2c_bus) {
+        if (!gma_encoder->i2c_bus) {
                 dev_printk(KERN_ERR,
                         &dev->pdev->dev, "I2C bus registration failed.\n");
                 goto failed_blc_i2c;
         }
-        psb_intel_encoder->i2c_bus->slave_addr = 0x2C;
-        dev_priv->lvds_i2c_bus = psb_intel_encoder->i2c_bus;
+        gma_encoder->i2c_bus->slave_addr = 0x2C;
+        dev_priv->lvds_i2c_bus = gma_encoder->i2c_bus;
 
         /*
          * LVDS discovery:
@@ -704,10 +699,10 @@ void cdv_intel_lvds_init(struct drm_device *dev,
          */
 
         /* Set up the DDC bus. */
-        psb_intel_encoder->ddc_bus = psb_intel_i2c_create(dev,
+        gma_encoder->ddc_bus = psb_intel_i2c_create(dev,
                                                          GPIOC,
                                                          "LVDSDDC_C");
-        if (!psb_intel_encoder->ddc_bus) {
+        if (!gma_encoder->ddc_bus) {
                 dev_printk(KERN_ERR, &dev->pdev->dev,
                            "DDC bus registration " "failed.\n");
                 goto failed_ddc;
@@ -718,7 +713,7 @@ void cdv_intel_lvds_init(struct drm_device *dev,
          * preferred mode is the right one.
          */
         psb_intel_ddc_get_modes(connector,
-                                &psb_intel_encoder->ddc_bus->adapter);
+                                &gma_encoder->ddc_bus->adapter);
         list_for_each_entry(scan, &connector->probed_modes, head) {
                 if (scan->type & DRM_MODE_TYPE_PREFERRED) {
                         mode_dev->panel_fixed_mode =
@@ -782,19 +777,19 @@ out:
 
 failed_find:
         printk(KERN_ERR "Failed find\n");
-        if (psb_intel_encoder->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_encoder->ddc_bus);
+        if (gma_encoder->ddc_bus)
+                psb_intel_i2c_destroy(gma_encoder->ddc_bus);
 failed_ddc:
         printk(KERN_ERR "Failed DDC\n");
-        if (psb_intel_encoder->i2c_bus)
-                psb_intel_i2c_destroy(psb_intel_encoder->i2c_bus);
+        if (gma_encoder->i2c_bus)
+                psb_intel_i2c_destroy(gma_encoder->i2c_bus);
 failed_blc_i2c:
         printk(KERN_ERR "Failed BLC\n");
         drm_encoder_cleanup(encoder);
         drm_connector_cleanup(connector);
         kfree(lvds_priv);
 failed_lvds_priv:
-        kfree(psb_intel_connector);
+        kfree(gma_connector);
 failed_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 8b1b6d923abe..01dd7d225762 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -321,10 +321,8 @@ static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size)
         /* Begin by trying to use stolen memory backing */
         backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);
         if (backing) {
-                if (drm_gem_private_object_init(dev,
-                                        &backing->gem, aligned_size) == 0)
-                        return backing;
-                psb_gtt_free_range(dev, backing);
+                drm_gem_private_object_init(dev, &backing->gem, aligned_size);
+                return backing;
         }
         return NULL;
 }
@@ -522,21 +520,21 @@ static struct drm_framebuffer *psb_user_framebuffer_create
 static void psbfb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
                                                         u16 blue, int regno)
 {
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
 
-        intel_crtc->lut_r[regno] = red >> 8;
-        intel_crtc->lut_g[regno] = green >> 8;
-        intel_crtc->lut_b[regno] = blue >> 8;
+        gma_crtc->lut_r[regno] = red >> 8;
+        gma_crtc->lut_g[regno] = green >> 8;
+        gma_crtc->lut_b[regno] = blue >> 8;
 }
 
 static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red,
                                         u16 *green, u16 *blue, int regno)
 {
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
 
-        *red = intel_crtc->lut_r[regno] << 8;
-        *green = intel_crtc->lut_g[regno] << 8;
-        *blue = intel_crtc->lut_b[regno] << 8;
+        *red = gma_crtc->lut_r[regno] << 8;
+        *green = gma_crtc->lut_g[regno] << 8;
+        *blue = gma_crtc->lut_b[regno] << 8;
 }
 
 static int psbfb_probe(struct drm_fb_helper *helper,
@@ -705,13 +703,12 @@ static void psb_setup_outputs(struct drm_device *dev)
 
         list_for_each_entry(connector, &dev->mode_config.connector_list,
                             head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                        psb_intel_attached_encoder(connector);
-                struct drm_encoder *encoder = &psb_intel_encoder->base;
+                struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+                struct drm_encoder *encoder = &gma_encoder->base;
                 int crtc_mask = 0, clone_mask = 0;
 
                 /* valid crtcs */
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_ANALOG:
                         crtc_mask = (1 << 0);
                         clone_mask = (1 << INTEL_OUTPUT_ANALOG);
@@ -746,7 +743,7 @@ static void psb_setup_outputs(struct drm_device *dev)
                 }
                 encoder->possible_crtcs = crtc_mask;
                 encoder->possible_clones =
-                    psb_intel_connector_clones(dev, clone_mask);
+                    gma_connector_clones(dev, clone_mask);
         }
 }
 
diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h
index 989558a9e6ee..395f20b07aab 100644
--- a/drivers/gpu/drm/gma500/framebuffer.h
+++ b/drivers/gpu/drm/gma500/framebuffer.h
@@ -41,7 +41,7 @@ struct psb_fbdev {
 
 #define to_psb_fb(x) container_of(x, struct psb_framebuffer, base)
 
-extern int psb_intel_connector_clones(struct drm_device *dev, int type_mask);
+extern int gma_connector_clones(struct drm_device *dev, int type_mask);
 
 #endif
 
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index eefd6cc5b80d..10ae8c52d06f 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -26,6 +26,7 @@
 #include <drm/drmP.h>
 #include <drm/drm.h>
 #include <drm/gma_drm.h>
+#include <drm/drm_vma_manager.h>
 #include "psb_drv.h"
 
 int psb_gem_init_object(struct drm_gem_object *obj)
@@ -38,8 +39,7 @@ void psb_gem_free_object(struct drm_gem_object *obj)
         struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
 
         /* Remove the list map if one is present */
-        if (obj->map_list.map)
-                drm_gem_free_mmap_offset(obj);
+        drm_gem_free_mmap_offset(obj);
         drm_gem_object_release(obj);
 
         /* This must occur last as it frees up the memory of the GEM object */
@@ -81,13 +81,10 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
         /* What validation is needed here ? */
 
         /* Make it mmapable */
-        if (!obj->map_list.map) {
-                ret = drm_gem_create_mmap_offset(obj);
-                if (ret)
-                        goto out;
-        }
-        /* GEM should really work out the hash offsets for us */
-        *offset = (u64)obj->map_list.hash.key << PAGE_SHIFT;
+        ret = drm_gem_create_mmap_offset(obj);
+        if (ret)
+                goto out;
+        *offset = drm_vma_node_offset_addr(&obj->vma_node);
 out:
         drm_gem_object_unreference(obj);
 unlock:
@@ -165,23 +162,6 @@ int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 }
 
 /**
- *      psb_gem_dumb_destroy    -       destroy a dumb buffer
- *      @file: client file
- *      @dev: our DRM device
- *      @handle: the object handle
- *
- *      Destroy a handle that was created via psb_gem_dumb_create, at least
- *      we hope it was created that way. i915 seems to assume the caller
- *      does the checking but that might be worth review ! FIXME
- */
-int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                        uint32_t handle)
-{
-        /* No special work needed, drop the reference and see what falls out */
-        return drm_gem_handle_delete(file, handle);
-}
-
-/**
  *      psb_gem_fault           -       pagefault handler for GEM objects
  *      @vma: the VMA of the GEM object
  *      @vmf: fault detail
@@ -261,11 +241,12 @@ static int psb_gem_create_stolen(struct drm_file *file, struct drm_device *dev,
         struct gtt_range *gtt = psb_gtt_alloc_range(dev, size, "gem", 1);
         if (gtt == NULL)
                 return -ENOMEM;
-        if (drm_gem_private_object_init(dev, &gtt->gem, size) != 0)
-                goto free_gtt;
+
+        drm_gem_private_object_init(dev, &gtt->gem, size);
         if (drm_gem_handle_create(file, &gtt->gem, handle) == 0)
                 return 0;
-free_gtt:
+
+        drm_gem_object_release(&gtt->gem);
         psb_gtt_free_range(dev, gtt);
         return -ENOMEM;
 }
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
new file mode 100644
index 000000000000..24e8af3d22bf
--- /dev/null
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -0,0 +1,776 @@
+/*
+ * Copyright © 2006-2011 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Authors:
+ *      Eric Anholt <eric@anholt.net>
+ *      Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+ */
+
+#include <drm/drmP.h>
+#include "gma_display.h"
+#include "psb_intel_drv.h"
+#include "psb_intel_reg.h"
+#include "psb_drv.h"
+#include "framebuffer.h"
+
+/**
+ * Returns whether any output on the specified pipe is of the specified type
+ */
+bool gma_pipe_has_type(struct drm_crtc *crtc, int type)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_mode_config *mode_config = &dev->mode_config;
+        struct drm_connector *l_entry;
+
+        list_for_each_entry(l_entry, &mode_config->connector_list, head) {
+                if (l_entry->encoder && l_entry->encoder->crtc == crtc) {
+                        struct gma_encoder *gma_encoder =
+                                                gma_attached_encoder(l_entry);
+                        if (gma_encoder->type == type)
+                                return true;
+                }
+        }
+
+        return false;
+}
+
+void gma_wait_for_vblank(struct drm_device *dev)
+{
+        /* Wait for 20ms, i.e. one cycle at 50hz. */
+        mdelay(20);
+}
+
+int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+                      struct drm_framebuffer *old_fb)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
+        int pipe = gma_crtc->pipe;
+        const struct psb_offset *map = &dev_priv->regmap[pipe];
+        unsigned long start, offset;
+        u32 dspcntr;
+        int ret = 0;
+
+        if (!gma_power_begin(dev, true))
+                return 0;
+
+        /* no fb bound */
+        if (!crtc->fb) {
+                dev_err(dev->dev, "No FB bound\n");
+                goto gma_pipe_cleaner;
+        }
+
+        /* We are displaying this buffer, make sure it is actually loaded
+           into the GTT */
+        ret = psb_gtt_pin(psbfb->gtt);
+        if (ret < 0)
+                goto gma_pipe_set_base_exit;
+        start = psbfb->gtt->offset;
+        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
+
+        REG_WRITE(map->stride, crtc->fb->pitches[0]);
+
+        dspcntr = REG_READ(map->cntr);
+        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
+
+        switch (crtc->fb->bits_per_pixel) {
+        case 8:
+                dspcntr |= DISPPLANE_8BPP;
+                break;
+        case 16:
+                if (crtc->fb->depth == 15)
+                        dspcntr |= DISPPLANE_15_16BPP;
+                else
+                        dspcntr |= DISPPLANE_16BPP;
+                break;
+        case 24:
+        case 32:
+                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
+                break;
+        default:
+                dev_err(dev->dev, "Unknown color depth\n");
+                ret = -EINVAL;
+                goto gma_pipe_set_base_exit;
+        }
+        REG_WRITE(map->cntr, dspcntr);
+
+        dev_dbg(dev->dev,
+                "Writing base %08lX %08lX %d %d\n", start, offset, x, y);
+
+        /* FIXME: Investigate whether this really is the base for psb and why
+                  the linear offset is named base for the other chips. map->surf
+                  should be the base and map->linoff the offset for all chips */
+        if (IS_PSB(dev)) {
+                REG_WRITE(map->base, offset + start);
+                REG_READ(map->base);
+        } else {
+                REG_WRITE(map->base, offset);
+                REG_READ(map->base);
+                REG_WRITE(map->surf, start);
+                REG_READ(map->surf);
+        }
+
+gma_pipe_cleaner:
+        /* If there was a previous display we can now unpin it */
+        if (old_fb)
+                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
+
+gma_pipe_set_base_exit:
+        gma_power_end(dev);
+        return ret;
+}
+
+/* Loads the palette/gamma unit for the CRTC with the prepared values */
+void gma_crtc_load_lut(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        const struct psb_offset *map = &dev_priv->regmap[gma_crtc->pipe];
+        int palreg = map->palette;
+        int i;
+
+        /* The clocks have to be on to load the palette. */
+        if (!crtc->enabled)
+                return;
+
+        if (gma_power_begin(dev, false)) {
+                for (i = 0; i < 256; i++) {
+                        REG_WRITE(palreg + 4 * i,
+                                  ((gma_crtc->lut_r[i] +
+                                  gma_crtc->lut_adj[i]) << 16) |
+                                  ((gma_crtc->lut_g[i] +
+                                  gma_crtc->lut_adj[i]) << 8) |
+                                  (gma_crtc->lut_b[i] +
+                                  gma_crtc->lut_adj[i]));
+                }
+                gma_power_end(dev);
+        } else {
+                for (i = 0; i < 256; i++) {
+                        /* FIXME: Why pipe[0] and not pipe[..._crtc->pipe]? */
+                        dev_priv->regs.pipe[0].palette[i] =
+                                  ((gma_crtc->lut_r[i] +
+                                  gma_crtc->lut_adj[i]) << 16) |
+                                  ((gma_crtc->lut_g[i] +
+                                  gma_crtc->lut_adj[i]) << 8) |
+                                  (gma_crtc->lut_b[i] +
+                                  gma_crtc->lut_adj[i]);
+                }
+
+        }
+}
+
+void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue,
+                        u32 start, u32 size)
+{
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int i;
+        int end = (start + size > 256) ? 256 : start + size;
+
+        for (i = start; i < end; i++) {
+                gma_crtc->lut_r[i] = red[i] >> 8;
+                gma_crtc->lut_g[i] = green[i] >> 8;
+                gma_crtc->lut_b[i] = blue[i] >> 8;
+        }
+
+        gma_crtc_load_lut(crtc);
+}
+
+/**
+ * Sets the power management mode of the pipe and plane.
+ *
+ * This code should probably grow support for turning the cursor off and back
+ * on appropriately at the same time as we're turning the pipe off/on.
+ */
+void gma_crtc_dpms(struct drm_crtc *crtc, int mode)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
+        const struct psb_offset *map = &dev_priv->regmap[pipe];
+        u32 temp;
+
+        /* XXX: When our outputs are all unaware of DPMS modes other than off
+         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
+         */
+
+        if (IS_CDV(dev))
+                dev_priv->ops->disable_sr(dev);
+
+        switch (mode) {
+        case DRM_MODE_DPMS_ON:
+        case DRM_MODE_DPMS_STANDBY:
+        case DRM_MODE_DPMS_SUSPEND:
+                if (gma_crtc->active)
+                        break;
+
+                gma_crtc->active = true;
+
+                /* Enable the DPLL */
+                temp = REG_READ(map->dpll);
+                if ((temp & DPLL_VCO_ENABLE) == 0) {
+                        REG_WRITE(map->dpll, temp);
+                        REG_READ(map->dpll);
+                        /* Wait for the clocks to stabilize. */
+                        udelay(150);
+                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
+                        REG_READ(map->dpll);
+                        /* Wait for the clocks to stabilize. */
+                        udelay(150);
+                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
+                        REG_READ(map->dpll);
+                        /* Wait for the clocks to stabilize. */
+                        udelay(150);
+                }
+
+                /* Enable the plane */
+                temp = REG_READ(map->cntr);
+                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
+                        REG_WRITE(map->cntr,
+                                  temp | DISPLAY_PLANE_ENABLE);
+                        /* Flush the plane changes */
+                        REG_WRITE(map->base, REG_READ(map->base));
+                }
+
+                udelay(150);
+
+                /* Enable the pipe */
+                temp = REG_READ(map->conf);
+                if ((temp & PIPEACONF_ENABLE) == 0)
+                        REG_WRITE(map->conf, temp | PIPEACONF_ENABLE);
+
+                temp = REG_READ(map->status);
+                temp &= ~(0xFFFF);
+                temp |= PIPE_FIFO_UNDERRUN;
+                REG_WRITE(map->status, temp);
+                REG_READ(map->status);
+
+                gma_crtc_load_lut(crtc);
+
+                /* Give the overlay scaler a chance to enable
+                 * if it's on this pipe */
+                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
+                break;
+        case DRM_MODE_DPMS_OFF:
+                if (!gma_crtc->active)
+                        break;
+
+                gma_crtc->active = false;
+
+                /* Give the overlay scaler a chance to disable
+                 * if it's on this pipe */
+                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
+
+                /* Disable the VGA plane that we never use */
+                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
+
+                /* Turn off vblank interrupts */
+                drm_vblank_off(dev, pipe);
+
+                /* Wait for vblank for the disable to take effect */
+                gma_wait_for_vblank(dev);
+
+                /* Disable plane */
+                temp = REG_READ(map->cntr);
+                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
+                        REG_WRITE(map->cntr,
+                                  temp & ~DISPLAY_PLANE_ENABLE);
+                        /* Flush the plane changes */
+                        REG_WRITE(map->base, REG_READ(map->base));
+                        REG_READ(map->base);
+                }
+
+                /* Disable pipe */
+                temp = REG_READ(map->conf);
+                if ((temp & PIPEACONF_ENABLE) != 0) {
+                        REG_WRITE(map->conf, temp & ~PIPEACONF_ENABLE);
+                        REG_READ(map->conf);
+                }
+
+                /* Wait for vblank for the disable to take effect. */
+                gma_wait_for_vblank(dev);
+
+                udelay(150);
+
+                /* Disable DPLL */
+                temp = REG_READ(map->dpll);
+                if ((temp & DPLL_VCO_ENABLE) != 0) {
+                        REG_WRITE(map->dpll, temp & ~DPLL_VCO_ENABLE);
+                        REG_READ(map->dpll);
+                }
+
+                /* Wait for the clocks to turn off. */
+                udelay(150);
+                break;
+        }
+
+        if (IS_CDV(dev))
+                dev_priv->ops->update_wm(dev, crtc);
+
+        /* Set FIFO watermarks */
+        REG_WRITE(DSPARB, 0x3F3E);
+}
+
+int gma_crtc_cursor_set(struct drm_crtc *crtc,
+                        struct drm_file *file_priv,
+                        uint32_t handle,
+                        uint32_t width, uint32_t height)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
+        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
+        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
+        uint32_t temp;
+        size_t addr = 0;
+        struct gtt_range *gt;
+        struct gtt_range *cursor_gt = gma_crtc->cursor_gt;
+        struct drm_gem_object *obj;
+        void *tmp_dst, *tmp_src;
+        int ret = 0, i, cursor_pages;
+
+        /* If we didn't get a handle then turn the cursor off */
+        if (!handle) {
+                temp = CURSOR_MODE_DISABLE;
+
+                if (gma_power_begin(dev, false)) {
+                        REG_WRITE(control, temp);
+                        REG_WRITE(base, 0);
+                        gma_power_end(dev);
+                }
+
+                /* Unpin the old GEM object */
+                if (gma_crtc->cursor_obj) {
+                        gt = container_of(gma_crtc->cursor_obj,
+                                          struct gtt_range, gem);
+                        psb_gtt_unpin(gt);
+                        drm_gem_object_unreference(gma_crtc->cursor_obj);
+                        gma_crtc->cursor_obj = NULL;
+                }
+
+                return 0;
+        }
+
+        /* Currently we only support 64x64 cursors */
+        if (width != 64 || height != 64) {
+                dev_dbg(dev->dev, "We currently only support 64x64 cursors\n");
+                return -EINVAL;
+        }
+
+        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        if (!obj)
+                return -ENOENT;
+
+        if (obj->size < width * height * 4) {
+                dev_dbg(dev->dev, "Buffer is too small\n");
+                ret = -ENOMEM;
+                goto unref_cursor;
+        }
+
+        gt = container_of(obj, struct gtt_range, gem);
+
+        /* Pin the memory into the GTT */
+        ret = psb_gtt_pin(gt);
+        if (ret) {
+                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
+                goto unref_cursor;
+        }
+
+        if (dev_priv->ops->cursor_needs_phys) {
+                if (cursor_gt == NULL) {
+                        dev_err(dev->dev, "No hardware cursor mem available");
+                        ret = -ENOMEM;
+                        goto unref_cursor;
+                }
+
+                /* Prevent overflow */
+                if (gt->npage > 4)
+                        cursor_pages = 4;
+                else
+                        cursor_pages = gt->npage;
+
+                /* Copy the cursor to cursor mem */
+                tmp_dst = dev_priv->vram_addr + cursor_gt->offset;
+                for (i = 0; i < cursor_pages; i++) {
+                        tmp_src = kmap(gt->pages[i]);
+                        memcpy(tmp_dst, tmp_src, PAGE_SIZE);
+                        kunmap(gt->pages[i]);
+                        tmp_dst += PAGE_SIZE;
+                }
+
+                addr = gma_crtc->cursor_addr;
+        } else {
+                addr = gt->offset;
+                gma_crtc->cursor_addr = addr;
+        }
+
+        temp = 0;
+        /* set the pipe for the cursor */
+        temp |= (pipe << 28);
+        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
+
+        if (gma_power_begin(dev, false)) {
+                REG_WRITE(control, temp);
+                REG_WRITE(base, addr);
+                gma_power_end(dev);
+        }
+
+        /* unpin the old bo */
+        if (gma_crtc->cursor_obj) {
+                gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);
+                psb_gtt_unpin(gt);
+                drm_gem_object_unreference(gma_crtc->cursor_obj);
+        }
+
+        gma_crtc->cursor_obj = obj;
+        return ret;
+
+unref_cursor:
+        drm_gem_object_unreference(obj);
+        return ret;
+}
+
+int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+{
+        struct drm_device *dev = crtc->dev;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
+        uint32_t temp = 0;
+        uint32_t addr;
+
+        if (x < 0) {
+                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
+                x = -x;
+        }
+        if (y < 0) {
+                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
+                y = -y;
+        }
+
+        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
+        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
+
+        addr = gma_crtc->cursor_addr;
+
+        if (gma_power_begin(dev, false)) {
+                REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
+                REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, addr);
+                gma_power_end(dev);
+        }
+        return 0;
+}
+
+bool gma_crtc_mode_fixup(struct drm_crtc *crtc,
+                         const struct drm_display_mode *mode,
+                         struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+
+void gma_crtc_prepare(struct drm_crtc *crtc)
+{
+        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+}
+
+void gma_crtc_commit(struct drm_crtc *crtc)
+{
+        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
+}
+
+void gma_crtc_disable(struct drm_crtc *crtc)
+{
+        struct gtt_range *gt;
+        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+
+        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+
+        if (crtc->fb) {
+                gt = to_psb_fb(crtc->fb)->gtt;
+                psb_gtt_unpin(gt);
+        }
+}
+
+void gma_crtc_destroy(struct drm_crtc *crtc)
+{
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+
+        kfree(gma_crtc->crtc_state);
+        drm_crtc_cleanup(crtc);
+        kfree(gma_crtc);
+}
+
+int gma_crtc_set_config(struct drm_mode_set *set)
+{
+        struct drm_device *dev = set->crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        int ret;
+
+        if (!dev_priv->rpm_enabled)
+                return drm_crtc_helper_set_config(set);
+
+        pm_runtime_forbid(&dev->pdev->dev);
+        ret = drm_crtc_helper_set_config(set);
+        pm_runtime_allow(&dev->pdev->dev);
+
+        return ret;
+}
+
+/**
+ * Save HW states of given crtc
+ */
+void gma_crtc_save(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        struct psb_intel_crtc_state *crtc_state = gma_crtc->crtc_state;
+        const struct psb_offset *map = &dev_priv->regmap[gma_crtc->pipe];
+        uint32_t palette_reg;
+        int i;
+
+        if (!crtc_state) {
+                dev_err(dev->dev, "No CRTC state found\n");
+                return;
+        }
+
+        crtc_state->saveDSPCNTR = REG_READ(map->cntr);
+        crtc_state->savePIPECONF = REG_READ(map->conf);
+        crtc_state->savePIPESRC = REG_READ(map->src);
+        crtc_state->saveFP0 = REG_READ(map->fp0);
+        crtc_state->saveFP1 = REG_READ(map->fp1);
+        crtc_state->saveDPLL = REG_READ(map->dpll);
+        crtc_state->saveHTOTAL = REG_READ(map->htotal);
+        crtc_state->saveHBLANK = REG_READ(map->hblank);
+        crtc_state->saveHSYNC = REG_READ(map->hsync);
+        crtc_state->saveVTOTAL = REG_READ(map->vtotal);
+        crtc_state->saveVBLANK = REG_READ(map->vblank);
+        crtc_state->saveVSYNC = REG_READ(map->vsync);
+        crtc_state->saveDSPSTRIDE = REG_READ(map->stride);
+
+        /* NOTE: DSPSIZE DSPPOS only for psb */
+        crtc_state->saveDSPSIZE = REG_READ(map->size);
+        crtc_state->saveDSPPOS = REG_READ(map->pos);
+
+        crtc_state->saveDSPBASE = REG_READ(map->base);
+
+        palette_reg = map->palette;
+        for (i = 0; i < 256; ++i)
+                crtc_state->savePalette[i] = REG_READ(palette_reg + (i << 2));
+}
+
+/**
+ * Restore HW states of given crtc
+ */
+void gma_crtc_restore(struct drm_crtc *crtc)
+{
+        struct drm_device *dev = crtc->dev;
+        struct drm_psb_private *dev_priv = dev->dev_private;
+        struct gma_crtc *gma_crtc =  to_gma_crtc(crtc);
+        struct psb_intel_crtc_state *crtc_state = gma_crtc->crtc_state;
+        const struct psb_offset *map = &dev_priv->regmap[gma_crtc->pipe];
+        uint32_t palette_reg;
+        int i;
+
+        if (!crtc_state) {
+                dev_err(dev->dev, "No crtc state\n");
+                return;
+        }
+
+        if (crtc_state->saveDPLL & DPLL_VCO_ENABLE) {
+                REG_WRITE(map->dpll,
+                        crtc_state->saveDPLL & ~DPLL_VCO_ENABLE);
+                REG_READ(map->dpll);
+                udelay(150);
+        }
+
+        REG_WRITE(map->fp0, crtc_state->saveFP0);
+        REG_READ(map->fp0);
+
+        REG_WRITE(map->fp1, crtc_state->saveFP1);
+        REG_READ(map->fp1);
+
+        REG_WRITE(map->dpll, crtc_state->saveDPLL);
+        REG_READ(map->dpll);
+        udelay(150);
+
+        REG_WRITE(map->htotal, crtc_state->saveHTOTAL);
+        REG_WRITE(map->hblank, crtc_state->saveHBLANK);
+        REG_WRITE(map->hsync, crtc_state->saveHSYNC);
+        REG_WRITE(map->vtotal, crtc_state->saveVTOTAL);
+        REG_WRITE(map->vblank, crtc_state->saveVBLANK);
+        REG_WRITE(map->vsync, crtc_state->saveVSYNC);
+        REG_WRITE(map->stride, crtc_state->saveDSPSTRIDE);
+
+        REG_WRITE(map->size, crtc_state->saveDSPSIZE);
+        REG_WRITE(map->pos, crtc_state->saveDSPPOS);
+
+        REG_WRITE(map->src, crtc_state->savePIPESRC);
+        REG_WRITE(map->base, crtc_state->saveDSPBASE);
+        REG_WRITE(map->conf, crtc_state->savePIPECONF);
+
+        gma_wait_for_vblank(dev);
+
+        REG_WRITE(map->cntr, crtc_state->saveDSPCNTR);
+        REG_WRITE(map->base, crtc_state->saveDSPBASE);
+
+        gma_wait_for_vblank(dev);
+
+        palette_reg = map->palette;
+        for (i = 0; i < 256; ++i)
+                REG_WRITE(palette_reg + (i << 2), crtc_state->savePalette[i]);
+}
+
+void gma_encoder_prepare(struct drm_encoder *encoder)
+{
+        struct drm_encoder_helper_funcs *encoder_funcs =
+            encoder->helper_private;
+        /* lvds has its own version of prepare see psb_intel_lvds_prepare */
+        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
+}
+
+void gma_encoder_commit(struct drm_encoder *encoder)
+{
+        struct drm_encoder_helper_funcs *encoder_funcs =
+            encoder->helper_private;
+        /* lvds has its own version of commit see psb_intel_lvds_commit */
+        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
+}
+
+void gma_encoder_destroy(struct drm_encoder *encoder)
+{
+        struct gma_encoder *intel_encoder = to_gma_encoder(encoder);
+
+        drm_encoder_cleanup(encoder);
+        kfree(intel_encoder);
+}
+
+/* Currently there is only a 1:1 mapping of encoders and connectors */
+struct drm_encoder *gma_best_encoder(struct drm_connector *connector)
+{
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+
+        return &gma_encoder->base;
+}
+
+void gma_connector_attach_encoder(struct gma_connector *connector,
+                                  struct gma_encoder *encoder)
+{
+        connector->encoder = encoder;
+        drm_mode_connector_attach_encoder(&connector->base,
+                                          &encoder->base);
+}
+
+#define GMA_PLL_INVALID(s) { /* DRM_ERROR(s); */ return false; }
+
+bool gma_pll_is_valid(struct drm_crtc *crtc,
+                      const struct gma_limit_t *limit,
+                      struct gma_clock_t *clock)
+{
+        if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1)
+                GMA_PLL_INVALID("p1 out of range");
+        if (clock->p < limit->p.min || limit->p.max < clock->p)
+                GMA_PLL_INVALID("p out of range");
+        if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2)
+                GMA_PLL_INVALID("m2 out of range");
+        if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1)
+                GMA_PLL_INVALID("m1 out of range");
+        /* On CDV m1 is always 0 */
+        if (clock->m1 <= clock->m2 && clock->m1 != 0)
+                GMA_PLL_INVALID("m1 <= m2 && m1 != 0");
+        if (clock->m < limit->m.min || limit->m.max < clock->m)
+                GMA_PLL_INVALID("m out of range");
+        if (clock->n < limit->n.min || limit->n.max < clock->n)
+                GMA_PLL_INVALID("n out of range");
+        if (clock->vco < limit->vco.min || limit->vco.max < clock->vco)
+                GMA_PLL_INVALID("vco out of range");
+        /* XXX: We may need to be checking "Dot clock"
+         * depending on the multiplier, connector, etc.,
+         * rather than just a single range.
+         */
+        if (clock->dot < limit->dot.min || limit->dot.max < clock->dot)
+                GMA_PLL_INVALID("dot out of range");
+
+        return true;
+}
+
+bool gma_find_best_pll(const struct gma_limit_t *limit,
+                       struct drm_crtc *crtc, int target, int refclk,
+                       struct gma_clock_t *best_clock)
+{
+        struct drm_device *dev = crtc->dev;
+        const struct gma_clock_funcs *clock_funcs =
+                                                to_gma_crtc(crtc)->clock_funcs;
+        struct gma_clock_t clock;
+        int err = target;
+
+        if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
+            (REG_READ(LVDS) & LVDS_PORT_EN) != 0) {
+                /*
+                 * For LVDS, if the panel is on, just rely on its current
+                 * settings for dual-channel.  We haven't figured out how to
+                 * reliably set up different single/dual channel state, if we
+                 * even can.
+                 */
+                if ((REG_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
+                    LVDS_CLKB_POWER_UP)
+                        clock.p2 = limit->p2.p2_fast;
+                else
+                        clock.p2 = limit->p2.p2_slow;
+        } else {
+                if (target < limit->p2.dot_limit)
+                        clock.p2 = limit->p2.p2_slow;
+                else
+                        clock.p2 = limit->p2.p2_fast;
+        }
+
+        memset(best_clock, 0, sizeof(*best_clock));
+
+        /* m1 is always 0 on CDV so the outmost loop will run just once */
+        for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max; clock.m1++) {
+                for (clock.m2 = limit->m2.min;
+                     (clock.m2 < clock.m1 || clock.m1 == 0) &&
+                      clock.m2 <= limit->m2.max; clock.m2++) {
+                        for (clock.n = limit->n.min;
+                             clock.n <= limit->n.max; clock.n++) {
+                                for (clock.p1 = limit->p1.min;
+                                     clock.p1 <= limit->p1.max;
+                                     clock.p1++) {
+                                        int this_err;
+
+                                        clock_funcs->clock(refclk, &clock);
+
+                                        if (!clock_funcs->pll_is_valid(crtc,
+                                                                limit, &clock))
+                                                continue;
+
+                                        this_err = abs(clock.dot - target);
+                                        if (this_err < err) {
+                                                *best_clock = clock;
+                                                err = this_err;
+                                        }
+                                }
+                        }
+                }
+        }
+
+        return err != target;
+}
diff --git a/drivers/gpu/drm/gma500/gma_display.h b/drivers/gpu/drm/gma500/gma_display.h
new file mode 100644
index 000000000000..78b9f986a6e5
--- /dev/null
+++ b/drivers/gpu/drm/gma500/gma_display.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2006-2011 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Authors:
+ *      Eric Anholt <eric@anholt.net>
+ *      Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
+ */
+
+#ifndef _GMA_DISPLAY_H_
+#define _GMA_DISPLAY_H_
+
+#include <linux/pm_runtime.h>
+
+struct gma_clock_t {
+        /* given values */
+        int n;
+        int m1, m2;
+        int p1, p2;
+        /* derived values */
+        int dot;
+        int vco;
+        int m;
+        int p;
+};
+
+struct gma_range_t {
+        int min, max;
+};
+
+struct gma_p2_t {
+        int dot_limit;
+        int p2_slow, p2_fast;
+};
+
+struct gma_limit_t {
+        struct gma_range_t dot, vco, n, m, m1, m2, p, p1;
+        struct gma_p2_t p2;
+        bool (*find_pll)(const struct gma_limit_t *, struct drm_crtc *,
+                         int target, int refclk,
+                         struct gma_clock_t *best_clock);
+};
+
+struct gma_clock_funcs {
+        void (*clock)(int refclk, struct gma_clock_t *clock);
+        const struct gma_limit_t *(*limit)(struct drm_crtc *crtc, int refclk);
+        bool (*pll_is_valid)(struct drm_crtc *crtc,
+                             const struct gma_limit_t *limit,
+                             struct gma_clock_t *clock);
+};
+
+/* Common pipe related functions */
+extern bool gma_pipe_has_type(struct drm_crtc *crtc, int type);
+extern void gma_wait_for_vblank(struct drm_device *dev);
+extern int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+                             struct drm_framebuffer *old_fb);
+extern int gma_crtc_cursor_set(struct drm_crtc *crtc,
+                               struct drm_file *file_priv,
+                               uint32_t handle,
+                               uint32_t width, uint32_t height);
+extern int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
+extern void gma_crtc_load_lut(struct drm_crtc *crtc);
+extern void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
+                               u16 *blue, u32 start, u32 size);
+extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);
+extern bool gma_crtc_mode_fixup(struct drm_crtc *crtc,
+                                const struct drm_display_mode *mode,
+                                struct drm_display_mode *adjusted_mode);
+extern void gma_crtc_prepare(struct drm_crtc *crtc);
+extern void gma_crtc_commit(struct drm_crtc *crtc);
+extern void gma_crtc_disable(struct drm_crtc *crtc);
+extern void gma_crtc_destroy(struct drm_crtc *crtc);
+extern int gma_crtc_set_config(struct drm_mode_set *set);
+
+extern void gma_crtc_save(struct drm_crtc *crtc);
+extern void gma_crtc_restore(struct drm_crtc *crtc);
+
+extern void gma_encoder_prepare(struct drm_encoder *encoder);
+extern void gma_encoder_commit(struct drm_encoder *encoder);
+extern void gma_encoder_destroy(struct drm_encoder *encoder);
+
+/* Common clock related functions */
+extern const struct gma_limit_t *gma_limit(struct drm_crtc *crtc, int refclk);
+extern void gma_clock(int refclk, struct gma_clock_t *clock);
+extern bool gma_pll_is_valid(struct drm_crtc *crtc,
+                             const struct gma_limit_t *limit,
+                             struct gma_clock_t *clock);
+extern bool gma_find_best_pll(const struct gma_limit_t *limit,
+                              struct drm_crtc *crtc, int target, int refclk,
+                              struct gma_clock_t *best_clock);
+#endif
diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index 1f82183536a3..92babac362ec 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -196,37 +196,17 @@ void psb_gtt_roll(struct drm_device *dev, struct gtt_range *r, int roll)
  */
 static int psb_gtt_attach_pages(struct gtt_range *gt)
 {
-        struct inode *inode;
-        struct address_space *mapping;
-        int i;
-        struct page *p;
-        int pages = gt->gem.size / PAGE_SIZE;
+        struct page **pages;
 
         WARN_ON(gt->pages);
 
-        /* This is the shared memory object that backs the GEM resource */
-        inode = file_inode(gt->gem.filp);
-        mapping = inode->i_mapping;
+        pages = drm_gem_get_pages(&gt->gem, 0);
+        if (IS_ERR(pages))
+                return PTR_ERR(pages);
 
-        gt->pages = kmalloc(pages * sizeof(struct page *), GFP_KERNEL);
-        if (gt->pages == NULL)
-                return -ENOMEM;
-        gt->npage = pages;
+        gt->pages = pages;
 
-        for (i = 0; i < pages; i++) {
-                p = shmem_read_mapping_page(mapping, i);
-                if (IS_ERR(p))
-                        goto err;
-                gt->pages[i] = p;
-        }
         return 0;
-
-err:
-        while (i--)
-                page_cache_release(gt->pages[i]);
-        kfree(gt->pages);
-        gt->pages = NULL;
-        return PTR_ERR(p);
 }
 
 /**
@@ -240,13 +220,7 @@ err:
  */
 static void psb_gtt_detach_pages(struct gtt_range *gt)
 {
-        int i;
-        for (i = 0; i < gt->npage; i++) {
-                /* FIXME: do we need to force dirty */
-                set_page_dirty(gt->pages[i]);
-                page_cache_release(gt->pages[i]);
-        }
-        kfree(gt->pages);
+        drm_gem_put_pages(&gt->gem, gt->pages, true, false);
         gt->pages = NULL;
 }
 
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 3abf8315f57c..860a4ee9baaf 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -249,12 +249,11 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
         struct drm_encoder *encoder = connector->encoder;
 
         if (!strcmp(property->name, "scaling mode") && encoder) {
-                struct psb_intel_crtc *psb_crtc =
-                                        to_psb_intel_crtc(encoder->crtc);
+                struct gma_crtc *gma_crtc = to_gma_crtc(encoder->crtc);
                 bool centerechange;
                 uint64_t val;
 
-                if (!psb_crtc)
+                if (!gma_crtc)
                         goto set_prop_error;
 
                 switch (value) {
@@ -281,11 +280,11 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
                 centerechange = (val == DRM_MODE_SCALE_NO_SCALE) ||
                         (value == DRM_MODE_SCALE_NO_SCALE);
 
-                if (psb_crtc->saved_mode.hdisplay != 0 &&
-                    psb_crtc->saved_mode.vdisplay != 0) {
+                if (gma_crtc->saved_mode.hdisplay != 0 &&
+                    gma_crtc->saved_mode.vdisplay != 0) {
                         if (centerechange) {
                                 if (!drm_crtc_helper_set_mode(encoder->crtc,
-                                                &psb_crtc->saved_mode,
+                                                &gma_crtc->saved_mode,
                                                 encoder->crtc->x,
                                                 encoder->crtc->y,
                                                 encoder->crtc->fb))
@@ -294,8 +293,8 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
                                 struct drm_encoder_helper_funcs *funcs =
                                                 encoder->helper_private;
                                 funcs->mode_set(encoder,
-                                        &psb_crtc->saved_mode,
-                                        &psb_crtc->saved_adjusted_mode);
+                                        &gma_crtc->saved_mode,
+                                        &gma_crtc->saved_adjusted_mode);
                         }
                 }
         } else if (!strcmp(property->name, "backlight") && encoder) {
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.h b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
index 36eb0744841c..45d5af0546bf 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.h
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.h
@@ -227,7 +227,7 @@ enum {
 #define DSI_DPI_DISABLE_BTA                                     BIT(3)
 
 struct mdfld_dsi_connector {
-        struct psb_intel_connector base;
+        struct gma_connector base;
 
         int pipe;
         void *private;
@@ -238,7 +238,7 @@ struct mdfld_dsi_connector {
 };
 
 struct mdfld_dsi_encoder {
-        struct psb_intel_encoder base;
+        struct gma_encoder base;
         void *private;
 };
 
@@ -269,21 +269,21 @@ struct mdfld_dsi_config {
 static inline struct mdfld_dsi_connector *mdfld_dsi_connector(
                 struct drm_connector *connector)
 {
-        struct psb_intel_connector *psb_connector;
+        struct gma_connector *gma_connector;
 
-        psb_connector = to_psb_intel_connector(connector);
+        gma_connector = to_gma_connector(connector);
 
-        return container_of(psb_connector, struct mdfld_dsi_connector, base);
+        return container_of(gma_connector, struct mdfld_dsi_connector, base);
 }
 
 static inline struct mdfld_dsi_encoder *mdfld_dsi_encoder(
                 struct drm_encoder *encoder)
 {
-        struct psb_intel_encoder *psb_encoder;
+        struct gma_encoder *gma_encoder;
 
-        psb_encoder = to_psb_intel_encoder(encoder);
+        gma_encoder = to_gma_encoder(encoder);
 
-        return container_of(psb_encoder, struct mdfld_dsi_encoder, base);
+        return container_of(gma_encoder, struct mdfld_dsi_encoder, base);
 }
 
 static inline struct mdfld_dsi_config *
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index 74485dc43945..321c00a944e9 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -23,7 +23,7 @@
 
 #include <drm/drmP.h>
 #include "psb_intel_reg.h"
-#include "psb_intel_display.h"
+#include "gma_display.h"
 #include "framebuffer.h"
 #include "mdfld_output.h"
 #include "mdfld_dsi_output.h"
@@ -65,7 +65,7 @@ void mdfldWaitForPipeDisable(struct drm_device *dev, int pipe)
         }
 
         /* FIXME JLIU7_PO */
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
         return;
 
         /* Wait for for the pipe disable to take effect. */
@@ -93,7 +93,7 @@ void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe)
         }
 
         /* FIXME JLIU7_PO */
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
         return;
 
         /* Wait for for the pipe enable to take effect. */
@@ -104,25 +104,6 @@ void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe)
         }
 }
 
-static void psb_intel_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void psb_intel_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-static bool psb_intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  const struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
 /**
  * Return the pipe currently connected to the panel fitter,
  * or -1 if the panel fitter is not present or not in use
@@ -184,9 +165,9 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         unsigned long start, offset;
         u32 dspcntr;
@@ -324,8 +305,8 @@ static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         u32 pipeconf = dev_priv->pipeconf[pipe];
         u32 temp;
@@ -436,7 +417,7 @@ static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode)
                         }
                 }
 
-                psb_intel_crtc_load_lut(crtc);
+                gma_crtc_load_lut(crtc);
 
                 /* Give the overlay scaler a chance to enable
                    if it's on this pipe */
@@ -611,8 +592,8 @@ static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc)
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
 
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)
-            || psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI2)) {
+        if (gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)
+            || gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI2)) {
                 if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
                         limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_19];
                 else if (ksel == KSEL_BYPASS_25)
@@ -624,7 +605,7 @@ static const struct mrst_limit_t *mdfld_limit(struct drm_crtc *crtc)
                          (dev_priv->core_freq == 100 ||
                                 dev_priv->core_freq == 200))
                         limit = &mdfld_limits[MDFLD_LIMT_DSIPLL_100];
-        } else if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
+        } else if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
                 if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19))
                         limit = &mdfld_limits[MDFLD_LIMT_DPLL_19];
                 else if (ksel == KSEL_BYPASS_25)
@@ -688,9 +669,9 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
                               struct drm_framebuffer *old_fb)
 {
         struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         int refclk = 0;
         int clk_n = 0, clk_p2 = 0, clk_byte = 1, clk = 0, m_conv = 0,
@@ -700,7 +681,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
         u32 dpll = 0, fp = 0;
         bool is_mipi = false, is_mipi2 = false, is_hdmi = false;
         struct drm_mode_config *mode_config = &dev->mode_config;
-        struct psb_intel_encoder *psb_intel_encoder = NULL;
+        struct gma_encoder *gma_encoder = NULL;
         uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;
         struct drm_encoder *encoder;
         struct drm_connector *connector;
@@ -749,9 +730,9 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
         if (!gma_power_begin(dev, true))
                 return 0;
 
-        memcpy(&psb_intel_crtc->saved_mode, mode,
+        memcpy(&gma_crtc->saved_mode, mode,
                                         sizeof(struct drm_display_mode));
-        memcpy(&psb_intel_crtc->saved_adjusted_mode, adjusted_mode,
+        memcpy(&gma_crtc->saved_adjusted_mode, adjusted_mode,
                                         sizeof(struct drm_display_mode));
 
         list_for_each_entry(connector, &mode_config->connector_list, head) {
@@ -766,9 +747,9 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
                 if (encoder->crtc != crtc)
                         continue;
 
-                psb_intel_encoder = psb_intel_attached_encoder(connector);
+                gma_encoder = gma_attached_encoder(connector);
 
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_MIPI:
                         is_mipi = true;
                         break;
@@ -819,7 +800,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
 
         REG_WRITE(map->pos, 0);
 
-        if (psb_intel_encoder)
+        if (gma_encoder)
                 drm_object_property_get_value(&connector->base,
                         dev->mode_config.scaling_mode_property, &scalingType);
 
@@ -1034,7 +1015,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
 
         /* Wait for for the pipe enable to take effect. */
         REG_WRITE(map->cntr, dev_priv->dspcntr[pipe]);
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
 mrst_crtc_mode_set_exit:
 
@@ -1045,10 +1026,10 @@ mrst_crtc_mode_set_exit:
 
 const struct drm_crtc_helper_funcs mdfld_helper_funcs = {
         .dpms = mdfld_crtc_dpms,
-        .mode_fixup = psb_intel_crtc_mode_fixup,
+        .mode_fixup = gma_crtc_mode_fixup,
         .mode_set = mdfld_crtc_mode_set,
         .mode_set_base = mdfld__intel_pipe_set_base,
-        .prepare = psb_intel_crtc_prepare,
-        .commit = psb_intel_crtc_commit,
+        .prepare = gma_crtc_prepare,
+        .commit = gma_crtc_commit,
 };
 
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 3071526bc3c1..54c98962b73e 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -23,7 +23,7 @@
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"
-#include "psb_intel_display.h"
+#include "gma_display.h"
 #include "power.h"
 
 struct psb_intel_range_t {
@@ -88,8 +88,8 @@ static const struct oaktrail_limit_t *oaktrail_limit(struct drm_crtc *crtc)
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
 
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
-            || psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {
+        if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)
+            || gma_pipe_has_type(crtc, INTEL_OUTPUT_MIPI)) {
                 switch (dev_priv->core_freq) {
                 case 100:
                         limit = &oaktrail_limits[MRST_LIMIT_LVDS_100L];
@@ -163,8 +163,8 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         u32 temp;
 
@@ -212,7 +212,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
                         REG_WRITE(map->base, REG_READ(map->base));
                 }
 
-                psb_intel_crtc_load_lut(crtc);
+                gma_crtc_load_lut(crtc);
 
                 /* Give the overlay scaler a chance to enable
                    if it's on this pipe */
@@ -242,7 +242,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
                         REG_READ(map->conf);
                 }
                 /* Wait for for the pipe disable to take effect. */
-                psb_intel_wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
 
                 temp = REG_READ(map->dpll);
                 if ((temp & DPLL_VCO_ENABLE) != 0) {
@@ -292,9 +292,9 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
                               struct drm_framebuffer *old_fb)
 {
         struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         int refclk = 0;
         struct oaktrail_clock_t clock;
@@ -303,7 +303,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
         bool is_lvds = false;
         bool is_mipi = false;
         struct drm_mode_config *mode_config = &dev->mode_config;
-        struct psb_intel_encoder *psb_intel_encoder = NULL;
+        struct gma_encoder *gma_encoder = NULL;
         uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;
         struct drm_connector *connector;
 
@@ -313,10 +313,10 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
         if (!gma_power_begin(dev, true))
                 return 0;
 
-        memcpy(&psb_intel_crtc->saved_mode,
+        memcpy(&gma_crtc->saved_mode,
                 mode,
                 sizeof(struct drm_display_mode));
-        memcpy(&psb_intel_crtc->saved_adjusted_mode,
+        memcpy(&gma_crtc->saved_adjusted_mode,
                 adjusted_mode,
                 sizeof(struct drm_display_mode));
 
@@ -324,9 +324,9 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
                 if (!connector->encoder || connector->encoder->crtc != crtc)
                         continue;
 
-                psb_intel_encoder = psb_intel_attached_encoder(connector);
+                gma_encoder = gma_attached_encoder(connector);
 
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_LVDS:
                         is_lvds = true;
                         break;
@@ -350,7 +350,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
                   ((mode->crtc_hdisplay - 1) << 16) |
                   (mode->crtc_vdisplay - 1));
 
-        if (psb_intel_encoder)
+        if (gma_encoder)
                 drm_object_property_get_value(&connector->base,
                         dev->mode_config.scaling_mode_property, &scalingType);
 
@@ -484,31 +484,24 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
 
         REG_WRITE(map->conf, pipeconf);
         REG_READ(map->conf);
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         REG_WRITE(map->cntr, dspcntr);
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
 oaktrail_crtc_mode_set_exit:
         gma_power_end(dev);
         return 0;
 }
 
-static bool oaktrail_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  const struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
 static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
                             int x, int y, struct drm_framebuffer *old_fb)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         unsigned long start, offset;
 
@@ -563,24 +556,12 @@ pipe_set_base_exit:
         return ret;
 }
 
-static void oaktrail_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void oaktrail_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
 const struct drm_crtc_helper_funcs oaktrail_helper_funcs = {
         .dpms = oaktrail_crtc_dpms,
-        .mode_fixup = oaktrail_crtc_mode_fixup,
+        .mode_fixup = gma_crtc_mode_fixup,
         .mode_set = oaktrail_crtc_mode_set,
         .mode_set_base = oaktrail_pipe_set_base,
-        .prepare = oaktrail_crtc_prepare,
-        .commit = oaktrail_crtc_commit,
+        .prepare = gma_crtc_prepare,
+        .commit = gma_crtc_commit,
 };
 
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index f036f1fc161e..38153143ed8c 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -155,12 +155,6 @@ static void oaktrail_hdmi_audio_disable(struct drm_device *dev)
         HDMI_READ(HDMI_HCR);
 }
 
-static void wait_for_vblank(struct drm_device *dev)
-{
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        mdelay(20);
-}
-
 static unsigned int htotal_calculate(struct drm_display_mode *mode)
 {
         u32 htotal, new_crtc_htotal;
@@ -372,10 +366,10 @@ int oaktrail_crtc_hdmi_mode_set(struct drm_crtc *crtc,
 
         REG_WRITE(PCH_PIPEBCONF, pipeconf);
         REG_READ(PCH_PIPEBCONF);
-        wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         REG_WRITE(dspcntr_reg, dspcntr);
-        wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         gma_power_end(dev);
 
@@ -459,7 +453,7 @@ void oaktrail_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)
                         REG_READ(PCH_PIPEBCONF);
                 }
 
-                wait_for_vblank(dev);
+                gma_wait_for_vblank(dev);
 
                 /* Enable plane */
                 temp = REG_READ(DSPBCNTR);
@@ -470,7 +464,7 @@ void oaktrail_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)
                         REG_READ(DSPBSURF);
                 }
 
-                psb_intel_crtc_load_lut(crtc);
+                gma_crtc_load_lut(crtc);
         }
 
         /* DSPARB */
@@ -615,16 +609,16 @@ static void oaktrail_hdmi_destroy(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = {
         .dpms = oaktrail_hdmi_dpms,
         .mode_fixup = oaktrail_hdmi_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
+        .prepare = gma_encoder_prepare,
         .mode_set = oaktrail_hdmi_mode_set,
-        .commit = psb_intel_encoder_commit,
+        .commit = gma_encoder_commit,
 };
 
 static const struct drm_connector_helper_funcs
                                         oaktrail_hdmi_connector_helper_funcs = {
         .get_modes = oaktrail_hdmi_get_modes,
         .mode_valid = oaktrail_hdmi_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static const struct drm_connector_funcs oaktrail_hdmi_connector_funcs = {
@@ -646,21 +640,21 @@ static const struct drm_encoder_funcs oaktrail_hdmi_enc_funcs = {
 void oaktrail_hdmi_init(struct drm_device *dev,
                                         struct psb_intel_mode_device *mode_dev)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-        if (!psb_intel_encoder)
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+        if (!gma_encoder)
                 return;
 
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-        if (!psb_intel_connector)
+        gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+        if (!gma_connector)
                 goto failed_connector;
 
-        connector = &psb_intel_connector->base;
-        encoder = &psb_intel_encoder->base;
+        connector = &gma_connector->base;
+        encoder = &gma_encoder->base;
         drm_connector_init(dev, connector,
                            &oaktrail_hdmi_connector_funcs,
                            DRM_MODE_CONNECTOR_DVID);
@@ -669,10 +663,9 @@ void oaktrail_hdmi_init(struct drm_device *dev,
                          &oaktrail_hdmi_enc_funcs,
                          DRM_MODE_ENCODER_TMDS);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
 
-        psb_intel_encoder->type = INTEL_OUTPUT_HDMI;
+        gma_encoder->type = INTEL_OUTPUT_HDMI;
         drm_encoder_helper_add(encoder, &oaktrail_hdmi_helper_funcs);
         drm_connector_helper_add(connector, &oaktrail_hdmi_connector_helper_funcs);
 
@@ -685,7 +678,7 @@ void oaktrail_hdmi_init(struct drm_device *dev,
         return;
 
 failed_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = {
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 325013a9c48c..e77d7214fca4 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -43,7 +43,7 @@
  * Sets the power state for the panel.
  */
 static void oaktrail_lvds_set_power(struct drm_device *dev,
-                                struct psb_intel_encoder *psb_intel_encoder,
+                                struct gma_encoder *gma_encoder,
                                 bool on)
 {
         u32 pp_status;
@@ -78,13 +78,12 @@ static void oaktrail_lvds_set_power(struct drm_device *dev,
 static void oaktrail_lvds_dpms(struct drm_encoder *encoder, int mode)
 {
         struct drm_device *dev = encoder->dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                                to_psb_intel_encoder(encoder);
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
 
         if (mode == DRM_MODE_DPMS_ON)
-                oaktrail_lvds_set_power(dev, psb_intel_encoder, true);
+                oaktrail_lvds_set_power(dev, gma_encoder, true);
         else
-                oaktrail_lvds_set_power(dev, psb_intel_encoder, false);
+                oaktrail_lvds_set_power(dev, gma_encoder, false);
 
         /* XXX: We never power down the LVDS pairs. */
 }
@@ -166,8 +165,7 @@ static void oaktrail_lvds_prepare(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                                to_psb_intel_encoder(encoder);
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
         struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
 
         if (!gma_power_begin(dev, true))
@@ -176,7 +174,7 @@ static void oaktrail_lvds_prepare(struct drm_encoder *encoder)
         mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
         mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &
                                           BACKLIGHT_DUTY_CYCLE_MASK);
-        oaktrail_lvds_set_power(dev, psb_intel_encoder, false);
+        oaktrail_lvds_set_power(dev, gma_encoder, false);
         gma_power_end(dev);
 }
 
@@ -203,14 +201,13 @@ static void oaktrail_lvds_commit(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                                to_psb_intel_encoder(encoder);
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
         struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
 
         if (mode_dev->backlight_duty_cycle == 0)
                 mode_dev->backlight_duty_cycle =
                                         oaktrail_lvds_get_max_backlight(dev);
-        oaktrail_lvds_set_power(dev, psb_intel_encoder, true);
+        oaktrail_lvds_set_power(dev, gma_encoder, true);
 }
 
 static const struct drm_encoder_helper_funcs oaktrail_lvds_helper_funcs = {
@@ -325,8 +322,8 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev,
 void oaktrail_lvds_init(struct drm_device *dev,
                     struct psb_intel_mode_device *mode_dev)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
         struct drm_psb_private *dev_priv = dev->dev_private;
@@ -334,16 +331,16 @@ void oaktrail_lvds_init(struct drm_device *dev,
         struct i2c_adapter *i2c_adap;
         struct drm_display_mode *scan;  /* *modes, *bios_mode; */
 
-        psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-        if (!psb_intel_encoder)
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+        if (!gma_encoder)
                 return;
 
-        psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-        if (!psb_intel_connector)
+        gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+        if (!gma_connector)
                 goto failed_connector;
 
-        connector = &psb_intel_connector->base;
-        encoder = &psb_intel_encoder->base;
+        connector = &gma_connector->base;
+        encoder = &gma_encoder->base;
         dev_priv->is_lvds_on = true;
         drm_connector_init(dev, connector,
                            &psb_intel_lvds_connector_funcs,
@@ -352,9 +349,8 @@ void oaktrail_lvds_init(struct drm_device *dev,
         drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs,
                          DRM_MODE_ENCODER_LVDS);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
-        psb_intel_encoder->type = INTEL_OUTPUT_LVDS;
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
+        gma_encoder->type = INTEL_OUTPUT_LVDS;
 
         drm_encoder_helper_add(encoder, &oaktrail_lvds_helper_funcs);
         drm_connector_helper_add(connector,
@@ -434,15 +430,15 @@ out:
 
 failed_find:
         dev_dbg(dev->dev, "No LVDS modes found, disabling.\n");
-        if (psb_intel_encoder->ddc_bus)
-                psb_intel_i2c_destroy(psb_intel_encoder->ddc_bus);
+        if (gma_encoder->ddc_bus)
+                psb_intel_i2c_destroy(gma_encoder->ddc_bus);
 
 /* failed_ddc: */
 
         drm_encoder_cleanup(encoder);
         drm_connector_cleanup(connector);
-        kfree(psb_intel_connector);
+        kfree(gma_connector);
 failed_connector:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
 
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
index f6f534b4197e..697678619bd1 100644
--- a/drivers/gpu/drm/gma500/psb_device.c
+++ b/drivers/gpu/drm/gma500/psb_device.c
@@ -25,7 +25,7 @@
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
 #include "intel_bios.h"
-
+#include "psb_device.h"
 
 static int psb_output_init(struct drm_device *dev)
 {
@@ -380,6 +380,7 @@ const struct psb_ops psb_chip_ops = {
 
         .crtc_helper = &psb_intel_helper_funcs,
         .crtc_funcs = &psb_intel_crtc_funcs,
+        .clock_funcs = &psb_clock_funcs,
 
         .output_init = psb_output_init,
 
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.h b/drivers/gpu/drm/gma500/psb_device.h
index 3724b971e91c..35e304c7f85a 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.h
+++ b/drivers/gpu/drm/gma500/psb_device.h
@@ -1,4 +1,6 @@
-/* copyright (c) 2008, Intel Corporation
+/*
+ * Copyright © 2013 Patrik Jakobsson
+ * Copyright © 2011 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -12,14 +14,11 @@
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Authors:
- * Eric Anholt <eric@anholt.net>
  */
 
-#ifndef _INTEL_DISPLAY_H_
-#define _INTEL_DISPLAY_H_
+#ifndef _PSB_DEVICE_H_
+#define _PSB_DEVICE_H_
 
-bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type);
+extern const struct gma_clock_funcs psb_clock_funcs;
 
 #endif
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index bddea5807442..fcb4e9ff1f20 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -131,7 +131,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
 static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *file_priv);
 
-static struct drm_ioctl_desc psb_ioctls[] = {
+static const struct drm_ioctl_desc psb_ioctls[] = {
         DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl,
                       DRM_AUTH),
@@ -270,7 +270,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         unsigned long irqflags;
         int ret = -ENOMEM;
         struct drm_connector *connector;
-        struct psb_intel_encoder *psb_intel_encoder;
+        struct gma_encoder *gma_encoder;
 
         dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
         if (dev_priv == NULL)
@@ -372,9 +372,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         /* Only add backlight support if we have LVDS output */
         list_for_each_entry(connector, &dev->mode_config.connector_list,
                             head) {
-                psb_intel_encoder = psb_intel_attached_encoder(connector);
+                gma_encoder = gma_attached_encoder(connector);
 
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_LVDS:
                 case INTEL_OUTPUT_MIPI:
                         ret = gma_backlight_init(dev);
@@ -441,7 +441,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
         struct drm_mode_object *obj;
         struct drm_crtc *crtc;
         struct drm_connector *connector;
-        struct psb_intel_crtc *psb_intel_crtc;
+        struct gma_crtc *gma_crtc;
         int i = 0;
         int32_t obj_id;
 
@@ -454,12 +454,12 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
 
         connector = obj_to_connector(obj);
         crtc = connector->encoder->crtc;
-        psb_intel_crtc = to_psb_intel_crtc(crtc);
+        gma_crtc = to_gma_crtc(crtc);
 
         for (i = 0; i < 256; i++)
-                psb_intel_crtc->lut_adj[i] = lut_arg->lut[i];
+                gma_crtc->lut_adj[i] = lut_arg->lut[i];
 
-        psb_intel_crtc_load_lut(crtc);
+        gma_crtc_load_lut(crtc);
 
         return 0;
 }
@@ -622,13 +622,12 @@ static const struct file_operations psb_gem_fops = {
         .unlocked_ioctl = psb_unlocked_ioctl,
         .mmap = drm_gem_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 };
 
 static struct drm_driver driver = {
         .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \
-                           DRIVER_IRQ_VBL | DRIVER_MODESET | DRIVER_GEM ,
+                           DRIVER_MODESET | DRIVER_GEM ,
         .load = psb_driver_load,
         .unload = psb_driver_unload,
 
@@ -652,7 +651,7 @@ static struct drm_driver driver = {
         .gem_vm_ops = &psb_gem_vm_ops,
         .dumb_create = psb_gem_dumb_create,
         .dumb_map_offset = psb_gem_dumb_map_gtt,
-        .dumb_destroy = psb_gem_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
         .fops = &psb_gem_fops,
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index 6053b8abcd12..4535ac7708f8 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -27,6 +27,7 @@
 #include <drm/gma_drm.h>
 #include "psb_reg.h"
 #include "psb_intel_drv.h"
+#include "gma_display.h"
 #include "intel_bios.h"
 #include "gtt.h"
 #include "power.h"
@@ -46,6 +47,7 @@ enum {
 #define IS_PSB(dev) (((dev)->pci_device & 0xfffe) == 0x8108)
 #define IS_MRST(dev) (((dev)->pci_device & 0xfffc) == 0x4100)
 #define IS_MFLD(dev) (((dev)->pci_device & 0xfff8) == 0x0130)
+#define IS_CDV(dev) (((dev)->pci_device & 0xfff0) == 0x0be0)
 
 /*
  * Driver definitions
@@ -675,6 +677,7 @@ struct psb_ops {
         /* Sub functions */
         struct drm_crtc_helper_funcs const *crtc_helper;
         struct drm_crtc_funcs const *crtc_funcs;
+        const struct gma_clock_funcs *clock_funcs;
 
         /* Setup hooks */
         int (*chip_setup)(struct drm_device *dev);
@@ -692,6 +695,8 @@ struct psb_ops {
         int (*restore_regs)(struct drm_device *dev);
         int (*power_up)(struct drm_device *dev);
         int (*power_down)(struct drm_device *dev);
+        void (*update_wm)(struct drm_device *dev, struct drm_crtc *crtc);
+        void (*disable_sr)(struct drm_device *dev);
 
         void (*lvds_bl_power)(struct drm_device *dev, bool on);
 #ifdef CONFIG_BACKLIGHT_CLASS_DEVICE
@@ -838,8 +843,6 @@ extern int psb_gem_get_aperture(struct drm_device *dev, void *data,
                         struct drm_file *file);
 extern int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
                         struct drm_mode_create_dumb *args);
-extern int psb_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                        uint32_t handle);
 extern int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
                         uint32_t handle, uint64_t *offset);
 extern int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 6666493789d1..97f8a03fee43 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -19,46 +19,19 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/pm_runtime.h>
 
 #include <drm/drmP.h>
 #include "framebuffer.h"
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"
-#include "psb_intel_display.h"
+#include "gma_display.h"
 #include "power.h"
 
-struct psb_intel_clock_t {
-        /* given values */
-        int n;
-        int m1, m2;
-        int p1, p2;
-        /* derived values */
-        int dot;
-        int vco;
-        int m;
-        int p;
-};
-
-struct psb_intel_range_t {
-        int min, max;
-};
-
-struct psb_intel_p2_t {
-        int dot_limit;
-        int p2_slow, p2_fast;
-};
-
-struct psb_intel_limit_t {
-        struct psb_intel_range_t dot, vco, n, m, m1, m2, p, p1;
-        struct psb_intel_p2_t p2;
-};
-
 #define INTEL_LIMIT_I9XX_SDVO_DAC   0
 #define INTEL_LIMIT_I9XX_LVDS       1
 
-static const struct psb_intel_limit_t psb_intel_limits[] = {
+static const struct gma_limit_t psb_intel_limits[] = {
         {                       /* INTEL_LIMIT_I9XX_SDVO_DAC */
          .dot = {.min = 20000, .max = 400000},
          .vco = {.min = 1400000, .max = 2800000},
@@ -68,8 +41,8 @@ static const struct psb_intel_limit_t psb_intel_limits[] = {
          .m2 = {.min = 3, .max = 7},
          .p = {.min = 5, .max = 80},
          .p1 = {.min = 1, .max = 8},
-         .p2 = {.dot_limit = 200000,
-                .p2_slow = 10, .p2_fast = 5},
+         .p2 = {.dot_limit = 200000, .p2_slow = 10, .p2_fast = 5},
+         .find_pll = gma_find_best_pll,
          },
         {                       /* INTEL_LIMIT_I9XX_LVDS */
          .dot = {.min = 20000, .max = 400000},
@@ -83,23 +56,24 @@ static const struct psb_intel_limit_t psb_intel_limits[] = {
          /* The single-channel range is 25-112Mhz, and dual-channel
           * is 80-224Mhz.  Prefer single channel as much as possible.
           */
-         .p2 = {.dot_limit = 112000,
-                .p2_slow = 14, .p2_fast = 7},
+         .p2 = {.dot_limit = 112000, .p2_slow = 14, .p2_fast = 7},
+         .find_pll = gma_find_best_pll,
          },
 };
 
-static const struct psb_intel_limit_t *psb_intel_limit(struct drm_crtc *crtc)
+static const struct gma_limit_t *psb_intel_limit(struct drm_crtc *crtc,
+                                                 int refclk)
 {
-        const struct psb_intel_limit_t *limit;
+        const struct gma_limit_t *limit;
 
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
+        if (gma_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))
                 limit = &psb_intel_limits[INTEL_LIMIT_I9XX_LVDS];
         else
                 limit = &psb_intel_limits[INTEL_LIMIT_I9XX_SDVO_DAC];
         return limit;
 }
 
-static void psb_intel_clock(int refclk, struct psb_intel_clock_t *clock)
+static void psb_intel_clock(int refclk, struct gma_clock_t *clock)
 {
         clock->m = 5 * (clock->m1 + 2) + (clock->m2 + 2);
         clock->p = clock->p1 * clock->p2;
@@ -108,353 +82,6 @@ static void psb_intel_clock(int refclk, struct psb_intel_clock_t *clock)
 }
 
 /**
- * Returns whether any output on the specified pipe is of the specified type
- */
-bool psb_intel_pipe_has_type(struct drm_crtc *crtc, int type)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_mode_config *mode_config = &dev->mode_config;
-        struct drm_connector *l_entry;
-
-        list_for_each_entry(l_entry, &mode_config->connector_list, head) {
-                if (l_entry->encoder && l_entry->encoder->crtc == crtc) {
-                        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(l_entry);
-                        if (psb_intel_encoder->type == type)
-                                return true;
-                }
-        }
-        return false;
-}
-
-#define INTELPllInvalid(s)   { /* ErrorF (s) */; return false; }
-/**
- * Returns whether the given set of divisors are valid for a given refclk with
- * the given connectors.
- */
-
-static bool psb_intel_PLL_is_valid(struct drm_crtc *crtc,
-                               struct psb_intel_clock_t *clock)
-{
-        const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);
-
-        if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1)
-                INTELPllInvalid("p1 out of range\n");
-        if (clock->p < limit->p.min || limit->p.max < clock->p)
-                INTELPllInvalid("p out of range\n");
-        if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2)
-                INTELPllInvalid("m2 out of range\n");
-        if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1)
-                INTELPllInvalid("m1 out of range\n");
-        if (clock->m1 <= clock->m2)
-                INTELPllInvalid("m1 <= m2\n");
-        if (clock->m < limit->m.min || limit->m.max < clock->m)
-                INTELPllInvalid("m out of range\n");
-        if (clock->n < limit->n.min || limit->n.max < clock->n)
-                INTELPllInvalid("n out of range\n");
-        if (clock->vco < limit->vco.min || limit->vco.max < clock->vco)
-                INTELPllInvalid("vco out of range\n");
-        /* XXX: We may need to be checking "Dot clock"
-         * depending on the multiplier, connector, etc.,
-         * rather than just a single range.
-         */
-        if (clock->dot < limit->dot.min || limit->dot.max < clock->dot)
-                INTELPllInvalid("dot out of range\n");
-
-        return true;
-}
-
-/**
- * Returns a set of divisors for the desired target clock with the given
- * refclk, or FALSE.  The returned values represent the clock equation:
- * reflck * (5 * (m1 + 2) + (m2 + 2)) / (n + 2) / p1 / p2.
- */
-static bool psb_intel_find_best_PLL(struct drm_crtc *crtc, int target,
-                                int refclk,
-                                struct psb_intel_clock_t *best_clock)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_clock_t clock;
-        const struct psb_intel_limit_t *limit = psb_intel_limit(crtc);
-        int err = target;
-
-        if (psb_intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
-            (REG_READ(LVDS) & LVDS_PORT_EN) != 0) {
-                /*
-                 * For LVDS, if the panel is on, just rely on its current
-                 * settings for dual-channel.  We haven't figured out how to
-                 * reliably set up different single/dual channel state, if we
-                 * even can.
-                 */
-                if ((REG_READ(LVDS) & LVDS_CLKB_POWER_MASK) ==
-                    LVDS_CLKB_POWER_UP)
-                        clock.p2 = limit->p2.p2_fast;
-                else
-                        clock.p2 = limit->p2.p2_slow;
-        } else {
-                if (target < limit->p2.dot_limit)
-                        clock.p2 = limit->p2.p2_slow;
-                else
-                        clock.p2 = limit->p2.p2_fast;
-        }
-
-        memset(best_clock, 0, sizeof(*best_clock));
-
-        for (clock.m1 = limit->m1.min; clock.m1 <= limit->m1.max;
-             clock.m1++) {
-                for (clock.m2 = limit->m2.min;
-                     clock.m2 < clock.m1 && clock.m2 <= limit->m2.max;
-                     clock.m2++) {
-                        for (clock.n = limit->n.min;
-                             clock.n <= limit->n.max; clock.n++) {
-                                for (clock.p1 = limit->p1.min;
-                                     clock.p1 <= limit->p1.max;
-                                     clock.p1++) {
-                                        int this_err;
-
-                                        psb_intel_clock(refclk, &clock);
-
-                                        if (!psb_intel_PLL_is_valid
-                                            (crtc, &clock))
-                                                continue;
-
-                                        this_err = abs(clock.dot - target);
-                                        if (this_err < err) {
-                                                *best_clock = clock;
-                                                err = this_err;
-                                        }
-                                }
-                        }
-                }
-        }
-
-        return err != target;
-}
-
-void psb_intel_wait_for_vblank(struct drm_device *dev)
-{
-        /* Wait for 20ms, i.e. one cycle at 50hz. */
-        mdelay(20);
-}
-
-static int psb_intel_pipe_set_base(struct drm_crtc *crtc,
-                            int x, int y, struct drm_framebuffer *old_fb)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
-        int pipe = psb_intel_crtc->pipe;
-        const struct psb_offset *map = &dev_priv->regmap[pipe];
-        unsigned long start, offset;
-        u32 dspcntr;
-        int ret = 0;
-
-        if (!gma_power_begin(dev, true))
-                return 0;
-
-        /* no fb bound */
-        if (!crtc->fb) {
-                dev_dbg(dev->dev, "No FB bound\n");
-                goto psb_intel_pipe_cleaner;
-        }
-
-        /* We are displaying this buffer, make sure it is actually loaded
-           into the GTT */
-        ret = psb_gtt_pin(psbfb->gtt);
-        if (ret < 0)
-                goto psb_intel_pipe_set_base_exit;
-        start = psbfb->gtt->offset;
-
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
-
-        REG_WRITE(map->stride, crtc->fb->pitches[0]);
-
-        dspcntr = REG_READ(map->cntr);
-        dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
-
-        switch (crtc->fb->bits_per_pixel) {
-        case 8:
-                dspcntr |= DISPPLANE_8BPP;
-                break;
-        case 16:
-                if (crtc->fb->depth == 15)
-                        dspcntr |= DISPPLANE_15_16BPP;
-                else
-                        dspcntr |= DISPPLANE_16BPP;
-                break;
-        case 24:
-        case 32:
-                dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
-                break;
-        default:
-                dev_err(dev->dev, "Unknown color depth\n");
-                ret = -EINVAL;
-                psb_gtt_unpin(psbfb->gtt);
-                goto psb_intel_pipe_set_base_exit;
-        }
-        REG_WRITE(map->cntr, dspcntr);
-
-        REG_WRITE(map->base, start + offset);
-        REG_READ(map->base);
-
-psb_intel_pipe_cleaner:
-        /* If there was a previous display we can now unpin it */
-        if (old_fb)
-                psb_gtt_unpin(to_psb_fb(old_fb)->gtt);
-
-psb_intel_pipe_set_base_exit:
-        gma_power_end(dev);
-        return ret;
-}
-
-/**
- * Sets the power management mode of the pipe and plane.
- *
- * This code should probably grow support for turning the cursor off and back
- * on appropriately at the same time as we're turning the pipe off/on.
- */
-static void psb_intel_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        const struct psb_offset *map = &dev_priv->regmap[pipe];
-        u32 temp;
-
-        /* XXX: When our outputs are all unaware of DPMS modes other than off
-         * and on, we should map those modes to DRM_MODE_DPMS_OFF in the CRTC.
-         */
-        switch (mode) {
-        case DRM_MODE_DPMS_ON:
-        case DRM_MODE_DPMS_STANDBY:
-        case DRM_MODE_DPMS_SUSPEND:
-                /* Enable the DPLL */
-                temp = REG_READ(map->dpll);
-                if ((temp & DPLL_VCO_ENABLE) == 0) {
-                        REG_WRITE(map->dpll, temp);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                        REG_WRITE(map->dpll, temp | DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                        /* Wait for the clocks to stabilize. */
-                        udelay(150);
-                }
-
-                /* Enable the pipe */
-                temp = REG_READ(map->conf);
-                if ((temp & PIPEACONF_ENABLE) == 0)
-                        REG_WRITE(map->conf, temp | PIPEACONF_ENABLE);
-
-                /* Enable the plane */
-                temp = REG_READ(map->cntr);
-                if ((temp & DISPLAY_PLANE_ENABLE) == 0) {
-                        REG_WRITE(map->cntr,
-                                  temp | DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(map->base, REG_READ(map->base));
-                }
-
-                psb_intel_crtc_load_lut(crtc);
-
-                /* Give the overlay scaler a chance to enable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, true); TODO */
-                break;
-        case DRM_MODE_DPMS_OFF:
-                /* Give the overlay scaler a chance to disable
-                 * if it's on this pipe */
-                /* psb_intel_crtc_dpms_video(crtc, FALSE); TODO */
-
-                /* Disable the VGA plane that we never use */
-                REG_WRITE(VGACNTRL, VGA_DISP_DISABLE);
-
-                /* Disable display plane */
-                temp = REG_READ(map->cntr);
-                if ((temp & DISPLAY_PLANE_ENABLE) != 0) {
-                        REG_WRITE(map->cntr,
-                                  temp & ~DISPLAY_PLANE_ENABLE);
-                        /* Flush the plane changes */
-                        REG_WRITE(map->base, REG_READ(map->base));
-                        REG_READ(map->base);
-                }
-
-                /* Next, disable display pipes */
-                temp = REG_READ(map->conf);
-                if ((temp & PIPEACONF_ENABLE) != 0) {
-                        REG_WRITE(map->conf, temp & ~PIPEACONF_ENABLE);
-                        REG_READ(map->conf);
-                }
-
-                /* Wait for vblank for the disable to take effect. */
-                psb_intel_wait_for_vblank(dev);
-
-                temp = REG_READ(map->dpll);
-                if ((temp & DPLL_VCO_ENABLE) != 0) {
-                        REG_WRITE(map->dpll, temp & ~DPLL_VCO_ENABLE);
-                        REG_READ(map->dpll);
-                }
-
-                /* Wait for the clocks to turn off. */
-                udelay(150);
-                break;
-        }
-
-        /*Set FIFO Watermarks*/
-        REG_WRITE(DSPARB, 0x3F3E);
-}
-
-static void psb_intel_crtc_prepare(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-}
-
-static void psb_intel_crtc_commit(struct drm_crtc *crtc)
-{
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
-}
-
-void psb_intel_encoder_prepare(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of prepare see psb_intel_lvds_prepare */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
-}
-
-void psb_intel_encoder_commit(struct drm_encoder *encoder)
-{
-        struct drm_encoder_helper_funcs *encoder_funcs =
-            encoder->helper_private;
-        /* lvds has its own version of commit see psb_intel_lvds_commit */
-        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
-}
-
-void psb_intel_encoder_destroy(struct drm_encoder *encoder)
-{
-        struct psb_intel_encoder *intel_encoder = to_psb_intel_encoder(encoder);
-
-        drm_encoder_cleanup(encoder);
-        kfree(intel_encoder);
-}
-
-static bool psb_intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  const struct drm_display_mode *mode,
-                                  struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-
-/**
  * Return the pipe currently connected to the panel fitter,
  * or -1 if the panel fitter is not present or not in use
  */
@@ -479,17 +106,18 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
 {
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         int refclk;
-        struct psb_intel_clock_t clock;
+        struct gma_clock_t clock;
         u32 dpll = 0, fp = 0, dspcntr, pipeconf;
         bool ok, is_sdvo = false;
         bool is_lvds = false, is_tv = false;
         struct drm_mode_config *mode_config = &dev->mode_config;
         struct drm_connector *connector;
+        const struct gma_limit_t *limit;
 
         /* No scan out no play */
         if (crtc->fb == NULL) {
@@ -498,14 +126,13 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
         }
 
         list_for_each_entry(connector, &mode_config->connector_list, head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+                struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
 
                 if (!connector->encoder
                     || connector->encoder->crtc != crtc)
                         continue;
 
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_LVDS:
                         is_lvds = true;
                         break;
@@ -520,10 +147,13 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
 
         refclk = 96000;
 
-        ok = psb_intel_find_best_PLL(crtc, adjusted_mode->clock, refclk,
+        limit = gma_crtc->clock_funcs->limit(crtc, refclk);
+
+        ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk,
                                  &clock);
         if (!ok) {
-                dev_err(dev->dev, "Couldn't find PLL settings for mode!\n");
+                DRM_ERROR("Couldn't find PLL settings for mode! target: %d, actual: %d",
+                          adjusted_mode->clock, clock.dot);
                 return 0;
         }
 
@@ -661,368 +291,29 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
         REG_WRITE(map->conf, pipeconf);
         REG_READ(map->conf);
 
-        psb_intel_wait_for_vblank(dev);
+        gma_wait_for_vblank(dev);
 
         REG_WRITE(map->cntr, dspcntr);
 
         /* Flush the plane changes */
         crtc_funcs->mode_set_base(crtc, x, y, old_fb);
 
-        psb_intel_wait_for_vblank(dev);
-
-        return 0;
-}
-
-/** Loads the palette/gamma unit for the CRTC with the prepared values */
-void psb_intel_crtc_load_lut(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        const struct psb_offset *map = &dev_priv->regmap[psb_intel_crtc->pipe];
-        int palreg = map->palette;
-        int i;
-
-        /* The clocks have to be on to load the palette. */
-        if (!crtc->enabled)
-                return;
-
-        switch (psb_intel_crtc->pipe) {
-        case 0:
-        case 1:
-                break;
-        default:
-                dev_err(dev->dev, "Illegal Pipe Number.\n");
-                return;
-        }
-
-        if (gma_power_begin(dev, false)) {
-                for (i = 0; i < 256; i++) {
-                        REG_WRITE(palreg + 4 * i,
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]));
-                }
-                gma_power_end(dev);
-        } else {
-                for (i = 0; i < 256; i++) {
-                        dev_priv->regs.pipe[0].palette[i] =
-                                  ((psb_intel_crtc->lut_r[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 16) |
-                                  ((psb_intel_crtc->lut_g[i] +
-                                  psb_intel_crtc->lut_adj[i]) << 8) |
-                                  (psb_intel_crtc->lut_b[i] +
-                                  psb_intel_crtc->lut_adj[i]);
-                }
-
-        }
-}
-
-/**
- * Save HW states of giving crtc
- */
-static void psb_intel_crtc_save(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        const struct psb_offset *map = &dev_priv->regmap[psb_intel_crtc->pipe];
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_err(dev->dev, "No CRTC state found\n");
-                return;
-        }
-
-        crtc_state->saveDSPCNTR = REG_READ(map->cntr);
-        crtc_state->savePIPECONF = REG_READ(map->conf);
-        crtc_state->savePIPESRC = REG_READ(map->src);
-        crtc_state->saveFP0 = REG_READ(map->fp0);
-        crtc_state->saveFP1 = REG_READ(map->fp1);
-        crtc_state->saveDPLL = REG_READ(map->dpll);
-        crtc_state->saveHTOTAL = REG_READ(map->htotal);
-        crtc_state->saveHBLANK = REG_READ(map->hblank);
-        crtc_state->saveHSYNC = REG_READ(map->hsync);
-        crtc_state->saveVTOTAL = REG_READ(map->vtotal);
-        crtc_state->saveVBLANK = REG_READ(map->vblank);
-        crtc_state->saveVSYNC = REG_READ(map->vsync);
-        crtc_state->saveDSPSTRIDE = REG_READ(map->stride);
-
-        /*NOTE: DSPSIZE DSPPOS only for psb*/
-        crtc_state->saveDSPSIZE = REG_READ(map->size);
-        crtc_state->saveDSPPOS = REG_READ(map->pos);
-
-        crtc_state->saveDSPBASE = REG_READ(map->base);
-
-        paletteReg = map->palette;
-        for (i = 0; i < 256; ++i)
-                crtc_state->savePalette[i] = REG_READ(paletteReg + (i << 2));
-}
-
-/**
- * Restore HW states of giving crtc
- */
-static void psb_intel_crtc_restore(struct drm_crtc *crtc)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc =  to_psb_intel_crtc(crtc);
-        struct psb_intel_crtc_state *crtc_state = psb_intel_crtc->crtc_state;
-        const struct psb_offset *map = &dev_priv->regmap[psb_intel_crtc->pipe];
-        uint32_t paletteReg;
-        int i;
-
-        if (!crtc_state) {
-                dev_err(dev->dev, "No crtc state\n");
-                return;
-        }
-
-        if (crtc_state->saveDPLL & DPLL_VCO_ENABLE) {
-                REG_WRITE(map->dpll,
-                        crtc_state->saveDPLL & ~DPLL_VCO_ENABLE);
-                REG_READ(map->dpll);
-                udelay(150);
-        }
-
-        REG_WRITE(map->fp0, crtc_state->saveFP0);
-        REG_READ(map->fp0);
-
-        REG_WRITE(map->fp1, crtc_state->saveFP1);
-        REG_READ(map->fp1);
-
-        REG_WRITE(map->dpll, crtc_state->saveDPLL);
-        REG_READ(map->dpll);
-        udelay(150);
-
-        REG_WRITE(map->htotal, crtc_state->saveHTOTAL);
-        REG_WRITE(map->hblank, crtc_state->saveHBLANK);
-        REG_WRITE(map->hsync, crtc_state->saveHSYNC);
-        REG_WRITE(map->vtotal, crtc_state->saveVTOTAL);
-        REG_WRITE(map->vblank, crtc_state->saveVBLANK);
-        REG_WRITE(map->vsync, crtc_state->saveVSYNC);
-        REG_WRITE(map->stride, crtc_state->saveDSPSTRIDE);
-
-        REG_WRITE(map->size, crtc_state->saveDSPSIZE);
-        REG_WRITE(map->pos, crtc_state->saveDSPPOS);
-
-        REG_WRITE(map->src, crtc_state->savePIPESRC);
-        REG_WRITE(map->base, crtc_state->saveDSPBASE);
-        REG_WRITE(map->conf, crtc_state->savePIPECONF);
-
-        psb_intel_wait_for_vblank(dev);
-
-        REG_WRITE(map->cntr, crtc_state->saveDSPCNTR);
-        REG_WRITE(map->base, crtc_state->saveDSPBASE);
-
-        psb_intel_wait_for_vblank(dev);
-
-        paletteReg = map->palette;
-        for (i = 0; i < 256; ++i)
-                REG_WRITE(paletteReg + (i << 2), crtc_state->savePalette[i]);
-}
-
-static int psb_intel_crtc_cursor_set(struct drm_crtc *crtc,
-                                 struct drm_file *file_priv,
-                                 uint32_t handle,
-                                 uint32_t width, uint32_t height)
-{
-        struct drm_device *dev = crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t control = (pipe == 0) ? CURACNTR : CURBCNTR;
-        uint32_t base = (pipe == 0) ? CURABASE : CURBBASE;
-        uint32_t temp;
-        size_t addr = 0;
-        struct gtt_range *gt;
-        struct gtt_range *cursor_gt = psb_intel_crtc->cursor_gt;
-        struct drm_gem_object *obj;
-        void *tmp_dst, *tmp_src;
-        int ret = 0, i, cursor_pages;
-
-        /* if we want to turn of the cursor ignore width and height */
-        if (!handle) {
-                /* turn off the cursor */
-                temp = CURSOR_MODE_DISABLE;
-
-                if (gma_power_begin(dev, false)) {
-                        REG_WRITE(control, temp);
-                        REG_WRITE(base, 0);
-                        gma_power_end(dev);
-                }
-
-                /* Unpin the old GEM object */
-                if (psb_intel_crtc->cursor_obj) {
-                        gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                        psb_gtt_unpin(gt);
-                        drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                        psb_intel_crtc->cursor_obj = NULL;
-                }
-
-                return 0;
-        }
-
-        /* Currently we only support 64x64 cursors */
-        if (width != 64 || height != 64) {
-                dev_dbg(dev->dev, "we currently only support 64x64 cursors\n");
-                return -EINVAL;
-        }
-
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (obj->size < width * height * 4) {
-                dev_dbg(dev->dev, "buffer is to small\n");
-                ret = -ENOMEM;
-                goto unref_cursor;
-        }
-
-        gt = container_of(obj, struct gtt_range, gem);
-
-        /* Pin the memory into the GTT */
-        ret = psb_gtt_pin(gt);
-        if (ret) {
-                dev_err(dev->dev, "Can not pin down handle 0x%x\n", handle);
-                goto unref_cursor;
-        }
-
-        if (dev_priv->ops->cursor_needs_phys) {
-                if (cursor_gt == NULL) {
-                        dev_err(dev->dev, "No hardware cursor mem available");
-                        ret = -ENOMEM;
-                        goto unref_cursor;
-                }
-
-                /* Prevent overflow */
-                if (gt->npage > 4)
-                        cursor_pages = 4;
-                else
-                        cursor_pages = gt->npage;
-
-                /* Copy the cursor to cursor mem */
-                tmp_dst = dev_priv->vram_addr + cursor_gt->offset;
-                for (i = 0; i < cursor_pages; i++) {
-                        tmp_src = kmap(gt->pages[i]);
-                        memcpy(tmp_dst, tmp_src, PAGE_SIZE);
-                        kunmap(gt->pages[i]);
-                        tmp_dst += PAGE_SIZE;
-                }
-
-                addr = psb_intel_crtc->cursor_addr;
-        } else {
-                addr = gt->offset;      /* Or resource.start ??? */
-                psb_intel_crtc->cursor_addr = addr;
-        }
-
-        temp = 0;
-        /* set the pipe for the cursor */
-        temp |= (pipe << 28);
-        temp |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
-
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE(control, temp);
-                REG_WRITE(base, addr);
-                gma_power_end(dev);
-        }
-
-        /* unpin the old bo */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                        struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-        }
-
-        psb_intel_crtc->cursor_obj = obj;
-        return ret;
-
-unref_cursor:
-        drm_gem_object_unreference(obj);
-        return ret;
-}
-
-static int psb_intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
-{
-        struct drm_device *dev = crtc->dev;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
-        uint32_t temp = 0;
-        uint32_t addr;
-
-
-        if (x < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_X_SHIFT);
-                x = -x;
-        }
-        if (y < 0) {
-                temp |= (CURSOR_POS_SIGN << CURSOR_Y_SHIFT);
-                y = -y;
-        }
-
-        temp |= ((x & CURSOR_POS_MASK) << CURSOR_X_SHIFT);
-        temp |= ((y & CURSOR_POS_MASK) << CURSOR_Y_SHIFT);
-
-        addr = psb_intel_crtc->cursor_addr;
+        gma_wait_for_vblank(dev);
 
-        if (gma_power_begin(dev, false)) {
-                REG_WRITE((pipe == 0) ? CURAPOS : CURBPOS, temp);
-                REG_WRITE((pipe == 0) ? CURABASE : CURBBASE, addr);
-                gma_power_end(dev);
-        }
         return 0;
 }
 
-static void psb_intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                         u16 *green, u16 *blue, uint32_t type, uint32_t size)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int i;
-
-        if (size != 256)
-                return;
-
-        for (i = 0; i < 256; i++) {
-                psb_intel_crtc->lut_r[i] = red[i] >> 8;
-                psb_intel_crtc->lut_g[i] = green[i] >> 8;
-                psb_intel_crtc->lut_b[i] = blue[i] >> 8;
-        }
-
-        psb_intel_crtc_load_lut(crtc);
-}
-
-static int psb_crtc_set_config(struct drm_mode_set *set)
-{
-        int ret;
-        struct drm_device *dev = set->crtc->dev;
-        struct drm_psb_private *dev_priv = dev->dev_private;
-
-        if (!dev_priv->rpm_enabled)
-                return drm_crtc_helper_set_config(set);
-
-        pm_runtime_forbid(&dev->pdev->dev);
-        ret = drm_crtc_helper_set_config(set);
-        pm_runtime_allow(&dev->pdev->dev);
-        return ret;
-}
-
 /* Returns the clock of the currently programmed mode of the given pipe. */
 static int psb_intel_crtc_clock_get(struct drm_device *dev,
                                 struct drm_crtc *crtc)
 {
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct drm_psb_private *dev_priv = dev->dev_private;
-        int pipe = psb_intel_crtc->pipe;
+        int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         u32 dpll;
         u32 fp;
-        struct psb_intel_clock_t clock;
+        struct gma_clock_t clock;
         bool is_lvds;
         struct psb_pipe *p = &dev_priv->regs.pipe[pipe];
 
@@ -1092,8 +383,8 @@ static int psb_intel_crtc_clock_get(struct drm_device *dev,
 struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
                                              struct drm_crtc *crtc)
 {
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        int pipe = psb_intel_crtc->pipe;
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+        int pipe = gma_crtc->pipe;
         struct drm_display_mode *mode;
         int htot;
         int hsync;
@@ -1136,58 +427,30 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
         return mode;
 }
 
-static void psb_intel_crtc_destroy(struct drm_crtc *crtc)
-{
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-        struct gtt_range *gt;
-
-        /* Unpin the old GEM object */
-        if (psb_intel_crtc->cursor_obj) {
-                gt = container_of(psb_intel_crtc->cursor_obj,
-                                                struct gtt_range, gem);
-                psb_gtt_unpin(gt);
-                drm_gem_object_unreference(psb_intel_crtc->cursor_obj);
-                psb_intel_crtc->cursor_obj = NULL;
-        }
-
-        if (psb_intel_crtc->cursor_gt != NULL)
-                psb_gtt_free_range(crtc->dev, psb_intel_crtc->cursor_gt);
-        kfree(psb_intel_crtc->crtc_state);
-        drm_crtc_cleanup(crtc);
-        kfree(psb_intel_crtc);
-}
-
-static void psb_intel_crtc_disable(struct drm_crtc *crtc)
-{
-        struct gtt_range *gt;
-        struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-
-        crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
-
-        if (crtc->fb) {
-                gt = to_psb_fb(crtc->fb)->gtt;
-                psb_gtt_unpin(gt);
-        }
-}
-
 const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
-        .dpms = psb_intel_crtc_dpms,
-        .mode_fixup = psb_intel_crtc_mode_fixup,
+        .dpms = gma_crtc_dpms,
+        .mode_fixup = gma_crtc_mode_fixup,
         .mode_set = psb_intel_crtc_mode_set,
-        .mode_set_base = psb_intel_pipe_set_base,
-        .prepare = psb_intel_crtc_prepare,
-        .commit = psb_intel_crtc_commit,
-        .disable = psb_intel_crtc_disable,
+        .mode_set_base = gma_pipe_set_base,
+        .prepare = gma_crtc_prepare,
+        .commit = gma_crtc_commit,
+        .disable = gma_crtc_disable,
 };
 
 const struct drm_crtc_funcs psb_intel_crtc_funcs = {
-        .save = psb_intel_crtc_save,
-        .restore = psb_intel_crtc_restore,
-        .cursor_set = psb_intel_crtc_cursor_set,
-        .cursor_move = psb_intel_crtc_cursor_move,
-        .gamma_set = psb_intel_crtc_gamma_set,
-        .set_config = psb_crtc_set_config,
-        .destroy = psb_intel_crtc_destroy,
+        .save = gma_crtc_save,
+        .restore = gma_crtc_restore,
+        .cursor_set = gma_crtc_cursor_set,
+        .cursor_move = gma_crtc_cursor_move,
+        .gamma_set = gma_crtc_gamma_set,
+        .set_config = gma_crtc_set_config,
+        .destroy = gma_crtc_destroy,
+};
+
+const struct gma_clock_funcs psb_clock_funcs = {
+        .clock = psb_intel_clock,
+        .limit = psb_intel_limit,
+        .pll_is_valid = gma_pll_is_valid,
 };
 
 /*
@@ -1195,7 +458,7 @@ const struct drm_crtc_funcs psb_intel_crtc_funcs = {
  * to zero. This is a workaround for h/w defect on Oaktrail
  */
 static void psb_intel_cursor_init(struct drm_device *dev,
-                                  struct psb_intel_crtc *psb_intel_crtc)
+                                  struct gma_crtc *gma_crtc)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
         u32 control[3] = { CURACNTR, CURBCNTR, CURCCNTR };
@@ -1208,88 +471,87 @@ static void psb_intel_cursor_init(struct drm_device *dev,
                  */
                 cursor_gt = psb_gtt_alloc_range(dev, 4 * PAGE_SIZE, "cursor", 1);
                 if (!cursor_gt) {
-                        psb_intel_crtc->cursor_gt = NULL;
+                        gma_crtc->cursor_gt = NULL;
                         goto out;
                 }
-                psb_intel_crtc->cursor_gt = cursor_gt;
-                psb_intel_crtc->cursor_addr = dev_priv->stolen_base +
+                gma_crtc->cursor_gt = cursor_gt;
+                gma_crtc->cursor_addr = dev_priv->stolen_base +
                                                         cursor_gt->offset;
         } else {
-                psb_intel_crtc->cursor_gt = NULL;
+                gma_crtc->cursor_gt = NULL;
         }
 
 out:
-        REG_WRITE(control[psb_intel_crtc->pipe], 0);
-        REG_WRITE(base[psb_intel_crtc->pipe], 0);
+        REG_WRITE(control[gma_crtc->pipe], 0);
+        REG_WRITE(base[gma_crtc->pipe], 0);
 }
 
 void psb_intel_crtc_init(struct drm_device *dev, int pipe,
                      struct psb_intel_mode_device *mode_dev)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_crtc *psb_intel_crtc;
+        struct gma_crtc *gma_crtc;
         int i;
         uint16_t *r_base, *g_base, *b_base;
 
         /* We allocate a extra array of drm_connector pointers
          * for fbdev after the crtc */
-        psb_intel_crtc =
-            kzalloc(sizeof(struct psb_intel_crtc) +
-                    (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)),
-                    GFP_KERNEL);
-        if (psb_intel_crtc == NULL)
+        gma_crtc = kzalloc(sizeof(struct gma_crtc) +
+                        (INTELFB_CONN_LIMIT * sizeof(struct drm_connector *)),
+                        GFP_KERNEL);
+        if (gma_crtc == NULL)
                 return;
 
-        psb_intel_crtc->crtc_state =
+        gma_crtc->crtc_state =
                 kzalloc(sizeof(struct psb_intel_crtc_state), GFP_KERNEL);
-        if (!psb_intel_crtc->crtc_state) {
+        if (!gma_crtc->crtc_state) {
                 dev_err(dev->dev, "Crtc state error: No memory\n");
-                kfree(psb_intel_crtc);
+                kfree(gma_crtc);
                 return;
         }
 
         /* Set the CRTC operations from the chip specific data */
-        drm_crtc_init(dev, &psb_intel_crtc->base, dev_priv->ops->crtc_funcs);
+        drm_crtc_init(dev, &gma_crtc->base, dev_priv->ops->crtc_funcs);
 
-        drm_mode_crtc_set_gamma_size(&psb_intel_crtc->base, 256);
-        psb_intel_crtc->pipe = pipe;
-        psb_intel_crtc->plane = pipe;
+        /* Set the CRTC clock functions from chip specific data */
+        gma_crtc->clock_funcs = dev_priv->ops->clock_funcs;
 
-        r_base = psb_intel_crtc->base.gamma_store;
+        drm_mode_crtc_set_gamma_size(&gma_crtc->base, 256);
+        gma_crtc->pipe = pipe;
+        gma_crtc->plane = pipe;
+
+        r_base = gma_crtc->base.gamma_store;
         g_base = r_base + 256;
         b_base = g_base + 256;
         for (i = 0; i < 256; i++) {
-                psb_intel_crtc->lut_r[i] = i;
-                psb_intel_crtc->lut_g[i] = i;
-                psb_intel_crtc->lut_b[i] = i;
+                gma_crtc->lut_r[i] = i;
+                gma_crtc->lut_g[i] = i;
+                gma_crtc->lut_b[i] = i;
                 r_base[i] = i << 8;
                 g_base[i] = i << 8;
                 b_base[i] = i << 8;
 
-                psb_intel_crtc->lut_adj[i] = 0;
+                gma_crtc->lut_adj[i] = 0;
         }
 
-        psb_intel_crtc->mode_dev = mode_dev;
-        psb_intel_crtc->cursor_addr = 0;
+        gma_crtc->mode_dev = mode_dev;
+        gma_crtc->cursor_addr = 0;
 
-        drm_crtc_helper_add(&psb_intel_crtc->base,
+        drm_crtc_helper_add(&gma_crtc->base,
                                                 dev_priv->ops->crtc_helper);
 
         /* Setup the array of drm_connector pointer array */
-        psb_intel_crtc->mode_set.crtc = &psb_intel_crtc->base;
+        gma_crtc->mode_set.crtc = &gma_crtc->base;
         BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||
-               dev_priv->plane_to_crtc_mapping[psb_intel_crtc->plane] != NULL);
-        dev_priv->plane_to_crtc_mapping[psb_intel_crtc->plane] =
-                                                        &psb_intel_crtc->base;
-        dev_priv->pipe_to_crtc_mapping[psb_intel_crtc->pipe] =
-                                                        &psb_intel_crtc->base;
-        psb_intel_crtc->mode_set.connectors =
-            (struct drm_connector **) (psb_intel_crtc + 1);
-        psb_intel_crtc->mode_set.num_connectors = 0;
-        psb_intel_cursor_init(dev, psb_intel_crtc);
+               dev_priv->plane_to_crtc_mapping[gma_crtc->plane] != NULL);
+        dev_priv->plane_to_crtc_mapping[gma_crtc->plane] = &gma_crtc->base;
+        dev_priv->pipe_to_crtc_mapping[gma_crtc->pipe] = &gma_crtc->base;
+        gma_crtc->mode_set.connectors = (struct drm_connector **)(gma_crtc + 1);
+        gma_crtc->mode_set.num_connectors = 0;
+        psb_intel_cursor_init(dev, gma_crtc);
 
         /* Set to true so that the pipe is forced off on initial config. */
-        psb_intel_crtc->active = true;
+        gma_crtc->active = true;
 }
 
 int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
@@ -1298,7 +560,7 @@ int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct drm_psb_get_pipe_from_crtc_id_arg *pipe_from_crtc_id = data;
         struct drm_mode_object *drmmode_obj;
-        struct psb_intel_crtc *crtc;
+        struct gma_crtc *crtc;
 
         if (!dev_priv) {
                 dev_err(dev->dev, "called with no initialization\n");
@@ -1313,7 +575,7 @@ int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        crtc = to_psb_intel_crtc(obj_to_crtc(drmmode_obj));
+        crtc = to_gma_crtc(obj_to_crtc(drmmode_obj));
         pipe_from_crtc_id->pipe = crtc->pipe;
 
         return 0;
@@ -1324,14 +586,14 @@ struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev, int pipe)
         struct drm_crtc *crtc = NULL;
 
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
-                struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
-                if (psb_intel_crtc->pipe == pipe)
+                struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
+                if (gma_crtc->pipe == pipe)
                         break;
         }
         return crtc;
 }
 
-int psb_intel_connector_clones(struct drm_device *dev, int type_mask)
+int gma_connector_clones(struct drm_device *dev, int type_mask)
 {
         int index_mask = 0;
         struct drm_connector *connector;
@@ -1339,30 +601,10 @@ int psb_intel_connector_clones(struct drm_device *dev, int type_mask)
 
         list_for_each_entry(connector, &dev->mode_config.connector_list,
                             head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-                if (type_mask & (1 << psb_intel_encoder->type))
+                struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+                if (type_mask & (1 << gma_encoder->type))
                         index_mask |= (1 << entry);
                 entry++;
         }
         return index_mask;
 }
-
-/* current intel driver doesn't take advantage of encoders
-   always give back the encoder for the connector
-*/
-struct drm_encoder *psb_intel_best_encoder(struct drm_connector *connector)
-{
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-
-        return &psb_intel_encoder->base;
-}
-
-void psb_intel_connector_attach_encoder(struct psb_intel_connector *connector,
-                                        struct psb_intel_encoder *encoder)
-{
-        connector->encoder = encoder;
-        drm_mode_connector_attach_encoder(&connector->base,
-                                          &encoder->base);
-}
diff --git a/drivers/gpu/drm/gma500/psb_intel_drv.h b/drivers/gpu/drm/gma500/psb_intel_drv.h
index 4dcae421a58d..bde27fdb41bf 100644
--- a/drivers/gpu/drm/gma500/psb_intel_drv.h
+++ b/drivers/gpu/drm/gma500/psb_intel_drv.h
@@ -24,6 +24,7 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <linux/gpio.h>
+#include "gma_display.h"
 
 /*
  * Display related stuff
@@ -116,11 +117,11 @@ struct psb_intel_i2c_chan {
         u8 slave_addr;
 };
 
-struct psb_intel_encoder {
+struct gma_encoder {
         struct drm_encoder base;
         int type;
         bool needs_tv_clock;
-        void (*hot_plug)(struct psb_intel_encoder *);
+        void (*hot_plug)(struct gma_encoder *);
         int crtc_mask;
         int clone_mask;
         u32 ddi_select; /* Channel info */
@@ -136,9 +137,9 @@ struct psb_intel_encoder {
         struct psb_intel_i2c_chan *ddc_bus;
 };
 
-struct psb_intel_connector {
+struct gma_connector {
         struct drm_connector base;
-        struct psb_intel_encoder *encoder;
+        struct gma_encoder *encoder;
 };
 
 struct psb_intel_crtc_state {
@@ -161,7 +162,7 @@ struct psb_intel_crtc_state {
         uint32_t savePalette[256];
 };
 
-struct psb_intel_crtc {
+struct gma_crtc {
         struct drm_crtc base;
         int pipe;
         int plane;
@@ -188,14 +189,16 @@ struct psb_intel_crtc {
 
         /* Saved Crtc HW states */
         struct psb_intel_crtc_state *crtc_state;
+
+        const struct gma_clock_funcs *clock_funcs;
 };
 
-#define to_psb_intel_crtc(x)    \
-                container_of(x, struct psb_intel_crtc, base)
-#define to_psb_intel_connector(x) \
-                container_of(x, struct psb_intel_connector, base)
-#define to_psb_intel_encoder(x) \
-                container_of(x, struct psb_intel_encoder, base)
+#define to_gma_crtc(x)  \
+                container_of(x, struct gma_crtc, base)
+#define to_gma_connector(x) \
+                container_of(x, struct gma_connector, base)
+#define to_gma_encoder(x)       \
+                container_of(x, struct gma_encoder, base)
 #define to_psb_intel_framebuffer(x)     \
                 container_of(x, struct psb_intel_framebuffer, base)
 
@@ -223,27 +226,18 @@ extern void oaktrail_dsi_init(struct drm_device *dev,
 extern void mid_dsi_init(struct drm_device *dev,
                     struct psb_intel_mode_device *mode_dev, int dsi_num);
 
-extern void psb_intel_crtc_load_lut(struct drm_crtc *crtc);
-extern void psb_intel_encoder_prepare(struct drm_encoder *encoder);
-extern void psb_intel_encoder_commit(struct drm_encoder *encoder);
-extern void psb_intel_encoder_destroy(struct drm_encoder *encoder);
+extern struct drm_encoder *gma_best_encoder(struct drm_connector *connector);
+extern void gma_connector_attach_encoder(struct gma_connector *connector,
+                                         struct gma_encoder *encoder);
 
-static inline struct psb_intel_encoder *psb_intel_attached_encoder(
+static inline struct gma_encoder *gma_attached_encoder(
                                                 struct drm_connector *connector)
 {
-        return to_psb_intel_connector(connector)->encoder;
+        return to_gma_connector(connector)->encoder;
 }
 
-extern void psb_intel_connector_attach_encoder(
-                                        struct psb_intel_connector *connector,
-                                        struct psb_intel_encoder *encoder);
-
-extern struct drm_encoder *psb_intel_best_encoder(struct drm_connector
-                                              *connector);
-
 extern struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
                                                     struct drm_crtc *crtc);
-extern void psb_intel_wait_for_vblank(struct drm_device *dev);
 extern int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
                                 struct drm_file *file_priv);
 extern struct drm_crtc *psb_intel_get_crtc_from_pipe(struct drm_device *dev,
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 9fa5fa2e6192..32342f6990d9 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -267,10 +267,9 @@ static void psb_intel_lvds_save(struct drm_connector *connector)
         struct drm_device *dev = connector->dev;
         struct drm_psb_private *dev_priv =
                 (struct drm_psb_private *)dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
         struct psb_intel_lvds_priv *lvds_priv =
-                (struct psb_intel_lvds_priv *)psb_intel_encoder->dev_priv;
+                (struct psb_intel_lvds_priv *)gma_encoder->dev_priv;
 
         lvds_priv->savePP_ON = REG_READ(LVDSPP_ON);
         lvds_priv->savePP_OFF = REG_READ(LVDSPP_OFF);
@@ -307,10 +306,9 @@ static void psb_intel_lvds_restore(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
         u32 pp_status;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
         struct psb_intel_lvds_priv *lvds_priv =
-                (struct psb_intel_lvds_priv *)psb_intel_encoder->dev_priv;
+                (struct psb_intel_lvds_priv *)gma_encoder->dev_priv;
 
         dev_dbg(dev->dev, "(0x%x, 0x%x, 0x%x, 0x%x, 0x%x, 0x%x)\n",
                         lvds_priv->savePP_ON,
@@ -349,12 +347,11 @@ int psb_intel_lvds_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
         struct drm_psb_private *dev_priv = connector->dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
         struct drm_display_mode *fixed_mode =
                                         dev_priv->mode_dev.panel_fixed_mode;
 
-        if (psb_intel_encoder->type == INTEL_OUTPUT_MIPI2)
+        if (gma_encoder->type == INTEL_OUTPUT_MIPI2)
                 fixed_mode = dev_priv->mode_dev.panel_fixed_mode2;
 
         /* just in case */
@@ -381,22 +378,20 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder,
         struct drm_device *dev = encoder->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
-        struct psb_intel_crtc *psb_intel_crtc =
-                                to_psb_intel_crtc(encoder->crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(encoder->crtc);
         struct drm_encoder *tmp_encoder;
         struct drm_display_mode *panel_fixed_mode = mode_dev->panel_fixed_mode;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                                to_psb_intel_encoder(encoder);
+        struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
 
-        if (psb_intel_encoder->type == INTEL_OUTPUT_MIPI2)
+        if (gma_encoder->type == INTEL_OUTPUT_MIPI2)
                 panel_fixed_mode = mode_dev->panel_fixed_mode2;
 
         /* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */
-        if (!IS_MRST(dev) && psb_intel_crtc->pipe == 0) {
+        if (!IS_MRST(dev) && gma_crtc->pipe == 0) {
                 printk(KERN_ERR "Can't support LVDS on pipe A\n");
                 return false;
         }
-        if (IS_MRST(dev) && psb_intel_crtc->pipe != 0) {
+        if (IS_MRST(dev) && gma_crtc->pipe != 0) {
                 printk(KERN_ERR "Must use PIPE A\n");
                 return false;
         }
@@ -525,9 +520,8 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector)
         struct drm_device *dev = connector->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct psb_intel_lvds_priv *lvds_priv = gma_encoder->dev_priv;
         int ret = 0;
 
         if (!IS_MRST(dev))
@@ -564,9 +558,8 @@ static int psb_intel_lvds_get_modes(struct drm_connector *connector)
  */
 void psb_intel_lvds_destroy(struct drm_connector *connector)
 {
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct psb_intel_lvds_priv *lvds_priv = psb_intel_encoder->dev_priv;
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct psb_intel_lvds_priv *lvds_priv = gma_encoder->dev_priv;
 
         if (lvds_priv->ddc_bus)
                 psb_intel_i2c_destroy(lvds_priv->ddc_bus);
@@ -585,8 +578,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
                 return -1;
 
         if (!strcmp(property->name, "scaling mode")) {
-                struct psb_intel_crtc *crtc =
-                                        to_psb_intel_crtc(encoder->crtc);
+                struct gma_crtc *crtc = to_gma_crtc(encoder->crtc);
                 uint64_t curval;
 
                 if (!crtc)
@@ -656,7 +648,7 @@ const struct drm_connector_helper_funcs
                                 psb_intel_lvds_connector_helper_funcs = {
         .get_modes = psb_intel_lvds_get_modes,
         .mode_valid = psb_intel_lvds_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 const struct drm_connector_funcs psb_intel_lvds_connector_funcs = {
@@ -691,8 +683,8 @@ const struct drm_encoder_funcs psb_intel_lvds_enc_funcs = {
 void psb_intel_lvds_init(struct drm_device *dev,
                          struct psb_intel_mode_device *mode_dev)
 {
-        struct psb_intel_encoder *psb_intel_encoder;
-        struct psb_intel_connector *psb_intel_connector;
+        struct gma_encoder *gma_encoder;
+        struct gma_connector *gma_connector;
         struct psb_intel_lvds_priv *lvds_priv;
         struct drm_connector *connector;
         struct drm_encoder *encoder;
@@ -702,17 +694,15 @@ void psb_intel_lvds_init(struct drm_device *dev,
         u32 lvds;
         int pipe;
 
-        psb_intel_encoder =
-                        kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-        if (!psb_intel_encoder) {
-                dev_err(dev->dev, "psb_intel_encoder allocation error\n");
+        gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+        if (!gma_encoder) {
+                dev_err(dev->dev, "gma_encoder allocation error\n");
                 return;
         }
 
-        psb_intel_connector =
-                kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-        if (!psb_intel_connector) {
-                dev_err(dev->dev, "psb_intel_connector allocation error\n");
+        gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+        if (!gma_connector) {
+                dev_err(dev->dev, "gma_connector allocation error\n");
                 goto failed_encoder;
         }
 
@@ -722,10 +712,10 @@ void psb_intel_lvds_init(struct drm_device *dev,
                 goto failed_connector;
         }
 
-        psb_intel_encoder->dev_priv = lvds_priv;
+        gma_encoder->dev_priv = lvds_priv;
 
-        connector = &psb_intel_connector->base;
-        encoder = &psb_intel_encoder->base;
+        connector = &gma_connector->base;
+        encoder = &gma_encoder->base;
         drm_connector_init(dev, connector,
                            &psb_intel_lvds_connector_funcs,
                            DRM_MODE_CONNECTOR_LVDS);
@@ -734,9 +724,8 @@ void psb_intel_lvds_init(struct drm_device *dev,
                          &psb_intel_lvds_enc_funcs,
                          DRM_MODE_ENCODER_LVDS);
 
-        psb_intel_connector_attach_encoder(psb_intel_connector,
-                                           psb_intel_encoder);
-        psb_intel_encoder->type = INTEL_OUTPUT_LVDS;
+        gma_connector_attach_encoder(gma_connector, gma_encoder);
+        gma_encoder->type = INTEL_OUTPUT_LVDS;
 
         drm_encoder_helper_add(encoder, &psb_intel_lvds_helper_funcs);
         drm_connector_helper_add(connector,
@@ -851,8 +840,8 @@ failed_blc_i2c:
         drm_encoder_cleanup(encoder);
         drm_connector_cleanup(connector);
 failed_connector:
-        kfree(psb_intel_connector);
+        kfree(gma_connector);
 failed_encoder:
-        kfree(psb_intel_encoder);
+        kfree(gma_encoder);
 }
 
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 19e36603b23b..77841a113617 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -65,7 +65,7 @@ static const char *tv_format_names[] = {
 #define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))
 
 struct psb_intel_sdvo {
-        struct psb_intel_encoder base;
+        struct gma_encoder base;
 
         struct i2c_adapter *i2c;
         u8 slave_addr;
@@ -140,7 +140,7 @@ struct psb_intel_sdvo {
 };
 
 struct psb_intel_sdvo_connector {
-        struct psb_intel_connector base;
+        struct gma_connector base;
 
         /* Mark the type of connector */
         uint16_t output_flag;
@@ -200,13 +200,13 @@ static struct psb_intel_sdvo *to_psb_intel_sdvo(struct drm_encoder *encoder)
 
 static struct psb_intel_sdvo *intel_attached_sdvo(struct drm_connector *connector)
 {
-        return container_of(psb_intel_attached_encoder(connector),
+        return container_of(gma_attached_encoder(connector),
                             struct psb_intel_sdvo, base);
 }
 
 static struct psb_intel_sdvo_connector *to_psb_intel_sdvo_connector(struct drm_connector *connector)
 {
-        return container_of(to_psb_intel_connector(connector), struct psb_intel_sdvo_connector, base);
+        return container_of(to_gma_connector(connector), struct psb_intel_sdvo_connector, base);
 }
 
 static bool
@@ -987,7 +987,7 @@ static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
 {
         struct drm_device *dev = encoder->dev;
         struct drm_crtc *crtc = encoder->crtc;
-        struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
         struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
         u32 sdvox;
         struct psb_intel_sdvo_in_out_map in_out;
@@ -1070,7 +1070,7 @@ static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
         }
         sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
 
-        if (psb_intel_crtc->pipe == 1)
+        if (gma_crtc->pipe == 1)
                 sdvox |= SDVO_PIPE_B_SELECT;
         if (psb_intel_sdvo->has_hdmi_audio)
                 sdvox |= SDVO_AUDIO_ENABLE;
@@ -1121,7 +1121,7 @@ static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
                 if ((temp & SDVO_ENABLE) == 0)
                         psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp | SDVO_ENABLE);
                 for (i = 0; i < 2; i++)
-                        psb_intel_wait_for_vblank(dev);
+                        gma_wait_for_vblank(dev);
 
                 status = psb_intel_sdvo_get_trained_inputs(psb_intel_sdvo, &input1, &input2);
                 /* Warn if the device reported failure to sync.
@@ -1836,10 +1836,8 @@ done:
 static void psb_intel_sdvo_save(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct psb_intel_encoder *psb_intel_encoder =
-                                        psb_intel_attached_encoder(connector);
-        struct psb_intel_sdvo *sdvo =
-                                to_psb_intel_sdvo(&psb_intel_encoder->base);
+        struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+        struct psb_intel_sdvo *sdvo = to_psb_intel_sdvo(&gma_encoder->base);
 
         sdvo->saveSDVO = REG_READ(sdvo->sdvo_reg);
 }
@@ -1847,8 +1845,7 @@ static void psb_intel_sdvo_save(struct drm_connector *connector)
 static void psb_intel_sdvo_restore(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
-        struct drm_encoder *encoder =
-                                &psb_intel_attached_encoder(connector)->base;
+        struct drm_encoder *encoder = &gma_attached_encoder(connector)->base;
         struct psb_intel_sdvo *sdvo = to_psb_intel_sdvo(encoder);
         struct drm_crtc *crtc = encoder->crtc;
 
@@ -1864,9 +1861,9 @@ static void psb_intel_sdvo_restore(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
         .dpms = psb_intel_sdvo_dpms,
         .mode_fixup = psb_intel_sdvo_mode_fixup,
-        .prepare = psb_intel_encoder_prepare,
+        .prepare = gma_encoder_prepare,
         .mode_set = psb_intel_sdvo_mode_set,
-        .commit = psb_intel_encoder_commit,
+        .commit = gma_encoder_commit,
 };
 
 static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
@@ -1882,7 +1879,7 @@ static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
 static const struct drm_connector_helper_funcs psb_intel_sdvo_connector_helper_funcs = {
         .get_modes = psb_intel_sdvo_get_modes,
         .mode_valid = psb_intel_sdvo_mode_valid,
-        .best_encoder = psb_intel_best_encoder,
+        .best_encoder = gma_best_encoder,
 };
 
 static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
@@ -1894,7 +1891,7 @@ static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
                                  psb_intel_sdvo->sdvo_lvds_fixed_mode);
 
         i2c_del_adapter(&psb_intel_sdvo->ddc);
-        psb_intel_encoder_destroy(encoder);
+        gma_encoder_destroy(encoder);
 }
 
 static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {
@@ -2055,7 +2052,7 @@ psb_intel_sdvo_connector_init(struct psb_intel_sdvo_connector *connector,
         connector->base.base.doublescan_allowed = 0;
         connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
 
-        psb_intel_connector_attach_encoder(&connector->base, &encoder->base);
+        gma_connector_attach_encoder(&connector->base, &encoder->base);
         drm_sysfs_connector_add(&connector->base.base);
 }
 
@@ -2075,7 +2072,7 @@ psb_intel_sdvo_dvi_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
         struct drm_connector *connector;
-        struct psb_intel_connector *intel_connector;
+        struct gma_connector *intel_connector;
         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2115,7 +2112,7 @@ psb_intel_sdvo_tv_init(struct psb_intel_sdvo *psb_intel_sdvo, int type)
 {
         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
         struct drm_connector *connector;
-        struct psb_intel_connector *intel_connector;
+        struct gma_connector *intel_connector;
         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2154,7 +2151,7 @@ psb_intel_sdvo_analog_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
         struct drm_connector *connector;
-        struct psb_intel_connector *intel_connector;
+        struct gma_connector *intel_connector;
         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2188,7 +2185,7 @@ psb_intel_sdvo_lvds_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
         struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
         struct drm_connector *connector;
-        struct psb_intel_connector *intel_connector;
+        struct gma_connector *intel_connector;
         struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
         psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2540,7 +2537,7 @@ psb_intel_sdvo_init_ddc_proxy(struct psb_intel_sdvo *sdvo,
 bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
-        struct psb_intel_encoder *psb_intel_encoder;
+        struct gma_encoder *gma_encoder;
         struct psb_intel_sdvo *psb_intel_sdvo;
         int i;
 
@@ -2557,9 +2554,9 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
         }
 
         /* encoder type will be decided later */
-        psb_intel_encoder = &psb_intel_sdvo->base;
-        psb_intel_encoder->type = INTEL_OUTPUT_SDVO;
-        drm_encoder_init(dev, &psb_intel_encoder->base, &psb_intel_sdvo_enc_funcs, 0);
+        gma_encoder = &psb_intel_sdvo->base;
+        gma_encoder->type = INTEL_OUTPUT_SDVO;
+        drm_encoder_init(dev, &gma_encoder->base, &psb_intel_sdvo_enc_funcs, 0);
 
         /* Read the regs to test if we can talk to the device */
         for (i = 0; i < 0x40; i++) {
@@ -2577,7 +2574,7 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
         else
                 dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
 
-        drm_encoder_helper_add(&psb_intel_encoder->base, &psb_intel_sdvo_helper_funcs);
+        drm_encoder_helper_add(&gma_encoder->base, &psb_intel_sdvo_helper_funcs);
 
         /* In default case sdvo lvds is false */
         if (!psb_intel_sdvo_get_capabilities(psb_intel_sdvo, &psb_intel_sdvo->caps))
@@ -2620,7 +2617,7 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
         return true;
 
 err:
-        drm_encoder_cleanup(&psb_intel_encoder->base);
+        drm_encoder_cleanup(&gma_encoder->base);
         i2c_del_adapter(&psb_intel_sdvo->ddc);
         kfree(psb_intel_sdvo);
 
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index e68b58a1aaf9..c2bd711e86e9 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -23,7 +23,7 @@
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_encoder_slave.h>
 #include <drm/drm_edid.h>
-
+#include <drm/i2c/tda998x.h>
 
 #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
 
@@ -32,6 +32,11 @@ struct tda998x_priv {
         uint16_t rev;
         uint8_t current_page;
         int dpms;
+        bool is_hdmi_sink;
+        u8 vip_cntrl_0;
+        u8 vip_cntrl_1;
+        u8 vip_cntrl_2;
+        struct tda998x_encoder_params params;
 };
 
 #define to_tda998x_priv(x)  ((struct tda998x_priv *)to_encoder_slave(x)->slave_priv)
@@ -68,10 +73,13 @@ struct tda998x_priv {
 # define I2C_MASTER_DIS_MM        (1 << 0)
 # define I2C_MASTER_DIS_FILT      (1 << 1)
 # define I2C_MASTER_APP_STRT_LAT  (1 << 2)
+#define REG_FEAT_POWERDOWN        REG(0x00, 0x0e)     /* read/write */
+# define FEAT_POWERDOWN_SPDIF     (1 << 3)
 #define REG_INT_FLAGS_0           REG(0x00, 0x0f)     /* read/write */
 #define REG_INT_FLAGS_1           REG(0x00, 0x10)     /* read/write */
 #define REG_INT_FLAGS_2           REG(0x00, 0x11)     /* read/write */
 # define INT_FLAGS_2_EDID_BLK_RD  (1 << 1)
+#define REG_ENA_ACLK              REG(0x00, 0x16)     /* read/write */
 #define REG_ENA_VP_0              REG(0x00, 0x18)     /* read/write */
 #define REG_ENA_VP_1              REG(0x00, 0x19)     /* read/write */
 #define REG_ENA_VP_2              REG(0x00, 0x1a)     /* read/write */
@@ -110,6 +118,8 @@ struct tda998x_priv {
 #define REG_VIP_CNTRL_5           REG(0x00, 0x25)     /* write */
 # define VIP_CNTRL_5_CKCASE       (1 << 0)
 # define VIP_CNTRL_5_SP_CNT(x)    (((x) & 3) << 1)
+#define REG_MUX_AP                REG(0x00, 0x26)     /* read/write */
+#define REG_MUX_VP_VIP_OUT        REG(0x00, 0x27)     /* read/write */
 #define REG_MAT_CONTRL            REG(0x00, 0x80)     /* write */
 # define MAT_CONTRL_MAT_SC(x)     (((x) & 3) << 0)
 # define MAT_CONTRL_MAT_BP        (1 << 2)
@@ -130,8 +140,12 @@ struct tda998x_priv {
 #define REG_VS_LINE_END_1_LSB     REG(0x00, 0xae)     /* write */
 #define REG_VS_PIX_END_1_MSB      REG(0x00, 0xaf)     /* write */
 #define REG_VS_PIX_END_1_LSB      REG(0x00, 0xb0)     /* write */
+#define REG_VS_LINE_STRT_2_MSB    REG(0x00, 0xb1)     /* write */
+#define REG_VS_LINE_STRT_2_LSB    REG(0x00, 0xb2)     /* write */
 #define REG_VS_PIX_STRT_2_MSB     REG(0x00, 0xb3)     /* write */
 #define REG_VS_PIX_STRT_2_LSB     REG(0x00, 0xb4)     /* write */
+#define REG_VS_LINE_END_2_MSB     REG(0x00, 0xb5)     /* write */
+#define REG_VS_LINE_END_2_LSB     REG(0x00, 0xb6)     /* write */
 #define REG_VS_PIX_END_2_MSB      REG(0x00, 0xb7)     /* write */
 #define REG_VS_PIX_END_2_LSB      REG(0x00, 0xb8)     /* write */
 #define REG_HS_PIX_START_MSB      REG(0x00, 0xb9)     /* write */
@@ -142,21 +156,29 @@ struct tda998x_priv {
 #define REG_VWIN_START_1_LSB      REG(0x00, 0xbe)     /* write */
 #define REG_VWIN_END_1_MSB        REG(0x00, 0xbf)     /* write */
 #define REG_VWIN_END_1_LSB        REG(0x00, 0xc0)     /* write */
+#define REG_VWIN_START_2_MSB      REG(0x00, 0xc1)     /* write */
+#define REG_VWIN_START_2_LSB      REG(0x00, 0xc2)     /* write */
+#define REG_VWIN_END_2_MSB        REG(0x00, 0xc3)     /* write */
+#define REG_VWIN_END_2_LSB        REG(0x00, 0xc4)     /* write */
 #define REG_DE_START_MSB          REG(0x00, 0xc5)     /* write */
 #define REG_DE_START_LSB          REG(0x00, 0xc6)     /* write */
 #define REG_DE_STOP_MSB           REG(0x00, 0xc7)     /* write */
 #define REG_DE_STOP_LSB           REG(0x00, 0xc8)     /* write */
 #define REG_TBG_CNTRL_0           REG(0x00, 0xca)     /* write */
+# define TBG_CNTRL_0_TOP_TGL      (1 << 0)
+# define TBG_CNTRL_0_TOP_SEL      (1 << 1)
+# define TBG_CNTRL_0_DE_EXT       (1 << 2)
+# define TBG_CNTRL_0_TOP_EXT      (1 << 3)
 # define TBG_CNTRL_0_FRAME_DIS    (1 << 5)
 # define TBG_CNTRL_0_SYNC_MTHD    (1 << 6)
 # define TBG_CNTRL_0_SYNC_ONCE    (1 << 7)
 #define REG_TBG_CNTRL_1           REG(0x00, 0xcb)     /* write */
-# define TBG_CNTRL_1_VH_TGL_0     (1 << 0)
-# define TBG_CNTRL_1_VH_TGL_1     (1 << 1)
-# define TBG_CNTRL_1_VH_TGL_2     (1 << 2)
-# define TBG_CNTRL_1_VHX_EXT_DE   (1 << 3)
-# define TBG_CNTRL_1_VHX_EXT_HS   (1 << 4)
-# define TBG_CNTRL_1_VHX_EXT_VS   (1 << 5)
+# define TBG_CNTRL_1_H_TGL        (1 << 0)
+# define TBG_CNTRL_1_V_TGL        (1 << 1)
+# define TBG_CNTRL_1_TGL_EN       (1 << 2)
+# define TBG_CNTRL_1_X_EXT        (1 << 3)
+# define TBG_CNTRL_1_H_EXT        (1 << 4)
+# define TBG_CNTRL_1_V_EXT        (1 << 5)
 # define TBG_CNTRL_1_DWIN_DIS     (1 << 6)
 #define REG_ENABLE_SPACE          REG(0x00, 0xd6)     /* write */
 #define REG_HVF_CNTRL_0           REG(0x00, 0xe4)     /* write */
@@ -171,6 +193,12 @@ struct tda998x_priv {
 # define HVF_CNTRL_1_PAD(x)       (((x) & 3) << 4)
 # define HVF_CNTRL_1_SEMI_PLANAR  (1 << 6)
 #define REG_RPT_CNTRL             REG(0x00, 0xf0)     /* write */
+#define REG_I2S_FORMAT            REG(0x00, 0xfc)     /* read/write */
+# define I2S_FORMAT(x)            (((x) & 3) << 0)
+#define REG_AIP_CLKSEL            REG(0x00, 0xfd)     /* write */
+# define AIP_CLKSEL_FS(x)         (((x) & 3) << 0)
+# define AIP_CLKSEL_CLK_POL(x)    (((x) & 1) << 2)
+# define AIP_CLKSEL_AIP(x)        (((x) & 7) << 3)
 
 
 /* Page 02h: PLL settings */
@@ -194,6 +222,12 @@ struct tda998x_priv {
 #define REG_PLL_SCGR1             REG(0x02, 0x09)     /* read/write */
 #define REG_PLL_SCGR2             REG(0x02, 0x0a)     /* read/write */
 #define REG_AUDIO_DIV             REG(0x02, 0x0e)     /* read/write */
+# define AUDIO_DIV_SERCLK_1       0
+# define AUDIO_DIV_SERCLK_2       1
+# define AUDIO_DIV_SERCLK_4       2
+# define AUDIO_DIV_SERCLK_8       3
+# define AUDIO_DIV_SERCLK_16      4
+# define AUDIO_DIV_SERCLK_32      5
 #define REG_SEL_CLK               REG(0x02, 0x11)     /* read/write */
 # define SEL_CLK_SEL_CLK1         (1 << 0)
 # define SEL_CLK_SEL_VRF_CLK(x)   (((x) & 3) << 1)
@@ -212,6 +246,11 @@ struct tda998x_priv {
 
 
 /* Page 10h: information frames and packets */
+#define REG_IF1_HB0               REG(0x10, 0x20)     /* read/write */
+#define REG_IF2_HB0               REG(0x10, 0x40)     /* read/write */
+#define REG_IF3_HB0               REG(0x10, 0x60)     /* read/write */
+#define REG_IF4_HB0               REG(0x10, 0x80)     /* read/write */
+#define REG_IF5_HB0               REG(0x10, 0xa0)     /* read/write */
 
 
 /* Page 11h: audio settings and content info packets */
@@ -221,14 +260,39 @@ struct tda998x_priv {
 # define AIP_CNTRL_0_LAYOUT       (1 << 2)
 # define AIP_CNTRL_0_ACR_MAN      (1 << 5)
 # define AIP_CNTRL_0_RST_CTS      (1 << 6)
+#define REG_CA_I2S                REG(0x11, 0x01)     /* read/write */
+# define CA_I2S_CA_I2S(x)         (((x) & 31) << 0)
+# define CA_I2S_HBR_CHSTAT        (1 << 6)
+#define REG_LATENCY_RD            REG(0x11, 0x04)     /* read/write */
+#define REG_ACR_CTS_0             REG(0x11, 0x05)     /* read/write */
+#define REG_ACR_CTS_1             REG(0x11, 0x06)     /* read/write */
+#define REG_ACR_CTS_2             REG(0x11, 0x07)     /* read/write */
+#define REG_ACR_N_0               REG(0x11, 0x08)     /* read/write */
+#define REG_ACR_N_1               REG(0x11, 0x09)     /* read/write */
+#define REG_ACR_N_2               REG(0x11, 0x0a)     /* read/write */
+#define REG_CTS_N                 REG(0x11, 0x0c)     /* read/write */
+# define CTS_N_K(x)               (((x) & 7) << 0)
+# define CTS_N_M(x)               (((x) & 3) << 4)
 #define REG_ENC_CNTRL             REG(0x11, 0x0d)     /* read/write */
 # define ENC_CNTRL_RST_ENC        (1 << 0)
 # define ENC_CNTRL_RST_SEL        (1 << 1)
 # define ENC_CNTRL_CTL_CODE(x)    (((x) & 3) << 2)
+#define REG_DIP_FLAGS             REG(0x11, 0x0e)     /* read/write */
+# define DIP_FLAGS_ACR            (1 << 0)
+# define DIP_FLAGS_GC             (1 << 1)
+#define REG_DIP_IF_FLAGS          REG(0x11, 0x0f)     /* read/write */
+# define DIP_IF_FLAGS_IF1         (1 << 1)
+# define DIP_IF_FLAGS_IF2         (1 << 2)
+# define DIP_IF_FLAGS_IF3         (1 << 3)
+# define DIP_IF_FLAGS_IF4         (1 << 4)
+# define DIP_IF_FLAGS_IF5         (1 << 5)
+#define REG_CH_STAT_B(x)          REG(0x11, 0x14 + (x)) /* read/write */
 
 
 /* Page 12h: HDCP and OTP */
 #define REG_TX3                   REG(0x12, 0x9a)     /* read/write */
+#define REG_TX4                   REG(0x12, 0x9b)     /* read/write */
+# define TX4_PD_RAM               (1 << 1)
 #define REG_TX33                  REG(0x12, 0xb8)     /* read/write */
 # define TX33_HDMI                (1 << 1)
 
@@ -338,6 +402,23 @@ fail:
         return ret;
 }
 
+static void
+reg_write_range(struct drm_encoder *encoder, uint16_t reg, uint8_t *p, int cnt)
+{
+        struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
+        uint8_t buf[cnt+1];
+        int ret;
+
+        buf[0] = REG2ADDR(reg);
+        memcpy(&buf[1], p, cnt);
+
+        set_page(encoder, reg);
+
+        ret = i2c_master_send(client, buf, cnt + 1);
+        if (ret < 0)
+                dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
+}
+
 static uint8_t
 reg_read(struct drm_encoder *encoder, uint16_t reg)
 {
@@ -406,13 +487,172 @@ tda998x_reset(struct drm_encoder *encoder)
         reg_write(encoder, REG_SERIALIZER,   0x00);
         reg_write(encoder, REG_BUFFER_OUT,   0x00);
         reg_write(encoder, REG_PLL_SCG1,     0x00);
-        reg_write(encoder, REG_AUDIO_DIV,    0x03);
+        reg_write(encoder, REG_AUDIO_DIV,    AUDIO_DIV_SERCLK_8);
         reg_write(encoder, REG_SEL_CLK,      SEL_CLK_SEL_CLK1 | SEL_CLK_ENA_SC_CLK);
         reg_write(encoder, REG_PLL_SCGN1,    0xfa);
         reg_write(encoder, REG_PLL_SCGN2,    0x00);
         reg_write(encoder, REG_PLL_SCGR1,    0x5b);
         reg_write(encoder, REG_PLL_SCGR2,    0x00);
         reg_write(encoder, REG_PLL_SCG2,     0x10);
+
+        /* Write the default value MUX register */
+        reg_write(encoder, REG_MUX_VP_VIP_OUT, 0x24);
+}
+
+static uint8_t tda998x_cksum(uint8_t *buf, size_t bytes)
+{
+        uint8_t sum = 0;
+
+        while (bytes--)
+                sum += *buf++;
+        return (255 - sum) + 1;
+}
+
+#define HB(x) (x)
+#define PB(x) (HB(2) + 1 + (x))
+
+static void
+tda998x_write_if(struct drm_encoder *encoder, uint8_t bit, uint16_t addr,
+                 uint8_t *buf, size_t size)
+{
+        buf[PB(0)] = tda998x_cksum(buf, size);
+
+        reg_clear(encoder, REG_DIP_IF_FLAGS, bit);
+        reg_write_range(encoder, addr, buf, size);
+        reg_set(encoder, REG_DIP_IF_FLAGS, bit);
+}
+
+static void
+tda998x_write_aif(struct drm_encoder *encoder, struct tda998x_encoder_params *p)
+{
+        uint8_t buf[PB(5) + 1];
+
+        buf[HB(0)] = 0x84;
+        buf[HB(1)] = 0x01;
+        buf[HB(2)] = 10;
+        buf[PB(0)] = 0;
+        buf[PB(1)] = p->audio_frame[1] & 0x07; /* CC */
+        buf[PB(2)] = p->audio_frame[2] & 0x1c; /* SF */
+        buf[PB(4)] = p->audio_frame[4];
+        buf[PB(5)] = p->audio_frame[5] & 0xf8; /* DM_INH + LSV */
+
+        tda998x_write_if(encoder, DIP_IF_FLAGS_IF4, REG_IF4_HB0, buf,
+                         sizeof(buf));
+}
+
+static void
+tda998x_write_avi(struct drm_encoder *encoder, struct drm_display_mode *mode)
+{
+        uint8_t buf[PB(13) + 1];
+
+        memset(buf, 0, sizeof(buf));
+        buf[HB(0)] = 0x82;
+        buf[HB(1)] = 0x02;
+        buf[HB(2)] = 13;
+        buf[PB(4)] = drm_match_cea_mode(mode);
+
+        tda998x_write_if(encoder, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf,
+                         sizeof(buf));
+}
+
+static void tda998x_audio_mute(struct drm_encoder *encoder, bool on)
+{
+        if (on) {
+                reg_set(encoder, REG_SOFTRESET, SOFTRESET_AUDIO);
+                reg_clear(encoder, REG_SOFTRESET, SOFTRESET_AUDIO);
+                reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO);
+        } else {
+                reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO);
+        }
+}
+
+static void
+tda998x_configure_audio(struct drm_encoder *encoder,
+                struct drm_display_mode *mode, struct tda998x_encoder_params *p)
+{
+        uint8_t buf[6], clksel_aip, clksel_fs, ca_i2s, cts_n, adiv;
+        uint32_t n;
+
+        /* Enable audio ports */
+        reg_write(encoder, REG_ENA_AP, p->audio_cfg);
+        reg_write(encoder, REG_ENA_ACLK, p->audio_clk_cfg);
+
+        /* Set audio input source */
+        switch (p->audio_format) {
+        case AFMT_SPDIF:
+                reg_write(encoder, REG_MUX_AP, 0x40);
+                clksel_aip = AIP_CLKSEL_AIP(0);
+                /* FS64SPDIF */
+                clksel_fs = AIP_CLKSEL_FS(2);
+                cts_n = CTS_N_M(3) | CTS_N_K(3);
+                ca_i2s = 0;
+                break;
+
+        case AFMT_I2S:
+                reg_write(encoder, REG_MUX_AP, 0x64);
+                clksel_aip = AIP_CLKSEL_AIP(1);
+                /* ACLK */
+                clksel_fs = AIP_CLKSEL_FS(0);
+                cts_n = CTS_N_M(3) | CTS_N_K(3);
+                ca_i2s = CA_I2S_CA_I2S(0);
+                break;
+        }
+
+        reg_write(encoder, REG_AIP_CLKSEL, clksel_aip);
+        reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_LAYOUT);
+
+        /* Enable automatic CTS generation */
+        reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_ACR_MAN);
+        reg_write(encoder, REG_CTS_N, cts_n);
+
+        /*
+         * Audio input somehow depends on HDMI line rate which is
+         * related to pixclk. Testing showed that modes with pixclk
+         * >100MHz need a larger divider while <40MHz need the default.
+         * There is no detailed info in the datasheet, so we just
+         * assume 100MHz requires larger divider.
+         */
+        if (mode->clock > 100000)
+                adiv = AUDIO_DIV_SERCLK_16;
+        else
+                adiv = AUDIO_DIV_SERCLK_8;
+        reg_write(encoder, REG_AUDIO_DIV, adiv);
+
+        /*
+         * This is the approximate value of N, which happens to be
+         * the recommended values for non-coherent clocks.
+         */
+        n = 128 * p->audio_sample_rate / 1000;
+
+        /* Write the CTS and N values */
+        buf[0] = 0x44;
+        buf[1] = 0x42;
+        buf[2] = 0x01;
+        buf[3] = n;
+        buf[4] = n >> 8;
+        buf[5] = n >> 16;
+        reg_write_range(encoder, REG_ACR_CTS_0, buf, 6);
+
+        /* Set CTS clock reference */
+        reg_write(encoder, REG_AIP_CLKSEL, clksel_aip | clksel_fs);
+
+        /* Reset CTS generator */
+        reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS);
+        reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS);
+
+        /* Write the channel status */
+        buf[0] = 0x04;
+        buf[1] = 0x00;
+        buf[2] = 0x00;
+        buf[3] = 0xf1;
+        reg_write_range(encoder, REG_CH_STAT_B(0), buf, 4);
+
+        tda998x_audio_mute(encoder, true);
+        mdelay(20);
+        tda998x_audio_mute(encoder, false);
+
+        /* Write the audio information packet */
+        tda998x_write_aif(encoder, p);
 }
 
 /* DRM encoder functions */
@@ -420,6 +660,23 @@ tda998x_reset(struct drm_encoder *encoder)
 static void
 tda998x_encoder_set_config(struct drm_encoder *encoder, void *params)
 {
+        struct tda998x_priv *priv = to_tda998x_priv(encoder);
+        struct tda998x_encoder_params *p = params;
+
+        priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) |
+                            (p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) |
+                            VIP_CNTRL_0_SWAP_B(p->swap_b) |
+                            (p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0);
+        priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) |
+                            (p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) |
+                            VIP_CNTRL_1_SWAP_D(p->swap_d) |
+                            (p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0);
+        priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) |
+                            (p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) |
+                            VIP_CNTRL_2_SWAP_F(p->swap_f) |
+                            (p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0);
+
+        priv->params = *p;
 }
 
 static void
@@ -436,18 +693,14 @@ tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
 
         switch (mode) {
         case DRM_MODE_DPMS_ON:
-                /* enable audio and video ports */
-                reg_write(encoder, REG_ENA_AP, 0xff);
+                /* enable video ports, audio will be enabled later */
                 reg_write(encoder, REG_ENA_VP_0, 0xff);
                 reg_write(encoder, REG_ENA_VP_1, 0xff);
                 reg_write(encoder, REG_ENA_VP_2, 0xff);
                 /* set muxing after enabling ports: */
-                reg_write(encoder, REG_VIP_CNTRL_0,
-                                VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3));
-                reg_write(encoder, REG_VIP_CNTRL_1,
-                                VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1));
-                reg_write(encoder, REG_VIP_CNTRL_2,
-                                VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5));
+                reg_write(encoder, REG_VIP_CNTRL_0, priv->vip_cntrl_0);
+                reg_write(encoder, REG_VIP_CNTRL_1, priv->vip_cntrl_1);
+                reg_write(encoder, REG_VIP_CNTRL_2, priv->vip_cntrl_2);
                 break;
         case DRM_MODE_DPMS_OFF:
                 /* disable audio and video ports */
@@ -494,43 +747,78 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder,
                         struct drm_display_mode *adjusted_mode)
 {
         struct tda998x_priv *priv = to_tda998x_priv(encoder);
-        uint16_t hs_start, hs_end, line_start, line_end;
-        uint16_t vwin_start, vwin_end, de_start, de_end;
-        uint16_t ref_pix, ref_line, pix_start2;
+        uint16_t ref_pix, ref_line, n_pix, n_line;
+        uint16_t hs_pix_s, hs_pix_e;
+        uint16_t vs1_pix_s, vs1_pix_e, vs1_line_s, vs1_line_e;
+        uint16_t vs2_pix_s, vs2_pix_e, vs2_line_s, vs2_line_e;
+        uint16_t vwin1_line_s, vwin1_line_e;
+        uint16_t vwin2_line_s, vwin2_line_e;
+        uint16_t de_pix_s, de_pix_e;
         uint8_t reg, div, rep;
 
-        hs_start   = mode->hsync_start - mode->hdisplay;
-        hs_end     = mode->hsync_end - mode->hdisplay;
-        line_start = 1;
-        line_end   = 1 + mode->vsync_end - mode->vsync_start;
-        vwin_start = mode->vtotal - mode->vsync_start;
-        vwin_end   = vwin_start + mode->vdisplay;
-        de_start   = mode->htotal - mode->hdisplay;
-        de_end     = mode->htotal;
-
-        pix_start2 = 0;
-        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-                pix_start2 = (mode->htotal / 2) + hs_start;
-
-        /* TODO how is this value calculated?  It is 2 for all common
-         * formats in the tables in out of tree nxp driver (assuming
-         * I've properly deciphered their byzantine table system)
+        /*
+         * Internally TDA998x is using ITU-R BT.656 style sync but
+         * we get VESA style sync. TDA998x is using a reference pixel
+         * relative to ITU to sync to the input frame and for output
+         * sync generation. Currently, we are using reference detection
+         * from HS/VS, i.e. REFPIX/REFLINE denote frame start sync point
+         * which is position of rising VS with coincident rising HS.
+         *
+         * Now there is some issues to take care of:
+         * - HDMI data islands require sync-before-active
+         * - TDA998x register values must be > 0 to be enabled
+         * - REFLINE needs an additional offset of +1
+         * - REFPIX needs an addtional offset of +1 for UYUV and +3 for RGB
+         *
+         * So we add +1 to all horizontal and vertical register values,
+         * plus an additional +3 for REFPIX as we are using RGB input only.
          */
-        ref_line = 2;
-
-        /* this might changes for other color formats from the CRTC: */
-        ref_pix = 3 + hs_start;
+        n_pix        = mode->htotal;
+        n_line       = mode->vtotal;
+
+        hs_pix_e     = mode->hsync_end - mode->hdisplay;
+        hs_pix_s     = mode->hsync_start - mode->hdisplay;
+        de_pix_e     = mode->htotal;
+        de_pix_s     = mode->htotal - mode->hdisplay;
+        ref_pix      = 3 + hs_pix_s;
+
+        /*
+         * Attached LCD controllers may generate broken sync. Allow
+         * those to adjust the position of the rising VS edge by adding
+         * HSKEW to ref_pix.
+         */
+        if (adjusted_mode->flags & DRM_MODE_FLAG_HSKEW)
+                ref_pix += adjusted_mode->hskew;
+
+        if ((mode->flags & DRM_MODE_FLAG_INTERLACE) == 0) {
+                ref_line     = 1 + mode->vsync_start - mode->vdisplay;
+                vwin1_line_s = mode->vtotal - mode->vdisplay - 1;
+                vwin1_line_e = vwin1_line_s + mode->vdisplay;
+                vs1_pix_s    = vs1_pix_e = hs_pix_s;
+                vs1_line_s   = mode->vsync_start - mode->vdisplay;
+                vs1_line_e   = vs1_line_s +
+                               mode->vsync_end - mode->vsync_start;
+                vwin2_line_s = vwin2_line_e = 0;
+                vs2_pix_s    = vs2_pix_e  = 0;
+                vs2_line_s   = vs2_line_e = 0;
+        } else {
+                ref_line     = 1 + (mode->vsync_start - mode->vdisplay)/2;
+                vwin1_line_s = (mode->vtotal - mode->vdisplay)/2;
+                vwin1_line_e = vwin1_line_s + mode->vdisplay/2;
+                vs1_pix_s    = vs1_pix_e = hs_pix_s;
+                vs1_line_s   = (mode->vsync_start - mode->vdisplay)/2;
+                vs1_line_e   = vs1_line_s +
+                               (mode->vsync_end - mode->vsync_start)/2;
+                vwin2_line_s = vwin1_line_s + mode->vtotal/2;
+                vwin2_line_e = vwin2_line_s + mode->vdisplay/2;
+                vs2_pix_s    = vs2_pix_e = hs_pix_s + mode->htotal/2;
+                vs2_line_s   = vs1_line_s + mode->vtotal/2 ;
+                vs2_line_e   = vs2_line_s +
+                               (mode->vsync_end - mode->vsync_start)/2;
+        }
 
         div = 148500 / mode->clock;
 
-        DBG("clock=%d, div=%u", mode->clock, div);
-        DBG("hs_start=%u, hs_end=%u, line_start=%u, line_end=%u",
-                        hs_start, hs_end, line_start, line_end);
-        DBG("vwin_start=%u, vwin_end=%u, de_start=%u, de_end=%u",
-                        vwin_start, vwin_end, de_start, de_end);
-        DBG("ref_line=%u, ref_pix=%u, pix_start2=%u",
-                        ref_line, ref_pix, pix_start2);
-
         /* mute the audio FIFO: */
         reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO);
 
@@ -561,9 +849,6 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder,
         reg_write(encoder, REG_PLL_SERIAL_2, PLL_SERIAL_2_SRL_NOSC(div) |
                         PLL_SERIAL_2_SRL_PR(rep));
 
-        reg_write16(encoder, REG_VS_PIX_STRT_2_MSB, pix_start2);
-        reg_write16(encoder, REG_VS_PIX_END_2_MSB, pix_start2);
-
         /* set color matrix bypass flag: */
         reg_set(encoder, REG_MAT_CONTRL, MAT_CONTRL_MAT_BP);
 
@@ -572,47 +857,75 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder,
 
         reg_clear(encoder, REG_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_MTHD);
 
+        /*
+         * Sync on rising HSYNC/VSYNC
+         */
         reg_write(encoder, REG_VIP_CNTRL_3, 0);
         reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_SYNC_HS);
+
+        /*
+         * TDA19988 requires high-active sync at input stage,
+         * so invert low-active sync provided by master encoder here
+         */
+        if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+                reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_H_TGL);
         if (mode->flags & DRM_MODE_FLAG_NVSYNC)
                 reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_V_TGL);
 
+        /*
+         * Always generate sync polarity relative to input sync and
+         * revert input stage toggled sync at output stage
+         */
+        reg = TBG_CNTRL_1_TGL_EN;
         if (mode->flags & DRM_MODE_FLAG_NHSYNC)
-                reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_H_TGL);
+                reg |= TBG_CNTRL_1_H_TGL;
+        if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+                reg |= TBG_CNTRL_1_V_TGL;
+        reg_write(encoder, REG_TBG_CNTRL_1, reg);
 
         reg_write(encoder, REG_VIDFORMAT, 0x00);
-        reg_write16(encoder, REG_NPIX_MSB, mode->hdisplay - 1);
-        reg_write16(encoder, REG_NLINE_MSB, mode->vdisplay - 1);
-        reg_write16(encoder, REG_VS_LINE_STRT_1_MSB, line_start);
-        reg_write16(encoder, REG_VS_LINE_END_1_MSB, line_end);
-        reg_write16(encoder, REG_VS_PIX_STRT_1_MSB, hs_start);
-        reg_write16(encoder, REG_VS_PIX_END_1_MSB, hs_start);
-        reg_write16(encoder, REG_HS_PIX_START_MSB, hs_start);
-        reg_write16(encoder, REG_HS_PIX_STOP_MSB, hs_end);
-        reg_write16(encoder, REG_VWIN_START_1_MSB, vwin_start);
-        reg_write16(encoder, REG_VWIN_END_1_MSB, vwin_end);
-        reg_write16(encoder, REG_DE_START_MSB, de_start);
-        reg_write16(encoder, REG_DE_STOP_MSB, de_end);
+        reg_write16(encoder, REG_REFPIX_MSB, ref_pix);
+        reg_write16(encoder, REG_REFLINE_MSB, ref_line);
+        reg_write16(encoder, REG_NPIX_MSB, n_pix);
+        reg_write16(encoder, REG_NLINE_MSB, n_line);
+        reg_write16(encoder, REG_VS_LINE_STRT_1_MSB, vs1_line_s);
+        reg_write16(encoder, REG_VS_PIX_STRT_1_MSB, vs1_pix_s);
+        reg_write16(encoder, REG_VS_LINE_END_1_MSB, vs1_line_e);
+        reg_write16(encoder, REG_VS_PIX_END_1_MSB, vs1_pix_e);
+        reg_write16(encoder, REG_VS_LINE_STRT_2_MSB, vs2_line_s);
+        reg_write16(encoder, REG_VS_PIX_STRT_2_MSB, vs2_pix_s);
+        reg_write16(encoder, REG_VS_LINE_END_2_MSB, vs2_line_e);
+        reg_write16(encoder, REG_VS_PIX_END_2_MSB, vs2_pix_e);
+        reg_write16(encoder, REG_HS_PIX_START_MSB, hs_pix_s);
+        reg_write16(encoder, REG_HS_PIX_STOP_MSB, hs_pix_e);
+        reg_write16(encoder, REG_VWIN_START_1_MSB, vwin1_line_s);
+        reg_write16(encoder, REG_VWIN_END_1_MSB, vwin1_line_e);
+        reg_write16(encoder, REG_VWIN_START_2_MSB, vwin2_line_s);
+        reg_write16(encoder, REG_VWIN_END_2_MSB, vwin2_line_e);
+        reg_write16(encoder, REG_DE_START_MSB, de_pix_s);
+        reg_write16(encoder, REG_DE_STOP_MSB, de_pix_e);
 
         if (priv->rev == TDA19988) {
                 /* let incoming pixels fill the active space (if any) */
                 reg_write(encoder, REG_ENABLE_SPACE, 0x01);
         }
 
-        reg_write16(encoder, REG_REFPIX_MSB, ref_pix);
-        reg_write16(encoder, REG_REFLINE_MSB, ref_line);
-
-        reg = TBG_CNTRL_1_VHX_EXT_DE |
-                        TBG_CNTRL_1_VHX_EXT_HS |
-                        TBG_CNTRL_1_VHX_EXT_VS |
-                        TBG_CNTRL_1_DWIN_DIS | /* HDCP off */
-                        TBG_CNTRL_1_VH_TGL_2;
-        if (mode->flags & (DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC))
-                reg |= TBG_CNTRL_1_VH_TGL_0;
-        reg_set(encoder, REG_TBG_CNTRL_1, reg);
-
         /* must be last register set: */
         reg_clear(encoder, REG_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_ONCE);
+
+        /* Only setup the info frames if the sink is HDMI */
+        if (priv->is_hdmi_sink) {
+                /* We need to turn HDMI HDCP stuff on to get audio through */
+                reg_clear(encoder, REG_TBG_CNTRL_1, TBG_CNTRL_1_DWIN_DIS);
+                reg_write(encoder, REG_ENC_CNTRL, ENC_CNTRL_CTL_CODE(1));
+                reg_set(encoder, REG_TX33, TX33_HDMI);
+
+                tda998x_write_avi(encoder, adjusted_mode);
+
+                if (priv->params.audio_cfg)
+                        tda998x_configure_audio(encoder, adjusted_mode,
+                                                &priv->params);
+        }
 }
 
 static enum drm_connector_status
@@ -673,6 +986,7 @@ read_edid_block(struct drm_encoder *encoder, uint8_t *buf, int blk)
 static uint8_t *
 do_get_edid(struct drm_encoder *encoder)
 {
+        struct tda998x_priv *priv = to_tda998x_priv(encoder);
         int j = 0, valid_extensions = 0;
         uint8_t *block, *new;
         bool print_bad_edid = drm_debug & DRM_UT_KMS;
@@ -680,6 +994,9 @@ do_get_edid(struct drm_encoder *encoder)
         if ((block = kmalloc(EDID_LENGTH, GFP_KERNEL)) == NULL)
                 return NULL;
 
+        if (priv->rev == TDA19988)
+                reg_clear(encoder, REG_TX4, TX4_PD_RAM);
+
         /* base block fetch */
         if (read_edid_block(encoder, block, 0))
                 goto fail;
@@ -689,7 +1006,7 @@ do_get_edid(struct drm_encoder *encoder)
 
         /* if there's no extensions, we're done */
         if (block[0x7e] == 0)
-                return block;
+                goto done;
 
         new = krealloc(block, (block[0x7e] + 1) * EDID_LENGTH, GFP_KERNEL);
         if (!new)
@@ -716,9 +1033,15 @@ do_get_edid(struct drm_encoder *encoder)
                 block = new;
         }
 
+done:
+        if (priv->rev == TDA19988)
+                reg_set(encoder, REG_TX4, TX4_PD_RAM);
+
         return block;
 
 fail:
+        if (priv->rev == TDA19988)
+                reg_set(encoder, REG_TX4, TX4_PD_RAM);
         dev_warn(encoder->dev->dev, "failed to read EDID\n");
         kfree(block);
         return NULL;
@@ -728,12 +1051,14 @@ static int
 tda998x_encoder_get_modes(struct drm_encoder *encoder,
                          struct drm_connector *connector)
 {
+        struct tda998x_priv *priv = to_tda998x_priv(encoder);
         struct edid *edid = (struct edid *)do_get_edid(encoder);
         int n = 0;
 
         if (edid) {
                 drm_mode_connector_update_edid_property(connector, edid);
                 n = drm_add_edid_modes(connector, edid);
+                priv->is_hdmi_sink = drm_detect_hdmi_monitor(edid);
                 kfree(edid);
         }
 
@@ -807,6 +1132,10 @@ tda998x_encoder_init(struct i2c_client *client,
         if (!priv)
                 return -ENOMEM;
 
+        priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(2) | VIP_CNTRL_0_SWAP_B(3);
+        priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(0) | VIP_CNTRL_1_SWAP_D(1);
+        priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(4) | VIP_CNTRL_2_SWAP_F(5);
+
         priv->current_page = 0;
         priv->cec = i2c_new_dummy(client->adapter, 0x34);
         priv->dpms = DRM_MODE_DPMS_OFF;
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index ada49eda489f..ab1892eb1074 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -113,7 +113,6 @@ static const struct file_operations i810_buffer_fops = {
         .release = drm_release,
         .unlocked_ioctl = drm_ioctl,
         .mmap = i810_mmap_buffers,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -1241,7 +1240,7 @@ int i810_driver_dma_quiescent(struct drm_device *dev)
         return 0;
 }
 
-struct drm_ioctl_desc i810_ioctls[] = {
+const struct drm_ioctl_desc i810_ioctls[] = {
         DRM_IOCTL_DEF_DRV(I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
         DRM_IOCTL_DEF_DRV(I810_VERTEX, i810_dma_vertex, DRM_AUTH|DRM_UNLOCKED),
         DRM_IOCTL_DEF_DRV(I810_CLEAR, i810_clear_bufs, DRM_AUTH|DRM_UNLOCKED),
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 2e91fc3580b4..d8180d22cedd 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -49,7 +49,6 @@ static const struct file_operations i810_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -58,7 +57,7 @@ static const struct file_operations i810_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
+            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP |
             DRIVER_HAVE_DMA,
         .dev_priv_size = sizeof(drm_i810_buf_priv_t),
         .load = i810_driver_load,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 6e0acad9e0f5..d4d16eddd651 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -125,7 +125,7 @@ extern void i810_driver_preclose(struct drm_device *dev,
 extern int i810_driver_device_is_agp(struct drm_device *dev);
 
 extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-extern struct drm_ioctl_desc i810_ioctls[];
+extern const struct drm_ioctl_desc i810_ioctls[];
 extern int i810_max_ioctl;
 
 #define I810_BASE(reg)          ((unsigned long) \
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 09e8ef910ec5..3e4e6073d171 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1296,7 +1296,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
 
         intel_register_dsm_handler();
 
-        ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops);
+        ret = vga_switcheroo_register_client(dev->pdev, &i915_switcheroo_ops, false);
         if (ret)
                 goto cleanup_vga_client;
 
@@ -1658,7 +1658,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         if (INTEL_INFO(dev)->num_pipes) {
                 /* Must be done after probing outputs */
                 intel_opregion_init(dev);
-                acpi_video_register_with_quirks();
+                acpi_video_register();
         }
 
         if (IS_GEN5(dev))
@@ -1859,7 +1859,7 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
         kfree(file_priv);
 }
 
-struct drm_ioctl_desc i915_ioctls[] = {
+const struct drm_ioctl_desc i915_ioctls[] = {
         DRM_IOCTL_DEF_DRV(I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(I915_FLIP, i915_flip_bufs, DRM_AUTH),
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index beb295634a49..735dd5625e9e 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1009,7 +1009,6 @@ static const struct file_operations i915_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_gem_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = i915_compat_ioctl,
@@ -1022,7 +1021,7 @@ static struct drm_driver driver = {
          * deal with them for Intel hardware.
          */
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
+            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP |
             DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME,
         .load = i915_driver_load,
         .unload = i915_driver_unload,
@@ -1053,7 +1052,7 @@ static struct drm_driver driver = {
 
         .dumb_create = i915_gem_dumb_create,
         .dumb_map_offset = i915_gem_mmap_gtt,
-        .dumb_destroy = i915_gem_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
         .ioctls = i915_ioctls,
         .fops = &i915_driver_fops,
         .name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5f8a638c5145..f22c81d040c0 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -380,7 +380,8 @@ struct drm_i915_display_funcs {
         void (*init_clock_gating)(struct drm_device *dev);
         int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
                           struct drm_framebuffer *fb,
-                          struct drm_i915_gem_object *obj);
+                          struct drm_i915_gem_object *obj,
+                          uint32_t flags);
         int (*update_plane)(struct drm_crtc *crtc, struct drm_framebuffer *fb,
                             int x, int y);
         void (*hpd_irq_setup)(struct drm_device *dev);
@@ -1687,7 +1688,7 @@ struct drm_i915_file_private {
 #define INTEL_RC6p_ENABLE                       (1<<1)
 #define INTEL_RC6pp_ENABLE                      (1<<2)
 
-extern struct drm_ioctl_desc i915_ioctls[];
+extern const struct drm_ioctl_desc i915_ioctls[];
 extern int i915_max_ioctl;
 extern unsigned int i915_fbpercrtc __always_unused;
 extern int i915_panel_ignore_lid __read_mostly;
@@ -1867,8 +1868,6 @@ int i915_gem_dumb_create(struct drm_file *file_priv,
                          struct drm_mode_create_dumb *args);
 int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev,
                       uint32_t handle, uint64_t *offset);
-int i915_gem_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,
-                          uint32_t handle);
 /**
  * Returns true if seq1 is later than seq2.
  */
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 23c42567631e..2d1cb10d846f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -26,6 +26,7 @@
  */
 
 #include <drm/drmP.h>
+#include <drm/drm_vma_manager.h>
 #include <drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_trace.h"
@@ -261,13 +262,6 @@ i915_gem_dumb_create(struct drm_file *file,
                                args->size, &args->handle);
 }
 
-int i915_gem_dumb_destroy(struct drm_file *file,
-                          struct drm_device *dev,
-                          uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 /**
  * Creates a new mm object and returns a handle to it.
  */
@@ -1443,11 +1437,7 @@ i915_gem_release_mmap(struct drm_i915_gem_object *obj)
         if (!obj->fault_mappable)
                 return;
 
-        if (obj->base.dev->dev_mapping)
-                unmap_mapping_range(obj->base.dev->dev_mapping,
-                                    (loff_t)obj->base.map_list.hash.key<<PAGE_SHIFT,
-                                    obj->base.size, 1);
-
+        drm_vma_node_unmap(&obj->base.vma_node, obj->base.dev->dev_mapping);
         obj->fault_mappable = false;
 }
 
@@ -1503,7 +1493,7 @@ static int i915_gem_object_create_mmap_offset(struct drm_i915_gem_object *obj)
         struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
         int ret;
 
-        if (obj->base.map_list.map)
+        if (drm_vma_node_has_offset(&obj->base.vma_node))
                 return 0;
 
         dev_priv->mm.shrinker_no_lock_stealing = true;
@@ -1534,9 +1524,6 @@ out:
 
 static void i915_gem_object_free_mmap_offset(struct drm_i915_gem_object *obj)
 {
-        if (!obj->base.map_list.map)
-                return;
-
         drm_gem_free_mmap_offset(&obj->base);
 }
 
@@ -1575,7 +1562,7 @@ i915_gem_mmap_gtt(struct drm_file *file,
         if (ret)
                 goto out;
 
-        *offset = (u64)obj->base.map_list.hash.key << PAGE_SHIFT;
+        *offset = drm_vma_node_offset_addr(&obj->base.vma_node);
 
 out:
         drm_gem_object_unreference(&obj->base);
@@ -3178,7 +3165,8 @@ i915_gem_object_bind_to_vm(struct drm_i915_gem_object *obj,
 search_free:
         ret = drm_mm_insert_node_in_range_generic(&vm->mm, &vma->node,
                                                   size, alignment,
-                                                  obj->cache_level, 0, gtt_max);
+                                                  obj->cache_level, 0, gtt_max,
+                                                  DRM_MM_SEARCH_DEFAULT);
         if (ret) {
                 ret = i915_gem_evict_something(dev, vm, size, alignment,
                                                obj->cache_level,
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 938eb341054c..e918b05fcbdd 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -103,17 +103,6 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,
         mutex_unlock(&obj->base.dev->struct_mutex);
 }
 
-static void i915_gem_dmabuf_release(struct dma_buf *dma_buf)
-{
-        struct drm_i915_gem_object *obj = dma_buf->priv;
-
-        if (obj->base.export_dma_buf == dma_buf) {
-                /* drop the reference on the export fd holds */
-                obj->base.export_dma_buf = NULL;
-                drm_gem_object_unreference_unlocked(&obj->base);
-        }
-}
-
 static void *i915_gem_dmabuf_vmap(struct dma_buf *dma_buf)
 {
         struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf);
@@ -224,7 +213,7 @@ static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, size_t start, size
 static const struct dma_buf_ops i915_dmabuf_ops =  {
         .map_dma_buf = i915_gem_map_dma_buf,
         .unmap_dma_buf = i915_gem_unmap_dma_buf,
-        .release = i915_gem_dmabuf_release,
+        .release = drm_gem_dmabuf_release,
         .kmap = i915_gem_dmabuf_kmap,
         .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
         .kunmap = i915_gem_dmabuf_kunmap,
@@ -300,12 +289,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
                 goto fail_detach;
         }
 
-        ret = drm_gem_private_object_init(dev, &obj->base, dma_buf->size);
-        if (ret) {
-                i915_gem_object_free(obj);
-                goto fail_detach;
-        }
-
+        drm_gem_private_object_init(dev, &obj->base, dma_buf->size);
         i915_gem_object_init(obj, &i915_gem_object_dmabuf_ops);
         obj->base.import_attach = attach;
 
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 7f4c510a751b..9969d10b80f5 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -94,31 +94,36 @@ static int i915_setup_compression(struct drm_device *dev, int size)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_mm_node *compressed_fb, *uninitialized_var(compressed_llb);
+        int ret;
 
-        /* Try to over-allocate to reduce reallocations and fragmentation */
-        compressed_fb = drm_mm_search_free(&dev_priv->mm.stolen,
-                                           size <<= 1, 4096, 0);
-        if (!compressed_fb)
-                compressed_fb = drm_mm_search_free(&dev_priv->mm.stolen,
-                                                   size >>= 1, 4096, 0);
-        if (compressed_fb)
-                compressed_fb = drm_mm_get_block(compressed_fb, size, 4096);
+        compressed_fb = kzalloc(sizeof(*compressed_fb), GFP_KERNEL);
         if (!compressed_fb)
-                goto err;
+                goto err_llb;
+
+        /* Try to over-allocate to reduce reallocations and fragmentation */
+        ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,
+                                 size <<= 1, 4096, DRM_MM_SEARCH_DEFAULT);
+        if (ret)
+                ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_fb,
+                                         size >>= 1, 4096,
+                                         DRM_MM_SEARCH_DEFAULT);
+        if (ret)
+                goto err_llb;
 
         if (HAS_PCH_SPLIT(dev))
                 I915_WRITE(ILK_DPFC_CB_BASE, compressed_fb->start);
         else if (IS_GM45(dev)) {
                 I915_WRITE(DPFC_CB_BASE, compressed_fb->start);
         } else {
-                compressed_llb = drm_mm_search_free(&dev_priv->mm.stolen,
-                                                    4096, 4096, 0);
-                if (compressed_llb)
-                        compressed_llb = drm_mm_get_block(compressed_llb,
-                                                          4096, 4096);
+                compressed_llb = kzalloc(sizeof(*compressed_llb), GFP_KERNEL);
                 if (!compressed_llb)
                         goto err_fb;
 
+                ret = drm_mm_insert_node(&dev_priv->mm.stolen, compressed_llb,
+                                         4096, 4096, DRM_MM_SEARCH_DEFAULT);
+                if (ret)
+                        goto err_fb;
+
                 dev_priv->fbc.compressed_llb = compressed_llb;
 
                 I915_WRITE(FBC_CFB_BASE,
@@ -136,8 +141,10 @@ static int i915_setup_compression(struct drm_device *dev, int size)
         return 0;
 
 err_fb:
-        drm_mm_put_block(compressed_fb);
-err:
+        kfree(compressed_llb);
+        drm_mm_remove_node(compressed_fb);
+err_llb:
+        kfree(compressed_fb);
         pr_info_once("drm: not enough stolen space for compressed buffer (need %d more bytes), disabling. Hint: you may be able to increase stolen memory size in the BIOS to avoid this.\n", size);
         return -ENOSPC;
 }
@@ -165,11 +172,15 @@ void i915_gem_stolen_cleanup_compression(struct drm_device *dev)
         if (dev_priv->fbc.size == 0)
                 return;
 
-        if (dev_priv->fbc.compressed_fb)
-                drm_mm_put_block(dev_priv->fbc.compressed_fb);
+        if (dev_priv->fbc.compressed_fb) {
+                drm_mm_remove_node(dev_priv->fbc.compressed_fb);
+                kfree(dev_priv->fbc.compressed_fb);
+        }
 
-        if (dev_priv->fbc.compressed_llb)
-                drm_mm_put_block(dev_priv->fbc.compressed_llb);
+        if (dev_priv->fbc.compressed_llb) {
+                drm_mm_remove_node(dev_priv->fbc.compressed_llb);
+                kfree(dev_priv->fbc.compressed_llb);
+        }
 
         dev_priv->fbc.size = 0;
 }
@@ -273,9 +284,7 @@ _i915_gem_object_create_stolen(struct drm_device *dev,
         if (obj == NULL)
                 return NULL;
 
-        if (drm_gem_private_object_init(dev, &obj->base, stolen->size))
-                goto cleanup;
-
+        drm_gem_private_object_init(dev, &obj->base, stolen->size);
         i915_gem_object_init(obj, &i915_gem_object_stolen_ops);
 
         obj->pages = i915_pages_create_for_stolen(dev,
@@ -303,6 +312,7 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
         struct drm_mm_node *stolen;
+        int ret;
 
         if (!drm_mm_initialized(&dev_priv->mm.stolen))
                 return NULL;
@@ -311,17 +321,23 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size)
         if (size == 0)
                 return NULL;
 
-        stolen = drm_mm_search_free(&dev_priv->mm.stolen, size, 4096, 0);
-        if (stolen)
-                stolen = drm_mm_get_block(stolen, size, 4096);
-        if (stolen == NULL)
+        stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
+        if (!stolen)
+                return NULL;
+
+        ret = drm_mm_insert_node(&dev_priv->mm.stolen, stolen, size,
+                                 4096, DRM_MM_SEARCH_DEFAULT);
+        if (ret) {
+                kfree(stolen);
                 return NULL;
+        }
 
         obj = _i915_gem_object_create_stolen(dev, stolen);
         if (obj)
                 return obj;
 
-        drm_mm_put_block(stolen);
+        drm_mm_remove_node(stolen);
+        kfree(stolen);
         return NULL;
 }
 
@@ -367,7 +383,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
         obj = _i915_gem_object_create_stolen(dev, stolen);
         if (obj == NULL) {
                 DRM_DEBUG_KMS("failed to allocate stolen object\n");
-                drm_mm_put_block(stolen);
+                drm_mm_remove_node(stolen);
+                kfree(stolen);
                 return NULL;
         }
 
@@ -406,7 +423,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
 err_vma:
         i915_gem_vma_destroy(vma);
 err_out:
-        drm_mm_put_block(stolen);
+        drm_mm_remove_node(stolen);
+        kfree(stolen);
         drm_gem_object_unreference(&obj->base);
         return NULL;
 }
@@ -415,7 +433,8 @@ void
 i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)
 {
         if (obj->stolen) {
-                drm_mm_put_block(obj->stolen);
+                drm_mm_remove_node(obj->stolen);
+                kfree(obj->stolen);
                 obj->stolen = NULL;
         }
 }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 76d965c38d7e..56708c64e68f 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4160,6 +4160,8 @@
          _TRANSCODER(trans, HSW_VIDEO_DIP_CTL_A, HSW_VIDEO_DIP_CTL_B)
 #define HSW_TVIDEO_DIP_AVI_DATA(trans) \
          _TRANSCODER(trans, HSW_VIDEO_DIP_AVI_DATA_A, HSW_VIDEO_DIP_AVI_DATA_B)
+#define HSW_TVIDEO_DIP_VS_DATA(trans) \
+         _TRANSCODER(trans, HSW_VIDEO_DIP_VS_DATA_A, HSW_VIDEO_DIP_VS_DATA_B)
 #define HSW_TVIDEO_DIP_SPD_DATA(trans) \
          _TRANSCODER(trans, HSW_VIDEO_DIP_SPD_DATA_A, HSW_VIDEO_DIP_SPD_DATA_B)
 #define HSW_TVIDEO_DIP_GCP(trans) \
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b4daa640a6d8..10c1db596387 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7650,7 +7650,8 @@ inline static void intel_mark_page_flip_active(struct intel_crtc *intel_crtc)
 static int intel_gen2_queue_flip(struct drm_device *dev,
                                  struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_i915_gem_object *obj)
+                                 struct drm_i915_gem_object *obj,
+                                 uint32_t flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7694,7 +7695,8 @@ err:
 static int intel_gen3_queue_flip(struct drm_device *dev,
                                  struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_i915_gem_object *obj)
+                                 struct drm_i915_gem_object *obj,
+                                 uint32_t flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7735,7 +7737,8 @@ err:
 static int intel_gen4_queue_flip(struct drm_device *dev,
                                  struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_i915_gem_object *obj)
+                                 struct drm_i915_gem_object *obj,
+                                 uint32_t flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7783,7 +7786,8 @@ err:
 static int intel_gen6_queue_flip(struct drm_device *dev,
                                  struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_i915_gem_object *obj)
+                                 struct drm_i915_gem_object *obj,
+                                 uint32_t flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7833,7 +7837,8 @@ err:
 static int intel_gen7_queue_flip(struct drm_device *dev,
                                  struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_i915_gem_object *obj)
+                                 struct drm_i915_gem_object *obj,
+                                 uint32_t flags)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -7883,14 +7888,16 @@ err:
 static int intel_default_queue_flip(struct drm_device *dev,
                                     struct drm_crtc *crtc,
                                     struct drm_framebuffer *fb,
-                                    struct drm_i915_gem_object *obj)
+                                    struct drm_i915_gem_object *obj,
+                                    uint32_t flags)
 {
         return -ENODEV;
 }
 
 static int intel_crtc_page_flip(struct drm_crtc *crtc,
                                 struct drm_framebuffer *fb,
-                                struct drm_pending_vblank_event *event)
+                                struct drm_pending_vblank_event *event,
+                                uint32_t page_flip_flags)
 {
         struct drm_device *dev = crtc->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -7960,7 +7967,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         atomic_inc(&intel_crtc->unpin_work_count);
         intel_crtc->reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
 
-        ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
+        ret = dev_priv->display.queue_flip(dev, crtc, fb, obj, page_flip_flags);
         if (ret)
                 goto cleanup_pending;
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 94179fdf61f5..4148cc85bf7f 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -74,6 +74,8 @@ static u32 g4x_infoframe_index(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_SELECT_AVI;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_SELECT_SPD;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_SELECT_VENDOR;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -87,6 +89,8 @@ static u32 g4x_infoframe_enable(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_ENABLE_AVI;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_ENABLE_SPD;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_ENABLE_VENDOR;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -100,6 +104,8 @@ static u32 hsw_infoframe_enable(enum hdmi_infoframe_type type)
                 return VIDEO_DIP_ENABLE_AVI_HSW;
         case HDMI_INFOFRAME_TYPE_SPD:
                 return VIDEO_DIP_ENABLE_SPD_HSW;
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return VIDEO_DIP_ENABLE_VS_HSW;
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -114,6 +120,8 @@ static u32 hsw_infoframe_data_reg(enum hdmi_infoframe_type type,
                 return HSW_TVIDEO_DIP_AVI_DATA(cpu_transcoder);
         case HDMI_INFOFRAME_TYPE_SPD:
                 return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder);
+        case HDMI_INFOFRAME_TYPE_VENDOR:
+                return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder);
         default:
                 DRM_DEBUG_DRIVER("unknown info frame type %d\n", type);
                 return 0;
@@ -392,6 +400,21 @@ static void intel_hdmi_set_spd_infoframe(struct drm_encoder *encoder)
         intel_write_infoframe(encoder, &frame);
 }
 
+static void
+intel_hdmi_set_hdmi_infoframe(struct drm_encoder *encoder,
+                              struct drm_display_mode *adjusted_mode)
+{
+        union hdmi_infoframe frame;
+        int ret;
+
+        ret = drm_hdmi_vendor_infoframe_from_display_mode(&frame.vendor.hdmi,
+                                                          adjusted_mode);
+        if (ret < 0)
+                return;
+
+        intel_write_infoframe(encoder, &frame);
+}
+
 static void g4x_set_infoframes(struct drm_encoder *encoder,
                                struct drm_display_mode *adjusted_mode)
 {
@@ -454,6 +477,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void ibx_set_infoframes(struct drm_encoder *encoder,
@@ -515,6 +539,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void cpt_set_infoframes(struct drm_encoder *encoder,
@@ -550,6 +575,7 @@ static void cpt_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void vlv_set_infoframes(struct drm_encoder *encoder,
@@ -584,6 +610,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void hsw_set_infoframes(struct drm_encoder *encoder,
@@ -611,6 +638,7 @@ static void hsw_set_infoframes(struct drm_encoder *encoder,
 
         intel_hdmi_set_avi_infoframe(encoder, adjusted_mode);
         intel_hdmi_set_spd_infoframe(encoder);
+        intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode);
 }
 
 static void intel_hdmi_mode_set(struct intel_encoder *encoder)
@@ -802,10 +830,22 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
         }
 }
 
+static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
+{
+        struct drm_device *dev = intel_hdmi_to_dev(hdmi);
+
+        if (IS_G4X(dev))
+                return 165000;
+        else if (IS_HASWELL(dev))
+                return 300000;
+        else
+                return 225000;
+}
+
 static int intel_hdmi_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
-        if (mode->clock > 165000)
+        if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
                 return MODE_CLOCK_HIGH;
         if (mode->clock < 20000)
                 return MODE_CLOCK_LOW;
@@ -823,6 +863,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
         struct drm_device *dev = encoder->base.dev;
         struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
         int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;
+        int portclock_limit = hdmi_portclock_limit(intel_hdmi);
         int desired_bpp;
 
         if (intel_hdmi->color_range_auto) {
@@ -846,7 +887,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
          * outputs. We also need to check that the higher clock still fits
          * within limits.
          */
-        if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= 225000
+        if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit
             && HAS_PCH_SPLIT(dev)) {
                 DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
                 desired_bpp = 12*3;
@@ -863,7 +904,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
                 pipe_config->pipe_bpp = desired_bpp;
         }
 
-        if (adjusted_mode->clock > 225000) {
+        if (adjusted_mode->clock > portclock_limit) {
                 DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n");
                 return false;
         }
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 17d0a637e4fb..6b1a87c8aac5 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -50,7 +50,6 @@ static const struct file_operations mga_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = mga_compat_ioctl,
 #endif
@@ -59,7 +58,7 @@ static const struct file_operations mga_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |
+            DRIVER_USE_AGP | DRIVER_PCI_DMA |
             DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
         .dev_priv_size = sizeof(drm_mga_buf_priv_t),
         .load = mga_driver_load,
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index 54558a01969a..ca4bc54ea214 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -149,7 +149,7 @@ typedef struct drm_mga_private {
         unsigned int agp_size;
 } drm_mga_private_t;
 
-extern struct drm_ioctl_desc mga_ioctls[];
+extern const struct drm_ioctl_desc mga_ioctls[];
 extern int mga_max_ioctl;
 
                                 /* mga_dma.c */
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index 9c145143ad0f..37cc2fb4eadd 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -1083,7 +1083,7 @@ file_priv)
         return 0;
 }
 
-struct drm_ioctl_desc mga_ioctls[] = {
+const struct drm_ioctl_desc mga_ioctls[] = {
         DRM_IOCTL_DEF_DRV(MGA_INIT, mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(MGA_FLUSH, mga_dma_flush, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(MGA_RESET, mga_dma_reset, DRM_AUTH),
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 122b571ccc7c..fcce7b2f8011 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -81,7 +81,6 @@ static const struct file_operations mgag200_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = mgag200_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -89,7 +88,7 @@ static const struct file_operations mgag200_driver_fops = {
 };
 
 static struct drm_driver driver = {
-        .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_USE_MTRR,
+        .driver_features = DRIVER_GEM | DRIVER_MODESET,
         .load = mgag200_driver_load,
         .unload = mgag200_driver_unload,
         .fops = &mgag200_driver_fops,
@@ -104,7 +103,7 @@ static struct drm_driver driver = {
         .gem_free_object = mgag200_gem_free_object,
         .dumb_create = mgag200_dumb_create,
         .dumb_map_offset = mgag200_dumb_mmap_offset,
-        .dumb_destroy = mgag200_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 };
 
 static struct pci_driver mgag200_pci_driver = {
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 12e2499d9352..baaae19332e2 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
@@ -264,9 +264,6 @@ int mgag200_gem_init_object(struct drm_gem_object *obj);
 int mgag200_dumb_create(struct drm_file *file,
                         struct drm_device *dev,
                         struct drm_mode_create_dumb *args);
-int mgag200_dumb_destroy(struct drm_file *file,
-                         struct drm_device *dev,
-                         uint32_t handle);
 void mgag200_gem_free_object(struct drm_gem_object *obj);
 int
 mgag200_dumb_mmap_offset(struct drm_file *file,
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index 9fa5685baee0..0f8b861b10b3 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -310,13 +310,6 @@ int mgag200_dumb_create(struct drm_file *file,
         return 0;
 }
 
-int mgag200_dumb_destroy(struct drm_file *file,
-                     struct drm_device *dev,
-                     uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 int mgag200_gem_init_object(struct drm_gem_object *obj)
 {
         BUG();
@@ -349,7 +342,7 @@ void mgag200_gem_free_object(struct drm_gem_object *obj)
 
 static inline u64 mgag200_bo_mmap_offset(struct mgag200_bo *bo)
 {
-        return bo->bo.addr_space_offset;
+        return drm_vma_node_offset_addr(&bo->bo.vma_node);
 }
 
 int
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 3acb2b044c7b..fd4539d9ad2c 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -148,7 +148,9 @@ mgag200_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 
 static int mgag200_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct mgag200_bo *mgabo = mgag200_bo(bo);
+
+        return drm_vma_node_verify_access(&mgabo->gem.vma_node, filp);
 }
 
 static int mgag200_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
@@ -321,7 +323,6 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align,
                 return ret;
         }
 
-        mgabo->gem.driver_private = NULL;
         mgabo->bo.bdev = &mdev->ttm.bdev;
 
         mgag200_ttm_placement(mgabo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
new file mode 100644
index 000000000000..a06c19cc56f8
--- /dev/null
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -0,0 +1,34 @@
+
+config DRM_MSM
+        tristate "MSM DRM"
+        depends on DRM
+        depends on ARCH_MSM
+        depends on ARCH_MSM8960
+        select DRM_KMS_HELPER
+        select SHMEM
+        select TMPFS
+        default y
+        help
+          DRM/KMS driver for MSM/snapdragon.
+
+config DRM_MSM_FBDEV
+        bool "Enable legacy fbdev support for MSM modesetting driver"
+        depends on DRM_MSM
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        default y
+        help
+          Choose this option if you have a need for the legacy fbdev
+          support. Note that this support also provide the linux console
+          support on top of the MSM modesetting driver.
+
+config DRM_MSM_REGISTER_LOGGING
+        bool "MSM DRM register logging"
+        depends on DRM_MSM
+        default n
+        help
+          Compile in support for logging register reads/writes in a format
+          that can be parsed by envytools demsm tool.  If enabled, register
+          logging can be switched on via msm.reglog=y module param.
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
new file mode 100644
index 000000000000..439dfb5b417b
--- /dev/null
+++ b/drivers/gpu/drm/msm/Makefile
@@ -0,0 +1,30 @@
+ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
+ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
+        ccflags-y += -Werror
+endif
+
+msm-y := \
+        adreno/adreno_gpu.o \
+        adreno/a3xx_gpu.o \
+        hdmi/hdmi.o \
+        hdmi/hdmi_connector.o \
+        hdmi/hdmi_i2c.o \
+        hdmi/hdmi_phy_8960.o \
+        hdmi/hdmi_phy_8x60.o \
+        mdp4/mdp4_crtc.o \
+        mdp4/mdp4_dtv_encoder.o \
+        mdp4/mdp4_format.o \
+        mdp4/mdp4_irq.o \
+        mdp4/mdp4_kms.o \
+        mdp4/mdp4_plane.o \
+        msm_connector.o \
+        msm_drv.o \
+        msm_fb.o \
+        msm_gem.o \
+        msm_gem_submit.o \
+        msm_gpu.o \
+        msm_ringbuffer.o
+
+msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o
+
+obj-$(CONFIG_DRM_MSM)   += msm.o
diff --git a/drivers/gpu/drm/msm/NOTES b/drivers/gpu/drm/msm/NOTES
new file mode 100644
index 000000000000..e036f6c1db94
--- /dev/null
+++ b/drivers/gpu/drm/msm/NOTES
@@ -0,0 +1,69 @@
+NOTES about msm drm/kms driver:
+
+In the current snapdragon SoC's, we have (at least) 3 different
+display controller blocks at play:
+ + MDP3 - ?? seems to be what is on geeksphone peak device
+ + MDP4 - S3 (APQ8060, touchpad), S4-pro (APQ8064, nexus4 & ifc6410)
+ + MDSS - snapdragon 800
+
+(I don't have a completely clear picture on which display controller
+maps to which part #)
+
+Plus a handful of blocks around them for HDMI/DSI/etc output.
+
+And on gpu side of things:
+ + zero, one, or two 2d cores (z180)
+ + and either a2xx or a3xx 3d core.
+
+But, HDMI/DSI/etc blocks seem like they can be shared across multiple
+display controller blocks.  And I for sure don't want to have to deal
+with N different kms devices from xf86-video-freedreno.  Plus, it
+seems like we can do some clever tricks like use GPU to trigger
+pageflip after rendering completes (ie. have the kms/crtc code build
+up gpu cmdstream to update scanout and write FLUSH register after).
+
+So, the approach is one drm driver, with some modularity.  Different
+'struct msm_kms' implementations, depending on display controller.
+And one or more 'struct msm_gpu' for the various different gpu sub-
+modules.
+
+(Second part is not implemented yet.  So far this is just basic KMS
+driver, and not exposing any custom ioctls to userspace for now.)
+
+The kms module provides the plane, crtc, and encoder objects, and
+loads whatever connectors are appropriate.
+
+For MDP4, the mapping is:
+
+  plane   -> PIPE{RGBn,VGn}              \
+  crtc    -> OVLP{n} + DMA{P,S,E} (??)   |-> MDP "device"
+  encoder -> DTV/LCDC/DSI (within MDP4)  /
+  connector -> HDMI/DSI/etc              --> other device(s)
+
+Since the irq's that drm core mostly cares about are vblank/framedone,
+we'll let msm_mdp4_kms provide the irq install/uninstall/etc functions
+and treat the MDP4 block's irq as "the" irq.  Even though the connectors
+may have their own irqs which they install themselves.  For this reason
+the display controller is the "master" device.
+
+Each connector probably ends up being a separate device, just for the
+logistics of finding/mapping io region, irq, etc.  Idealy we would
+have a better way than just stashing the platform device in a global
+(ie. like DT super-node.. but I don't have any snapdragon hw yet that
+is using DT).
+
+Note that so far I've not been able to get any docs on the hw, and it
+seems that access to such docs would prevent me from working on the
+freedreno gallium driver.  So there may be some mistakes in register
+names (I had to invent a few, since no sufficient hint was given in
+the downstream android fbdev driver), bitfield sizes, etc.  My current
+state of understanding the registers is given in the envytools rnndb
+files at:
+
+  https://github.com/freedreno/envytools/tree/master/rnndb
+  (the mdp4/hdmi/dsi directories)
+
+These files are used both for a parser tool (in the same tree) to
+parse logged register reads/writes (both from downstream android fbdev
+driver, and this driver with register logging enabled), as well as to
+generate the register level headers.
diff --git a/drivers/gpu/drm/msm/adreno/a2xx.xml.h b/drivers/gpu/drm/msm/adreno/a2xx.xml.h
new file mode 100644
index 000000000000..35463864b959
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/a2xx.xml.h
@@ -0,0 +1,1438 @@
+#ifndef A2XX_XML
+#define A2XX_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml              (    327 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  30005 bytes, from 2013-07-19 21:30:48)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9712 bytes, from 2013-05-26 15:22:37)
+- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51415 bytes, from 2013-08-03 14:26:05)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum a2xx_rb_dither_type {
+        DITHER_PIXEL = 0,
+        DITHER_SUBPIXEL = 1,
+};
+
+enum a2xx_colorformatx {
+        COLORX_4_4_4_4 = 0,
+        COLORX_1_5_5_5 = 1,
+        COLORX_5_6_5 = 2,
+        COLORX_8 = 3,
+        COLORX_8_8 = 4,
+        COLORX_8_8_8_8 = 5,
+        COLORX_S8_8_8_8 = 6,
+        COLORX_16_FLOAT = 7,
+        COLORX_16_16_FLOAT = 8,
+        COLORX_16_16_16_16_FLOAT = 9,
+        COLORX_32_FLOAT = 10,
+        COLORX_32_32_FLOAT = 11,
+        COLORX_32_32_32_32_FLOAT = 12,
+        COLORX_2_3_3 = 13,
+        COLORX_8_8_8 = 14,
+};
+
+enum a2xx_sq_surfaceformat {
+        FMT_1_REVERSE = 0,
+        FMT_1 = 1,
+        FMT_8 = 2,
+        FMT_1_5_5_5 = 3,
+        FMT_5_6_5 = 4,
+        FMT_6_5_5 = 5,
+        FMT_8_8_8_8 = 6,
+        FMT_2_10_10_10 = 7,
+        FMT_8_A = 8,
+        FMT_8_B = 9,
+        FMT_8_8 = 10,
+        FMT_Cr_Y1_Cb_Y0 = 11,
+        FMT_Y1_Cr_Y0_Cb = 12,
+        FMT_5_5_5_1 = 13,
+        FMT_8_8_8_8_A = 14,
+        FMT_4_4_4_4 = 15,
+        FMT_10_11_11 = 16,
+        FMT_11_11_10 = 17,
+        FMT_DXT1 = 18,
+        FMT_DXT2_3 = 19,
+        FMT_DXT4_5 = 20,
+        FMT_24_8 = 22,
+        FMT_24_8_FLOAT = 23,
+        FMT_16 = 24,
+        FMT_16_16 = 25,
+        FMT_16_16_16_16 = 26,
+        FMT_16_EXPAND = 27,
+        FMT_16_16_EXPAND = 28,
+        FMT_16_16_16_16_EXPAND = 29,
+        FMT_16_FLOAT = 30,
+        FMT_16_16_FLOAT = 31,
+        FMT_16_16_16_16_FLOAT = 32,
+        FMT_32 = 33,
+        FMT_32_32 = 34,
+        FMT_32_32_32_32 = 35,
+        FMT_32_FLOAT = 36,
+        FMT_32_32_FLOAT = 37,
+        FMT_32_32_32_32_FLOAT = 38,
+        FMT_32_AS_8 = 39,
+        FMT_32_AS_8_8 = 40,
+        FMT_16_MPEG = 41,
+        FMT_16_16_MPEG = 42,
+        FMT_8_INTERLACED = 43,
+        FMT_32_AS_8_INTERLACED = 44,
+        FMT_32_AS_8_8_INTERLACED = 45,
+        FMT_16_INTERLACED = 46,
+        FMT_16_MPEG_INTERLACED = 47,
+        FMT_16_16_MPEG_INTERLACED = 48,
+        FMT_DXN = 49,
+        FMT_8_8_8_8_AS_16_16_16_16 = 50,
+        FMT_DXT1_AS_16_16_16_16 = 51,
+        FMT_DXT2_3_AS_16_16_16_16 = 52,
+        FMT_DXT4_5_AS_16_16_16_16 = 53,
+        FMT_2_10_10_10_AS_16_16_16_16 = 54,
+        FMT_10_11_11_AS_16_16_16_16 = 55,
+        FMT_11_11_10_AS_16_16_16_16 = 56,
+        FMT_32_32_32_FLOAT = 57,
+        FMT_DXT3A = 58,
+        FMT_DXT5A = 59,
+        FMT_CTX1 = 60,
+        FMT_DXT3A_AS_1_1_1_1 = 61,
+};
+
+enum a2xx_sq_ps_vtx_mode {
+        POSITION_1_VECTOR = 0,
+        POSITION_2_VECTORS_UNUSED = 1,
+        POSITION_2_VECTORS_SPRITE = 2,
+        POSITION_2_VECTORS_EDGE = 3,
+        POSITION_2_VECTORS_KILL = 4,
+        POSITION_2_VECTORS_SPRITE_KILL = 5,
+        POSITION_2_VECTORS_EDGE_KILL = 6,
+        MULTIPASS = 7,
+};
+
+enum a2xx_sq_sample_cntl {
+        CENTROIDS_ONLY = 0,
+        CENTERS_ONLY = 1,
+        CENTROIDS_AND_CENTERS = 2,
+};
+
+enum a2xx_dx_clip_space {
+        DXCLIP_OPENGL = 0,
+        DXCLIP_DIRECTX = 1,
+};
+
+enum a2xx_pa_su_sc_polymode {
+        POLY_DISABLED = 0,
+        POLY_DUALMODE = 1,
+};
+
+enum a2xx_rb_edram_mode {
+        EDRAM_NOP = 0,
+        COLOR_DEPTH = 4,
+        DEPTH_ONLY = 5,
+        EDRAM_COPY = 6,
+};
+
+enum a2xx_pa_sc_pattern_bit_order {
+        LITTLE = 0,
+        BIG = 1,
+};
+
+enum a2xx_pa_sc_auto_reset_cntl {
+        NEVER = 0,
+        EACH_PRIMITIVE = 1,
+        EACH_PACKET = 2,
+};
+
+enum a2xx_pa_pixcenter {
+        PIXCENTER_D3D = 0,
+        PIXCENTER_OGL = 1,
+};
+
+enum a2xx_pa_roundmode {
+        TRUNCATE = 0,
+        ROUND = 1,
+        ROUNDTOEVEN = 2,
+        ROUNDTOODD = 3,
+};
+
+enum a2xx_pa_quantmode {
+        ONE_SIXTEENTH = 0,
+        ONE_EIGTH = 1,
+        ONE_QUARTER = 2,
+        ONE_HALF = 3,
+        ONE = 4,
+};
+
+enum a2xx_rb_copy_sample_select {
+        SAMPLE_0 = 0,
+        SAMPLE_1 = 1,
+        SAMPLE_2 = 2,
+        SAMPLE_3 = 3,
+        SAMPLE_01 = 4,
+        SAMPLE_23 = 5,
+        SAMPLE_0123 = 6,
+};
+
+enum sq_tex_clamp {
+        SQ_TEX_WRAP = 0,
+        SQ_TEX_MIRROR = 1,
+        SQ_TEX_CLAMP_LAST_TEXEL = 2,
+        SQ_TEX_MIRROR_ONCE_LAST_TEXEL = 3,
+        SQ_TEX_CLAMP_HALF_BORDER = 4,
+        SQ_TEX_MIRROR_ONCE_HALF_BORDER = 5,
+        SQ_TEX_CLAMP_BORDER = 6,
+        SQ_TEX_MIRROR_ONCE_BORDER = 7,
+};
+
+enum sq_tex_swiz {
+        SQ_TEX_X = 0,
+        SQ_TEX_Y = 1,
+        SQ_TEX_Z = 2,
+        SQ_TEX_W = 3,
+        SQ_TEX_ZERO = 4,
+        SQ_TEX_ONE = 5,
+};
+
+enum sq_tex_filter {
+        SQ_TEX_FILTER_POINT = 0,
+        SQ_TEX_FILTER_BILINEAR = 1,
+        SQ_TEX_FILTER_BICUBIC = 2,
+};
+
+#define REG_A2XX_RBBM_PATCH_RELEASE                             0x00000001
+
+#define REG_A2XX_RBBM_CNTL                                      0x0000003b
+
+#define REG_A2XX_RBBM_SOFT_RESET                                0x0000003c
+
+#define REG_A2XX_CP_PFP_UCODE_ADDR                              0x000000c0
+
+#define REG_A2XX_CP_PFP_UCODE_DATA                              0x000000c1
+
+#define REG_A2XX_RBBM_PERFCOUNTER1_SELECT                       0x00000395
+
+#define REG_A2XX_RBBM_PERFCOUNTER1_LO                           0x00000397
+
+#define REG_A2XX_RBBM_PERFCOUNTER1_HI                           0x00000398
+
+#define REG_A2XX_RBBM_DEBUG                                     0x0000039b
+
+#define REG_A2XX_RBBM_PM_OVERRIDE1                              0x0000039c
+
+#define REG_A2XX_RBBM_PM_OVERRIDE2                              0x0000039d
+
+#define REG_A2XX_RBBM_DEBUG_OUT                                 0x000003a0
+
+#define REG_A2XX_RBBM_DEBUG_CNTL                                0x000003a1
+
+#define REG_A2XX_RBBM_READ_ERROR                                0x000003b3
+
+#define REG_A2XX_RBBM_INT_CNTL                                  0x000003b4
+
+#define REG_A2XX_RBBM_INT_STATUS                                0x000003b5
+
+#define REG_A2XX_RBBM_INT_ACK                                   0x000003b6
+
+#define REG_A2XX_MASTER_INT_SIGNAL                              0x000003b7
+
+#define REG_A2XX_RBBM_PERIPHID1                                 0x000003f9
+
+#define REG_A2XX_RBBM_PERIPHID2                                 0x000003fa
+
+#define REG_A2XX_CP_PERFMON_CNTL                                0x00000444
+
+#define REG_A2XX_CP_PERFCOUNTER_SELECT                          0x00000445
+
+#define REG_A2XX_CP_PERFCOUNTER_LO                              0x00000446
+
+#define REG_A2XX_CP_PERFCOUNTER_HI                              0x00000447
+
+#define REG_A2XX_CP_ST_BASE                                     0x0000044d
+
+#define REG_A2XX_CP_ST_BUFSZ                                    0x0000044e
+
+#define REG_A2XX_CP_IB1_BASE                                    0x00000458
+
+#define REG_A2XX_CP_IB1_BUFSZ                                   0x00000459
+
+#define REG_A2XX_CP_IB2_BASE                                    0x0000045a
+
+#define REG_A2XX_CP_IB2_BUFSZ                                   0x0000045b
+
+#define REG_A2XX_CP_STAT                                        0x0000047f
+
+#define REG_A2XX_RBBM_STATUS                                    0x000005d0
+#define A2XX_RBBM_STATUS_CMDFIFO_AVAIL__MASK                    0x0000001f
+#define A2XX_RBBM_STATUS_CMDFIFO_AVAIL__SHIFT                   0
+static inline uint32_t A2XX_RBBM_STATUS_CMDFIFO_AVAIL(uint32_t val)
+{
+        return ((val) << A2XX_RBBM_STATUS_CMDFIFO_AVAIL__SHIFT) & A2XX_RBBM_STATUS_CMDFIFO_AVAIL__MASK;
+}
+#define A2XX_RBBM_STATUS_TC_BUSY                                0x00000020
+#define A2XX_RBBM_STATUS_HIRQ_PENDING                           0x00000100
+#define A2XX_RBBM_STATUS_CPRQ_PENDING                           0x00000200
+#define A2XX_RBBM_STATUS_CFRQ_PENDING                           0x00000400
+#define A2XX_RBBM_STATUS_PFRQ_PENDING                           0x00000800
+#define A2XX_RBBM_STATUS_VGT_BUSY_NO_DMA                        0x00001000
+#define A2XX_RBBM_STATUS_RBBM_WU_BUSY                           0x00004000
+#define A2XX_RBBM_STATUS_CP_NRT_BUSY                            0x00010000
+#define A2XX_RBBM_STATUS_MH_BUSY                                0x00040000
+#define A2XX_RBBM_STATUS_MH_COHERENCY_BUSY                      0x00080000
+#define A2XX_RBBM_STATUS_SX_BUSY                                0x00200000
+#define A2XX_RBBM_STATUS_TPC_BUSY                               0x00400000
+#define A2XX_RBBM_STATUS_SC_CNTX_BUSY                           0x01000000
+#define A2XX_RBBM_STATUS_PA_BUSY                                0x02000000
+#define A2XX_RBBM_STATUS_VGT_BUSY                               0x04000000
+#define A2XX_RBBM_STATUS_SQ_CNTX17_BUSY                         0x08000000
+#define A2XX_RBBM_STATUS_SQ_CNTX0_BUSY                          0x10000000
+#define A2XX_RBBM_STATUS_RB_CNTX_BUSY                           0x40000000
+#define A2XX_RBBM_STATUS_GUI_ACTIVE                             0x80000000
+
+#define REG_A2XX_A220_VSC_BIN_SIZE                              0x00000c01
+#define A2XX_A220_VSC_BIN_SIZE_WIDTH__MASK                      0x0000001f
+#define A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT                     0
+static inline uint32_t A2XX_A220_VSC_BIN_SIZE_WIDTH(uint32_t val)
+{
+        return ((val >> 5) << A2XX_A220_VSC_BIN_SIZE_WIDTH__SHIFT) & A2XX_A220_VSC_BIN_SIZE_WIDTH__MASK;
+}
+#define A2XX_A220_VSC_BIN_SIZE_HEIGHT__MASK                     0x000003e0
+#define A2XX_A220_VSC_BIN_SIZE_HEIGHT__SHIFT                    5
+static inline uint32_t A2XX_A220_VSC_BIN_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val >> 5) << A2XX_A220_VSC_BIN_SIZE_HEIGHT__SHIFT) & A2XX_A220_VSC_BIN_SIZE_HEIGHT__MASK;
+}
+
+static inline uint32_t REG_A2XX_VSC_PIPE(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
+
+static inline uint32_t REG_A2XX_VSC_PIPE_CONFIG(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
+
+static inline uint32_t REG_A2XX_VSC_PIPE_DATA_ADDRESS(uint32_t i0) { return 0x00000c07 + 0x3*i0; }
+
+static inline uint32_t REG_A2XX_VSC_PIPE_DATA_LENGTH(uint32_t i0) { return 0x00000c08 + 0x3*i0; }
+
+#define REG_A2XX_PC_DEBUG_CNTL                                  0x00000c38
+
+#define REG_A2XX_PC_DEBUG_DATA                                  0x00000c39
+
+#define REG_A2XX_PA_SC_VIZ_QUERY_STATUS                         0x00000c44
+
+#define REG_A2XX_GRAS_DEBUG_CNTL                                0x00000c80
+
+#define REG_A2XX_PA_SU_DEBUG_CNTL                               0x00000c80
+
+#define REG_A2XX_GRAS_DEBUG_DATA                                0x00000c81
+
+#define REG_A2XX_PA_SU_DEBUG_DATA                               0x00000c81
+
+#define REG_A2XX_PA_SU_FACE_DATA                                0x00000c86
+
+#define REG_A2XX_SQ_GPR_MANAGEMENT                              0x00000d00
+
+#define REG_A2XX_SQ_FLOW_CONTROL                                0x00000d01
+
+#define REG_A2XX_SQ_INST_STORE_MANAGMENT                        0x00000d02
+
+#define REG_A2XX_SQ_DEBUG_MISC                                  0x00000d05
+
+#define REG_A2XX_SQ_INT_CNTL                                    0x00000d34
+
+#define REG_A2XX_SQ_INT_STATUS                                  0x00000d35
+
+#define REG_A2XX_SQ_INT_ACK                                     0x00000d36
+
+#define REG_A2XX_SQ_DEBUG_INPUT_FSM                             0x00000dae
+
+#define REG_A2XX_SQ_DEBUG_CONST_MGR_FSM                         0x00000daf
+
+#define REG_A2XX_SQ_DEBUG_TP_FSM                                0x00000db0
+
+#define REG_A2XX_SQ_DEBUG_FSM_ALU_0                             0x00000db1
+
+#define REG_A2XX_SQ_DEBUG_FSM_ALU_1                             0x00000db2
+
+#define REG_A2XX_SQ_DEBUG_EXP_ALLOC                             0x00000db3
+
+#define REG_A2XX_SQ_DEBUG_PTR_BUFF                              0x00000db4
+
+#define REG_A2XX_SQ_DEBUG_GPR_VTX                               0x00000db5
+
+#define REG_A2XX_SQ_DEBUG_GPR_PIX                               0x00000db6
+
+#define REG_A2XX_SQ_DEBUG_TB_STATUS_SEL                         0x00000db7
+
+#define REG_A2XX_SQ_DEBUG_VTX_TB_0                              0x00000db8
+
+#define REG_A2XX_SQ_DEBUG_VTX_TB_1                              0x00000db9
+
+#define REG_A2XX_SQ_DEBUG_VTX_TB_STATUS_REG                     0x00000dba
+
+#define REG_A2XX_SQ_DEBUG_VTX_TB_STATE_MEM                      0x00000dbb
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_0                              0x00000dbc
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_STATUS_REG_0                   0x00000dbd
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_STATUS_REG_1                   0x00000dbe
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_STATUS_REG_2                   0x00000dbf
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_STATUS_REG_3                   0x00000dc0
+
+#define REG_A2XX_SQ_DEBUG_PIX_TB_STATE_MEM                      0x00000dc1
+
+#define REG_A2XX_TC_CNTL_STATUS                                 0x00000e00
+#define A2XX_TC_CNTL_STATUS_L2_INVALIDATE                       0x00000001
+
+#define REG_A2XX_TP0_CHICKEN                                    0x00000e1e
+
+#define REG_A2XX_RB_BC_CONTROL                                  0x00000f01
+#define A2XX_RB_BC_CONTROL_ACCUM_LINEAR_MODE_ENABLE             0x00000001
+#define A2XX_RB_BC_CONTROL_ACCUM_TIMEOUT_SELECT__MASK           0x00000006
+#define A2XX_RB_BC_CONTROL_ACCUM_TIMEOUT_SELECT__SHIFT          1
+static inline uint32_t A2XX_RB_BC_CONTROL_ACCUM_TIMEOUT_SELECT(uint32_t val)
+{
+        return ((val) << A2XX_RB_BC_CONTROL_ACCUM_TIMEOUT_SELECT__SHIFT) & A2XX_RB_BC_CONTROL_ACCUM_TIMEOUT_SELECT__MASK;
+}
+#define A2XX_RB_BC_CONTROL_DISABLE_EDRAM_CAM                    0x00000008
+#define A2XX_RB_BC_CONTROL_DISABLE_EZ_FAST_CONTEXT_SWITCH       0x00000010
+#define A2XX_RB_BC_CONTROL_DISABLE_EZ_NULL_ZCMD_DROP            0x00000020
+#define A2XX_RB_BC_CONTROL_DISABLE_LZ_NULL_ZCMD_DROP            0x00000040
+#define A2XX_RB_BC_CONTROL_ENABLE_AZ_THROTTLE                   0x00000080
+#define A2XX_RB_BC_CONTROL_AZ_THROTTLE_COUNT__MASK              0x00001f00
+#define A2XX_RB_BC_CONTROL_AZ_THROTTLE_COUNT__SHIFT             8
+static inline uint32_t A2XX_RB_BC_CONTROL_AZ_THROTTLE_COUNT(uint32_t val)
+{
+        return ((val) << A2XX_RB_BC_CONTROL_AZ_THROTTLE_COUNT__SHIFT) & A2XX_RB_BC_CONTROL_AZ_THROTTLE_COUNT__MASK;
+}
+#define A2XX_RB_BC_CONTROL_ENABLE_CRC_UPDATE                    0x00004000
+#define A2XX_RB_BC_CONTROL_CRC_MODE                             0x00008000
+#define A2XX_RB_BC_CONTROL_DISABLE_SAMPLE_COUNTERS              0x00010000
+#define A2XX_RB_BC_CONTROL_DISABLE_ACCUM                        0x00020000
+#define A2XX_RB_BC_CONTROL_ACCUM_ALLOC_MASK__MASK               0x003c0000
+#define A2XX_RB_BC_CONTROL_ACCUM_ALLOC_MASK__SHIFT              18
+static inline uint32_t A2XX_RB_BC_CONTROL_ACCUM_ALLOC_MASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_BC_CONTROL_ACCUM_ALLOC_MASK__SHIFT) & A2XX_RB_BC_CONTROL_ACCUM_ALLOC_MASK__MASK;
+}
+#define A2XX_RB_BC_CONTROL_LINEAR_PERFORMANCE_ENABLE            0x00400000
+#define A2XX_RB_BC_CONTROL_ACCUM_DATA_FIFO_LIMIT__MASK          0x07800000
+#define A2XX_RB_BC_CONTROL_ACCUM_DATA_FIFO_LIMIT__SHIFT         23
+static inline uint32_t A2XX_RB_BC_CONTROL_ACCUM_DATA_FIFO_LIMIT(uint32_t val)
+{
+        return ((val) << A2XX_RB_BC_CONTROL_ACCUM_DATA_FIFO_LIMIT__SHIFT) & A2XX_RB_BC_CONTROL_ACCUM_DATA_FIFO_LIMIT__MASK;
+}
+#define A2XX_RB_BC_CONTROL_MEM_EXPORT_TIMEOUT_SELECT__MASK      0x18000000
+#define A2XX_RB_BC_CONTROL_MEM_EXPORT_TIMEOUT_SELECT__SHIFT     27
+static inline uint32_t A2XX_RB_BC_CONTROL_MEM_EXPORT_TIMEOUT_SELECT(uint32_t val)
+{
+        return ((val) << A2XX_RB_BC_CONTROL_MEM_EXPORT_TIMEOUT_SELECT__SHIFT) & A2XX_RB_BC_CONTROL_MEM_EXPORT_TIMEOUT_SELECT__MASK;
+}
+#define A2XX_RB_BC_CONTROL_MEM_EXPORT_LINEAR_MODE_ENABLE        0x20000000
+#define A2XX_RB_BC_CONTROL_CRC_SYSTEM                           0x40000000
+#define A2XX_RB_BC_CONTROL_RESERVED6                            0x80000000
+
+#define REG_A2XX_RB_EDRAM_INFO                                  0x00000f02
+
+#define REG_A2XX_RB_DEBUG_CNTL                                  0x00000f26
+
+#define REG_A2XX_RB_DEBUG_DATA                                  0x00000f27
+
+#define REG_A2XX_RB_SURFACE_INFO                                0x00002000
+
+#define REG_A2XX_RB_COLOR_INFO                                  0x00002001
+#define A2XX_RB_COLOR_INFO_FORMAT__MASK                         0x0000000f
+#define A2XX_RB_COLOR_INFO_FORMAT__SHIFT                        0
+static inline uint32_t A2XX_RB_COLOR_INFO_FORMAT(enum a2xx_colorformatx val)
+{
+        return ((val) << A2XX_RB_COLOR_INFO_FORMAT__SHIFT) & A2XX_RB_COLOR_INFO_FORMAT__MASK;
+}
+#define A2XX_RB_COLOR_INFO_ROUND_MODE__MASK                     0x00000030
+#define A2XX_RB_COLOR_INFO_ROUND_MODE__SHIFT                    4
+static inline uint32_t A2XX_RB_COLOR_INFO_ROUND_MODE(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLOR_INFO_ROUND_MODE__SHIFT) & A2XX_RB_COLOR_INFO_ROUND_MODE__MASK;
+}
+#define A2XX_RB_COLOR_INFO_LINEAR                               0x00000040
+#define A2XX_RB_COLOR_INFO_ENDIAN__MASK                         0x00000180
+#define A2XX_RB_COLOR_INFO_ENDIAN__SHIFT                        7
+static inline uint32_t A2XX_RB_COLOR_INFO_ENDIAN(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLOR_INFO_ENDIAN__SHIFT) & A2XX_RB_COLOR_INFO_ENDIAN__MASK;
+}
+#define A2XX_RB_COLOR_INFO_SWAP__MASK                           0x00000600
+#define A2XX_RB_COLOR_INFO_SWAP__SHIFT                          9
+static inline uint32_t A2XX_RB_COLOR_INFO_SWAP(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLOR_INFO_SWAP__SHIFT) & A2XX_RB_COLOR_INFO_SWAP__MASK;
+}
+#define A2XX_RB_COLOR_INFO_BASE__MASK                           0xfffff000
+#define A2XX_RB_COLOR_INFO_BASE__SHIFT                          12
+static inline uint32_t A2XX_RB_COLOR_INFO_BASE(uint32_t val)
+{
+        return ((val >> 10) << A2XX_RB_COLOR_INFO_BASE__SHIFT) & A2XX_RB_COLOR_INFO_BASE__MASK;
+}
+
+#define REG_A2XX_RB_DEPTH_INFO                                  0x00002002
+#define A2XX_RB_DEPTH_INFO_DEPTH_FORMAT__MASK                   0x00000001
+#define A2XX_RB_DEPTH_INFO_DEPTH_FORMAT__SHIFT                  0
+static inline uint32_t A2XX_RB_DEPTH_INFO_DEPTH_FORMAT(enum adreno_rb_depth_format val)
+{
+        return ((val) << A2XX_RB_DEPTH_INFO_DEPTH_FORMAT__SHIFT) & A2XX_RB_DEPTH_INFO_DEPTH_FORMAT__MASK;
+}
+#define A2XX_RB_DEPTH_INFO_DEPTH_BASE__MASK                     0xfffff000
+#define A2XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT                    12
+static inline uint32_t A2XX_RB_DEPTH_INFO_DEPTH_BASE(uint32_t val)
+{
+        return ((val >> 10) << A2XX_RB_DEPTH_INFO_DEPTH_BASE__SHIFT) & A2XX_RB_DEPTH_INFO_DEPTH_BASE__MASK;
+}
+
+#define REG_A2XX_A225_RB_COLOR_INFO3                            0x00002005
+
+#define REG_A2XX_COHER_DEST_BASE_0                              0x00002006
+
+#define REG_A2XX_PA_SC_SCREEN_SCISSOR_TL                        0x0000200e
+#define A2XX_PA_SC_SCREEN_SCISSOR_TL_WINDOW_OFFSET_DISABLE      0x80000000
+#define A2XX_PA_SC_SCREEN_SCISSOR_TL_X__MASK                    0x00007fff
+#define A2XX_PA_SC_SCREEN_SCISSOR_TL_X__SHIFT                   0
+static inline uint32_t A2XX_PA_SC_SCREEN_SCISSOR_TL_X(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_SCREEN_SCISSOR_TL_X__SHIFT) & A2XX_PA_SC_SCREEN_SCISSOR_TL_X__MASK;
+}
+#define A2XX_PA_SC_SCREEN_SCISSOR_TL_Y__MASK                    0x7fff0000
+#define A2XX_PA_SC_SCREEN_SCISSOR_TL_Y__SHIFT                   16
+static inline uint32_t A2XX_PA_SC_SCREEN_SCISSOR_TL_Y(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_SCREEN_SCISSOR_TL_Y__SHIFT) & A2XX_PA_SC_SCREEN_SCISSOR_TL_Y__MASK;
+}
+
+#define REG_A2XX_PA_SC_SCREEN_SCISSOR_BR                        0x0000200f
+#define A2XX_PA_SC_SCREEN_SCISSOR_BR_WINDOW_OFFSET_DISABLE      0x80000000
+#define A2XX_PA_SC_SCREEN_SCISSOR_BR_X__MASK                    0x00007fff
+#define A2XX_PA_SC_SCREEN_SCISSOR_BR_X__SHIFT                   0
+static inline uint32_t A2XX_PA_SC_SCREEN_SCISSOR_BR_X(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_SCREEN_SCISSOR_BR_X__SHIFT) & A2XX_PA_SC_SCREEN_SCISSOR_BR_X__MASK;
+}
+#define A2XX_PA_SC_SCREEN_SCISSOR_BR_Y__MASK                    0x7fff0000
+#define A2XX_PA_SC_SCREEN_SCISSOR_BR_Y__SHIFT                   16
+static inline uint32_t A2XX_PA_SC_SCREEN_SCISSOR_BR_Y(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_SCREEN_SCISSOR_BR_Y__SHIFT) & A2XX_PA_SC_SCREEN_SCISSOR_BR_Y__MASK;
+}
+
+#define REG_A2XX_PA_SC_WINDOW_OFFSET                            0x00002080
+#define A2XX_PA_SC_WINDOW_OFFSET_X__MASK                        0x00007fff
+#define A2XX_PA_SC_WINDOW_OFFSET_X__SHIFT                       0
+static inline uint32_t A2XX_PA_SC_WINDOW_OFFSET_X(int32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_OFFSET_X__SHIFT) & A2XX_PA_SC_WINDOW_OFFSET_X__MASK;
+}
+#define A2XX_PA_SC_WINDOW_OFFSET_Y__MASK                        0x7fff0000
+#define A2XX_PA_SC_WINDOW_OFFSET_Y__SHIFT                       16
+static inline uint32_t A2XX_PA_SC_WINDOW_OFFSET_Y(int32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_OFFSET_Y__SHIFT) & A2XX_PA_SC_WINDOW_OFFSET_Y__MASK;
+}
+#define A2XX_PA_SC_WINDOW_OFFSET_DISABLE                        0x80000000
+
+#define REG_A2XX_PA_SC_WINDOW_SCISSOR_TL                        0x00002081
+#define A2XX_PA_SC_WINDOW_SCISSOR_TL_WINDOW_OFFSET_DISABLE      0x80000000
+#define A2XX_PA_SC_WINDOW_SCISSOR_TL_X__MASK                    0x00007fff
+#define A2XX_PA_SC_WINDOW_SCISSOR_TL_X__SHIFT                   0
+static inline uint32_t A2XX_PA_SC_WINDOW_SCISSOR_TL_X(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_SCISSOR_TL_X__SHIFT) & A2XX_PA_SC_WINDOW_SCISSOR_TL_X__MASK;
+}
+#define A2XX_PA_SC_WINDOW_SCISSOR_TL_Y__MASK                    0x7fff0000
+#define A2XX_PA_SC_WINDOW_SCISSOR_TL_Y__SHIFT                   16
+static inline uint32_t A2XX_PA_SC_WINDOW_SCISSOR_TL_Y(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_SCISSOR_TL_Y__SHIFT) & A2XX_PA_SC_WINDOW_SCISSOR_TL_Y__MASK;
+}
+
+#define REG_A2XX_PA_SC_WINDOW_SCISSOR_BR                        0x00002082
+#define A2XX_PA_SC_WINDOW_SCISSOR_BR_WINDOW_OFFSET_DISABLE      0x80000000
+#define A2XX_PA_SC_WINDOW_SCISSOR_BR_X__MASK                    0x00007fff
+#define A2XX_PA_SC_WINDOW_SCISSOR_BR_X__SHIFT                   0
+static inline uint32_t A2XX_PA_SC_WINDOW_SCISSOR_BR_X(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_SCISSOR_BR_X__SHIFT) & A2XX_PA_SC_WINDOW_SCISSOR_BR_X__MASK;
+}
+#define A2XX_PA_SC_WINDOW_SCISSOR_BR_Y__MASK                    0x7fff0000
+#define A2XX_PA_SC_WINDOW_SCISSOR_BR_Y__SHIFT                   16
+static inline uint32_t A2XX_PA_SC_WINDOW_SCISSOR_BR_Y(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_WINDOW_SCISSOR_BR_Y__SHIFT) & A2XX_PA_SC_WINDOW_SCISSOR_BR_Y__MASK;
+}
+
+#define REG_A2XX_UNKNOWN_2010                                   0x00002010
+
+#define REG_A2XX_VGT_MAX_VTX_INDX                               0x00002100
+
+#define REG_A2XX_VGT_MIN_VTX_INDX                               0x00002101
+
+#define REG_A2XX_VGT_INDX_OFFSET                                0x00002102
+
+#define REG_A2XX_A225_PC_MULTI_PRIM_IB_RESET_INDX               0x00002103
+
+#define REG_A2XX_RB_COLOR_MASK                                  0x00002104
+#define A2XX_RB_COLOR_MASK_WRITE_RED                            0x00000001
+#define A2XX_RB_COLOR_MASK_WRITE_GREEN                          0x00000002
+#define A2XX_RB_COLOR_MASK_WRITE_BLUE                           0x00000004
+#define A2XX_RB_COLOR_MASK_WRITE_ALPHA                          0x00000008
+
+#define REG_A2XX_RB_BLEND_RED                                   0x00002105
+
+#define REG_A2XX_RB_BLEND_GREEN                                 0x00002106
+
+#define REG_A2XX_RB_BLEND_BLUE                                  0x00002107
+
+#define REG_A2XX_RB_BLEND_ALPHA                                 0x00002108
+
+#define REG_A2XX_RB_FOG_COLOR                                   0x00002109
+
+#define REG_A2XX_RB_STENCILREFMASK_BF                           0x0000210c
+#define A2XX_RB_STENCILREFMASK_BF_STENCILREF__MASK              0x000000ff
+#define A2XX_RB_STENCILREFMASK_BF_STENCILREF__SHIFT             0
+static inline uint32_t A2XX_RB_STENCILREFMASK_BF_STENCILREF(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_BF_STENCILREF__SHIFT) & A2XX_RB_STENCILREFMASK_BF_STENCILREF__MASK;
+}
+#define A2XX_RB_STENCILREFMASK_BF_STENCILMASK__MASK             0x0000ff00
+#define A2XX_RB_STENCILREFMASK_BF_STENCILMASK__SHIFT            8
+static inline uint32_t A2XX_RB_STENCILREFMASK_BF_STENCILMASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_BF_STENCILMASK__SHIFT) & A2XX_RB_STENCILREFMASK_BF_STENCILMASK__MASK;
+}
+#define A2XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__MASK        0x00ff0000
+#define A2XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__SHIFT       16
+static inline uint32_t A2XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__SHIFT) & A2XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__MASK;
+}
+
+#define REG_A2XX_RB_STENCILREFMASK                              0x0000210d
+#define A2XX_RB_STENCILREFMASK_STENCILREF__MASK                 0x000000ff
+#define A2XX_RB_STENCILREFMASK_STENCILREF__SHIFT                0
+static inline uint32_t A2XX_RB_STENCILREFMASK_STENCILREF(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_STENCILREF__SHIFT) & A2XX_RB_STENCILREFMASK_STENCILREF__MASK;
+}
+#define A2XX_RB_STENCILREFMASK_STENCILMASK__MASK                0x0000ff00
+#define A2XX_RB_STENCILREFMASK_STENCILMASK__SHIFT               8
+static inline uint32_t A2XX_RB_STENCILREFMASK_STENCILMASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_STENCILMASK__SHIFT) & A2XX_RB_STENCILREFMASK_STENCILMASK__MASK;
+}
+#define A2XX_RB_STENCILREFMASK_STENCILWRITEMASK__MASK           0x00ff0000
+#define A2XX_RB_STENCILREFMASK_STENCILWRITEMASK__SHIFT          16
+static inline uint32_t A2XX_RB_STENCILREFMASK_STENCILWRITEMASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_STENCILREFMASK_STENCILWRITEMASK__SHIFT) & A2XX_RB_STENCILREFMASK_STENCILWRITEMASK__MASK;
+}
+
+#define REG_A2XX_RB_ALPHA_REF                                   0x0000210e
+
+#define REG_A2XX_PA_CL_VPORT_XSCALE                             0x0000210f
+#define A2XX_PA_CL_VPORT_XSCALE__MASK                           0xffffffff
+#define A2XX_PA_CL_VPORT_XSCALE__SHIFT                          0
+static inline uint32_t A2XX_PA_CL_VPORT_XSCALE(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_XSCALE__SHIFT) & A2XX_PA_CL_VPORT_XSCALE__MASK;
+}
+
+#define REG_A2XX_PA_CL_VPORT_XOFFSET                            0x00002110
+#define A2XX_PA_CL_VPORT_XOFFSET__MASK                          0xffffffff
+#define A2XX_PA_CL_VPORT_XOFFSET__SHIFT                         0
+static inline uint32_t A2XX_PA_CL_VPORT_XOFFSET(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_XOFFSET__SHIFT) & A2XX_PA_CL_VPORT_XOFFSET__MASK;
+}
+
+#define REG_A2XX_PA_CL_VPORT_YSCALE                             0x00002111
+#define A2XX_PA_CL_VPORT_YSCALE__MASK                           0xffffffff
+#define A2XX_PA_CL_VPORT_YSCALE__SHIFT                          0
+static inline uint32_t A2XX_PA_CL_VPORT_YSCALE(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_YSCALE__SHIFT) & A2XX_PA_CL_VPORT_YSCALE__MASK;
+}
+
+#define REG_A2XX_PA_CL_VPORT_YOFFSET                            0x00002112
+#define A2XX_PA_CL_VPORT_YOFFSET__MASK                          0xffffffff
+#define A2XX_PA_CL_VPORT_YOFFSET__SHIFT                         0
+static inline uint32_t A2XX_PA_CL_VPORT_YOFFSET(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_YOFFSET__SHIFT) & A2XX_PA_CL_VPORT_YOFFSET__MASK;
+}
+
+#define REG_A2XX_PA_CL_VPORT_ZSCALE                             0x00002113
+#define A2XX_PA_CL_VPORT_ZSCALE__MASK                           0xffffffff
+#define A2XX_PA_CL_VPORT_ZSCALE__SHIFT                          0
+static inline uint32_t A2XX_PA_CL_VPORT_ZSCALE(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_ZSCALE__SHIFT) & A2XX_PA_CL_VPORT_ZSCALE__MASK;
+}
+
+#define REG_A2XX_PA_CL_VPORT_ZOFFSET                            0x00002114
+#define A2XX_PA_CL_VPORT_ZOFFSET__MASK                          0xffffffff
+#define A2XX_PA_CL_VPORT_ZOFFSET__SHIFT                         0
+static inline uint32_t A2XX_PA_CL_VPORT_ZOFFSET(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_VPORT_ZOFFSET__SHIFT) & A2XX_PA_CL_VPORT_ZOFFSET__MASK;
+}
+
+#define REG_A2XX_SQ_PROGRAM_CNTL                                0x00002180
+#define A2XX_SQ_PROGRAM_CNTL_VS_REGS__MASK                      0x000000ff
+#define A2XX_SQ_PROGRAM_CNTL_VS_REGS__SHIFT                     0
+static inline uint32_t A2XX_SQ_PROGRAM_CNTL_VS_REGS(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PROGRAM_CNTL_VS_REGS__SHIFT) & A2XX_SQ_PROGRAM_CNTL_VS_REGS__MASK;
+}
+#define A2XX_SQ_PROGRAM_CNTL_PS_REGS__MASK                      0x0000ff00
+#define A2XX_SQ_PROGRAM_CNTL_PS_REGS__SHIFT                     8
+static inline uint32_t A2XX_SQ_PROGRAM_CNTL_PS_REGS(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PROGRAM_CNTL_PS_REGS__SHIFT) & A2XX_SQ_PROGRAM_CNTL_PS_REGS__MASK;
+}
+#define A2XX_SQ_PROGRAM_CNTL_VS_RESOURCE                        0x00010000
+#define A2XX_SQ_PROGRAM_CNTL_PS_RESOURCE                        0x00020000
+#define A2XX_SQ_PROGRAM_CNTL_PARAM_GEN                          0x00040000
+#define A2XX_SQ_PROGRAM_CNTL_GEN_INDEX_PIX                      0x00080000
+#define A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_COUNT__MASK              0x00f00000
+#define A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_COUNT__SHIFT             20
+static inline uint32_t A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_COUNT(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_COUNT__SHIFT) & A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_COUNT__MASK;
+}
+#define A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_MODE__MASK               0x07000000
+#define A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_MODE__SHIFT              24
+static inline uint32_t A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_MODE(enum a2xx_sq_ps_vtx_mode val)
+{
+        return ((val) << A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_MODE__SHIFT) & A2XX_SQ_PROGRAM_CNTL_VS_EXPORT_MODE__MASK;
+}
+#define A2XX_SQ_PROGRAM_CNTL_PS_EXPORT_MODE__MASK               0x78000000
+#define A2XX_SQ_PROGRAM_CNTL_PS_EXPORT_MODE__SHIFT              27
+static inline uint32_t A2XX_SQ_PROGRAM_CNTL_PS_EXPORT_MODE(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PROGRAM_CNTL_PS_EXPORT_MODE__SHIFT) & A2XX_SQ_PROGRAM_CNTL_PS_EXPORT_MODE__MASK;
+}
+#define A2XX_SQ_PROGRAM_CNTL_GEN_INDEX_VTX                      0x80000000
+
+#define REG_A2XX_SQ_CONTEXT_MISC                                0x00002181
+#define A2XX_SQ_CONTEXT_MISC_INST_PRED_OPTIMIZE                 0x00000001
+#define A2XX_SQ_CONTEXT_MISC_SC_OUTPUT_SCREEN_XY                0x00000002
+#define A2XX_SQ_CONTEXT_MISC_SC_SAMPLE_CNTL__MASK               0x0000000c
+#define A2XX_SQ_CONTEXT_MISC_SC_SAMPLE_CNTL__SHIFT              2
+static inline uint32_t A2XX_SQ_CONTEXT_MISC_SC_SAMPLE_CNTL(enum a2xx_sq_sample_cntl val)
+{
+        return ((val) << A2XX_SQ_CONTEXT_MISC_SC_SAMPLE_CNTL__SHIFT) & A2XX_SQ_CONTEXT_MISC_SC_SAMPLE_CNTL__MASK;
+}
+#define A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS__MASK                0x0000ff00
+#define A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS__SHIFT               8
+static inline uint32_t A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS(uint32_t val)
+{
+        return ((val) << A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS__SHIFT) & A2XX_SQ_CONTEXT_MISC_PARAM_GEN_POS__MASK;
+}
+#define A2XX_SQ_CONTEXT_MISC_PERFCOUNTER_REF                    0x00010000
+#define A2XX_SQ_CONTEXT_MISC_YEILD_OPTIMIZE                     0x00020000
+#define A2XX_SQ_CONTEXT_MISC_TX_CACHE_SEL                       0x00040000
+
+#define REG_A2XX_SQ_INTERPOLATOR_CNTL                           0x00002182
+
+#define REG_A2XX_SQ_WRAPPING_0                                  0x00002183
+
+#define REG_A2XX_SQ_WRAPPING_1                                  0x00002184
+
+#define REG_A2XX_SQ_PS_PROGRAM                                  0x000021f6
+
+#define REG_A2XX_SQ_VS_PROGRAM                                  0x000021f7
+
+#define REG_A2XX_RB_DEPTHCONTROL                                0x00002200
+#define A2XX_RB_DEPTHCONTROL_STENCIL_ENABLE                     0x00000001
+#define A2XX_RB_DEPTHCONTROL_Z_ENABLE                           0x00000002
+#define A2XX_RB_DEPTHCONTROL_Z_WRITE_ENABLE                     0x00000004
+#define A2XX_RB_DEPTHCONTROL_EARLY_Z_ENABLE                     0x00000008
+#define A2XX_RB_DEPTHCONTROL_ZFUNC__MASK                        0x00000070
+#define A2XX_RB_DEPTHCONTROL_ZFUNC__SHIFT                       4
+static inline uint32_t A2XX_RB_DEPTHCONTROL_ZFUNC(enum adreno_compare_func val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_ZFUNC__SHIFT) & A2XX_RB_DEPTHCONTROL_ZFUNC__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_BACKFACE_ENABLE                    0x00000080
+#define A2XX_RB_DEPTHCONTROL_STENCILFUNC__MASK                  0x00000700
+#define A2XX_RB_DEPTHCONTROL_STENCILFUNC__SHIFT                 8
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILFUNC(enum adreno_compare_func val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILFUNC__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILFUNC__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILFAIL__MASK                  0x00003800
+#define A2XX_RB_DEPTHCONTROL_STENCILFAIL__SHIFT                 11
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILFAIL(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILFAIL__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILFAIL__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILZPASS__MASK                 0x0001c000
+#define A2XX_RB_DEPTHCONTROL_STENCILZPASS__SHIFT                14
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILZPASS(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILZPASS__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILZPASS__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILZFAIL__MASK                 0x000e0000
+#define A2XX_RB_DEPTHCONTROL_STENCILZFAIL__SHIFT                17
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILZFAIL(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILZFAIL__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILZFAIL__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILFUNC_BF__MASK               0x00700000
+#define A2XX_RB_DEPTHCONTROL_STENCILFUNC_BF__SHIFT              20
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILFUNC_BF(enum adreno_compare_func val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILFUNC_BF__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILFUNC_BF__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILFAIL_BF__MASK               0x03800000
+#define A2XX_RB_DEPTHCONTROL_STENCILFAIL_BF__SHIFT              23
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILFAIL_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILFAIL_BF__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILFAIL_BF__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILZPASS_BF__MASK              0x1c000000
+#define A2XX_RB_DEPTHCONTROL_STENCILZPASS_BF__SHIFT             26
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILZPASS_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILZPASS_BF__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILZPASS_BF__MASK;
+}
+#define A2XX_RB_DEPTHCONTROL_STENCILZFAIL_BF__MASK              0xe0000000
+#define A2XX_RB_DEPTHCONTROL_STENCILZFAIL_BF__SHIFT             29
+static inline uint32_t A2XX_RB_DEPTHCONTROL_STENCILZFAIL_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A2XX_RB_DEPTHCONTROL_STENCILZFAIL_BF__SHIFT) & A2XX_RB_DEPTHCONTROL_STENCILZFAIL_BF__MASK;
+}
+
+#define REG_A2XX_RB_BLEND_CONTROL                               0x00002201
+#define A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND__MASK              0x0000001f
+#define A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND__SHIFT             0
+static inline uint32_t A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND__SHIFT) & A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND__MASK;
+}
+#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)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__SHIFT) & A2XX_RB_BLEND_CONTROL_COLOR_COMB_FCN__MASK;
+}
+#define A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND__MASK             0x00001f00
+#define A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND__SHIFT            8
+static inline uint32_t A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND__SHIFT) & A2XX_RB_BLEND_CONTROL_COLOR_DESTBLEND__MASK;
+}
+#define A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND__MASK              0x001f0000
+#define A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND__SHIFT             16
+static inline uint32_t A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND__SHIFT) & A2XX_RB_BLEND_CONTROL_ALPHA_SRCBLEND__MASK;
+}
+#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)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__SHIFT) & A2XX_RB_BLEND_CONTROL_ALPHA_COMB_FCN__MASK;
+}
+#define A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND__MASK             0x1f000000
+#define A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND__SHIFT            24
+static inline uint32_t A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND__SHIFT) & A2XX_RB_BLEND_CONTROL_ALPHA_DESTBLEND__MASK;
+}
+#define A2XX_RB_BLEND_CONTROL_BLEND_FORCE_ENABLE                0x20000000
+#define A2XX_RB_BLEND_CONTROL_BLEND_FORCE                       0x40000000
+
+#define REG_A2XX_RB_COLORCONTROL                                0x00002202
+#define A2XX_RB_COLORCONTROL_ALPHA_FUNC__MASK                   0x00000007
+#define A2XX_RB_COLORCONTROL_ALPHA_FUNC__SHIFT                  0
+static inline uint32_t A2XX_RB_COLORCONTROL_ALPHA_FUNC(enum adreno_compare_func val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ALPHA_FUNC__SHIFT) & A2XX_RB_COLORCONTROL_ALPHA_FUNC__MASK;
+}
+#define A2XX_RB_COLORCONTROL_ALPHA_TEST_ENABLE                  0x00000008
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_ENABLE               0x00000010
+#define A2XX_RB_COLORCONTROL_BLEND_DISABLE                      0x00000020
+#define A2XX_RB_COLORCONTROL_VOB_ENABLE                         0x00000040
+#define A2XX_RB_COLORCONTROL_VS_EXPORTS_FOG                     0x00000080
+#define A2XX_RB_COLORCONTROL_ROP_CODE__MASK                     0x00000f00
+#define A2XX_RB_COLORCONTROL_ROP_CODE__SHIFT                    8
+static inline uint32_t A2XX_RB_COLORCONTROL_ROP_CODE(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ROP_CODE__SHIFT) & A2XX_RB_COLORCONTROL_ROP_CODE__MASK;
+}
+#define A2XX_RB_COLORCONTROL_DITHER_MODE__MASK                  0x00003000
+#define A2XX_RB_COLORCONTROL_DITHER_MODE__SHIFT                 12
+static inline uint32_t A2XX_RB_COLORCONTROL_DITHER_MODE(enum adreno_rb_dither_mode val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_DITHER_MODE__SHIFT) & A2XX_RB_COLORCONTROL_DITHER_MODE__MASK;
+}
+#define A2XX_RB_COLORCONTROL_DITHER_TYPE__MASK                  0x0000c000
+#define A2XX_RB_COLORCONTROL_DITHER_TYPE__SHIFT                 14
+static inline uint32_t A2XX_RB_COLORCONTROL_DITHER_TYPE(enum a2xx_rb_dither_type val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_DITHER_TYPE__SHIFT) & A2XX_RB_COLORCONTROL_DITHER_TYPE__MASK;
+}
+#define A2XX_RB_COLORCONTROL_PIXEL_FOG                          0x00010000
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET0__MASK        0x03000000
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET0__SHIFT       24
+static inline uint32_t A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET0(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET0__SHIFT) & A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET0__MASK;
+}
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET1__MASK        0x0c000000
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET1__SHIFT       26
+static inline uint32_t A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET1(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET1__SHIFT) & A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET1__MASK;
+}
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET2__MASK        0x30000000
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET2__SHIFT       28
+static inline uint32_t A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET2(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET2__SHIFT) & A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET2__MASK;
+}
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET3__MASK        0xc0000000
+#define A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET3__SHIFT       30
+static inline uint32_t A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET3(uint32_t val)
+{
+        return ((val) << A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET3__SHIFT) & A2XX_RB_COLORCONTROL_ALPHA_TO_MASK_OFFSET3__MASK;
+}
+
+#define REG_A2XX_VGT_CURRENT_BIN_ID_MAX                         0x00002203
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_COLUMN__MASK                0x00000007
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_COLUMN__SHIFT               0
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MAX_COLUMN(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MAX_COLUMN__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MAX_COLUMN__MASK;
+}
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_ROW__MASK                   0x00000038
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_ROW__SHIFT                  3
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MAX_ROW(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MAX_ROW__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MAX_ROW__MASK;
+}
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_GUARD_BAND_MASK__MASK       0x000001c0
+#define A2XX_VGT_CURRENT_BIN_ID_MAX_GUARD_BAND_MASK__SHIFT      6
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MAX_GUARD_BAND_MASK(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MAX_GUARD_BAND_MASK__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MAX_GUARD_BAND_MASK__MASK;
+}
+
+#define REG_A2XX_PA_CL_CLIP_CNTL                                0x00002204
+#define A2XX_PA_CL_CLIP_CNTL_CLIP_DISABLE                       0x00010000
+#define A2XX_PA_CL_CLIP_CNTL_BOUNDARY_EDGE_FLAG_ENA             0x00040000
+#define A2XX_PA_CL_CLIP_CNTL_DX_CLIP_SPACE_DEF__MASK            0x00080000
+#define A2XX_PA_CL_CLIP_CNTL_DX_CLIP_SPACE_DEF__SHIFT           19
+static inline uint32_t A2XX_PA_CL_CLIP_CNTL_DX_CLIP_SPACE_DEF(enum a2xx_dx_clip_space val)
+{
+        return ((val) << A2XX_PA_CL_CLIP_CNTL_DX_CLIP_SPACE_DEF__SHIFT) & A2XX_PA_CL_CLIP_CNTL_DX_CLIP_SPACE_DEF__MASK;
+}
+#define A2XX_PA_CL_CLIP_CNTL_DIS_CLIP_ERR_DETECT                0x00100000
+#define A2XX_PA_CL_CLIP_CNTL_VTX_KILL_OR                        0x00200000
+#define A2XX_PA_CL_CLIP_CNTL_XY_NAN_RETAIN                      0x00400000
+#define A2XX_PA_CL_CLIP_CNTL_Z_NAN_RETAIN                       0x00800000
+#define A2XX_PA_CL_CLIP_CNTL_W_NAN_RETAIN                       0x01000000
+
+#define REG_A2XX_PA_SU_SC_MODE_CNTL                             0x00002205
+#define A2XX_PA_SU_SC_MODE_CNTL_CULL_FRONT                      0x00000001
+#define A2XX_PA_SU_SC_MODE_CNTL_CULL_BACK                       0x00000002
+#define A2XX_PA_SU_SC_MODE_CNTL_FACE                            0x00000004
+#define A2XX_PA_SU_SC_MODE_CNTL_POLYMODE__MASK                  0x00000018
+#define A2XX_PA_SU_SC_MODE_CNTL_POLYMODE__SHIFT                 3
+static inline uint32_t A2XX_PA_SU_SC_MODE_CNTL_POLYMODE(enum a2xx_pa_su_sc_polymode val)
+{
+        return ((val) << A2XX_PA_SU_SC_MODE_CNTL_POLYMODE__SHIFT) & A2XX_PA_SU_SC_MODE_CNTL_POLYMODE__MASK;
+}
+#define A2XX_PA_SU_SC_MODE_CNTL_FRONT_PTYPE__MASK               0x000000e0
+#define A2XX_PA_SU_SC_MODE_CNTL_FRONT_PTYPE__SHIFT              5
+static inline uint32_t A2XX_PA_SU_SC_MODE_CNTL_FRONT_PTYPE(enum adreno_pa_su_sc_draw val)
+{
+        return ((val) << A2XX_PA_SU_SC_MODE_CNTL_FRONT_PTYPE__SHIFT) & A2XX_PA_SU_SC_MODE_CNTL_FRONT_PTYPE__MASK;
+}
+#define A2XX_PA_SU_SC_MODE_CNTL_BACK_PTYPE__MASK                0x00000700
+#define A2XX_PA_SU_SC_MODE_CNTL_BACK_PTYPE__SHIFT               8
+static inline uint32_t A2XX_PA_SU_SC_MODE_CNTL_BACK_PTYPE(enum adreno_pa_su_sc_draw val)
+{
+        return ((val) << A2XX_PA_SU_SC_MODE_CNTL_BACK_PTYPE__SHIFT) & A2XX_PA_SU_SC_MODE_CNTL_BACK_PTYPE__MASK;
+}
+#define A2XX_PA_SU_SC_MODE_CNTL_POLY_OFFSET_FRONT_ENABLE        0x00000800
+#define A2XX_PA_SU_SC_MODE_CNTL_POLY_OFFSET_BACK_ENABLE         0x00001000
+#define A2XX_PA_SU_SC_MODE_CNTL_POLY_OFFSET_PARA_ENABLE         0x00002000
+#define A2XX_PA_SU_SC_MODE_CNTL_MSAA_ENABLE                     0x00008000
+#define A2XX_PA_SU_SC_MODE_CNTL_VTX_WINDOW_OFFSET_ENABLE        0x00010000
+#define A2XX_PA_SU_SC_MODE_CNTL_LINE_STIPPLE_ENABLE             0x00040000
+#define A2XX_PA_SU_SC_MODE_CNTL_PROVOKING_VTX_LAST              0x00080000
+#define A2XX_PA_SU_SC_MODE_CNTL_PERSP_CORR_DIS                  0x00100000
+#define A2XX_PA_SU_SC_MODE_CNTL_MULTI_PRIM_IB_ENA               0x00200000
+#define A2XX_PA_SU_SC_MODE_CNTL_QUAD_ORDER_ENABLE               0x00800000
+#define A2XX_PA_SU_SC_MODE_CNTL_WAIT_RB_IDLE_ALL_TRI            0x02000000
+#define A2XX_PA_SU_SC_MODE_CNTL_WAIT_RB_IDLE_FIRST_TRI_NEW_STATE        0x04000000
+#define A2XX_PA_SU_SC_MODE_CNTL_CLAMPED_FACENESS                0x10000000
+#define A2XX_PA_SU_SC_MODE_CNTL_ZERO_AREA_FACENESS              0x20000000
+#define A2XX_PA_SU_SC_MODE_CNTL_FACE_KILL_ENABLE                0x40000000
+#define A2XX_PA_SU_SC_MODE_CNTL_FACE_WRITE_ENABLE               0x80000000
+
+#define REG_A2XX_PA_CL_VTE_CNTL                                 0x00002206
+#define A2XX_PA_CL_VTE_CNTL_VPORT_X_SCALE_ENA                   0x00000001
+#define A2XX_PA_CL_VTE_CNTL_VPORT_X_OFFSET_ENA                  0x00000002
+#define A2XX_PA_CL_VTE_CNTL_VPORT_Y_SCALE_ENA                   0x00000004
+#define A2XX_PA_CL_VTE_CNTL_VPORT_Y_OFFSET_ENA                  0x00000008
+#define A2XX_PA_CL_VTE_CNTL_VPORT_Z_SCALE_ENA                   0x00000010
+#define A2XX_PA_CL_VTE_CNTL_VPORT_Z_OFFSET_ENA                  0x00000020
+#define A2XX_PA_CL_VTE_CNTL_VTX_XY_FMT                          0x00000100
+#define A2XX_PA_CL_VTE_CNTL_VTX_Z_FMT                           0x00000200
+#define A2XX_PA_CL_VTE_CNTL_VTX_W0_FMT                          0x00000400
+#define A2XX_PA_CL_VTE_CNTL_PERFCOUNTER_REF                     0x00000800
+
+#define REG_A2XX_VGT_CURRENT_BIN_ID_MIN                         0x00002207
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_COLUMN__MASK                0x00000007
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_COLUMN__SHIFT               0
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MIN_COLUMN(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MIN_COLUMN__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MIN_COLUMN__MASK;
+}
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_ROW__MASK                   0x00000038
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_ROW__SHIFT                  3
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MIN_ROW(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MIN_ROW__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MIN_ROW__MASK;
+}
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_GUARD_BAND_MASK__MASK       0x000001c0
+#define A2XX_VGT_CURRENT_BIN_ID_MIN_GUARD_BAND_MASK__SHIFT      6
+static inline uint32_t A2XX_VGT_CURRENT_BIN_ID_MIN_GUARD_BAND_MASK(uint32_t val)
+{
+        return ((val) << A2XX_VGT_CURRENT_BIN_ID_MIN_GUARD_BAND_MASK__SHIFT) & A2XX_VGT_CURRENT_BIN_ID_MIN_GUARD_BAND_MASK__MASK;
+}
+
+#define REG_A2XX_RB_MODECONTROL                                 0x00002208
+#define A2XX_RB_MODECONTROL_EDRAM_MODE__MASK                    0x00000007
+#define A2XX_RB_MODECONTROL_EDRAM_MODE__SHIFT                   0
+static inline uint32_t A2XX_RB_MODECONTROL_EDRAM_MODE(enum a2xx_rb_edram_mode val)
+{
+        return ((val) << A2XX_RB_MODECONTROL_EDRAM_MODE__SHIFT) & A2XX_RB_MODECONTROL_EDRAM_MODE__MASK;
+}
+
+#define REG_A2XX_A220_RB_LRZ_VSC_CONTROL                        0x00002209
+
+#define REG_A2XX_RB_SAMPLE_POS                                  0x0000220a
+
+#define REG_A2XX_CLEAR_COLOR                                    0x0000220b
+#define A2XX_CLEAR_COLOR_RED__MASK                              0x000000ff
+#define A2XX_CLEAR_COLOR_RED__SHIFT                             0
+static inline uint32_t A2XX_CLEAR_COLOR_RED(uint32_t val)
+{
+        return ((val) << A2XX_CLEAR_COLOR_RED__SHIFT) & A2XX_CLEAR_COLOR_RED__MASK;
+}
+#define A2XX_CLEAR_COLOR_GREEN__MASK                            0x0000ff00
+#define A2XX_CLEAR_COLOR_GREEN__SHIFT                           8
+static inline uint32_t A2XX_CLEAR_COLOR_GREEN(uint32_t val)
+{
+        return ((val) << A2XX_CLEAR_COLOR_GREEN__SHIFT) & A2XX_CLEAR_COLOR_GREEN__MASK;
+}
+#define A2XX_CLEAR_COLOR_BLUE__MASK                             0x00ff0000
+#define A2XX_CLEAR_COLOR_BLUE__SHIFT                            16
+static inline uint32_t A2XX_CLEAR_COLOR_BLUE(uint32_t val)
+{
+        return ((val) << A2XX_CLEAR_COLOR_BLUE__SHIFT) & A2XX_CLEAR_COLOR_BLUE__MASK;
+}
+#define A2XX_CLEAR_COLOR_ALPHA__MASK                            0xff000000
+#define A2XX_CLEAR_COLOR_ALPHA__SHIFT                           24
+static inline uint32_t A2XX_CLEAR_COLOR_ALPHA(uint32_t val)
+{
+        return ((val) << A2XX_CLEAR_COLOR_ALPHA__SHIFT) & A2XX_CLEAR_COLOR_ALPHA__MASK;
+}
+
+#define REG_A2XX_A220_GRAS_CONTROL                              0x00002210
+
+#define REG_A2XX_PA_SU_POINT_SIZE                               0x00002280
+#define A2XX_PA_SU_POINT_SIZE_HEIGHT__MASK                      0x0000ffff
+#define A2XX_PA_SU_POINT_SIZE_HEIGHT__SHIFT                     0
+static inline uint32_t A2XX_PA_SU_POINT_SIZE_HEIGHT(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A2XX_PA_SU_POINT_SIZE_HEIGHT__SHIFT) & A2XX_PA_SU_POINT_SIZE_HEIGHT__MASK;
+}
+#define A2XX_PA_SU_POINT_SIZE_WIDTH__MASK                       0xffff0000
+#define A2XX_PA_SU_POINT_SIZE_WIDTH__SHIFT                      16
+static inline uint32_t A2XX_PA_SU_POINT_SIZE_WIDTH(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A2XX_PA_SU_POINT_SIZE_WIDTH__SHIFT) & A2XX_PA_SU_POINT_SIZE_WIDTH__MASK;
+}
+
+#define REG_A2XX_PA_SU_POINT_MINMAX                             0x00002281
+#define A2XX_PA_SU_POINT_MINMAX_MIN__MASK                       0x0000ffff
+#define A2XX_PA_SU_POINT_MINMAX_MIN__SHIFT                      0
+static inline uint32_t A2XX_PA_SU_POINT_MINMAX_MIN(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A2XX_PA_SU_POINT_MINMAX_MIN__SHIFT) & A2XX_PA_SU_POINT_MINMAX_MIN__MASK;
+}
+#define A2XX_PA_SU_POINT_MINMAX_MAX__MASK                       0xffff0000
+#define A2XX_PA_SU_POINT_MINMAX_MAX__SHIFT                      16
+static inline uint32_t A2XX_PA_SU_POINT_MINMAX_MAX(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A2XX_PA_SU_POINT_MINMAX_MAX__SHIFT) & A2XX_PA_SU_POINT_MINMAX_MAX__MASK;
+}
+
+#define REG_A2XX_PA_SU_LINE_CNTL                                0x00002282
+#define A2XX_PA_SU_LINE_CNTL_WIDTH__MASK                        0x0000ffff
+#define A2XX_PA_SU_LINE_CNTL_WIDTH__SHIFT                       0
+static inline uint32_t A2XX_PA_SU_LINE_CNTL_WIDTH(float val)
+{
+        return ((((uint32_t)(val * 8.0))) << A2XX_PA_SU_LINE_CNTL_WIDTH__SHIFT) & A2XX_PA_SU_LINE_CNTL_WIDTH__MASK;
+}
+
+#define REG_A2XX_PA_SC_LINE_STIPPLE                             0x00002283
+#define A2XX_PA_SC_LINE_STIPPLE_LINE_PATTERN__MASK              0x0000ffff
+#define A2XX_PA_SC_LINE_STIPPLE_LINE_PATTERN__SHIFT             0
+static inline uint32_t A2XX_PA_SC_LINE_STIPPLE_LINE_PATTERN(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_LINE_STIPPLE_LINE_PATTERN__SHIFT) & A2XX_PA_SC_LINE_STIPPLE_LINE_PATTERN__MASK;
+}
+#define A2XX_PA_SC_LINE_STIPPLE_REPEAT_COUNT__MASK              0x00ff0000
+#define A2XX_PA_SC_LINE_STIPPLE_REPEAT_COUNT__SHIFT             16
+static inline uint32_t A2XX_PA_SC_LINE_STIPPLE_REPEAT_COUNT(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_LINE_STIPPLE_REPEAT_COUNT__SHIFT) & A2XX_PA_SC_LINE_STIPPLE_REPEAT_COUNT__MASK;
+}
+#define A2XX_PA_SC_LINE_STIPPLE_PATTERN_BIT_ORDER__MASK         0x10000000
+#define A2XX_PA_SC_LINE_STIPPLE_PATTERN_BIT_ORDER__SHIFT        28
+static inline uint32_t A2XX_PA_SC_LINE_STIPPLE_PATTERN_BIT_ORDER(enum a2xx_pa_sc_pattern_bit_order val)
+{
+        return ((val) << A2XX_PA_SC_LINE_STIPPLE_PATTERN_BIT_ORDER__SHIFT) & A2XX_PA_SC_LINE_STIPPLE_PATTERN_BIT_ORDER__MASK;
+}
+#define A2XX_PA_SC_LINE_STIPPLE_AUTO_RESET_CNTL__MASK           0x60000000
+#define A2XX_PA_SC_LINE_STIPPLE_AUTO_RESET_CNTL__SHIFT          29
+static inline uint32_t A2XX_PA_SC_LINE_STIPPLE_AUTO_RESET_CNTL(enum a2xx_pa_sc_auto_reset_cntl val)
+{
+        return ((val) << A2XX_PA_SC_LINE_STIPPLE_AUTO_RESET_CNTL__SHIFT) & A2XX_PA_SC_LINE_STIPPLE_AUTO_RESET_CNTL__MASK;
+}
+
+#define REG_A2XX_PA_SC_VIZ_QUERY                                0x00002293
+
+#define REG_A2XX_VGT_ENHANCE                                    0x00002294
+
+#define REG_A2XX_PA_SC_LINE_CNTL                                0x00002300
+#define A2XX_PA_SC_LINE_CNTL_BRES_CNTL__MASK                    0x0000ffff
+#define A2XX_PA_SC_LINE_CNTL_BRES_CNTL__SHIFT                   0
+static inline uint32_t A2XX_PA_SC_LINE_CNTL_BRES_CNTL(uint32_t val)
+{
+        return ((val) << A2XX_PA_SC_LINE_CNTL_BRES_CNTL__SHIFT) & A2XX_PA_SC_LINE_CNTL_BRES_CNTL__MASK;
+}
+#define A2XX_PA_SC_LINE_CNTL_USE_BRES_CNTL                      0x00000100
+#define A2XX_PA_SC_LINE_CNTL_EXPAND_LINE_WIDTH                  0x00000200
+#define A2XX_PA_SC_LINE_CNTL_LAST_PIXEL                         0x00000400
+
+#define REG_A2XX_PA_SC_AA_CONFIG                                0x00002301
+
+#define REG_A2XX_PA_SU_VTX_CNTL                                 0x00002302
+#define A2XX_PA_SU_VTX_CNTL_PIX_CENTER__MASK                    0x00000001
+#define A2XX_PA_SU_VTX_CNTL_PIX_CENTER__SHIFT                   0
+static inline uint32_t A2XX_PA_SU_VTX_CNTL_PIX_CENTER(enum a2xx_pa_pixcenter val)
+{
+        return ((val) << A2XX_PA_SU_VTX_CNTL_PIX_CENTER__SHIFT) & A2XX_PA_SU_VTX_CNTL_PIX_CENTER__MASK;
+}
+#define A2XX_PA_SU_VTX_CNTL_ROUND_MODE__MASK                    0x00000006
+#define A2XX_PA_SU_VTX_CNTL_ROUND_MODE__SHIFT                   1
+static inline uint32_t A2XX_PA_SU_VTX_CNTL_ROUND_MODE(enum a2xx_pa_roundmode val)
+{
+        return ((val) << A2XX_PA_SU_VTX_CNTL_ROUND_MODE__SHIFT) & A2XX_PA_SU_VTX_CNTL_ROUND_MODE__MASK;
+}
+#define A2XX_PA_SU_VTX_CNTL_QUANT_MODE__MASK                    0x00000380
+#define A2XX_PA_SU_VTX_CNTL_QUANT_MODE__SHIFT                   7
+static inline uint32_t A2XX_PA_SU_VTX_CNTL_QUANT_MODE(enum a2xx_pa_quantmode val)
+{
+        return ((val) << A2XX_PA_SU_VTX_CNTL_QUANT_MODE__SHIFT) & A2XX_PA_SU_VTX_CNTL_QUANT_MODE__MASK;
+}
+
+#define REG_A2XX_PA_CL_GB_VERT_CLIP_ADJ                         0x00002303
+#define A2XX_PA_CL_GB_VERT_CLIP_ADJ__MASK                       0xffffffff
+#define A2XX_PA_CL_GB_VERT_CLIP_ADJ__SHIFT                      0
+static inline uint32_t A2XX_PA_CL_GB_VERT_CLIP_ADJ(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_GB_VERT_CLIP_ADJ__SHIFT) & A2XX_PA_CL_GB_VERT_CLIP_ADJ__MASK;
+}
+
+#define REG_A2XX_PA_CL_GB_VERT_DISC_ADJ                         0x00002304
+#define A2XX_PA_CL_GB_VERT_DISC_ADJ__MASK                       0xffffffff
+#define A2XX_PA_CL_GB_VERT_DISC_ADJ__SHIFT                      0
+static inline uint32_t A2XX_PA_CL_GB_VERT_DISC_ADJ(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_GB_VERT_DISC_ADJ__SHIFT) & A2XX_PA_CL_GB_VERT_DISC_ADJ__MASK;
+}
+
+#define REG_A2XX_PA_CL_GB_HORZ_CLIP_ADJ                         0x00002305
+#define A2XX_PA_CL_GB_HORZ_CLIP_ADJ__MASK                       0xffffffff
+#define A2XX_PA_CL_GB_HORZ_CLIP_ADJ__SHIFT                      0
+static inline uint32_t A2XX_PA_CL_GB_HORZ_CLIP_ADJ(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_GB_HORZ_CLIP_ADJ__SHIFT) & A2XX_PA_CL_GB_HORZ_CLIP_ADJ__MASK;
+}
+
+#define REG_A2XX_PA_CL_GB_HORZ_DISC_ADJ                         0x00002306
+#define A2XX_PA_CL_GB_HORZ_DISC_ADJ__MASK                       0xffffffff
+#define A2XX_PA_CL_GB_HORZ_DISC_ADJ__SHIFT                      0
+static inline uint32_t A2XX_PA_CL_GB_HORZ_DISC_ADJ(float val)
+{
+        return ((fui(val)) << A2XX_PA_CL_GB_HORZ_DISC_ADJ__SHIFT) & A2XX_PA_CL_GB_HORZ_DISC_ADJ__MASK;
+}
+
+#define REG_A2XX_SQ_VS_CONST                                    0x00002307
+#define A2XX_SQ_VS_CONST_BASE__MASK                             0x000001ff
+#define A2XX_SQ_VS_CONST_BASE__SHIFT                            0
+static inline uint32_t A2XX_SQ_VS_CONST_BASE(uint32_t val)
+{
+        return ((val) << A2XX_SQ_VS_CONST_BASE__SHIFT) & A2XX_SQ_VS_CONST_BASE__MASK;
+}
+#define A2XX_SQ_VS_CONST_SIZE__MASK                             0x001ff000
+#define A2XX_SQ_VS_CONST_SIZE__SHIFT                            12
+static inline uint32_t A2XX_SQ_VS_CONST_SIZE(uint32_t val)
+{
+        return ((val) << A2XX_SQ_VS_CONST_SIZE__SHIFT) & A2XX_SQ_VS_CONST_SIZE__MASK;
+}
+
+#define REG_A2XX_SQ_PS_CONST                                    0x00002308
+#define A2XX_SQ_PS_CONST_BASE__MASK                             0x000001ff
+#define A2XX_SQ_PS_CONST_BASE__SHIFT                            0
+static inline uint32_t A2XX_SQ_PS_CONST_BASE(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PS_CONST_BASE__SHIFT) & A2XX_SQ_PS_CONST_BASE__MASK;
+}
+#define A2XX_SQ_PS_CONST_SIZE__MASK                             0x001ff000
+#define A2XX_SQ_PS_CONST_SIZE__SHIFT                            12
+static inline uint32_t A2XX_SQ_PS_CONST_SIZE(uint32_t val)
+{
+        return ((val) << A2XX_SQ_PS_CONST_SIZE__SHIFT) & A2XX_SQ_PS_CONST_SIZE__MASK;
+}
+
+#define REG_A2XX_SQ_DEBUG_MISC_0                                0x00002309
+
+#define REG_A2XX_SQ_DEBUG_MISC_1                                0x0000230a
+
+#define REG_A2XX_PA_SC_AA_MASK                                  0x00002312
+
+#define REG_A2XX_VGT_VERTEX_REUSE_BLOCK_CNTL                    0x00002316
+
+#define REG_A2XX_VGT_OUT_DEALLOC_CNTL                           0x00002317
+
+#define REG_A2XX_RB_COPY_CONTROL                                0x00002318
+#define A2XX_RB_COPY_CONTROL_COPY_SAMPLE_SELECT__MASK           0x00000007
+#define A2XX_RB_COPY_CONTROL_COPY_SAMPLE_SELECT__SHIFT          0
+static inline uint32_t A2XX_RB_COPY_CONTROL_COPY_SAMPLE_SELECT(enum a2xx_rb_copy_sample_select val)
+{
+        return ((val) << A2XX_RB_COPY_CONTROL_COPY_SAMPLE_SELECT__SHIFT) & A2XX_RB_COPY_CONTROL_COPY_SAMPLE_SELECT__MASK;
+}
+#define A2XX_RB_COPY_CONTROL_DEPTH_CLEAR_ENABLE                 0x00000008
+#define A2XX_RB_COPY_CONTROL_CLEAR_MASK__MASK                   0x000000f0
+#define A2XX_RB_COPY_CONTROL_CLEAR_MASK__SHIFT                  4
+static inline uint32_t A2XX_RB_COPY_CONTROL_CLEAR_MASK(uint32_t val)
+{
+        return ((val) << A2XX_RB_COPY_CONTROL_CLEAR_MASK__SHIFT) & A2XX_RB_COPY_CONTROL_CLEAR_MASK__MASK;
+}
+
+#define REG_A2XX_RB_COPY_DEST_BASE                              0x00002319
+
+#define REG_A2XX_RB_COPY_DEST_PITCH                             0x0000231a
+#define A2XX_RB_COPY_DEST_PITCH__MASK                           0xffffffff
+#define A2XX_RB_COPY_DEST_PITCH__SHIFT                          0
+static inline uint32_t A2XX_RB_COPY_DEST_PITCH(uint32_t val)
+{
+        return ((val >> 5) << A2XX_RB_COPY_DEST_PITCH__SHIFT) & A2XX_RB_COPY_DEST_PITCH__MASK;
+}
+
+#define REG_A2XX_RB_COPY_DEST_INFO                              0x0000231b
+#define A2XX_RB_COPY_DEST_INFO_DEST_ENDIAN__MASK                0x00000007
+#define A2XX_RB_COPY_DEST_INFO_DEST_ENDIAN__SHIFT               0
+static inline uint32_t A2XX_RB_COPY_DEST_INFO_DEST_ENDIAN(enum adreno_rb_surface_endian val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_INFO_DEST_ENDIAN__SHIFT) & A2XX_RB_COPY_DEST_INFO_DEST_ENDIAN__MASK;
+}
+#define A2XX_RB_COPY_DEST_INFO_LINEAR                           0x00000008
+#define A2XX_RB_COPY_DEST_INFO_FORMAT__MASK                     0x000000f0
+#define A2XX_RB_COPY_DEST_INFO_FORMAT__SHIFT                    4
+static inline uint32_t A2XX_RB_COPY_DEST_INFO_FORMAT(enum a2xx_colorformatx val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_INFO_FORMAT__SHIFT) & A2XX_RB_COPY_DEST_INFO_FORMAT__MASK;
+}
+#define A2XX_RB_COPY_DEST_INFO_SWAP__MASK                       0x00000300
+#define A2XX_RB_COPY_DEST_INFO_SWAP__SHIFT                      8
+static inline uint32_t A2XX_RB_COPY_DEST_INFO_SWAP(uint32_t val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_INFO_SWAP__SHIFT) & A2XX_RB_COPY_DEST_INFO_SWAP__MASK;
+}
+#define A2XX_RB_COPY_DEST_INFO_DITHER_MODE__MASK                0x00000c00
+#define A2XX_RB_COPY_DEST_INFO_DITHER_MODE__SHIFT               10
+static inline uint32_t A2XX_RB_COPY_DEST_INFO_DITHER_MODE(enum adreno_rb_dither_mode val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_INFO_DITHER_MODE__SHIFT) & A2XX_RB_COPY_DEST_INFO_DITHER_MODE__MASK;
+}
+#define A2XX_RB_COPY_DEST_INFO_DITHER_TYPE__MASK                0x00003000
+#define A2XX_RB_COPY_DEST_INFO_DITHER_TYPE__SHIFT               12
+static inline uint32_t A2XX_RB_COPY_DEST_INFO_DITHER_TYPE(enum a2xx_rb_dither_type val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_INFO_DITHER_TYPE__SHIFT) & A2XX_RB_COPY_DEST_INFO_DITHER_TYPE__MASK;
+}
+#define A2XX_RB_COPY_DEST_INFO_WRITE_RED                        0x00004000
+#define A2XX_RB_COPY_DEST_INFO_WRITE_GREEN                      0x00008000
+#define A2XX_RB_COPY_DEST_INFO_WRITE_BLUE                       0x00010000
+#define A2XX_RB_COPY_DEST_INFO_WRITE_ALPHA                      0x00020000
+
+#define REG_A2XX_RB_COPY_DEST_OFFSET                            0x0000231c
+#define A2XX_RB_COPY_DEST_OFFSET_X__MASK                        0x00001fff
+#define A2XX_RB_COPY_DEST_OFFSET_X__SHIFT                       0
+static inline uint32_t A2XX_RB_COPY_DEST_OFFSET_X(uint32_t val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_OFFSET_X__SHIFT) & A2XX_RB_COPY_DEST_OFFSET_X__MASK;
+}
+#define A2XX_RB_COPY_DEST_OFFSET_Y__MASK                        0x03ffe000
+#define A2XX_RB_COPY_DEST_OFFSET_Y__SHIFT                       13
+static inline uint32_t A2XX_RB_COPY_DEST_OFFSET_Y(uint32_t val)
+{
+        return ((val) << A2XX_RB_COPY_DEST_OFFSET_Y__SHIFT) & A2XX_RB_COPY_DEST_OFFSET_Y__MASK;
+}
+
+#define REG_A2XX_RB_DEPTH_CLEAR                                 0x0000231d
+
+#define REG_A2XX_RB_SAMPLE_COUNT_CTL                            0x00002324
+
+#define REG_A2XX_RB_COLOR_DEST_MASK                             0x00002326
+
+#define REG_A2XX_A225_GRAS_UCP0X                                0x00002340
+
+#define REG_A2XX_A225_GRAS_UCP5W                                0x00002357
+
+#define REG_A2XX_A225_GRAS_UCP_ENABLED                          0x00002360
+
+#define REG_A2XX_PA_SU_POLY_OFFSET_FRONT_SCALE                  0x00002380
+
+#define REG_A2XX_PA_SU_POLY_OFFSET_BACK_OFFSET                  0x00002383
+
+#define REG_A2XX_SQ_CONSTANT_0                                  0x00004000
+
+#define REG_A2XX_SQ_FETCH_0                                     0x00004800
+
+#define REG_A2XX_SQ_CF_BOOLEANS                                 0x00004900
+
+#define REG_A2XX_SQ_CF_LOOP                                     0x00004908
+
+#define REG_A2XX_COHER_SIZE_PM4                                 0x00000a29
+
+#define REG_A2XX_COHER_BASE_PM4                                 0x00000a2a
+
+#define REG_A2XX_COHER_STATUS_PM4                               0x00000a2b
+
+#define REG_A2XX_SQ_TEX_0                                       0x00000000
+#define A2XX_SQ_TEX_0_CLAMP_X__MASK                             0x00001c00
+#define A2XX_SQ_TEX_0_CLAMP_X__SHIFT                            10
+static inline uint32_t A2XX_SQ_TEX_0_CLAMP_X(enum sq_tex_clamp val)
+{
+        return ((val) << A2XX_SQ_TEX_0_CLAMP_X__SHIFT) & A2XX_SQ_TEX_0_CLAMP_X__MASK;
+}
+#define A2XX_SQ_TEX_0_CLAMP_Y__MASK                             0x0000e000
+#define A2XX_SQ_TEX_0_CLAMP_Y__SHIFT                            13
+static inline uint32_t A2XX_SQ_TEX_0_CLAMP_Y(enum sq_tex_clamp val)
+{
+        return ((val) << A2XX_SQ_TEX_0_CLAMP_Y__SHIFT) & A2XX_SQ_TEX_0_CLAMP_Y__MASK;
+}
+#define A2XX_SQ_TEX_0_CLAMP_Z__MASK                             0x00070000
+#define A2XX_SQ_TEX_0_CLAMP_Z__SHIFT                            16
+static inline uint32_t A2XX_SQ_TEX_0_CLAMP_Z(enum sq_tex_clamp val)
+{
+        return ((val) << A2XX_SQ_TEX_0_CLAMP_Z__SHIFT) & A2XX_SQ_TEX_0_CLAMP_Z__MASK;
+}
+#define A2XX_SQ_TEX_0_PITCH__MASK                               0xffc00000
+#define A2XX_SQ_TEX_0_PITCH__SHIFT                              22
+static inline uint32_t A2XX_SQ_TEX_0_PITCH(uint32_t val)
+{
+        return ((val >> 5) << A2XX_SQ_TEX_0_PITCH__SHIFT) & A2XX_SQ_TEX_0_PITCH__MASK;
+}
+
+#define REG_A2XX_SQ_TEX_1                                       0x00000001
+
+#define REG_A2XX_SQ_TEX_2                                       0x00000002
+#define A2XX_SQ_TEX_2_WIDTH__MASK                               0x00001fff
+#define A2XX_SQ_TEX_2_WIDTH__SHIFT                              0
+static inline uint32_t A2XX_SQ_TEX_2_WIDTH(uint32_t val)
+{
+        return ((val) << A2XX_SQ_TEX_2_WIDTH__SHIFT) & A2XX_SQ_TEX_2_WIDTH__MASK;
+}
+#define A2XX_SQ_TEX_2_HEIGHT__MASK                              0x03ffe000
+#define A2XX_SQ_TEX_2_HEIGHT__SHIFT                             13
+static inline uint32_t A2XX_SQ_TEX_2_HEIGHT(uint32_t val)
+{
+        return ((val) << A2XX_SQ_TEX_2_HEIGHT__SHIFT) & A2XX_SQ_TEX_2_HEIGHT__MASK;
+}
+
+#define REG_A2XX_SQ_TEX_3                                       0x00000003
+#define A2XX_SQ_TEX_3_SWIZ_X__MASK                              0x0000000e
+#define A2XX_SQ_TEX_3_SWIZ_X__SHIFT                             1
+static inline uint32_t A2XX_SQ_TEX_3_SWIZ_X(enum sq_tex_swiz val)
+{
+        return ((val) << A2XX_SQ_TEX_3_SWIZ_X__SHIFT) & A2XX_SQ_TEX_3_SWIZ_X__MASK;
+}
+#define A2XX_SQ_TEX_3_SWIZ_Y__MASK                              0x00000070
+#define A2XX_SQ_TEX_3_SWIZ_Y__SHIFT                             4
+static inline uint32_t A2XX_SQ_TEX_3_SWIZ_Y(enum sq_tex_swiz val)
+{
+        return ((val) << A2XX_SQ_TEX_3_SWIZ_Y__SHIFT) & A2XX_SQ_TEX_3_SWIZ_Y__MASK;
+}
+#define A2XX_SQ_TEX_3_SWIZ_Z__MASK                              0x00000380
+#define A2XX_SQ_TEX_3_SWIZ_Z__SHIFT                             7
+static inline uint32_t A2XX_SQ_TEX_3_SWIZ_Z(enum sq_tex_swiz val)
+{
+        return ((val) << A2XX_SQ_TEX_3_SWIZ_Z__SHIFT) & A2XX_SQ_TEX_3_SWIZ_Z__MASK;
+}
+#define A2XX_SQ_TEX_3_SWIZ_W__MASK                              0x00001c00
+#define A2XX_SQ_TEX_3_SWIZ_W__SHIFT                             10
+static inline uint32_t A2XX_SQ_TEX_3_SWIZ_W(enum sq_tex_swiz val)
+{
+        return ((val) << A2XX_SQ_TEX_3_SWIZ_W__SHIFT) & A2XX_SQ_TEX_3_SWIZ_W__MASK;
+}
+#define A2XX_SQ_TEX_3_XY_MAG_FILTER__MASK                       0x00180000
+#define A2XX_SQ_TEX_3_XY_MAG_FILTER__SHIFT                      19
+static inline uint32_t A2XX_SQ_TEX_3_XY_MAG_FILTER(enum sq_tex_filter val)
+{
+        return ((val) << A2XX_SQ_TEX_3_XY_MAG_FILTER__SHIFT) & A2XX_SQ_TEX_3_XY_MAG_FILTER__MASK;
+}
+#define A2XX_SQ_TEX_3_XY_MIN_FILTER__MASK                       0x00600000
+#define A2XX_SQ_TEX_3_XY_MIN_FILTER__SHIFT                      21
+static inline uint32_t A2XX_SQ_TEX_3_XY_MIN_FILTER(enum sq_tex_filter val)
+{
+        return ((val) << A2XX_SQ_TEX_3_XY_MIN_FILTER__SHIFT) & A2XX_SQ_TEX_3_XY_MIN_FILTER__MASK;
+}
+
+
+#endif /* A2XX_XML */
diff --git a/drivers/gpu/drm/msm/adreno/a3xx.xml.h b/drivers/gpu/drm/msm/adreno/a3xx.xml.h
new file mode 100644
index 000000000000..d183516067b4
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/a3xx.xml.h
@@ -0,0 +1,2193 @@
+#ifndef A3XX_XML
+#define A3XX_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml              (    327 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  30005 bytes, from 2013-07-19 21:30:48)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9712 bytes, from 2013-05-26 15:22:37)
+- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51415 bytes, from 2013-08-03 14:26:05)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+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,
+        HLSQ_BLOCK_ID_SP_VS = 4,
+        HLSQ_BLOCK_ID_SP_FS = 6,
+};
+
+enum a3xx_cache_opcode {
+        INVALIDATE = 1,
+};
+
+enum a3xx_vtx_fmt {
+        VFMT_FLOAT_32 = 0,
+        VFMT_FLOAT_32_32 = 1,
+        VFMT_FLOAT_32_32_32 = 2,
+        VFMT_FLOAT_32_32_32_32 = 3,
+        VFMT_FLOAT_16 = 4,
+        VFMT_FLOAT_16_16 = 5,
+        VFMT_FLOAT_16_16_16 = 6,
+        VFMT_FLOAT_16_16_16_16 = 7,
+        VFMT_FIXED_32 = 8,
+        VFMT_FIXED_32_32 = 9,
+        VFMT_FIXED_32_32_32 = 10,
+        VFMT_FIXED_32_32_32_32 = 11,
+        VFMT_SHORT_16 = 16,
+        VFMT_SHORT_16_16 = 17,
+        VFMT_SHORT_16_16_16 = 18,
+        VFMT_SHORT_16_16_16_16 = 19,
+        VFMT_USHORT_16 = 20,
+        VFMT_USHORT_16_16 = 21,
+        VFMT_USHORT_16_16_16 = 22,
+        VFMT_USHORT_16_16_16_16 = 23,
+        VFMT_NORM_SHORT_16 = 24,
+        VFMT_NORM_SHORT_16_16 = 25,
+        VFMT_NORM_SHORT_16_16_16 = 26,
+        VFMT_NORM_SHORT_16_16_16_16 = 27,
+        VFMT_NORM_USHORT_16 = 28,
+        VFMT_NORM_USHORT_16_16 = 29,
+        VFMT_NORM_USHORT_16_16_16 = 30,
+        VFMT_NORM_USHORT_16_16_16_16 = 31,
+        VFMT_UBYTE_8 = 40,
+        VFMT_UBYTE_8_8 = 41,
+        VFMT_UBYTE_8_8_8 = 42,
+        VFMT_UBYTE_8_8_8_8 = 43,
+        VFMT_NORM_UBYTE_8 = 44,
+        VFMT_NORM_UBYTE_8_8 = 45,
+        VFMT_NORM_UBYTE_8_8_8 = 46,
+        VFMT_NORM_UBYTE_8_8_8_8 = 47,
+        VFMT_BYTE_8 = 48,
+        VFMT_BYTE_8_8 = 49,
+        VFMT_BYTE_8_8_8 = 50,
+        VFMT_BYTE_8_8_8_8 = 51,
+        VFMT_NORM_BYTE_8 = 52,
+        VFMT_NORM_BYTE_8_8 = 53,
+        VFMT_NORM_BYTE_8_8_8 = 54,
+        VFMT_NORM_BYTE_8_8_8_8 = 55,
+        VFMT_UINT_10_10_10_2 = 60,
+        VFMT_NORM_UINT_10_10_10_2 = 61,
+        VFMT_INT_10_10_10_2 = 62,
+        VFMT_NORM_INT_10_10_10_2 = 63,
+};
+
+enum a3xx_tex_fmt {
+        TFMT_NORM_USHORT_565 = 4,
+        TFMT_NORM_USHORT_5551 = 6,
+        TFMT_NORM_USHORT_4444 = 7,
+        TFMT_NORM_UINT_X8Z24 = 10,
+        TFMT_NORM_UINT_NV12_UV_TILED = 17,
+        TFMT_NORM_UINT_NV12_Y_TILED = 19,
+        TFMT_NORM_UINT_NV12_UV = 21,
+        TFMT_NORM_UINT_NV12_Y = 23,
+        TFMT_NORM_UINT_I420_Y = 24,
+        TFMT_NORM_UINT_I420_U = 26,
+        TFMT_NORM_UINT_I420_V = 27,
+        TFMT_NORM_UINT_2_10_10_10 = 41,
+        TFMT_NORM_UINT_A8 = 44,
+        TFMT_NORM_UINT_L8_A8 = 47,
+        TFMT_NORM_UINT_8 = 48,
+        TFMT_NORM_UINT_8_8 = 49,
+        TFMT_NORM_UINT_8_8_8 = 50,
+        TFMT_NORM_UINT_8_8_8_8 = 51,
+        TFMT_FLOAT_16 = 64,
+        TFMT_FLOAT_16_16 = 65,
+        TFMT_FLOAT_16_16_16_16 = 67,
+        TFMT_FLOAT_32 = 84,
+        TFMT_FLOAT_32_32 = 85,
+        TFMT_FLOAT_32_32_32_32 = 87,
+};
+
+enum a3xx_tex_fetchsize {
+        TFETCH_DISABLE = 0,
+        TFETCH_1_BYTE = 1,
+        TFETCH_2_BYTE = 2,
+        TFETCH_4_BYTE = 3,
+        TFETCH_8_BYTE = 4,
+        TFETCH_16_BYTE = 5,
+};
+
+enum a3xx_color_fmt {
+        RB_R8G8B8_UNORM = 4,
+        RB_R8G8B8A8_UNORM = 8,
+        RB_Z16_UNORM = 12,
+        RB_A8_UNORM = 20,
+};
+
+enum a3xx_color_swap {
+        WZYX = 0,
+        WXYZ = 1,
+        ZYXW = 2,
+        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,
+        SP0_ICL1_MISSES = 26,
+        SP_ALU_ACTIVE_CYCLES = 29,
+};
+
+enum adreno_rb_copy_control_mode {
+        RB_COPY_RESOLVE = 1,
+        RB_COPY_DEPTH_STENCIL = 5,
+};
+
+enum a3xx_tex_filter {
+        A3XX_TEX_NEAREST = 0,
+        A3XX_TEX_LINEAR = 1,
+};
+
+enum a3xx_tex_clamp {
+        A3XX_TEX_REPEAT = 0,
+        A3XX_TEX_CLAMP_TO_EDGE = 1,
+        A3XX_TEX_MIRROR_REPEAT = 2,
+        A3XX_TEX_CLAMP_NONE = 3,
+};
+
+enum a3xx_tex_swiz {
+        A3XX_TEX_X = 0,
+        A3XX_TEX_Y = 1,
+        A3XX_TEX_Z = 2,
+        A3XX_TEX_W = 3,
+        A3XX_TEX_ZERO = 4,
+        A3XX_TEX_ONE = 5,
+};
+
+enum a3xx_tex_type {
+        A3XX_TEX_1D = 0,
+        A3XX_TEX_2D = 1,
+        A3XX_TEX_CUBE = 2,
+        A3XX_TEX_3D = 3,
+};
+
+#define A3XX_INT0_RBBM_GPU_IDLE                                 0x00000001
+#define A3XX_INT0_RBBM_AHB_ERROR                                0x00000002
+#define A3XX_INT0_RBBM_REG_TIMEOUT                              0x00000004
+#define A3XX_INT0_RBBM_ME_MS_TIMEOUT                            0x00000008
+#define A3XX_INT0_RBBM_PFP_MS_TIMEOUT                           0x00000010
+#define A3XX_INT0_RBBM_ATB_BUS_OVERFLOW                         0x00000020
+#define A3XX_INT0_VFD_ERROR                                     0x00000040
+#define A3XX_INT0_CP_SW_INT                                     0x00000080
+#define A3XX_INT0_CP_T0_PACKET_IN_IB                            0x00000100
+#define A3XX_INT0_CP_OPCODE_ERROR                               0x00000200
+#define A3XX_INT0_CP_RESERVED_BIT_ERROR                         0x00000400
+#define A3XX_INT0_CP_HW_FAULT                                   0x00000800
+#define A3XX_INT0_CP_DMA                                        0x00001000
+#define A3XX_INT0_CP_IB2_INT                                    0x00002000
+#define A3XX_INT0_CP_IB1_INT                                    0x00004000
+#define A3XX_INT0_CP_RB_INT                                     0x00008000
+#define A3XX_INT0_CP_REG_PROTECT_FAULT                          0x00010000
+#define A3XX_INT0_CP_RB_DONE_TS                                 0x00020000
+#define A3XX_INT0_CP_VS_DONE_TS                                 0x00040000
+#define A3XX_INT0_CP_PS_DONE_TS                                 0x00080000
+#define A3XX_INT0_CACHE_FLUSH_TS                                0x00100000
+#define A3XX_INT0_CP_AHB_ERROR_HALT                             0x00200000
+#define A3XX_INT0_MISC_HANG_DETECT                              0x01000000
+#define A3XX_INT0_UCHE_OOB_ACCESS                               0x02000000
+#define REG_A3XX_RBBM_HW_VERSION                                0x00000000
+
+#define REG_A3XX_RBBM_HW_RELEASE                                0x00000001
+
+#define REG_A3XX_RBBM_HW_CONFIGURATION                          0x00000002
+
+#define REG_A3XX_RBBM_CLOCK_CTL                                 0x00000010
+
+#define REG_A3XX_RBBM_SP_HYST_CNT                               0x00000012
+
+#define REG_A3XX_RBBM_SW_RESET_CMD                              0x00000018
+
+#define REG_A3XX_RBBM_AHB_CTL0                                  0x00000020
+
+#define REG_A3XX_RBBM_AHB_CTL1                                  0x00000021
+
+#define REG_A3XX_RBBM_AHB_CMD                                   0x00000022
+
+#define REG_A3XX_RBBM_AHB_ERROR_STATUS                          0x00000027
+
+#define REG_A3XX_RBBM_GPR0_CTL                                  0x0000002e
+
+#define REG_A3XX_RBBM_STATUS                                    0x00000030
+#define A3XX_RBBM_STATUS_HI_BUSY                                0x00000001
+#define A3XX_RBBM_STATUS_CP_ME_BUSY                             0x00000002
+#define A3XX_RBBM_STATUS_CP_PFP_BUSY                            0x00000004
+#define A3XX_RBBM_STATUS_CP_NRT_BUSY                            0x00004000
+#define A3XX_RBBM_STATUS_VBIF_BUSY                              0x00008000
+#define A3XX_RBBM_STATUS_TSE_BUSY                               0x00010000
+#define A3XX_RBBM_STATUS_RAS_BUSY                               0x00020000
+#define A3XX_RBBM_STATUS_RB_BUSY                                0x00040000
+#define A3XX_RBBM_STATUS_PC_DCALL_BUSY                          0x00080000
+#define A3XX_RBBM_STATUS_PC_VSD_BUSY                            0x00100000
+#define A3XX_RBBM_STATUS_VFD_BUSY                               0x00200000
+#define A3XX_RBBM_STATUS_VPC_BUSY                               0x00400000
+#define A3XX_RBBM_STATUS_UCHE_BUSY                              0x00800000
+#define A3XX_RBBM_STATUS_SP_BUSY                                0x01000000
+#define A3XX_RBBM_STATUS_TPL1_BUSY                              0x02000000
+#define A3XX_RBBM_STATUS_MARB_BUSY                              0x04000000
+#define A3XX_RBBM_STATUS_VSC_BUSY                               0x08000000
+#define A3XX_RBBM_STATUS_ARB_BUSY                               0x10000000
+#define A3XX_RBBM_STATUS_HLSQ_BUSY                              0x20000000
+#define A3XX_RBBM_STATUS_GPU_BUSY_NOHC                          0x40000000
+#define A3XX_RBBM_STATUS_GPU_BUSY                               0x80000000
+
+#define REG_A3XX_RBBM_WAIT_IDLE_CLOCKS_CTL                      0x00000033
+
+#define REG_A3XX_RBBM_INTERFACE_HANG_INT_CTL                    0x00000050
+
+#define REG_A3XX_RBBM_INTERFACE_HANG_MASK_CTL0                  0x00000051
+
+#define REG_A3XX_RBBM_INTERFACE_HANG_MASK_CTL1                  0x00000054
+
+#define REG_A3XX_RBBM_INTERFACE_HANG_MASK_CTL2                  0x00000057
+
+#define REG_A3XX_RBBM_INTERFACE_HANG_MASK_CTL3                  0x0000005a
+
+#define REG_A3XX_RBBM_INT_CLEAR_CMD                             0x00000061
+
+#define REG_A3XX_RBBM_INT_0_MASK                                0x00000063
+
+#define REG_A3XX_RBBM_INT_0_STATUS                              0x00000064
+
+#define REG_A3XX_RBBM_PERFCTR_CTL                               0x00000080
+
+#define REG_A3XX_RBBM_PERFCTR_LOAD_CMD0                         0x00000081
+
+#define REG_A3XX_RBBM_PERFCTR_LOAD_CMD1                         0x00000082
+
+#define REG_A3XX_RBBM_PERFCTR_LOAD_VALUE_LO                     0x00000084
+
+#define REG_A3XX_RBBM_PERFCTR_LOAD_VALUE_HI                     0x00000085
+
+#define REG_A3XX_RBBM_PERFCOUNTER0_SELECT                       0x00000086
+
+#define REG_A3XX_RBBM_PERFCOUNTER1_SELECT                       0x00000087
+
+#define REG_A3XX_RBBM_GPU_BUSY_MASKED                           0x00000088
+
+#define REG_A3XX_RBBM_PERFCTR_CP_0_LO                           0x00000090
+
+#define REG_A3XX_RBBM_PERFCTR_CP_0_HI                           0x00000091
+
+#define REG_A3XX_RBBM_PERFCTR_RBBM_0_LO                         0x00000092
+
+#define REG_A3XX_RBBM_PERFCTR_RBBM_0_HI                         0x00000093
+
+#define REG_A3XX_RBBM_PERFCTR_RBBM_1_LO                         0x00000094
+
+#define REG_A3XX_RBBM_PERFCTR_RBBM_1_HI                         0x00000095
+
+#define REG_A3XX_RBBM_PERFCTR_PC_0_LO                           0x00000096
+
+#define REG_A3XX_RBBM_PERFCTR_PC_0_HI                           0x00000097
+
+#define REG_A3XX_RBBM_PERFCTR_PC_1_LO                           0x00000098
+
+#define REG_A3XX_RBBM_PERFCTR_PC_1_HI                           0x00000099
+
+#define REG_A3XX_RBBM_PERFCTR_PC_2_LO                           0x0000009a
+
+#define REG_A3XX_RBBM_PERFCTR_PC_2_HI                           0x0000009b
+
+#define REG_A3XX_RBBM_PERFCTR_PC_3_LO                           0x0000009c
+
+#define REG_A3XX_RBBM_PERFCTR_PC_3_HI                           0x0000009d
+
+#define REG_A3XX_RBBM_PERFCTR_VFD_0_LO                          0x0000009e
+
+#define REG_A3XX_RBBM_PERFCTR_VFD_0_HI                          0x0000009f
+
+#define REG_A3XX_RBBM_PERFCTR_VFD_1_LO                          0x000000a0
+
+#define REG_A3XX_RBBM_PERFCTR_VFD_1_HI                          0x000000a1
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_0_LO                         0x000000a2
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_0_HI                         0x000000a3
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_1_LO                         0x000000a4
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_1_HI                         0x000000a5
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_2_LO                         0x000000a6
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_2_HI                         0x000000a7
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_3_LO                         0x000000a8
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_3_HI                         0x000000a9
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_4_LO                         0x000000aa
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_4_HI                         0x000000ab
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_5_LO                         0x000000ac
+
+#define REG_A3XX_RBBM_PERFCTR_HLSQ_5_HI                         0x000000ad
+
+#define REG_A3XX_RBBM_PERFCTR_VPC_0_LO                          0x000000ae
+
+#define REG_A3XX_RBBM_PERFCTR_VPC_0_HI                          0x000000af
+
+#define REG_A3XX_RBBM_PERFCTR_VPC_1_LO                          0x000000b0
+
+#define REG_A3XX_RBBM_PERFCTR_VPC_1_HI                          0x000000b1
+
+#define REG_A3XX_RBBM_PERFCTR_TSE_0_LO                          0x000000b2
+
+#define REG_A3XX_RBBM_PERFCTR_TSE_0_HI                          0x000000b3
+
+#define REG_A3XX_RBBM_PERFCTR_TSE_1_LO                          0x000000b4
+
+#define REG_A3XX_RBBM_PERFCTR_TSE_1_HI                          0x000000b5
+
+#define REG_A3XX_RBBM_PERFCTR_RAS_0_LO                          0x000000b6
+
+#define REG_A3XX_RBBM_PERFCTR_RAS_0_HI                          0x000000b7
+
+#define REG_A3XX_RBBM_PERFCTR_RAS_1_LO                          0x000000b8
+
+#define REG_A3XX_RBBM_PERFCTR_RAS_1_HI                          0x000000b9
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_0_LO                         0x000000ba
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_0_HI                         0x000000bb
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_1_LO                         0x000000bc
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_1_HI                         0x000000bd
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_2_LO                         0x000000be
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_2_HI                         0x000000bf
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_3_LO                         0x000000c0
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_3_HI                         0x000000c1
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_4_LO                         0x000000c2
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_4_HI                         0x000000c3
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_5_LO                         0x000000c4
+
+#define REG_A3XX_RBBM_PERFCTR_UCHE_5_HI                         0x000000c5
+
+#define REG_A3XX_RBBM_PERFCTR_TP_0_LO                           0x000000c6
+
+#define REG_A3XX_RBBM_PERFCTR_TP_0_HI                           0x000000c7
+
+#define REG_A3XX_RBBM_PERFCTR_TP_1_LO                           0x000000c8
+
+#define REG_A3XX_RBBM_PERFCTR_TP_1_HI                           0x000000c9
+
+#define REG_A3XX_RBBM_PERFCTR_TP_2_LO                           0x000000ca
+
+#define REG_A3XX_RBBM_PERFCTR_TP_2_HI                           0x000000cb
+
+#define REG_A3XX_RBBM_PERFCTR_TP_3_LO                           0x000000cc
+
+#define REG_A3XX_RBBM_PERFCTR_TP_3_HI                           0x000000cd
+
+#define REG_A3XX_RBBM_PERFCTR_TP_4_LO                           0x000000ce
+
+#define REG_A3XX_RBBM_PERFCTR_TP_4_HI                           0x000000cf
+
+#define REG_A3XX_RBBM_PERFCTR_TP_5_LO                           0x000000d0
+
+#define REG_A3XX_RBBM_PERFCTR_TP_5_HI                           0x000000d1
+
+#define REG_A3XX_RBBM_PERFCTR_SP_0_LO                           0x000000d2
+
+#define REG_A3XX_RBBM_PERFCTR_SP_0_HI                           0x000000d3
+
+#define REG_A3XX_RBBM_PERFCTR_SP_1_LO                           0x000000d4
+
+#define REG_A3XX_RBBM_PERFCTR_SP_1_HI                           0x000000d5
+
+#define REG_A3XX_RBBM_PERFCTR_SP_2_LO                           0x000000d6
+
+#define REG_A3XX_RBBM_PERFCTR_SP_2_HI                           0x000000d7
+
+#define REG_A3XX_RBBM_PERFCTR_SP_3_LO                           0x000000d8
+
+#define REG_A3XX_RBBM_PERFCTR_SP_3_HI                           0x000000d9
+
+#define REG_A3XX_RBBM_PERFCTR_SP_4_LO                           0x000000da
+
+#define REG_A3XX_RBBM_PERFCTR_SP_4_HI                           0x000000db
+
+#define REG_A3XX_RBBM_PERFCTR_SP_5_LO                           0x000000dc
+
+#define REG_A3XX_RBBM_PERFCTR_SP_5_HI                           0x000000dd
+
+#define REG_A3XX_RBBM_PERFCTR_SP_6_LO                           0x000000de
+
+#define REG_A3XX_RBBM_PERFCTR_SP_6_HI                           0x000000df
+
+#define REG_A3XX_RBBM_PERFCTR_SP_7_LO                           0x000000e0
+
+#define REG_A3XX_RBBM_PERFCTR_SP_7_HI                           0x000000e1
+
+#define REG_A3XX_RBBM_PERFCTR_RB_0_LO                           0x000000e2
+
+#define REG_A3XX_RBBM_PERFCTR_RB_0_HI                           0x000000e3
+
+#define REG_A3XX_RBBM_PERFCTR_RB_1_LO                           0x000000e4
+
+#define REG_A3XX_RBBM_PERFCTR_RB_1_HI                           0x000000e5
+
+#define REG_A3XX_RBBM_PERFCTR_PWR_0_LO                          0x000000ea
+
+#define REG_A3XX_RBBM_PERFCTR_PWR_0_HI                          0x000000eb
+
+#define REG_A3XX_RBBM_PERFCTR_PWR_1_LO                          0x000000ec
+
+#define REG_A3XX_RBBM_PERFCTR_PWR_1_HI                          0x000000ed
+
+#define REG_A3XX_RBBM_RBBM_CTL                                  0x00000100
+
+#define REG_A3XX_RBBM_DEBUG_BUS_CTL                             0x00000111
+
+#define REG_A3XX_RBBM_DEBUG_BUS_DATA_STATUS                     0x00000112
+
+#define REG_A3XX_CP_PFP_UCODE_ADDR                              0x000001c9
+
+#define REG_A3XX_CP_PFP_UCODE_DATA                              0x000001ca
+
+#define REG_A3XX_CP_ROQ_ADDR                                    0x000001cc
+
+#define REG_A3XX_CP_ROQ_DATA                                    0x000001cd
+
+#define REG_A3XX_CP_MERCIU_ADDR                                 0x000001d1
+
+#define REG_A3XX_CP_MERCIU_DATA                                 0x000001d2
+
+#define REG_A3XX_CP_MERCIU_DATA2                                0x000001d3
+
+#define REG_A3XX_CP_MEQ_ADDR                                    0x000001da
+
+#define REG_A3XX_CP_MEQ_DATA                                    0x000001db
+
+#define REG_A3XX_CP_PERFCOUNTER_SELECT                          0x00000445
+
+#define REG_A3XX_CP_HW_FAULT                                    0x0000045c
+
+#define REG_A3XX_CP_PROTECT_CTRL                                0x0000045e
+
+#define REG_A3XX_CP_PROTECT_STATUS                              0x0000045f
+
+static inline uint32_t REG_A3XX_CP_PROTECT(uint32_t i0) { return 0x00000460 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_CP_PROTECT_REG(uint32_t i0) { return 0x00000460 + 0x1*i0; }
+
+#define REG_A3XX_CP_AHB_FAULT                                   0x0000054d
+
+#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
+#define A3XX_GRAS_CL_CLIP_CNTL_ZFAR_CLIP_DISABLE                0x00020000
+#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 REG_A3XX_GRAS_CL_GB_CLIP_ADJ                            0x00002044
+#define A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ__MASK                     0x000003ff
+#define A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ__SHIFT                    0
+static inline uint32_t A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ__SHIFT) & A3XX_GRAS_CL_GB_CLIP_ADJ_HORZ__MASK;
+}
+#define A3XX_GRAS_CL_GB_CLIP_ADJ_VERT__MASK                     0x000ffc00
+#define A3XX_GRAS_CL_GB_CLIP_ADJ_VERT__SHIFT                    10
+static inline uint32_t A3XX_GRAS_CL_GB_CLIP_ADJ_VERT(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_CL_GB_CLIP_ADJ_VERT__SHIFT) & A3XX_GRAS_CL_GB_CLIP_ADJ_VERT__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_XOFFSET                          0x00002048
+#define A3XX_GRAS_CL_VPORT_XOFFSET__MASK                        0xffffffff
+#define A3XX_GRAS_CL_VPORT_XOFFSET__SHIFT                       0
+static inline uint32_t A3XX_GRAS_CL_VPORT_XOFFSET(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_XOFFSET__SHIFT) & A3XX_GRAS_CL_VPORT_XOFFSET__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_XSCALE                           0x00002049
+#define A3XX_GRAS_CL_VPORT_XSCALE__MASK                         0xffffffff
+#define A3XX_GRAS_CL_VPORT_XSCALE__SHIFT                        0
+static inline uint32_t A3XX_GRAS_CL_VPORT_XSCALE(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_XSCALE__SHIFT) & A3XX_GRAS_CL_VPORT_XSCALE__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_YOFFSET                          0x0000204a
+#define A3XX_GRAS_CL_VPORT_YOFFSET__MASK                        0xffffffff
+#define A3XX_GRAS_CL_VPORT_YOFFSET__SHIFT                       0
+static inline uint32_t A3XX_GRAS_CL_VPORT_YOFFSET(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_YOFFSET__SHIFT) & A3XX_GRAS_CL_VPORT_YOFFSET__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_YSCALE                           0x0000204b
+#define A3XX_GRAS_CL_VPORT_YSCALE__MASK                         0xffffffff
+#define A3XX_GRAS_CL_VPORT_YSCALE__SHIFT                        0
+static inline uint32_t A3XX_GRAS_CL_VPORT_YSCALE(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_YSCALE__SHIFT) & A3XX_GRAS_CL_VPORT_YSCALE__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_ZOFFSET                          0x0000204c
+#define A3XX_GRAS_CL_VPORT_ZOFFSET__MASK                        0xffffffff
+#define A3XX_GRAS_CL_VPORT_ZOFFSET__SHIFT                       0
+static inline uint32_t A3XX_GRAS_CL_VPORT_ZOFFSET(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_ZOFFSET__SHIFT) & A3XX_GRAS_CL_VPORT_ZOFFSET__MASK;
+}
+
+#define REG_A3XX_GRAS_CL_VPORT_ZSCALE                           0x0000204d
+#define A3XX_GRAS_CL_VPORT_ZSCALE__MASK                         0xffffffff
+#define A3XX_GRAS_CL_VPORT_ZSCALE__SHIFT                        0
+static inline uint32_t A3XX_GRAS_CL_VPORT_ZSCALE(float val)
+{
+        return ((fui(val)) << A3XX_GRAS_CL_VPORT_ZSCALE__SHIFT) & A3XX_GRAS_CL_VPORT_ZSCALE__MASK;
+}
+
+#define REG_A3XX_GRAS_SU_POINT_MINMAX                           0x00002068
+
+#define REG_A3XX_GRAS_SU_POINT_SIZE                             0x00002069
+
+#define REG_A3XX_GRAS_SU_POLY_OFFSET_SCALE                      0x0000206c
+#define A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL__MASK                0x00ffffff
+#define A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL__SHIFT               0
+static inline uint32_t A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL(float val)
+{
+        return ((((uint32_t)(val * 40.0))) << A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL__SHIFT) & A3XX_GRAS_SU_POLY_OFFSET_SCALE_VAL__MASK;
+}
+
+#define REG_A3XX_GRAS_SU_POLY_OFFSET_OFFSET                     0x0000206d
+#define A3XX_GRAS_SU_POLY_OFFSET_OFFSET__MASK                   0xffffffff
+#define A3XX_GRAS_SU_POLY_OFFSET_OFFSET__SHIFT                  0
+static inline uint32_t A3XX_GRAS_SU_POLY_OFFSET_OFFSET(float val)
+{
+        return ((((uint32_t)(val * 44.0))) << A3XX_GRAS_SU_POLY_OFFSET_OFFSET__SHIFT) & A3XX_GRAS_SU_POLY_OFFSET_OFFSET__MASK;
+}
+
+#define REG_A3XX_GRAS_SU_MODE_CONTROL                           0x00002070
+#define A3XX_GRAS_SU_MODE_CONTROL_CULL_FRONT                    0x00000001
+#define A3XX_GRAS_SU_MODE_CONTROL_CULL_BACK                     0x00000002
+#define A3XX_GRAS_SU_MODE_CONTROL_LINEHALFWIDTH__MASK           0x000007fc
+#define A3XX_GRAS_SU_MODE_CONTROL_LINEHALFWIDTH__SHIFT          2
+static inline uint32_t A3XX_GRAS_SU_MODE_CONTROL_LINEHALFWIDTH(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SU_MODE_CONTROL_LINEHALFWIDTH__SHIFT) & A3XX_GRAS_SU_MODE_CONTROL_LINEHALFWIDTH__MASK;
+}
+#define A3XX_GRAS_SU_MODE_CONTROL_POLY_OFFSET                   0x00000800
+
+#define REG_A3XX_GRAS_SC_CONTROL                                0x00002072
+#define A3XX_GRAS_SC_CONTROL_RENDER_MODE__MASK                  0x000000f0
+#define A3XX_GRAS_SC_CONTROL_RENDER_MODE__SHIFT                 4
+static inline uint32_t A3XX_GRAS_SC_CONTROL_RENDER_MODE(enum a3xx_render_mode val)
+{
+        return ((val) << A3XX_GRAS_SC_CONTROL_RENDER_MODE__SHIFT) & A3XX_GRAS_SC_CONTROL_RENDER_MODE__MASK;
+}
+#define A3XX_GRAS_SC_CONTROL_MSAA_SAMPLES__MASK                 0x00000f00
+#define A3XX_GRAS_SC_CONTROL_MSAA_SAMPLES__SHIFT                8
+static inline uint32_t A3XX_GRAS_SC_CONTROL_MSAA_SAMPLES(enum a3xx_msaa_samples val)
+{
+        return ((val) << A3XX_GRAS_SC_CONTROL_MSAA_SAMPLES__SHIFT) & A3XX_GRAS_SC_CONTROL_MSAA_SAMPLES__MASK;
+}
+#define A3XX_GRAS_SC_CONTROL_RASTER_MODE__MASK                  0x0000f000
+#define A3XX_GRAS_SC_CONTROL_RASTER_MODE__SHIFT                 12
+static inline uint32_t A3XX_GRAS_SC_CONTROL_RASTER_MODE(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_CONTROL_RASTER_MODE__SHIFT) & A3XX_GRAS_SC_CONTROL_RASTER_MODE__MASK;
+}
+
+#define REG_A3XX_GRAS_SC_SCREEN_SCISSOR_TL                      0x00002074
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_TL_WINDOW_OFFSET_DISABLE    0x80000000
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_TL_X__MASK                  0x00007fff
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_TL_X__SHIFT                 0
+static inline uint32_t A3XX_GRAS_SC_SCREEN_SCISSOR_TL_X(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_SCREEN_SCISSOR_TL_X__SHIFT) & A3XX_GRAS_SC_SCREEN_SCISSOR_TL_X__MASK;
+}
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_TL_Y__MASK                  0x7fff0000
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_TL_Y__SHIFT                 16
+static inline uint32_t A3XX_GRAS_SC_SCREEN_SCISSOR_TL_Y(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_SCREEN_SCISSOR_TL_Y__SHIFT) & A3XX_GRAS_SC_SCREEN_SCISSOR_TL_Y__MASK;
+}
+
+#define REG_A3XX_GRAS_SC_SCREEN_SCISSOR_BR                      0x00002075
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_BR_WINDOW_OFFSET_DISABLE    0x80000000
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_BR_X__MASK                  0x00007fff
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_BR_X__SHIFT                 0
+static inline uint32_t A3XX_GRAS_SC_SCREEN_SCISSOR_BR_X(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_SCREEN_SCISSOR_BR_X__SHIFT) & A3XX_GRAS_SC_SCREEN_SCISSOR_BR_X__MASK;
+}
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_BR_Y__MASK                  0x7fff0000
+#define A3XX_GRAS_SC_SCREEN_SCISSOR_BR_Y__SHIFT                 16
+static inline uint32_t A3XX_GRAS_SC_SCREEN_SCISSOR_BR_Y(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_SCREEN_SCISSOR_BR_Y__SHIFT) & A3XX_GRAS_SC_SCREEN_SCISSOR_BR_Y__MASK;
+}
+
+#define REG_A3XX_GRAS_SC_WINDOW_SCISSOR_TL                      0x00002079
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_TL_WINDOW_OFFSET_DISABLE    0x80000000
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_TL_X__MASK                  0x00007fff
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_TL_X__SHIFT                 0
+static inline uint32_t A3XX_GRAS_SC_WINDOW_SCISSOR_TL_X(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_WINDOW_SCISSOR_TL_X__SHIFT) & A3XX_GRAS_SC_WINDOW_SCISSOR_TL_X__MASK;
+}
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_TL_Y__MASK                  0x7fff0000
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_TL_Y__SHIFT                 16
+static inline uint32_t A3XX_GRAS_SC_WINDOW_SCISSOR_TL_Y(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_WINDOW_SCISSOR_TL_Y__SHIFT) & A3XX_GRAS_SC_WINDOW_SCISSOR_TL_Y__MASK;
+}
+
+#define REG_A3XX_GRAS_SC_WINDOW_SCISSOR_BR                      0x0000207a
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_BR_WINDOW_OFFSET_DISABLE    0x80000000
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_BR_X__MASK                  0x00007fff
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_BR_X__SHIFT                 0
+static inline uint32_t A3XX_GRAS_SC_WINDOW_SCISSOR_BR_X(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_WINDOW_SCISSOR_BR_X__SHIFT) & A3XX_GRAS_SC_WINDOW_SCISSOR_BR_X__MASK;
+}
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_BR_Y__MASK                  0x7fff0000
+#define A3XX_GRAS_SC_WINDOW_SCISSOR_BR_Y__SHIFT                 16
+static inline uint32_t A3XX_GRAS_SC_WINDOW_SCISSOR_BR_Y(uint32_t val)
+{
+        return ((val) << A3XX_GRAS_SC_WINDOW_SCISSOR_BR_Y__SHIFT) & A3XX_GRAS_SC_WINDOW_SCISSOR_BR_Y__MASK;
+}
+
+#define REG_A3XX_RB_MODE_CONTROL                                0x000020c0
+#define A3XX_RB_MODE_CONTROL_GMEM_BYPASS                        0x00000080
+#define A3XX_RB_MODE_CONTROL_RENDER_MODE__MASK                  0x00000700
+#define A3XX_RB_MODE_CONTROL_RENDER_MODE__SHIFT                 8
+static inline uint32_t A3XX_RB_MODE_CONTROL_RENDER_MODE(enum a3xx_render_mode val)
+{
+        return ((val) << A3XX_RB_MODE_CONTROL_RENDER_MODE__SHIFT) & A3XX_RB_MODE_CONTROL_RENDER_MODE__MASK;
+}
+#define A3XX_RB_MODE_CONTROL_MARB_CACHE_SPLIT_MODE              0x00008000
+#define A3XX_RB_MODE_CONTROL_PACKER_TIMER_ENABLE                0x00010000
+
+#define REG_A3XX_RB_RENDER_CONTROL                              0x000020c1
+#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)
+{
+        return ((val >> 5) << A3XX_RB_RENDER_CONTROL_BIN_WIDTH__SHIFT) & A3XX_RB_RENDER_CONTROL_BIN_WIDTH__MASK;
+}
+#define A3XX_RB_RENDER_CONTROL_DISABLE_COLOR_PIPE               0x00001000
+#define A3XX_RB_RENDER_CONTROL_ENABLE_GMEM                      0x00002000
+#define A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__MASK            0x07000000
+#define A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__SHIFT           24
+static inline uint32_t A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC(enum adreno_compare_func val)
+{
+        return ((val) << A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__SHIFT) & A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__MASK;
+}
+
+#define REG_A3XX_RB_MSAA_CONTROL                                0x000020c2
+#define A3XX_RB_MSAA_CONTROL_DISABLE                            0x00000400
+#define A3XX_RB_MSAA_CONTROL_SAMPLES__MASK                      0x0000f000
+#define A3XX_RB_MSAA_CONTROL_SAMPLES__SHIFT                     12
+static inline uint32_t A3XX_RB_MSAA_CONTROL_SAMPLES(enum a3xx_msaa_samples val)
+{
+        return ((val) << A3XX_RB_MSAA_CONTROL_SAMPLES__SHIFT) & A3XX_RB_MSAA_CONTROL_SAMPLES__MASK;
+}
+#define A3XX_RB_MSAA_CONTROL_SAMPLE_MASK__MASK                  0xffff0000
+#define A3XX_RB_MSAA_CONTROL_SAMPLE_MASK__SHIFT                 16
+static inline uint32_t A3XX_RB_MSAA_CONTROL_SAMPLE_MASK(uint32_t val)
+{
+        return ((val) << A3XX_RB_MSAA_CONTROL_SAMPLE_MASK__SHIFT) & A3XX_RB_MSAA_CONTROL_SAMPLE_MASK__MASK;
+}
+
+#define REG_A3XX_UNKNOWN_20C3                                   0x000020c3
+
+static inline uint32_t REG_A3XX_RB_MRT(uint32_t i0) { return 0x000020c4 + 0x4*i0; }
+
+static inline uint32_t REG_A3XX_RB_MRT_CONTROL(uint32_t i0) { return 0x000020c4 + 0x4*i0; }
+#define A3XX_RB_MRT_CONTROL_READ_DEST_ENABLE                    0x00000008
+#define A3XX_RB_MRT_CONTROL_BLEND                               0x00000010
+#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)
+{
+        return ((val) << A3XX_RB_MRT_CONTROL_ROP_CODE__SHIFT) & A3XX_RB_MRT_CONTROL_ROP_CODE__MASK;
+}
+#define A3XX_RB_MRT_CONTROL_DITHER_MODE__MASK                   0x00003000
+#define A3XX_RB_MRT_CONTROL_DITHER_MODE__SHIFT                  12
+static inline uint32_t A3XX_RB_MRT_CONTROL_DITHER_MODE(enum adreno_rb_dither_mode val)
+{
+        return ((val) << A3XX_RB_MRT_CONTROL_DITHER_MODE__SHIFT) & A3XX_RB_MRT_CONTROL_DITHER_MODE__MASK;
+}
+#define A3XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK              0x0f000000
+#define A3XX_RB_MRT_CONTROL_COMPONENT_ENABLE__SHIFT             24
+static inline uint32_t A3XX_RB_MRT_CONTROL_COMPONENT_ENABLE(uint32_t val)
+{
+        return ((val) << A3XX_RB_MRT_CONTROL_COMPONENT_ENABLE__SHIFT) & A3XX_RB_MRT_CONTROL_COMPONENT_ENABLE__MASK;
+}
+
+static inline uint32_t REG_A3XX_RB_MRT_BUF_INFO(uint32_t i0) { return 0x000020c5 + 0x4*i0; }
+#define A3XX_RB_MRT_BUF_INFO_COLOR_FORMAT__MASK                 0x0000003f
+#define A3XX_RB_MRT_BUF_INFO_COLOR_FORMAT__SHIFT                0
+static inline uint32_t A3XX_RB_MRT_BUF_INFO_COLOR_FORMAT(enum a3xx_color_fmt val)
+{
+        return ((val) << A3XX_RB_MRT_BUF_INFO_COLOR_FORMAT__SHIFT) & A3XX_RB_MRT_BUF_INFO_COLOR_FORMAT__MASK;
+}
+#define A3XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE__MASK              0x000000c0
+#define A3XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE__SHIFT             6
+static inline uint32_t A3XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE(enum a3xx_tile_mode val)
+{
+        return ((val) << A3XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE__SHIFT) & A3XX_RB_MRT_BUF_INFO_COLOR_TILE_MODE__MASK;
+}
+#define A3XX_RB_MRT_BUF_INFO_COLOR_SWAP__MASK                   0x00000c00
+#define A3XX_RB_MRT_BUF_INFO_COLOR_SWAP__SHIFT                  10
+static inline uint32_t A3XX_RB_MRT_BUF_INFO_COLOR_SWAP(enum a3xx_color_swap val)
+{
+        return ((val) << A3XX_RB_MRT_BUF_INFO_COLOR_SWAP__SHIFT) & A3XX_RB_MRT_BUF_INFO_COLOR_SWAP__MASK;
+}
+#define A3XX_RB_MRT_BUF_INFO_COLOR_BUF_PITCH__MASK              0xfffe0000
+#define A3XX_RB_MRT_BUF_INFO_COLOR_BUF_PITCH__SHIFT             17
+static inline uint32_t A3XX_RB_MRT_BUF_INFO_COLOR_BUF_PITCH(uint32_t val)
+{
+        return ((val >> 5) << A3XX_RB_MRT_BUF_INFO_COLOR_BUF_PITCH__SHIFT) & A3XX_RB_MRT_BUF_INFO_COLOR_BUF_PITCH__MASK;
+}
+
+static inline uint32_t REG_A3XX_RB_MRT_BUF_BASE(uint32_t i0) { return 0x000020c6 + 0x4*i0; }
+#define A3XX_RB_MRT_BUF_BASE_COLOR_BUF_BASE__MASK               0xfffffff0
+#define A3XX_RB_MRT_BUF_BASE_COLOR_BUF_BASE__SHIFT              4
+static inline uint32_t A3XX_RB_MRT_BUF_BASE_COLOR_BUF_BASE(uint32_t val)
+{
+        return ((val >> 5) << A3XX_RB_MRT_BUF_BASE_COLOR_BUF_BASE__SHIFT) & A3XX_RB_MRT_BUF_BASE_COLOR_BUF_BASE__MASK;
+}
+
+static inline uint32_t REG_A3XX_RB_MRT_BLEND_CONTROL(uint32_t i0) { return 0x000020c7 + 0x4*i0; }
+#define A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR__MASK          0x0000001f
+#define A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR__SHIFT         0
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR__MASK;
+}
+#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)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE__MASK;
+}
+#define A3XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR__MASK         0x00001f00
+#define A3XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR__SHIFT        8
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR__MASK;
+}
+#define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR__MASK        0x001f0000
+#define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR__SHIFT       16
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR__MASK;
+}
+#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)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE__MASK;
+}
+#define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR__MASK       0x1f000000
+#define A3XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR__SHIFT      24
+static inline uint32_t A3XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR(enum adreno_rb_blend_factor val)
+{
+        return ((val) << A3XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR__SHIFT) & A3XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR__MASK;
+}
+#define A3XX_RB_MRT_BLEND_CONTROL_CLAMP_ENABLE                  0x20000000
+
+#define REG_A3XX_RB_BLEND_RED                                   0x000020e4
+#define A3XX_RB_BLEND_RED_UINT__MASK                            0x000000ff
+#define A3XX_RB_BLEND_RED_UINT__SHIFT                           0
+static inline uint32_t A3XX_RB_BLEND_RED_UINT(uint32_t val)
+{
+        return ((val) << A3XX_RB_BLEND_RED_UINT__SHIFT) & A3XX_RB_BLEND_RED_UINT__MASK;
+}
+#define A3XX_RB_BLEND_RED_FLOAT__MASK                           0xffff0000
+#define A3XX_RB_BLEND_RED_FLOAT__SHIFT                          16
+static inline uint32_t A3XX_RB_BLEND_RED_FLOAT(float val)
+{
+        return ((util_float_to_half(val)) << A3XX_RB_BLEND_RED_FLOAT__SHIFT) & A3XX_RB_BLEND_RED_FLOAT__MASK;
+}
+
+#define REG_A3XX_RB_BLEND_GREEN                                 0x000020e5
+#define A3XX_RB_BLEND_GREEN_UINT__MASK                          0x000000ff
+#define A3XX_RB_BLEND_GREEN_UINT__SHIFT                         0
+static inline uint32_t A3XX_RB_BLEND_GREEN_UINT(uint32_t val)
+{
+        return ((val) << A3XX_RB_BLEND_GREEN_UINT__SHIFT) & A3XX_RB_BLEND_GREEN_UINT__MASK;
+}
+#define A3XX_RB_BLEND_GREEN_FLOAT__MASK                         0xffff0000
+#define A3XX_RB_BLEND_GREEN_FLOAT__SHIFT                        16
+static inline uint32_t A3XX_RB_BLEND_GREEN_FLOAT(float val)
+{
+        return ((util_float_to_half(val)) << A3XX_RB_BLEND_GREEN_FLOAT__SHIFT) & A3XX_RB_BLEND_GREEN_FLOAT__MASK;
+}
+
+#define REG_A3XX_RB_BLEND_BLUE                                  0x000020e6
+#define A3XX_RB_BLEND_BLUE_UINT__MASK                           0x000000ff
+#define A3XX_RB_BLEND_BLUE_UINT__SHIFT                          0
+static inline uint32_t A3XX_RB_BLEND_BLUE_UINT(uint32_t val)
+{
+        return ((val) << A3XX_RB_BLEND_BLUE_UINT__SHIFT) & A3XX_RB_BLEND_BLUE_UINT__MASK;
+}
+#define A3XX_RB_BLEND_BLUE_FLOAT__MASK                          0xffff0000
+#define A3XX_RB_BLEND_BLUE_FLOAT__SHIFT                         16
+static inline uint32_t A3XX_RB_BLEND_BLUE_FLOAT(float val)
+{
+        return ((util_float_to_half(val)) << A3XX_RB_BLEND_BLUE_FLOAT__SHIFT) & A3XX_RB_BLEND_BLUE_FLOAT__MASK;
+}
+
+#define REG_A3XX_RB_BLEND_ALPHA                                 0x000020e7
+#define A3XX_RB_BLEND_ALPHA_UINT__MASK                          0x000000ff
+#define A3XX_RB_BLEND_ALPHA_UINT__SHIFT                         0
+static inline uint32_t A3XX_RB_BLEND_ALPHA_UINT(uint32_t val)
+{
+        return ((val) << A3XX_RB_BLEND_ALPHA_UINT__SHIFT) & A3XX_RB_BLEND_ALPHA_UINT__MASK;
+}
+#define A3XX_RB_BLEND_ALPHA_FLOAT__MASK                         0xffff0000
+#define A3XX_RB_BLEND_ALPHA_FLOAT__SHIFT                        16
+static inline uint32_t A3XX_RB_BLEND_ALPHA_FLOAT(float val)
+{
+        return ((util_float_to_half(val)) << A3XX_RB_BLEND_ALPHA_FLOAT__SHIFT) & A3XX_RB_BLEND_ALPHA_FLOAT__MASK;
+}
+
+#define REG_A3XX_UNKNOWN_20E8                                   0x000020e8
+
+#define REG_A3XX_UNKNOWN_20E9                                   0x000020e9
+
+#define REG_A3XX_UNKNOWN_20EA                                   0x000020ea
+
+#define REG_A3XX_UNKNOWN_20EB                                   0x000020eb
+
+#define REG_A3XX_RB_COPY_CONTROL                                0x000020ec
+#define A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__MASK                 0x00000003
+#define A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__SHIFT                0
+static inline uint32_t A3XX_RB_COPY_CONTROL_MSAA_RESOLVE(enum a3xx_msaa_samples val)
+{
+        return ((val) << A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__SHIFT) & A3XX_RB_COPY_CONTROL_MSAA_RESOLVE__MASK;
+}
+#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
+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;
+}
+
+#define REG_A3XX_RB_COPY_DEST_BASE                              0x000020ed
+#define A3XX_RB_COPY_DEST_BASE_BASE__MASK                       0xfffffff0
+#define A3XX_RB_COPY_DEST_BASE_BASE__SHIFT                      4
+static inline uint32_t A3XX_RB_COPY_DEST_BASE_BASE(uint32_t val)
+{
+        return ((val >> 5) << A3XX_RB_COPY_DEST_BASE_BASE__SHIFT) & A3XX_RB_COPY_DEST_BASE_BASE__MASK;
+}
+
+#define REG_A3XX_RB_COPY_DEST_PITCH                             0x000020ee
+#define A3XX_RB_COPY_DEST_PITCH_PITCH__MASK                     0xffffffff
+#define A3XX_RB_COPY_DEST_PITCH_PITCH__SHIFT                    0
+static inline uint32_t A3XX_RB_COPY_DEST_PITCH_PITCH(uint32_t val)
+{
+        return ((val >> 5) << A3XX_RB_COPY_DEST_PITCH_PITCH__SHIFT) & A3XX_RB_COPY_DEST_PITCH_PITCH__MASK;
+}
+
+#define REG_A3XX_RB_COPY_DEST_INFO                              0x000020ef
+#define A3XX_RB_COPY_DEST_INFO_TILE__MASK                       0x00000003
+#define A3XX_RB_COPY_DEST_INFO_TILE__SHIFT                      0
+static inline uint32_t A3XX_RB_COPY_DEST_INFO_TILE(enum a3xx_tile_mode val)
+{
+        return ((val) << A3XX_RB_COPY_DEST_INFO_TILE__SHIFT) & A3XX_RB_COPY_DEST_INFO_TILE__MASK;
+}
+#define A3XX_RB_COPY_DEST_INFO_FORMAT__MASK                     0x000000fc
+#define A3XX_RB_COPY_DEST_INFO_FORMAT__SHIFT                    2
+static inline uint32_t A3XX_RB_COPY_DEST_INFO_FORMAT(enum a3xx_color_fmt val)
+{
+        return ((val) << A3XX_RB_COPY_DEST_INFO_FORMAT__SHIFT) & A3XX_RB_COPY_DEST_INFO_FORMAT__MASK;
+}
+#define A3XX_RB_COPY_DEST_INFO_SWAP__MASK                       0x00000300
+#define A3XX_RB_COPY_DEST_INFO_SWAP__SHIFT                      8
+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_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)
+{
+        return ((val) << A3XX_RB_COPY_DEST_INFO_COMPONENT_ENABLE__SHIFT) & A3XX_RB_COPY_DEST_INFO_COMPONENT_ENABLE__MASK;
+}
+#define A3XX_RB_COPY_DEST_INFO_ENDIAN__MASK                     0x001c0000
+#define A3XX_RB_COPY_DEST_INFO_ENDIAN__SHIFT                    18
+static inline uint32_t A3XX_RB_COPY_DEST_INFO_ENDIAN(enum adreno_rb_surface_endian val)
+{
+        return ((val) << A3XX_RB_COPY_DEST_INFO_ENDIAN__SHIFT) & A3XX_RB_COPY_DEST_INFO_ENDIAN__MASK;
+}
+
+#define REG_A3XX_RB_DEPTH_CONTROL                               0x00002100
+#define A3XX_RB_DEPTH_CONTROL_Z_ENABLE                          0x00000002
+#define A3XX_RB_DEPTH_CONTROL_Z_WRITE_ENABLE                    0x00000004
+#define A3XX_RB_DEPTH_CONTROL_EARLY_Z_ENABLE                    0x00000008
+#define A3XX_RB_DEPTH_CONTROL_ZFUNC__MASK                       0x00000070
+#define A3XX_RB_DEPTH_CONTROL_ZFUNC__SHIFT                      4
+static inline uint32_t A3XX_RB_DEPTH_CONTROL_ZFUNC(enum adreno_compare_func val)
+{
+        return ((val) << A3XX_RB_DEPTH_CONTROL_ZFUNC__SHIFT) & A3XX_RB_DEPTH_CONTROL_ZFUNC__MASK;
+}
+#define A3XX_RB_DEPTH_CONTROL_BF_ENABLE                         0x00000080
+#define A3XX_RB_DEPTH_CONTROL_Z_TEST_ENABLE                     0x80000000
+
+#define REG_A3XX_UNKNOWN_2101                                   0x00002101
+
+#define REG_A3XX_RB_DEPTH_INFO                                  0x00002102
+#define A3XX_RB_DEPTH_INFO_DEPTH_FORMAT__MASK                   0x00000001
+#define A3XX_RB_DEPTH_INFO_DEPTH_FORMAT__SHIFT                  0
+static inline uint32_t A3XX_RB_DEPTH_INFO_DEPTH_FORMAT(enum adreno_rb_depth_format val)
+{
+        return ((val) << A3XX_RB_DEPTH_INFO_DEPTH_FORMAT__SHIFT) & A3XX_RB_DEPTH_INFO_DEPTH_FORMAT__MASK;
+}
+#define A3XX_RB_DEPTH_INFO_DEPTH_BASE__MASK                     0xfffff800
+#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;
+}
+
+#define REG_A3XX_RB_DEPTH_PITCH                                 0x00002103
+#define A3XX_RB_DEPTH_PITCH__MASK                               0xffffffff
+#define A3XX_RB_DEPTH_PITCH__SHIFT                              0
+static inline uint32_t A3XX_RB_DEPTH_PITCH(uint32_t val)
+{
+        return ((val >> 3) << A3XX_RB_DEPTH_PITCH__SHIFT) & A3XX_RB_DEPTH_PITCH__MASK;
+}
+
+#define REG_A3XX_RB_STENCIL_CONTROL                             0x00002104
+#define A3XX_RB_STENCIL_CONTROL_STENCIL_ENABLE                  0x00000001
+#define A3XX_RB_STENCIL_CONTROL_STENCIL_ENABLE_BF               0x00000004
+#define A3XX_RB_STENCIL_CONTROL_FUNC__MASK                      0x00000700
+#define A3XX_RB_STENCIL_CONTROL_FUNC__SHIFT                     8
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_FUNC(enum adreno_compare_func val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_FUNC__SHIFT) & A3XX_RB_STENCIL_CONTROL_FUNC__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_FAIL__MASK                      0x00003800
+#define A3XX_RB_STENCIL_CONTROL_FAIL__SHIFT                     11
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_FAIL(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_FAIL__SHIFT) & A3XX_RB_STENCIL_CONTROL_FAIL__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_ZPASS__MASK                     0x0001c000
+#define A3XX_RB_STENCIL_CONTROL_ZPASS__SHIFT                    14
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_ZPASS(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_ZPASS__SHIFT) & A3XX_RB_STENCIL_CONTROL_ZPASS__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_ZFAIL__MASK                     0x000e0000
+#define A3XX_RB_STENCIL_CONTROL_ZFAIL__SHIFT                    17
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_ZFAIL(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_ZFAIL__SHIFT) & A3XX_RB_STENCIL_CONTROL_ZFAIL__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_FUNC_BF__MASK                   0x00700000
+#define A3XX_RB_STENCIL_CONTROL_FUNC_BF__SHIFT                  20
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_FUNC_BF(enum adreno_compare_func val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_FUNC_BF__SHIFT) & A3XX_RB_STENCIL_CONTROL_FUNC_BF__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_FAIL_BF__MASK                   0x03800000
+#define A3XX_RB_STENCIL_CONTROL_FAIL_BF__SHIFT                  23
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_FAIL_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_FAIL_BF__SHIFT) & A3XX_RB_STENCIL_CONTROL_FAIL_BF__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_ZPASS_BF__MASK                  0x1c000000
+#define A3XX_RB_STENCIL_CONTROL_ZPASS_BF__SHIFT                 26
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_ZPASS_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_ZPASS_BF__SHIFT) & A3XX_RB_STENCIL_CONTROL_ZPASS_BF__MASK;
+}
+#define A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__MASK                  0xe0000000
+#define A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__SHIFT                 29
+static inline uint32_t A3XX_RB_STENCIL_CONTROL_ZFAIL_BF(enum adreno_stencil_op val)
+{
+        return ((val) << A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__SHIFT) & A3XX_RB_STENCIL_CONTROL_ZFAIL_BF__MASK;
+}
+
+#define REG_A3XX_UNKNOWN_2105                                   0x00002105
+
+#define REG_A3XX_UNKNOWN_2106                                   0x00002106
+
+#define REG_A3XX_UNKNOWN_2107                                   0x00002107
+
+#define REG_A3XX_RB_STENCILREFMASK                              0x00002108
+#define A3XX_RB_STENCILREFMASK_STENCILREF__MASK                 0x000000ff
+#define A3XX_RB_STENCILREFMASK_STENCILREF__SHIFT                0
+static inline uint32_t A3XX_RB_STENCILREFMASK_STENCILREF(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_STENCILREF__SHIFT) & A3XX_RB_STENCILREFMASK_STENCILREF__MASK;
+}
+#define A3XX_RB_STENCILREFMASK_STENCILMASK__MASK                0x0000ff00
+#define A3XX_RB_STENCILREFMASK_STENCILMASK__SHIFT               8
+static inline uint32_t A3XX_RB_STENCILREFMASK_STENCILMASK(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_STENCILMASK__SHIFT) & A3XX_RB_STENCILREFMASK_STENCILMASK__MASK;
+}
+#define A3XX_RB_STENCILREFMASK_STENCILWRITEMASK__MASK           0x00ff0000
+#define A3XX_RB_STENCILREFMASK_STENCILWRITEMASK__SHIFT          16
+static inline uint32_t A3XX_RB_STENCILREFMASK_STENCILWRITEMASK(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_STENCILWRITEMASK__SHIFT) & A3XX_RB_STENCILREFMASK_STENCILWRITEMASK__MASK;
+}
+
+#define REG_A3XX_RB_STENCILREFMASK_BF                           0x00002109
+#define A3XX_RB_STENCILREFMASK_BF_STENCILREF__MASK              0x000000ff
+#define A3XX_RB_STENCILREFMASK_BF_STENCILREF__SHIFT             0
+static inline uint32_t A3XX_RB_STENCILREFMASK_BF_STENCILREF(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_BF_STENCILREF__SHIFT) & A3XX_RB_STENCILREFMASK_BF_STENCILREF__MASK;
+}
+#define A3XX_RB_STENCILREFMASK_BF_STENCILMASK__MASK             0x0000ff00
+#define A3XX_RB_STENCILREFMASK_BF_STENCILMASK__SHIFT            8
+static inline uint32_t A3XX_RB_STENCILREFMASK_BF_STENCILMASK(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_BF_STENCILMASK__SHIFT) & A3XX_RB_STENCILREFMASK_BF_STENCILMASK__MASK;
+}
+#define A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__MASK        0x00ff0000
+#define A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__SHIFT       16
+static inline uint32_t A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK(uint32_t val)
+{
+        return ((val) << A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__SHIFT) & A3XX_RB_STENCILREFMASK_BF_STENCILWRITEMASK__MASK;
+}
+
+#define REG_A3XX_PA_SC_WINDOW_OFFSET                            0x0000210e
+#define A3XX_PA_SC_WINDOW_OFFSET_X__MASK                        0x0000ffff
+#define A3XX_PA_SC_WINDOW_OFFSET_X__SHIFT                       0
+static inline uint32_t A3XX_PA_SC_WINDOW_OFFSET_X(uint32_t val)
+{
+        return ((val) << A3XX_PA_SC_WINDOW_OFFSET_X__SHIFT) & A3XX_PA_SC_WINDOW_OFFSET_X__MASK;
+}
+#define A3XX_PA_SC_WINDOW_OFFSET_Y__MASK                        0xffff0000
+#define A3XX_PA_SC_WINDOW_OFFSET_Y__SHIFT                       16
+static inline uint32_t A3XX_PA_SC_WINDOW_OFFSET_Y(uint32_t val)
+{
+        return ((val) << A3XX_PA_SC_WINDOW_OFFSET_Y__SHIFT) & A3XX_PA_SC_WINDOW_OFFSET_Y__MASK;
+}
+
+#define REG_A3XX_PC_VSTREAM_CONTROL                             0x000021e4
+
+#define REG_A3XX_PC_VERTEX_REUSE_BLOCK_CNTL                     0x000021ea
+
+#define REG_A3XX_PC_PRIM_VTX_CNTL                               0x000021ec
+#define A3XX_PC_PRIM_VTX_CNTL_STRIDE_IN_VPC__MASK               0x0000001f
+#define A3XX_PC_PRIM_VTX_CNTL_STRIDE_IN_VPC__SHIFT              0
+static inline uint32_t A3XX_PC_PRIM_VTX_CNTL_STRIDE_IN_VPC(uint32_t val)
+{
+        return ((val) << A3XX_PC_PRIM_VTX_CNTL_STRIDE_IN_VPC__SHIFT) & A3XX_PC_PRIM_VTX_CNTL_STRIDE_IN_VPC__MASK;
+}
+#define A3XX_PC_PRIM_VTX_CNTL_POLYMODE_FRONT_PTYPE__MASK        0x000000e0
+#define A3XX_PC_PRIM_VTX_CNTL_POLYMODE_FRONT_PTYPE__SHIFT       5
+static inline uint32_t A3XX_PC_PRIM_VTX_CNTL_POLYMODE_FRONT_PTYPE(enum adreno_pa_su_sc_draw val)
+{
+        return ((val) << A3XX_PC_PRIM_VTX_CNTL_POLYMODE_FRONT_PTYPE__SHIFT) & A3XX_PC_PRIM_VTX_CNTL_POLYMODE_FRONT_PTYPE__MASK;
+}
+#define A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE__MASK         0x00000700
+#define A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE__SHIFT        8
+static inline uint32_t A3XX_PC_PRIM_VTX_CNTL_POLYMODE_BACK_PTYPE(enum adreno_pa_su_sc_draw val)
+{
+        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 REG_A3XX_PC_RESTART_INDEX                               0x000021ed
+
+#define REG_A3XX_HLSQ_CONTROL_0_REG                             0x00002200
+#define A3XX_HLSQ_CONTROL_0_REG_FSTHREADSIZE__MASK              0x00000010
+#define A3XX_HLSQ_CONTROL_0_REG_FSTHREADSIZE__SHIFT             4
+static inline uint32_t A3XX_HLSQ_CONTROL_0_REG_FSTHREADSIZE(enum a3xx_threadsize val)
+{
+        return ((val) << A3XX_HLSQ_CONTROL_0_REG_FSTHREADSIZE__SHIFT) & A3XX_HLSQ_CONTROL_0_REG_FSTHREADSIZE__MASK;
+}
+#define A3XX_HLSQ_CONTROL_0_REG_FSSUPERTHREADENABLE             0x00000040
+#define A3XX_HLSQ_CONTROL_0_REG_SPSHADERRESTART                 0x00000200
+#define A3XX_HLSQ_CONTROL_0_REG_RESERVED2                       0x00000400
+#define A3XX_HLSQ_CONTROL_0_REG_CHUNKDISABLE                    0x04000000
+#define A3XX_HLSQ_CONTROL_0_REG_CONSTSWITCHMODE                 0x08000000
+#define A3XX_HLSQ_CONTROL_0_REG_LAZYUPDATEDISABLE               0x10000000
+#define A3XX_HLSQ_CONTROL_0_REG_SPCONSTFULLUPDATE               0x20000000
+#define A3XX_HLSQ_CONTROL_0_REG_TPFULLUPDATE                    0x40000000
+#define A3XX_HLSQ_CONTROL_0_REG_SINGLECONTEXT                   0x80000000
+
+#define REG_A3XX_HLSQ_CONTROL_1_REG                             0x00002201
+#define A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE__MASK              0x00000040
+#define A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE__SHIFT             6
+static inline uint32_t A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE(enum a3xx_threadsize val)
+{
+        return ((val) << A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE__SHIFT) & A3XX_HLSQ_CONTROL_1_REG_VSTHREADSIZE__MASK;
+}
+#define A3XX_HLSQ_CONTROL_1_REG_VSSUPERTHREADENABLE             0x00000100
+#define A3XX_HLSQ_CONTROL_1_REG_RESERVED1                       0x00000200
+
+#define REG_A3XX_HLSQ_CONTROL_2_REG                             0x00002202
+#define A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD__MASK        0xfc000000
+#define A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD__SHIFT       26
+static inline uint32_t A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD__SHIFT) & A3XX_HLSQ_CONTROL_2_REG_PRIMALLOCTHRESHOLD__MASK;
+}
+
+#define REG_A3XX_HLSQ_CONTROL_3_REG                             0x00002203
+
+#define REG_A3XX_HLSQ_VS_CONTROL_REG                            0x00002204
+#define A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__MASK              0x00000fff
+#define A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__SHIFT             0
+static inline uint32_t A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__SHIFT) & A3XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH__MASK;
+}
+#define A3XX_HLSQ_VS_CONTROL_REG_CONSTSTARTOFFSET__MASK         0x00fff000
+#define A3XX_HLSQ_VS_CONTROL_REG_CONSTSTARTOFFSET__SHIFT        12
+static inline uint32_t A3XX_HLSQ_VS_CONTROL_REG_CONSTSTARTOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_VS_CONTROL_REG_CONSTSTARTOFFSET__SHIFT) & A3XX_HLSQ_VS_CONTROL_REG_CONSTSTARTOFFSET__MASK;
+}
+#define A3XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH__MASK              0xff000000
+#define A3XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH__SHIFT             24
+static inline uint32_t A3XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH__SHIFT) & A3XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH__MASK;
+}
+
+#define REG_A3XX_HLSQ_FS_CONTROL_REG                            0x00002205
+#define A3XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__MASK              0x00000fff
+#define A3XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__SHIFT             0
+static inline uint32_t A3XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__SHIFT) & A3XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH__MASK;
+}
+#define A3XX_HLSQ_FS_CONTROL_REG_CONSTSTARTOFFSET__MASK         0x00fff000
+#define A3XX_HLSQ_FS_CONTROL_REG_CONSTSTARTOFFSET__SHIFT        12
+static inline uint32_t A3XX_HLSQ_FS_CONTROL_REG_CONSTSTARTOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_FS_CONTROL_REG_CONSTSTARTOFFSET__SHIFT) & A3XX_HLSQ_FS_CONTROL_REG_CONSTSTARTOFFSET__MASK;
+}
+#define A3XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH__MASK              0xff000000
+#define A3XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH__SHIFT             24
+static inline uint32_t A3XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH__SHIFT) & A3XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH__MASK;
+}
+
+#define REG_A3XX_HLSQ_CONST_VSPRESV_RANGE_REG                   0x00002206
+#define A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_STARTENTRY__MASK      0x0000ffff
+#define A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_STARTENTRY__SHIFT     0
+static inline uint32_t A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_STARTENTRY(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_STARTENTRY__SHIFT) & A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_STARTENTRY__MASK;
+}
+#define A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_ENDENTRY__MASK        0xffff0000
+#define A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_ENDENTRY__SHIFT       16
+static inline uint32_t A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_ENDENTRY(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_ENDENTRY__SHIFT) & A3XX_HLSQ_CONST_VSPRESV_RANGE_REG_ENDENTRY__MASK;
+}
+
+#define REG_A3XX_HLSQ_CONST_FSPRESV_RANGE_REG                   0x00002207
+#define A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_STARTENTRY__MASK      0x0000ffff
+#define A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_STARTENTRY__SHIFT     0
+static inline uint32_t A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_STARTENTRY(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_STARTENTRY__SHIFT) & A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_STARTENTRY__MASK;
+}
+#define A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY__MASK        0xffff0000
+#define A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY__SHIFT       16
+static inline uint32_t A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY(uint32_t val)
+{
+        return ((val) << A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY__SHIFT) & A3XX_HLSQ_CONST_FSPRESV_RANGE_REG_ENDENTRY__MASK;
+}
+
+#define REG_A3XX_HLSQ_CL_NDRANGE_0_REG                          0x0000220a
+
+#define REG_A3XX_HLSQ_CL_NDRANGE_1_REG                          0x0000220b
+
+#define REG_A3XX_HLSQ_CL_NDRANGE_2_REG                          0x0000220c
+
+#define REG_A3XX_HLSQ_CL_CONTROL_0_REG                          0x00002211
+
+#define REG_A3XX_HLSQ_CL_CONTROL_1_REG                          0x00002212
+
+#define REG_A3XX_HLSQ_CL_KERNEL_CONST_REG                       0x00002214
+
+#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_X_REG                     0x00002215
+
+#define REG_A3XX_HLSQ_CL_KERNEL_GROUP_Z_REG                     0x00002217
+
+#define REG_A3XX_HLSQ_CL_WG_OFFSET_REG                          0x0000221a
+
+#define REG_A3XX_VFD_CONTROL_0                                  0x00002240
+#define A3XX_VFD_CONTROL_0_TOTALATTRTOVS__MASK                  0x0003ffff
+#define A3XX_VFD_CONTROL_0_TOTALATTRTOVS__SHIFT                 0
+static inline uint32_t A3XX_VFD_CONTROL_0_TOTALATTRTOVS(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_0_TOTALATTRTOVS__SHIFT) & A3XX_VFD_CONTROL_0_TOTALATTRTOVS__MASK;
+}
+#define A3XX_VFD_CONTROL_0_PACKETSIZE__MASK                     0x003c0000
+#define A3XX_VFD_CONTROL_0_PACKETSIZE__SHIFT                    18
+static inline uint32_t A3XX_VFD_CONTROL_0_PACKETSIZE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_0_PACKETSIZE__SHIFT) & A3XX_VFD_CONTROL_0_PACKETSIZE__MASK;
+}
+#define A3XX_VFD_CONTROL_0_STRMDECINSTRCNT__MASK                0x07c00000
+#define A3XX_VFD_CONTROL_0_STRMDECINSTRCNT__SHIFT               22
+static inline uint32_t A3XX_VFD_CONTROL_0_STRMDECINSTRCNT(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_0_STRMDECINSTRCNT__SHIFT) & A3XX_VFD_CONTROL_0_STRMDECINSTRCNT__MASK;
+}
+#define A3XX_VFD_CONTROL_0_STRMFETCHINSTRCNT__MASK              0xf8000000
+#define A3XX_VFD_CONTROL_0_STRMFETCHINSTRCNT__SHIFT             27
+static inline uint32_t A3XX_VFD_CONTROL_0_STRMFETCHINSTRCNT(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_0_STRMFETCHINSTRCNT__SHIFT) & A3XX_VFD_CONTROL_0_STRMFETCHINSTRCNT__MASK;
+}
+
+#define REG_A3XX_VFD_CONTROL_1                                  0x00002241
+#define A3XX_VFD_CONTROL_1_MAXSTORAGE__MASK                     0x0000ffff
+#define A3XX_VFD_CONTROL_1_MAXSTORAGE__SHIFT                    0
+static inline uint32_t A3XX_VFD_CONTROL_1_MAXSTORAGE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_1_MAXSTORAGE__SHIFT) & A3XX_VFD_CONTROL_1_MAXSTORAGE__MASK;
+}
+#define A3XX_VFD_CONTROL_1_REGID4VTX__MASK                      0x00ff0000
+#define A3XX_VFD_CONTROL_1_REGID4VTX__SHIFT                     16
+static inline uint32_t A3XX_VFD_CONTROL_1_REGID4VTX(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_1_REGID4VTX__SHIFT) & A3XX_VFD_CONTROL_1_REGID4VTX__MASK;
+}
+#define A3XX_VFD_CONTROL_1_REGID4INST__MASK                     0xff000000
+#define A3XX_VFD_CONTROL_1_REGID4INST__SHIFT                    24
+static inline uint32_t A3XX_VFD_CONTROL_1_REGID4INST(uint32_t val)
+{
+        return ((val) << A3XX_VFD_CONTROL_1_REGID4INST__SHIFT) & A3XX_VFD_CONTROL_1_REGID4INST__MASK;
+}
+
+#define REG_A3XX_VFD_INDEX_MIN                                  0x00002242
+
+#define REG_A3XX_VFD_INDEX_MAX                                  0x00002243
+
+#define REG_A3XX_VFD_INSTANCEID_OFFSET                          0x00002244
+
+#define REG_A3XX_VFD_INDEX_OFFSET                               0x00002245
+
+static inline uint32_t REG_A3XX_VFD_FETCH(uint32_t i0) { return 0x00002246 + 0x2*i0; }
+
+static inline uint32_t REG_A3XX_VFD_FETCH_INSTR_0(uint32_t i0) { return 0x00002246 + 0x2*i0; }
+#define A3XX_VFD_FETCH_INSTR_0_FETCHSIZE__MASK                  0x0000007f
+#define A3XX_VFD_FETCH_INSTR_0_FETCHSIZE__SHIFT                 0
+static inline uint32_t A3XX_VFD_FETCH_INSTR_0_FETCHSIZE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_FETCH_INSTR_0_FETCHSIZE__SHIFT) & A3XX_VFD_FETCH_INSTR_0_FETCHSIZE__MASK;
+}
+#define A3XX_VFD_FETCH_INSTR_0_BUFSTRIDE__MASK                  0x0001ff80
+#define A3XX_VFD_FETCH_INSTR_0_BUFSTRIDE__SHIFT                 7
+static inline uint32_t A3XX_VFD_FETCH_INSTR_0_BUFSTRIDE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_FETCH_INSTR_0_BUFSTRIDE__SHIFT) & A3XX_VFD_FETCH_INSTR_0_BUFSTRIDE__MASK;
+}
+#define A3XX_VFD_FETCH_INSTR_0_SWITCHNEXT                       0x00020000
+#define A3XX_VFD_FETCH_INSTR_0_INDEXCODE__MASK                  0x00fc0000
+#define A3XX_VFD_FETCH_INSTR_0_INDEXCODE__SHIFT                 18
+static inline uint32_t A3XX_VFD_FETCH_INSTR_0_INDEXCODE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_FETCH_INSTR_0_INDEXCODE__SHIFT) & A3XX_VFD_FETCH_INSTR_0_INDEXCODE__MASK;
+}
+#define A3XX_VFD_FETCH_INSTR_0_STEPRATE__MASK                   0xff000000
+#define A3XX_VFD_FETCH_INSTR_0_STEPRATE__SHIFT                  24
+static inline uint32_t A3XX_VFD_FETCH_INSTR_0_STEPRATE(uint32_t val)
+{
+        return ((val) << A3XX_VFD_FETCH_INSTR_0_STEPRATE__SHIFT) & A3XX_VFD_FETCH_INSTR_0_STEPRATE__MASK;
+}
+
+static inline uint32_t REG_A3XX_VFD_FETCH_INSTR_1(uint32_t i0) { return 0x00002247 + 0x2*i0; }
+
+static inline uint32_t REG_A3XX_VFD_DECODE(uint32_t i0) { return 0x00002266 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_VFD_DECODE_INSTR(uint32_t i0) { return 0x00002266 + 0x1*i0; }
+#define A3XX_VFD_DECODE_INSTR_WRITEMASK__MASK                   0x0000000f
+#define A3XX_VFD_DECODE_INSTR_WRITEMASK__SHIFT                  0
+static inline uint32_t A3XX_VFD_DECODE_INSTR_WRITEMASK(uint32_t val)
+{
+        return ((val) << A3XX_VFD_DECODE_INSTR_WRITEMASK__SHIFT) & A3XX_VFD_DECODE_INSTR_WRITEMASK__MASK;
+}
+#define A3XX_VFD_DECODE_INSTR_CONSTFILL                         0x00000010
+#define A3XX_VFD_DECODE_INSTR_FORMAT__MASK                      0x00000fc0
+#define A3XX_VFD_DECODE_INSTR_FORMAT__SHIFT                     6
+static inline uint32_t A3XX_VFD_DECODE_INSTR_FORMAT(enum a3xx_vtx_fmt val)
+{
+        return ((val) << A3XX_VFD_DECODE_INSTR_FORMAT__SHIFT) & A3XX_VFD_DECODE_INSTR_FORMAT__MASK;
+}
+#define A3XX_VFD_DECODE_INSTR_REGID__MASK                       0x000ff000
+#define A3XX_VFD_DECODE_INSTR_REGID__SHIFT                      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_SHIFTCNT__MASK                    0x1f000000
+#define A3XX_VFD_DECODE_INSTR_SHIFTCNT__SHIFT                   24
+static inline uint32_t A3XX_VFD_DECODE_INSTR_SHIFTCNT(uint32_t val)
+{
+        return ((val) << A3XX_VFD_DECODE_INSTR_SHIFTCNT__SHIFT) & A3XX_VFD_DECODE_INSTR_SHIFTCNT__MASK;
+}
+#define A3XX_VFD_DECODE_INSTR_LASTCOMPVALID                     0x20000000
+#define A3XX_VFD_DECODE_INSTR_SWITCHNEXT                        0x40000000
+
+#define REG_A3XX_VFD_VS_THREADING_THRESHOLD                     0x0000227e
+#define A3XX_VFD_VS_THREADING_THRESHOLD_REGID_THRESHOLD__MASK   0x0000000f
+#define A3XX_VFD_VS_THREADING_THRESHOLD_REGID_THRESHOLD__SHIFT  0
+static inline uint32_t A3XX_VFD_VS_THREADING_THRESHOLD_REGID_THRESHOLD(uint32_t val)
+{
+        return ((val) << A3XX_VFD_VS_THREADING_THRESHOLD_REGID_THRESHOLD__SHIFT) & A3XX_VFD_VS_THREADING_THRESHOLD_REGID_THRESHOLD__MASK;
+}
+#define A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT__MASK      0x0000ff00
+#define A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT__SHIFT     8
+static inline uint32_t A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT(uint32_t val)
+{
+        return ((val) << A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT__SHIFT) & A3XX_VFD_VS_THREADING_THRESHOLD_REGID_VTXCNT__MASK;
+}
+
+#define REG_A3XX_VPC_ATTR                                       0x00002280
+#define A3XX_VPC_ATTR_TOTALATTR__MASK                           0x00000fff
+#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_THRDASSIGN__MASK                          0x0ffff000
+#define A3XX_VPC_ATTR_THRDASSIGN__SHIFT                         12
+static inline uint32_t A3XX_VPC_ATTR_THRDASSIGN(uint32_t val)
+{
+        return ((val) << A3XX_VPC_ATTR_THRDASSIGN__SHIFT) & A3XX_VPC_ATTR_THRDASSIGN__MASK;
+}
+#define A3XX_VPC_ATTR_LMSIZE__MASK                              0xf0000000
+#define A3XX_VPC_ATTR_LMSIZE__SHIFT                             28
+static inline uint32_t A3XX_VPC_ATTR_LMSIZE(uint32_t val)
+{
+        return ((val) << A3XX_VPC_ATTR_LMSIZE__SHIFT) & A3XX_VPC_ATTR_LMSIZE__MASK;
+}
+
+#define REG_A3XX_VPC_PACK                                       0x00002281
+#define A3XX_VPC_PACK_NUMFPNONPOSVAR__MASK                      0x0000ff00
+#define A3XX_VPC_PACK_NUMFPNONPOSVAR__SHIFT                     8
+static inline uint32_t A3XX_VPC_PACK_NUMFPNONPOSVAR(uint32_t val)
+{
+        return ((val) << A3XX_VPC_PACK_NUMFPNONPOSVAR__SHIFT) & A3XX_VPC_PACK_NUMFPNONPOSVAR__MASK;
+}
+#define A3XX_VPC_PACK_NUMNONPOSVSVAR__MASK                      0x00ff0000
+#define A3XX_VPC_PACK_NUMNONPOSVSVAR__SHIFT                     16
+static inline uint32_t A3XX_VPC_PACK_NUMNONPOSVSVAR(uint32_t val)
+{
+        return ((val) << A3XX_VPC_PACK_NUMNONPOSVSVAR__SHIFT) & A3XX_VPC_PACK_NUMNONPOSVSVAR__MASK;
+}
+
+static inline uint32_t REG_A3XX_VPC_VARYING_INTERP(uint32_t i0) { return 0x00002282 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_VPC_VARYING_INTERP_MODE(uint32_t i0) { return 0x00002282 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_VPC_VARYING_PS_REPL(uint32_t i0) { return 0x00002286 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_VPC_VARYING_PS_REPL_MODE(uint32_t i0) { return 0x00002286 + 0x1*i0; }
+
+#define REG_A3XX_VPC_VARY_CYLWRAP_ENABLE_0                      0x0000228a
+
+#define REG_A3XX_VPC_VARY_CYLWRAP_ENABLE_1                      0x0000228b
+
+#define REG_A3XX_SP_SP_CTRL_REG                                 0x000022c0
+#define A3XX_SP_SP_CTRL_REG_RESOLVE                             0x00010000
+#define A3XX_SP_SP_CTRL_REG_CONSTMODE__MASK                     0x000c0000
+#define A3XX_SP_SP_CTRL_REG_CONSTMODE__SHIFT                    18
+static inline uint32_t A3XX_SP_SP_CTRL_REG_CONSTMODE(uint32_t val)
+{
+        return ((val) << A3XX_SP_SP_CTRL_REG_CONSTMODE__SHIFT) & A3XX_SP_SP_CTRL_REG_CONSTMODE__MASK;
+}
+#define A3XX_SP_SP_CTRL_REG_SLEEPMODE__MASK                     0x00300000
+#define A3XX_SP_SP_CTRL_REG_SLEEPMODE__SHIFT                    20
+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)
+{
+        return ((val) << A3XX_SP_SP_CTRL_REG_LOMODE__SHIFT) & A3XX_SP_SP_CTRL_REG_LOMODE__MASK;
+}
+
+#define REG_A3XX_SP_VS_CTRL_REG0                                0x000022c4
+#define A3XX_SP_VS_CTRL_REG0_THREADMODE__MASK                   0x00000001
+#define A3XX_SP_VS_CTRL_REG0_THREADMODE__SHIFT                  0
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_THREADMODE(enum a3xx_threadmode val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_THREADMODE__SHIFT) & A3XX_SP_VS_CTRL_REG0_THREADMODE__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_INSTRBUFFERMODE__MASK              0x00000002
+#define A3XX_SP_VS_CTRL_REG0_INSTRBUFFERMODE__SHIFT             1
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_INSTRBUFFERMODE(enum a3xx_instrbuffermode val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_INSTRBUFFERMODE__SHIFT) & A3XX_SP_VS_CTRL_REG0_INSTRBUFFERMODE__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_CACHEINVALID                       0x00000004
+#define A3XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT__MASK             0x000003f0
+#define A3XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT__SHIFT            4
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT__SHIFT) & A3XX_SP_VS_CTRL_REG0_HALFREGFOOTPRINT__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT__MASK             0x0003fc00
+#define A3XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT__SHIFT            10
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT__SHIFT) & A3XX_SP_VS_CTRL_REG0_FULLREGFOOTPRINT__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_INOUTREGOVERLAP__MASK              0x000c0000
+#define A3XX_SP_VS_CTRL_REG0_INOUTREGOVERLAP__SHIFT             18
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_INOUTREGOVERLAP(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_INOUTREGOVERLAP__SHIFT) & A3XX_SP_VS_CTRL_REG0_INOUTREGOVERLAP__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_THREADSIZE__MASK                   0x00100000
+#define A3XX_SP_VS_CTRL_REG0_THREADSIZE__SHIFT                  20
+static inline uint32_t A3XX_SP_VS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_THREADSIZE__SHIFT) & A3XX_SP_VS_CTRL_REG0_THREADSIZE__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG0_SUPERTHREADMODE                    0x00200000
+#define A3XX_SP_VS_CTRL_REG0_PIXLODENABLE                       0x00400000
+#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)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG0_LENGTH__SHIFT) & A3XX_SP_VS_CTRL_REG0_LENGTH__MASK;
+}
+
+#define REG_A3XX_SP_VS_CTRL_REG1                                0x000022c5
+#define A3XX_SP_VS_CTRL_REG1_CONSTLENGTH__MASK                  0x000003ff
+#define A3XX_SP_VS_CTRL_REG1_CONSTLENGTH__SHIFT                 0
+static inline uint32_t A3XX_SP_VS_CTRL_REG1_CONSTLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG1_CONSTLENGTH__SHIFT) & A3XX_SP_VS_CTRL_REG1_CONSTLENGTH__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT__MASK               0x000ffc00
+#define A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT__SHIFT              10
+static inline uint32_t A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT__SHIFT) & A3XX_SP_VS_CTRL_REG1_CONSTFOOTPRINT__MASK;
+}
+#define A3XX_SP_VS_CTRL_REG1_INITIALOUTSTANDING__MASK           0x3f000000
+#define A3XX_SP_VS_CTRL_REG1_INITIALOUTSTANDING__SHIFT          24
+static inline uint32_t A3XX_SP_VS_CTRL_REG1_INITIALOUTSTANDING(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_CTRL_REG1_INITIALOUTSTANDING__SHIFT) & A3XX_SP_VS_CTRL_REG1_INITIALOUTSTANDING__MASK;
+}
+
+#define REG_A3XX_SP_VS_PARAM_REG                                0x000022c6
+#define A3XX_SP_VS_PARAM_REG_POSREGID__MASK                     0x000000ff
+#define A3XX_SP_VS_PARAM_REG_POSREGID__SHIFT                    0
+static inline uint32_t A3XX_SP_VS_PARAM_REG_POSREGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_PARAM_REG_POSREGID__SHIFT) & A3XX_SP_VS_PARAM_REG_POSREGID__MASK;
+}
+#define A3XX_SP_VS_PARAM_REG_PSIZEREGID__MASK                   0x0000ff00
+#define A3XX_SP_VS_PARAM_REG_PSIZEREGID__SHIFT                  8
+static inline uint32_t A3XX_SP_VS_PARAM_REG_PSIZEREGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_PARAM_REG_PSIZEREGID__SHIFT) & A3XX_SP_VS_PARAM_REG_PSIZEREGID__MASK;
+}
+#define A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR__MASK                0xfff00000
+#define A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR__SHIFT               20
+static inline uint32_t A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR__SHIFT) & A3XX_SP_VS_PARAM_REG_TOTALVSOUTVAR__MASK;
+}
+
+static inline uint32_t REG_A3XX_SP_VS_OUT(uint32_t i0) { return 0x000022c7 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_SP_VS_OUT_REG(uint32_t i0) { return 0x000022c7 + 0x1*i0; }
+#define A3XX_SP_VS_OUT_REG_A_REGID__MASK                        0x000001ff
+#define A3XX_SP_VS_OUT_REG_A_REGID__SHIFT                       0
+static inline uint32_t A3XX_SP_VS_OUT_REG_A_REGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OUT_REG_A_REGID__SHIFT) & A3XX_SP_VS_OUT_REG_A_REGID__MASK;
+}
+#define A3XX_SP_VS_OUT_REG_A_COMPMASK__MASK                     0x00001e00
+#define A3XX_SP_VS_OUT_REG_A_COMPMASK__SHIFT                    9
+static inline uint32_t A3XX_SP_VS_OUT_REG_A_COMPMASK(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OUT_REG_A_COMPMASK__SHIFT) & A3XX_SP_VS_OUT_REG_A_COMPMASK__MASK;
+}
+#define A3XX_SP_VS_OUT_REG_B_REGID__MASK                        0x01ff0000
+#define A3XX_SP_VS_OUT_REG_B_REGID__SHIFT                       16
+static inline uint32_t A3XX_SP_VS_OUT_REG_B_REGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OUT_REG_B_REGID__SHIFT) & A3XX_SP_VS_OUT_REG_B_REGID__MASK;
+}
+#define A3XX_SP_VS_OUT_REG_B_COMPMASK__MASK                     0x1e000000
+#define A3XX_SP_VS_OUT_REG_B_COMPMASK__SHIFT                    25
+static inline uint32_t A3XX_SP_VS_OUT_REG_B_COMPMASK(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OUT_REG_B_COMPMASK__SHIFT) & A3XX_SP_VS_OUT_REG_B_COMPMASK__MASK;
+}
+
+static inline uint32_t REG_A3XX_SP_VS_VPC_DST(uint32_t i0) { return 0x000022d0 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_SP_VS_VPC_DST_REG(uint32_t i0) { return 0x000022d0 + 0x1*i0; }
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC0__MASK                    0x000000ff
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC0__SHIFT                   0
+static inline uint32_t A3XX_SP_VS_VPC_DST_REG_OUTLOC0(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_VPC_DST_REG_OUTLOC0__SHIFT) & A3XX_SP_VS_VPC_DST_REG_OUTLOC0__MASK;
+}
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC1__MASK                    0x0000ff00
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC1__SHIFT                   8
+static inline uint32_t A3XX_SP_VS_VPC_DST_REG_OUTLOC1(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_VPC_DST_REG_OUTLOC1__SHIFT) & A3XX_SP_VS_VPC_DST_REG_OUTLOC1__MASK;
+}
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC2__MASK                    0x00ff0000
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC2__SHIFT                   16
+static inline uint32_t A3XX_SP_VS_VPC_DST_REG_OUTLOC2(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_VPC_DST_REG_OUTLOC2__SHIFT) & A3XX_SP_VS_VPC_DST_REG_OUTLOC2__MASK;
+}
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC3__MASK                    0xff000000
+#define A3XX_SP_VS_VPC_DST_REG_OUTLOC3__SHIFT                   24
+static inline uint32_t A3XX_SP_VS_VPC_DST_REG_OUTLOC3(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_VPC_DST_REG_OUTLOC3__SHIFT) & A3XX_SP_VS_VPC_DST_REG_OUTLOC3__MASK;
+}
+
+#define REG_A3XX_SP_VS_OBJ_OFFSET_REG                           0x000022d4
+#define A3XX_SP_VS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__MASK       0x01ff0000
+#define A3XX_SP_VS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__SHIFT      16
+static inline uint32_t A3XX_SP_VS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__SHIFT) & A3XX_SP_VS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__MASK;
+}
+#define A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET__MASK         0xfe000000
+#define A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET__SHIFT        25
+static inline uint32_t A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET__SHIFT) & A3XX_SP_VS_OBJ_OFFSET_REG_SHADEROBJOFFSET__MASK;
+}
+
+#define REG_A3XX_SP_VS_OBJ_START_REG                            0x000022d5
+
+#define REG_A3XX_SP_VS_PVT_MEM_CTRL_REG                         0x000022d6
+
+#define REG_A3XX_SP_VS_PVT_MEM_ADDR_REG                         0x000022d7
+
+#define REG_A3XX_SP_VS_PVT_MEM_SIZE_REG                         0x000022d8
+
+#define REG_A3XX_SP_VS_LENGTH_REG                               0x000022df
+#define A3XX_SP_VS_LENGTH_REG_SHADERLENGTH__MASK                0xffffffff
+#define A3XX_SP_VS_LENGTH_REG_SHADERLENGTH__SHIFT               0
+static inline uint32_t A3XX_SP_VS_LENGTH_REG_SHADERLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_SP_VS_LENGTH_REG_SHADERLENGTH__SHIFT) & A3XX_SP_VS_LENGTH_REG_SHADERLENGTH__MASK;
+}
+
+#define REG_A3XX_SP_FS_CTRL_REG0                                0x000022e0
+#define A3XX_SP_FS_CTRL_REG0_THREADMODE__MASK                   0x00000001
+#define A3XX_SP_FS_CTRL_REG0_THREADMODE__SHIFT                  0
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_THREADMODE(enum a3xx_threadmode val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_THREADMODE__SHIFT) & A3XX_SP_FS_CTRL_REG0_THREADMODE__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_INSTRBUFFERMODE__MASK              0x00000002
+#define A3XX_SP_FS_CTRL_REG0_INSTRBUFFERMODE__SHIFT             1
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_INSTRBUFFERMODE(enum a3xx_instrbuffermode val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_INSTRBUFFERMODE__SHIFT) & A3XX_SP_FS_CTRL_REG0_INSTRBUFFERMODE__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_CACHEINVALID                       0x00000004
+#define A3XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT__MASK             0x000003f0
+#define A3XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT__SHIFT            4
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT__SHIFT) & A3XX_SP_FS_CTRL_REG0_HALFREGFOOTPRINT__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT__MASK             0x0003fc00
+#define A3XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT__SHIFT            10
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT__SHIFT) & A3XX_SP_FS_CTRL_REG0_FULLREGFOOTPRINT__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_INOUTREGOVERLAP__MASK              0x000c0000
+#define A3XX_SP_FS_CTRL_REG0_INOUTREGOVERLAP__SHIFT             18
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_INOUTREGOVERLAP(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_INOUTREGOVERLAP__SHIFT) & A3XX_SP_FS_CTRL_REG0_INOUTREGOVERLAP__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_THREADSIZE__MASK                   0x00100000
+#define A3XX_SP_FS_CTRL_REG0_THREADSIZE__SHIFT                  20
+static inline uint32_t A3XX_SP_FS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_THREADSIZE__SHIFT) & A3XX_SP_FS_CTRL_REG0_THREADSIZE__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG0_SUPERTHREADMODE                    0x00200000
+#define A3XX_SP_FS_CTRL_REG0_PIXLODENABLE                       0x00400000
+#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)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG0_LENGTH__SHIFT) & A3XX_SP_FS_CTRL_REG0_LENGTH__MASK;
+}
+
+#define REG_A3XX_SP_FS_CTRL_REG1                                0x000022e1
+#define A3XX_SP_FS_CTRL_REG1_CONSTLENGTH__MASK                  0x000003ff
+#define A3XX_SP_FS_CTRL_REG1_CONSTLENGTH__SHIFT                 0
+static inline uint32_t A3XX_SP_FS_CTRL_REG1_CONSTLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG1_CONSTLENGTH__SHIFT) & A3XX_SP_FS_CTRL_REG1_CONSTLENGTH__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG1_CONSTFOOTPRINT__MASK               0x000ffc00
+#define A3XX_SP_FS_CTRL_REG1_CONSTFOOTPRINT__SHIFT              10
+static inline uint32_t A3XX_SP_FS_CTRL_REG1_CONSTFOOTPRINT(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG1_CONSTFOOTPRINT__SHIFT) & A3XX_SP_FS_CTRL_REG1_CONSTFOOTPRINT__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG1_INITIALOUTSTANDING__MASK           0x00f00000
+#define A3XX_SP_FS_CTRL_REG1_INITIALOUTSTANDING__SHIFT          20
+static inline uint32_t A3XX_SP_FS_CTRL_REG1_INITIALOUTSTANDING(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG1_INITIALOUTSTANDING__SHIFT) & A3XX_SP_FS_CTRL_REG1_INITIALOUTSTANDING__MASK;
+}
+#define A3XX_SP_FS_CTRL_REG1_HALFPRECVAROFFSET__MASK            0x3f000000
+#define A3XX_SP_FS_CTRL_REG1_HALFPRECVAROFFSET__SHIFT           24
+static inline uint32_t A3XX_SP_FS_CTRL_REG1_HALFPRECVAROFFSET(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_CTRL_REG1_HALFPRECVAROFFSET__SHIFT) & A3XX_SP_FS_CTRL_REG1_HALFPRECVAROFFSET__MASK;
+}
+
+#define REG_A3XX_SP_FS_OBJ_OFFSET_REG                           0x000022e2
+#define A3XX_SP_FS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__MASK       0x01ff0000
+#define A3XX_SP_FS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__SHIFT      16
+static inline uint32_t A3XX_SP_FS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__SHIFT) & A3XX_SP_FS_OBJ_OFFSET_REG_CONSTOBJECTOFFSET__MASK;
+}
+#define A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET__MASK         0xfe000000
+#define A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET__SHIFT        25
+static inline uint32_t A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET__SHIFT) & A3XX_SP_FS_OBJ_OFFSET_REG_SHADEROBJOFFSET__MASK;
+}
+
+#define REG_A3XX_SP_FS_OBJ_START_REG                            0x000022e3
+
+#define REG_A3XX_SP_FS_PVT_MEM_CTRL_REG                         0x000022e4
+
+#define REG_A3XX_SP_FS_PVT_MEM_ADDR_REG                         0x000022e5
+
+#define REG_A3XX_SP_FS_PVT_MEM_SIZE_REG                         0x000022e6
+
+#define REG_A3XX_SP_FS_FLAT_SHAD_MODE_REG_0                     0x000022e8
+
+#define REG_A3XX_SP_FS_FLAT_SHAD_MODE_REG_1                     0x000022e9
+
+#define REG_A3XX_SP_FS_OUTPUT_REG                               0x000022ec
+
+static inline uint32_t REG_A3XX_SP_FS_MRT(uint32_t i0) { return 0x000022f0 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_SP_FS_MRT_REG(uint32_t i0) { return 0x000022f0 + 0x1*i0; }
+#define A3XX_SP_FS_MRT_REG_REGID__MASK                          0x000000ff
+#define A3XX_SP_FS_MRT_REG_REGID__SHIFT                         0
+static inline uint32_t A3XX_SP_FS_MRT_REG_REGID(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_MRT_REG_REGID__SHIFT) & A3XX_SP_FS_MRT_REG_REGID__MASK;
+}
+#define A3XX_SP_FS_MRT_REG_HALF_PRECISION                       0x00000100
+
+static inline uint32_t REG_A3XX_SP_FS_IMAGE_OUTPUT(uint32_t i0) { return 0x000022f4 + 0x1*i0; }
+
+static inline uint32_t REG_A3XX_SP_FS_IMAGE_OUTPUT_REG(uint32_t i0) { return 0x000022f4 + 0x1*i0; }
+#define A3XX_SP_FS_IMAGE_OUTPUT_REG_MRTFORMAT__MASK             0x0000003f
+#define A3XX_SP_FS_IMAGE_OUTPUT_REG_MRTFORMAT__SHIFT            0
+static inline uint32_t A3XX_SP_FS_IMAGE_OUTPUT_REG_MRTFORMAT(enum a3xx_color_fmt val)
+{
+        return ((val) << A3XX_SP_FS_IMAGE_OUTPUT_REG_MRTFORMAT__SHIFT) & A3XX_SP_FS_IMAGE_OUTPUT_REG_MRTFORMAT__MASK;
+}
+
+#define REG_A3XX_SP_FS_LENGTH_REG                               0x000022ff
+#define A3XX_SP_FS_LENGTH_REG_SHADERLENGTH__MASK                0xffffffff
+#define A3XX_SP_FS_LENGTH_REG_SHADERLENGTH__SHIFT               0
+static inline uint32_t A3XX_SP_FS_LENGTH_REG_SHADERLENGTH(uint32_t val)
+{
+        return ((val) << A3XX_SP_FS_LENGTH_REG_SHADERLENGTH__SHIFT) & A3XX_SP_FS_LENGTH_REG_SHADERLENGTH__MASK;
+}
+
+#define REG_A3XX_TPL1_TP_VS_TEX_OFFSET                          0x00002340
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_SAMPLEROFFSET__MASK          0x000000ff
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_SAMPLEROFFSET__SHIFT         0
+static inline uint32_t A3XX_TPL1_TP_VS_TEX_OFFSET_SAMPLEROFFSET(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_VS_TEX_OFFSET_SAMPLEROFFSET__SHIFT) & A3XX_TPL1_TP_VS_TEX_OFFSET_SAMPLEROFFSET__MASK;
+}
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_MEMOBJOFFSET__MASK           0x0000ff00
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_MEMOBJOFFSET__SHIFT          8
+static inline uint32_t A3XX_TPL1_TP_VS_TEX_OFFSET_MEMOBJOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_VS_TEX_OFFSET_MEMOBJOFFSET__SHIFT) & A3XX_TPL1_TP_VS_TEX_OFFSET_MEMOBJOFFSET__MASK;
+}
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_BASETABLEPTR__MASK           0xffff0000
+#define A3XX_TPL1_TP_VS_TEX_OFFSET_BASETABLEPTR__SHIFT          16
+static inline uint32_t A3XX_TPL1_TP_VS_TEX_OFFSET_BASETABLEPTR(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_VS_TEX_OFFSET_BASETABLEPTR__SHIFT) & A3XX_TPL1_TP_VS_TEX_OFFSET_BASETABLEPTR__MASK;
+}
+
+#define REG_A3XX_TPL1_TP_VS_BORDER_COLOR_BASE_ADDR              0x00002341
+
+#define REG_A3XX_TPL1_TP_FS_TEX_OFFSET                          0x00002342
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_SAMPLEROFFSET__MASK          0x000000ff
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_SAMPLEROFFSET__SHIFT         0
+static inline uint32_t A3XX_TPL1_TP_FS_TEX_OFFSET_SAMPLEROFFSET(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_FS_TEX_OFFSET_SAMPLEROFFSET__SHIFT) & A3XX_TPL1_TP_FS_TEX_OFFSET_SAMPLEROFFSET__MASK;
+}
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_MEMOBJOFFSET__MASK           0x0000ff00
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_MEMOBJOFFSET__SHIFT          8
+static inline uint32_t A3XX_TPL1_TP_FS_TEX_OFFSET_MEMOBJOFFSET(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_FS_TEX_OFFSET_MEMOBJOFFSET__SHIFT) & A3XX_TPL1_TP_FS_TEX_OFFSET_MEMOBJOFFSET__MASK;
+}
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR__MASK           0xffff0000
+#define A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR__SHIFT          16
+static inline uint32_t A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR(uint32_t val)
+{
+        return ((val) << A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR__SHIFT) & A3XX_TPL1_TP_FS_TEX_OFFSET_BASETABLEPTR__MASK;
+}
+
+#define REG_A3XX_TPL1_TP_FS_BORDER_COLOR_BASE_ADDR              0x00002343
+
+#define REG_A3XX_VBIF_CLKON                                     0x00003001
+
+#define REG_A3XX_VBIF_FIXED_SORT_EN                             0x0000300c
+
+#define REG_A3XX_VBIF_FIXED_SORT_SEL0                           0x0000300d
+
+#define REG_A3XX_VBIF_FIXED_SORT_SEL1                           0x0000300e
+
+#define REG_A3XX_VBIF_ABIT_SORT                                 0x0000301c
+
+#define REG_A3XX_VBIF_ABIT_SORT_CONF                            0x0000301d
+
+#define REG_A3XX_VBIF_GATE_OFF_WRREQ_EN                         0x0000302a
+
+#define REG_A3XX_VBIF_IN_RD_LIM_CONF0                           0x0000302c
+
+#define REG_A3XX_VBIF_IN_RD_LIM_CONF1                           0x0000302d
+
+#define REG_A3XX_VBIF_IN_WR_LIM_CONF0                           0x00003030
+
+#define REG_A3XX_VBIF_IN_WR_LIM_CONF1                           0x00003031
+
+#define REG_A3XX_VBIF_OUT_RD_LIM_CONF0                          0x00003034
+
+#define REG_A3XX_VBIF_OUT_WR_LIM_CONF0                          0x00003035
+
+#define REG_A3XX_VBIF_DDR_OUT_MAX_BURST                         0x00003036
+
+#define REG_A3XX_VBIF_ARB_CTL                                   0x0000303c
+
+#define REG_A3XX_VBIF_ROUND_ROBIN_QOS_ARB                       0x00003049
+
+#define REG_A3XX_VBIF_OUT_AXI_AMEMTYPE_CONF0                    0x00003058
+
+#define REG_A3XX_VBIF_OUT_AXI_AOOO_EN                           0x0000305e
+
+#define REG_A3XX_VBIF_OUT_AXI_AOOO                              0x0000305f
+
+#define REG_A3XX_VSC_BIN_SIZE                                   0x00000c01
+#define A3XX_VSC_BIN_SIZE_WIDTH__MASK                           0x0000001f
+#define A3XX_VSC_BIN_SIZE_WIDTH__SHIFT                          0
+static inline uint32_t A3XX_VSC_BIN_SIZE_WIDTH(uint32_t val)
+{
+        return ((val >> 5) << A3XX_VSC_BIN_SIZE_WIDTH__SHIFT) & A3XX_VSC_BIN_SIZE_WIDTH__MASK;
+}
+#define A3XX_VSC_BIN_SIZE_HEIGHT__MASK                          0x000003e0
+#define A3XX_VSC_BIN_SIZE_HEIGHT__SHIFT                         5
+static inline uint32_t A3XX_VSC_BIN_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val >> 5) << A3XX_VSC_BIN_SIZE_HEIGHT__SHIFT) & A3XX_VSC_BIN_SIZE_HEIGHT__MASK;
+}
+
+#define REG_A3XX_VSC_SIZE_ADDRESS                               0x00000c02
+
+static inline uint32_t REG_A3XX_VSC_PIPE(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
+
+static inline uint32_t REG_A3XX_VSC_PIPE_CONFIG(uint32_t i0) { return 0x00000c06 + 0x3*i0; }
+#define A3XX_VSC_PIPE_CONFIG_X__MASK                            0x000003ff
+#define A3XX_VSC_PIPE_CONFIG_X__SHIFT                           0
+static inline uint32_t A3XX_VSC_PIPE_CONFIG_X(uint32_t val)
+{
+        return ((val) << A3XX_VSC_PIPE_CONFIG_X__SHIFT) & A3XX_VSC_PIPE_CONFIG_X__MASK;
+}
+#define A3XX_VSC_PIPE_CONFIG_Y__MASK                            0x000ffc00
+#define A3XX_VSC_PIPE_CONFIG_Y__SHIFT                           10
+static inline uint32_t A3XX_VSC_PIPE_CONFIG_Y(uint32_t val)
+{
+        return ((val) << A3XX_VSC_PIPE_CONFIG_Y__SHIFT) & A3XX_VSC_PIPE_CONFIG_Y__MASK;
+}
+#define A3XX_VSC_PIPE_CONFIG_W__MASK                            0x00f00000
+#define A3XX_VSC_PIPE_CONFIG_W__SHIFT                           20
+static inline uint32_t A3XX_VSC_PIPE_CONFIG_W(uint32_t val)
+{
+        return ((val) << A3XX_VSC_PIPE_CONFIG_W__SHIFT) & A3XX_VSC_PIPE_CONFIG_W__MASK;
+}
+#define A3XX_VSC_PIPE_CONFIG_H__MASK                            0x0f000000
+#define A3XX_VSC_PIPE_CONFIG_H__SHIFT                           24
+static inline uint32_t A3XX_VSC_PIPE_CONFIG_H(uint32_t val)
+{
+        return ((val) << A3XX_VSC_PIPE_CONFIG_H__SHIFT) & A3XX_VSC_PIPE_CONFIG_H__MASK;
+}
+
+static inline uint32_t REG_A3XX_VSC_PIPE_DATA_ADDRESS(uint32_t i0) { return 0x00000c07 + 0x3*i0; }
+
+static inline uint32_t REG_A3XX_VSC_PIPE_DATA_LENGTH(uint32_t i0) { return 0x00000c08 + 0x3*i0; }
+
+#define REG_A3XX_UNKNOWN_0C3D                                   0x00000c3d
+
+#define REG_A3XX_PC_PERFCOUNTER0_SELECT                         0x00000c48
+
+#define REG_A3XX_PC_PERFCOUNTER1_SELECT                         0x00000c49
+
+#define REG_A3XX_PC_PERFCOUNTER2_SELECT                         0x00000c4a
+
+#define REG_A3XX_PC_PERFCOUNTER3_SELECT                         0x00000c4b
+
+#define REG_A3XX_UNKNOWN_0C81                                   0x00000c81
+
+#define REG_A3XX_GRAS_PERFCOUNTER0_SELECT                       0x00000c88
+
+#define REG_A3XX_GRAS_PERFCOUNTER1_SELECT                       0x00000c89
+
+#define REG_A3XX_GRAS_PERFCOUNTER2_SELECT                       0x00000c8a
+
+#define REG_A3XX_GRAS_PERFCOUNTER3_SELECT                       0x00000c8b
+
+static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE(uint32_t i0) { return 0x00000ca0 + 0x4*i0; }
+
+static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE_X(uint32_t i0) { return 0x00000ca0 + 0x4*i0; }
+
+static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE_Y(uint32_t i0) { return 0x00000ca1 + 0x4*i0; }
+
+static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE_Z(uint32_t i0) { return 0x00000ca2 + 0x4*i0; }
+
+static inline uint32_t REG_A3XX_GRAS_CL_USER_PLANE_W(uint32_t i0) { return 0x00000ca3 + 0x4*i0; }
+
+#define REG_A3XX_RB_GMEM_BASE_ADDR                              0x00000cc0
+
+#define REG_A3XX_RB_PERFCOUNTER0_SELECT                         0x00000cc6
+
+#define REG_A3XX_RB_PERFCOUNTER1_SELECT                         0x00000cc7
+
+#define REG_A3XX_RB_WINDOW_SIZE                                 0x00000ce0
+#define A3XX_RB_WINDOW_SIZE_WIDTH__MASK                         0x00003fff
+#define A3XX_RB_WINDOW_SIZE_WIDTH__SHIFT                        0
+static inline uint32_t A3XX_RB_WINDOW_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << A3XX_RB_WINDOW_SIZE_WIDTH__SHIFT) & A3XX_RB_WINDOW_SIZE_WIDTH__MASK;
+}
+#define A3XX_RB_WINDOW_SIZE_HEIGHT__MASK                        0x0fffc000
+#define A3XX_RB_WINDOW_SIZE_HEIGHT__SHIFT                       14
+static inline uint32_t A3XX_RB_WINDOW_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << A3XX_RB_WINDOW_SIZE_HEIGHT__SHIFT) & A3XX_RB_WINDOW_SIZE_HEIGHT__MASK;
+}
+
+#define REG_A3XX_HLSQ_PERFCOUNTER0_SELECT                       0x00000e00
+
+#define REG_A3XX_HLSQ_PERFCOUNTER1_SELECT                       0x00000e01
+
+#define REG_A3XX_HLSQ_PERFCOUNTER2_SELECT                       0x00000e02
+
+#define REG_A3XX_HLSQ_PERFCOUNTER3_SELECT                       0x00000e03
+
+#define REG_A3XX_HLSQ_PERFCOUNTER4_SELECT                       0x00000e04
+
+#define REG_A3XX_HLSQ_PERFCOUNTER5_SELECT                       0x00000e05
+
+#define REG_A3XX_UNKNOWN_0E43                                   0x00000e43
+
+#define REG_A3XX_VFD_PERFCOUNTER0_SELECT                        0x00000e44
+
+#define REG_A3XX_VFD_PERFCOUNTER1_SELECT                        0x00000e45
+
+#define REG_A3XX_VPC_VPC_DEBUG_RAM_SEL                          0x00000e61
+
+#define REG_A3XX_VPC_VPC_DEBUG_RAM_READ                         0x00000e62
+
+#define REG_A3XX_VPC_PERFCOUNTER0_SELECT                        0x00000e64
+
+#define REG_A3XX_VPC_PERFCOUNTER1_SELECT                        0x00000e65
+
+#define REG_A3XX_UCHE_CACHE_MODE_CONTROL_REG                    0x00000e82
+
+#define REG_A3XX_UCHE_PERFCOUNTER0_SELECT                       0x00000e84
+
+#define REG_A3XX_UCHE_PERFCOUNTER1_SELECT                       0x00000e85
+
+#define REG_A3XX_UCHE_PERFCOUNTER2_SELECT                       0x00000e86
+
+#define REG_A3XX_UCHE_PERFCOUNTER3_SELECT                       0x00000e87
+
+#define REG_A3XX_UCHE_PERFCOUNTER4_SELECT                       0x00000e88
+
+#define REG_A3XX_UCHE_PERFCOUNTER5_SELECT                       0x00000e89
+
+#define REG_A3XX_UCHE_CACHE_INVALIDATE0_REG                     0x00000ea0
+#define A3XX_UCHE_CACHE_INVALIDATE0_REG_ADDR__MASK              0x0fffffff
+#define A3XX_UCHE_CACHE_INVALIDATE0_REG_ADDR__SHIFT             0
+static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE0_REG_ADDR(uint32_t val)
+{
+        return ((val) << A3XX_UCHE_CACHE_INVALIDATE0_REG_ADDR__SHIFT) & A3XX_UCHE_CACHE_INVALIDATE0_REG_ADDR__MASK;
+}
+
+#define REG_A3XX_UCHE_CACHE_INVALIDATE1_REG                     0x00000ea1
+#define A3XX_UCHE_CACHE_INVALIDATE1_REG_ADDR__MASK              0x0fffffff
+#define A3XX_UCHE_CACHE_INVALIDATE1_REG_ADDR__SHIFT             0
+static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE1_REG_ADDR(uint32_t val)
+{
+        return ((val) << A3XX_UCHE_CACHE_INVALIDATE1_REG_ADDR__SHIFT) & A3XX_UCHE_CACHE_INVALIDATE1_REG_ADDR__MASK;
+}
+#define A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE__MASK            0x30000000
+#define A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE__SHIFT           28
+static inline uint32_t A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE(enum a3xx_cache_opcode val)
+{
+        return ((val) << A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE__SHIFT) & A3XX_UCHE_CACHE_INVALIDATE1_REG_OPCODE__MASK;
+}
+#define A3XX_UCHE_CACHE_INVALIDATE1_REG_ENTIRE_CACHE            0x80000000
+
+#define REG_A3XX_SP_PERFCOUNTER0_SELECT                         0x00000ec4
+
+#define REG_A3XX_SP_PERFCOUNTER1_SELECT                         0x00000ec5
+
+#define REG_A3XX_SP_PERFCOUNTER2_SELECT                         0x00000ec6
+
+#define REG_A3XX_SP_PERFCOUNTER3_SELECT                         0x00000ec7
+
+#define REG_A3XX_SP_PERFCOUNTER4_SELECT                         0x00000ec8
+
+#define REG_A3XX_SP_PERFCOUNTER5_SELECT                         0x00000ec9
+
+#define REG_A3XX_SP_PERFCOUNTER6_SELECT                         0x00000eca
+
+#define REG_A3XX_SP_PERFCOUNTER7_SELECT                         0x00000ecb
+
+#define REG_A3XX_UNKNOWN_0EE0                                   0x00000ee0
+
+#define REG_A3XX_UNKNOWN_0F03                                   0x00000f03
+
+#define REG_A3XX_TP_PERFCOUNTER0_SELECT                         0x00000f04
+
+#define REG_A3XX_TP_PERFCOUNTER1_SELECT                         0x00000f05
+
+#define REG_A3XX_TP_PERFCOUNTER2_SELECT                         0x00000f06
+
+#define REG_A3XX_TP_PERFCOUNTER3_SELECT                         0x00000f07
+
+#define REG_A3XX_TP_PERFCOUNTER4_SELECT                         0x00000f08
+
+#define REG_A3XX_TP_PERFCOUNTER5_SELECT                         0x00000f09
+
+#define REG_A3XX_TEX_SAMP_0                                     0x00000000
+#define A3XX_TEX_SAMP_0_XY_MAG__MASK                            0x0000000c
+#define A3XX_TEX_SAMP_0_XY_MAG__SHIFT                           2
+static inline uint32_t A3XX_TEX_SAMP_0_XY_MAG(enum a3xx_tex_filter val)
+{
+        return ((val) << A3XX_TEX_SAMP_0_XY_MAG__SHIFT) & A3XX_TEX_SAMP_0_XY_MAG__MASK;
+}
+#define A3XX_TEX_SAMP_0_XY_MIN__MASK                            0x00000030
+#define A3XX_TEX_SAMP_0_XY_MIN__SHIFT                           4
+static inline uint32_t A3XX_TEX_SAMP_0_XY_MIN(enum a3xx_tex_filter val)
+{
+        return ((val) << A3XX_TEX_SAMP_0_XY_MIN__SHIFT) & A3XX_TEX_SAMP_0_XY_MIN__MASK;
+}
+#define A3XX_TEX_SAMP_0_WRAP_S__MASK                            0x000001c0
+#define A3XX_TEX_SAMP_0_WRAP_S__SHIFT                           6
+static inline uint32_t A3XX_TEX_SAMP_0_WRAP_S(enum a3xx_tex_clamp val)
+{
+        return ((val) << A3XX_TEX_SAMP_0_WRAP_S__SHIFT) & A3XX_TEX_SAMP_0_WRAP_S__MASK;
+}
+#define A3XX_TEX_SAMP_0_WRAP_T__MASK                            0x00000e00
+#define A3XX_TEX_SAMP_0_WRAP_T__SHIFT                           9
+static inline uint32_t A3XX_TEX_SAMP_0_WRAP_T(enum a3xx_tex_clamp val)
+{
+        return ((val) << A3XX_TEX_SAMP_0_WRAP_T__SHIFT) & A3XX_TEX_SAMP_0_WRAP_T__MASK;
+}
+#define A3XX_TEX_SAMP_0_WRAP_R__MASK                            0x00007000
+#define A3XX_TEX_SAMP_0_WRAP_R__SHIFT                           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_UNNORM_COORDS                           0x80000000
+
+#define REG_A3XX_TEX_SAMP_1                                     0x00000001
+
+#define REG_A3XX_TEX_CONST_0                                    0x00000000
+#define A3XX_TEX_CONST_0_TILED                                  0x00000001
+#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)
+{
+        return ((val) << A3XX_TEX_CONST_0_SWIZ_X__SHIFT) & A3XX_TEX_CONST_0_SWIZ_X__MASK;
+}
+#define A3XX_TEX_CONST_0_SWIZ_Y__MASK                           0x00000380
+#define A3XX_TEX_CONST_0_SWIZ_Y__SHIFT                          7
+static inline uint32_t A3XX_TEX_CONST_0_SWIZ_Y(enum a3xx_tex_swiz val)
+{
+        return ((val) << A3XX_TEX_CONST_0_SWIZ_Y__SHIFT) & A3XX_TEX_CONST_0_SWIZ_Y__MASK;
+}
+#define A3XX_TEX_CONST_0_SWIZ_Z__MASK                           0x00001c00
+#define A3XX_TEX_CONST_0_SWIZ_Z__SHIFT                          10
+static inline uint32_t A3XX_TEX_CONST_0_SWIZ_Z(enum a3xx_tex_swiz val)
+{
+        return ((val) << A3XX_TEX_CONST_0_SWIZ_Z__SHIFT) & A3XX_TEX_CONST_0_SWIZ_Z__MASK;
+}
+#define A3XX_TEX_CONST_0_SWIZ_W__MASK                           0x0000e000
+#define A3XX_TEX_CONST_0_SWIZ_W__SHIFT                          13
+static inline uint32_t A3XX_TEX_CONST_0_SWIZ_W(enum a3xx_tex_swiz val)
+{
+        return ((val) << A3XX_TEX_CONST_0_SWIZ_W__SHIFT) & A3XX_TEX_CONST_0_SWIZ_W__MASK;
+}
+#define A3XX_TEX_CONST_0_FMT__MASK                              0x1fc00000
+#define A3XX_TEX_CONST_0_FMT__SHIFT                             22
+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_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)
+{
+        return ((val) << A3XX_TEX_CONST_0_TYPE__SHIFT) & A3XX_TEX_CONST_0_TYPE__MASK;
+}
+
+#define REG_A3XX_TEX_CONST_1                                    0x00000001
+#define A3XX_TEX_CONST_1_HEIGHT__MASK                           0x00003fff
+#define A3XX_TEX_CONST_1_HEIGHT__SHIFT                          0
+static inline uint32_t A3XX_TEX_CONST_1_HEIGHT(uint32_t val)
+{
+        return ((val) << A3XX_TEX_CONST_1_HEIGHT__SHIFT) & A3XX_TEX_CONST_1_HEIGHT__MASK;
+}
+#define A3XX_TEX_CONST_1_WIDTH__MASK                            0x0fffc000
+#define A3XX_TEX_CONST_1_WIDTH__SHIFT                           14
+static inline uint32_t A3XX_TEX_CONST_1_WIDTH(uint32_t val)
+{
+        return ((val) << A3XX_TEX_CONST_1_WIDTH__SHIFT) & A3XX_TEX_CONST_1_WIDTH__MASK;
+}
+#define A3XX_TEX_CONST_1_FETCHSIZE__MASK                        0xf0000000
+#define A3XX_TEX_CONST_1_FETCHSIZE__SHIFT                       28
+static inline uint32_t A3XX_TEX_CONST_1_FETCHSIZE(enum a3xx_tex_fetchsize val)
+{
+        return ((val) << A3XX_TEX_CONST_1_FETCHSIZE__SHIFT) & A3XX_TEX_CONST_1_FETCHSIZE__MASK;
+}
+
+#define REG_A3XX_TEX_CONST_2                                    0x00000002
+#define A3XX_TEX_CONST_2_INDX__MASK                             0x000000ff
+#define A3XX_TEX_CONST_2_INDX__SHIFT                            0
+static inline uint32_t A3XX_TEX_CONST_2_INDX(uint32_t val)
+{
+        return ((val) << A3XX_TEX_CONST_2_INDX__SHIFT) & A3XX_TEX_CONST_2_INDX__MASK;
+}
+#define A3XX_TEX_CONST_2_PITCH__MASK                            0x3ffff000
+#define A3XX_TEX_CONST_2_PITCH__SHIFT                           12
+static inline uint32_t A3XX_TEX_CONST_2_PITCH(uint32_t val)
+{
+        return ((val) << A3XX_TEX_CONST_2_PITCH__SHIFT) & A3XX_TEX_CONST_2_PITCH__MASK;
+}
+#define A3XX_TEX_CONST_2_SWAP__MASK                             0xc0000000
+#define A3XX_TEX_CONST_2_SWAP__SHIFT                            30
+static inline uint32_t A3XX_TEX_CONST_2_SWAP(enum a3xx_color_swap val)
+{
+        return ((val) << A3XX_TEX_CONST_2_SWAP__SHIFT) & A3XX_TEX_CONST_2_SWAP__MASK;
+}
+
+#define REG_A3XX_TEX_CONST_3                                    0x00000003
+
+
+#endif /* A3XX_XML */
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
new file mode 100644
index 000000000000..035bd13dc8bd
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "a3xx_gpu.h"
+
+#define A3XX_INT0_MASK \
+        (A3XX_INT0_RBBM_AHB_ERROR |        \
+         A3XX_INT0_RBBM_ATB_BUS_OVERFLOW | \
+         A3XX_INT0_CP_T0_PACKET_IN_IB |    \
+         A3XX_INT0_CP_OPCODE_ERROR |       \
+         A3XX_INT0_CP_RESERVED_BIT_ERROR | \
+         A3XX_INT0_CP_HW_FAULT |           \
+         A3XX_INT0_CP_IB1_INT |            \
+         A3XX_INT0_CP_IB2_INT |            \
+         A3XX_INT0_CP_RB_INT |             \
+         A3XX_INT0_CP_REG_PROTECT_FAULT |  \
+         A3XX_INT0_CP_AHB_ERROR_HALT |     \
+         A3XX_INT0_UCHE_OOB_ACCESS)
+
+static struct platform_device *a3xx_pdev;
+
+static void a3xx_me_init(struct msm_gpu *gpu)
+{
+        struct msm_ringbuffer *ring = gpu->rb;
+
+        OUT_PKT3(ring, CP_ME_INIT, 17);
+        OUT_RING(ring, 0x000003f7);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000080);
+        OUT_RING(ring, 0x00000100);
+        OUT_RING(ring, 0x00000180);
+        OUT_RING(ring, 0x00006600);
+        OUT_RING(ring, 0x00000150);
+        OUT_RING(ring, 0x0000014e);
+        OUT_RING(ring, 0x00000154);
+        OUT_RING(ring, 0x00000001);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+        OUT_RING(ring, 0x00000000);
+
+        gpu->funcs->flush(gpu);
+        gpu->funcs->idle(gpu);
+}
+
+static int a3xx_hw_init(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        uint32_t *ptr, len;
+        int i, ret;
+
+        DBG("%s", gpu->name);
+
+        if (adreno_is_a305(adreno_gpu)) {
+                /* Set up 16 deep read/write request queues: */
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF1, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_RD_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_WR_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_DDR_OUT_MAX_BURST, 0x0000303);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF1, 0x10101010);
+                /* Enable WR-REQ: */
+                gpu_write(gpu, REG_A3XX_VBIF_GATE_OFF_WRREQ_EN, 0x0000ff);
+                /* Set up round robin arbitration between both AXI ports: */
+                gpu_write(gpu, REG_A3XX_VBIF_ARB_CTL, 0x00000030);
+                /* Set up AOOO: */
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO_EN, 0x0000003c);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO, 0x003c003c);
+
+        } else if (adreno_is_a320(adreno_gpu)) {
+                /* Set up 16 deep read/write request queues: */
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF1, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_RD_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_WR_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_DDR_OUT_MAX_BURST, 0x0000303);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF0, 0x10101010);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF1, 0x10101010);
+                /* Enable WR-REQ: */
+                gpu_write(gpu, REG_A3XX_VBIF_GATE_OFF_WRREQ_EN, 0x0000ff);
+                /* Set up round robin arbitration between both AXI ports: */
+                gpu_write(gpu, REG_A3XX_VBIF_ARB_CTL, 0x00000030);
+                /* Set up AOOO: */
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO_EN, 0x0000003c);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO, 0x003c003c);
+                /* Enable 1K sort: */
+                gpu_write(gpu, REG_A3XX_VBIF_ABIT_SORT, 0x000000ff);
+                gpu_write(gpu, REG_A3XX_VBIF_ABIT_SORT_CONF, 0x000000a4);
+
+        } else if (adreno_is_a330(adreno_gpu)) {
+                /* Set up 16 deep read/write request queues: */
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF0, 0x18181818);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_RD_LIM_CONF1, 0x18181818);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_RD_LIM_CONF0, 0x18181818);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_WR_LIM_CONF0, 0x18181818);
+                gpu_write(gpu, REG_A3XX_VBIF_DDR_OUT_MAX_BURST, 0x0000303);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF0, 0x18181818);
+                gpu_write(gpu, REG_A3XX_VBIF_IN_WR_LIM_CONF1, 0x18181818);
+                /* Enable WR-REQ: */
+                gpu_write(gpu, REG_A3XX_VBIF_GATE_OFF_WRREQ_EN, 0x00003f);
+                /* Set up round robin arbitration between both AXI ports: */
+                gpu_write(gpu, REG_A3XX_VBIF_ARB_CTL, 0x00000030);
+                /* Set up VBIF_ROUND_ROBIN_QOS_ARB: */
+                gpu_write(gpu, REG_A3XX_VBIF_ROUND_ROBIN_QOS_ARB, 0x0001);
+                /* Set up AOOO: */
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO_EN, 0x0000ffff);
+                gpu_write(gpu, REG_A3XX_VBIF_OUT_AXI_AOOO, 0xffffffff);
+                /* Enable 1K sort: */
+                gpu_write(gpu, REG_A3XX_VBIF_ABIT_SORT, 0x0001ffff);
+                gpu_write(gpu, REG_A3XX_VBIF_ABIT_SORT_CONF, 0x000000a4);
+                /* Disable VBIF clock gating. This is to enable AXI running
+                 * higher frequency than GPU:
+                 */
+                gpu_write(gpu, REG_A3XX_VBIF_CLKON, 0x00000001);
+
+        } else {
+                BUG();
+        }
+
+        /* Make all blocks contribute to the GPU BUSY perf counter: */
+        gpu_write(gpu, REG_A3XX_RBBM_GPU_BUSY_MASKED, 0xffffffff);
+
+        /* Tune the hystersis counters for SP and CP idle detection: */
+        gpu_write(gpu, REG_A3XX_RBBM_SP_HYST_CNT, 0x10);
+        gpu_write(gpu, REG_A3XX_RBBM_WAIT_IDLE_CLOCKS_CTL, 0x10);
+
+        /* Enable the RBBM error reporting bits.  This lets us get
+         * useful information on failure:
+         */
+        gpu_write(gpu, REG_A3XX_RBBM_AHB_CTL0, 0x00000001);
+
+        /* Enable AHB error reporting: */
+        gpu_write(gpu, REG_A3XX_RBBM_AHB_CTL1, 0xa6ffffff);
+
+        /* Turn on the power counters: */
+        gpu_write(gpu, REG_A3XX_RBBM_RBBM_CTL, 0x00030000);
+
+        /* Turn on hang detection - this spews a lot of useful information
+         * into the RBBM registers on a hang:
+         */
+        gpu_write(gpu, REG_A3XX_RBBM_INTERFACE_HANG_INT_CTL, 0x00010fff);
+
+        /* Enable 64-byte cacheline size. HW Default is 32-byte (0x000000E0): */
+        gpu_write(gpu, REG_A3XX_UCHE_CACHE_MODE_CONTROL_REG, 0x00000001);
+
+        /* Enable Clock gating: */
+        gpu_write(gpu, REG_A3XX_RBBM_CLOCK_CTL, 0xbfffffff);
+
+        /* Set the OCMEM base address for A330 */
+//TODO:
+//      if (adreno_is_a330(adreno_gpu)) {
+//              gpu_write(gpu, REG_A3XX_RB_GMEM_BASE_ADDR,
+//                      (unsigned int)(a3xx_gpu->ocmem_base >> 14));
+//      }
+
+        /* Turn on performance counters: */
+        gpu_write(gpu, REG_A3XX_RBBM_PERFCTR_CTL, 0x01);
+
+        /* Set SP perfcounter 7 to count SP_FS_FULL_ALU_INSTRUCTIONS
+         * we will use this to augment our hang detection:
+         */
+        gpu_write(gpu, REG_A3XX_SP_PERFCOUNTER7_SELECT,
+                        SP_FS_FULL_ALU_INSTRUCTIONS);
+
+        gpu_write(gpu, REG_A3XX_RBBM_INT_0_MASK, A3XX_INT0_MASK);
+
+        ret = adreno_hw_init(gpu);
+        if (ret)
+                return ret;
+
+        /* setup access protection: */
+        gpu_write(gpu, REG_A3XX_CP_PROTECT_CTRL, 0x00000007);
+
+        /* RBBM registers */
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(0), 0x63000040);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(1), 0x62000080);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(2), 0x600000cc);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(3), 0x60000108);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(4), 0x64000140);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(5), 0x66000400);
+
+        /* CP registers */
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(6), 0x65000700);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(7), 0x610007d8);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(8), 0x620007e0);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(9), 0x61001178);
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(10), 0x64001180);
+
+        /* RB registers */
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(11), 0x60003300);
+
+        /* VBIF registers */
+        gpu_write(gpu, REG_A3XX_CP_PROTECT(12), 0x6b00c000);
+
+        /* NOTE: PM4/micro-engine firmware registers look to be the same
+         * for a2xx and a3xx.. we could possibly push that part down to
+         * adreno_gpu base class.  Or push both PM4 and PFP but
+         * parameterize the pfp ucode addr/data registers..
+         */
+
+        /* Load PM4: */
+        ptr = (uint32_t *)(adreno_gpu->pm4->data);
+        len = adreno_gpu->pm4->size / 4;
+        DBG("loading PM4 ucode version: %u", ptr[0]);
+
+        gpu_write(gpu, REG_AXXX_CP_DEBUG,
+                        AXXX_CP_DEBUG_DYNAMIC_CLK_DISABLE |
+                        AXXX_CP_DEBUG_MIU_128BIT_WRITE_ENABLE);
+        gpu_write(gpu, REG_AXXX_CP_ME_RAM_WADDR, 0);
+        for (i = 1; i < len; i++)
+                gpu_write(gpu, REG_AXXX_CP_ME_RAM_DATA, ptr[i]);
+
+        /* Load PFP: */
+        ptr = (uint32_t *)(adreno_gpu->pfp->data);
+        len = adreno_gpu->pfp->size / 4;
+        DBG("loading PFP ucode version: %u", ptr[0]);
+
+        gpu_write(gpu, REG_A3XX_CP_PFP_UCODE_ADDR, 0);
+        for (i = 1; i < len; i++)
+                gpu_write(gpu, REG_A3XX_CP_PFP_UCODE_DATA, ptr[i]);
+
+        /* CP ROQ queue sizes (bytes) - RB:16, ST:16, IB1:32, IB2:64 */
+        if (adreno_is_a305(adreno_gpu) || adreno_is_a320(adreno_gpu))
+                gpu_write(gpu, REG_AXXX_CP_QUEUE_THRESHOLDS,
+                                AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START(2) |
+                                AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START(6) |
+                                AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START(14));
+
+
+        /* clear ME_HALT to start micro engine */
+        gpu_write(gpu, REG_AXXX_CP_ME_CNTL, 0);
+
+        a3xx_me_init(gpu);
+
+        return 0;
+}
+
+static void a3xx_destroy(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        struct a3xx_gpu *a3xx_gpu = to_a3xx_gpu(adreno_gpu);
+
+        DBG("%s", gpu->name);
+
+        adreno_gpu_cleanup(adreno_gpu);
+        put_device(&a3xx_gpu->pdev->dev);
+        kfree(a3xx_gpu);
+}
+
+static void a3xx_idle(struct msm_gpu *gpu)
+{
+        unsigned long t;
+
+        /* wait for ringbuffer to drain: */
+        adreno_idle(gpu);
+
+        t = jiffies + ADRENO_IDLE_TIMEOUT;
+
+        /* then wait for GPU to finish: */
+        do {
+                uint32_t rbbm_status = gpu_read(gpu, REG_A3XX_RBBM_STATUS);
+                if (!(rbbm_status & A3XX_RBBM_STATUS_GPU_BUSY))
+                        return;
+        } while(time_before(jiffies, t));
+
+        DRM_ERROR("timeout waiting for %s to idle!\n", gpu->name);
+
+        /* TODO maybe we need to reset GPU here to recover from hang? */
+}
+
+static irqreturn_t a3xx_irq(struct msm_gpu *gpu)
+{
+        uint32_t status;
+
+        status = gpu_read(gpu, REG_A3XX_RBBM_INT_0_STATUS);
+        DBG("%s: %08x", gpu->name, status);
+
+        // TODO
+
+        gpu_write(gpu, REG_A3XX_RBBM_INT_CLEAR_CMD, status);
+
+        msm_gpu_retire(gpu);
+
+        return IRQ_HANDLED;
+}
+
+#ifdef CONFIG_DEBUG_FS
+static const unsigned int a3xx_registers[] = {
+        0x0000, 0x0002, 0x0010, 0x0012, 0x0018, 0x0018, 0x0020, 0x0027,
+        0x0029, 0x002b, 0x002e, 0x0033, 0x0040, 0x0042, 0x0050, 0x005c,
+        0x0060, 0x006c, 0x0080, 0x0082, 0x0084, 0x0088, 0x0090, 0x00e5,
+        0x00ea, 0x00ed, 0x0100, 0x0100, 0x0110, 0x0123, 0x01c0, 0x01c1,
+        0x01c3, 0x01c5, 0x01c7, 0x01c7, 0x01d5, 0x01d9, 0x01dc, 0x01dd,
+        0x01ea, 0x01ea, 0x01ee, 0x01f1, 0x01f5, 0x01f5, 0x01fc, 0x01ff,
+        0x0440, 0x0440, 0x0443, 0x0443, 0x0445, 0x0445, 0x044d, 0x044f,
+        0x0452, 0x0452, 0x0454, 0x046f, 0x047c, 0x047c, 0x047f, 0x047f,
+        0x0578, 0x057f, 0x0600, 0x0602, 0x0605, 0x0607, 0x060a, 0x060e,
+        0x0612, 0x0614, 0x0c01, 0x0c02, 0x0c06, 0x0c1d, 0x0c3d, 0x0c3f,
+        0x0c48, 0x0c4b, 0x0c80, 0x0c80, 0x0c88, 0x0c8b, 0x0ca0, 0x0cb7,
+        0x0cc0, 0x0cc1, 0x0cc6, 0x0cc7, 0x0ce4, 0x0ce5, 0x0e00, 0x0e05,
+        0x0e0c, 0x0e0c, 0x0e22, 0x0e23, 0x0e41, 0x0e45, 0x0e64, 0x0e65,
+        0x0e80, 0x0e82, 0x0e84, 0x0e89, 0x0ea0, 0x0ea1, 0x0ea4, 0x0ea7,
+        0x0ec4, 0x0ecb, 0x0ee0, 0x0ee0, 0x0f00, 0x0f01, 0x0f03, 0x0f09,
+        0x2040, 0x2040, 0x2044, 0x2044, 0x2048, 0x204d, 0x2068, 0x2069,
+        0x206c, 0x206d, 0x2070, 0x2070, 0x2072, 0x2072, 0x2074, 0x2075,
+        0x2079, 0x207a, 0x20c0, 0x20d3, 0x20e4, 0x20ef, 0x2100, 0x2109,
+        0x210c, 0x210c, 0x210e, 0x210e, 0x2110, 0x2111, 0x2114, 0x2115,
+        0x21e4, 0x21e4, 0x21ea, 0x21ea, 0x21ec, 0x21ed, 0x21f0, 0x21f0,
+        0x2200, 0x2212, 0x2214, 0x2217, 0x221a, 0x221a, 0x2240, 0x227e,
+        0x2280, 0x228b, 0x22c0, 0x22c0, 0x22c4, 0x22ce, 0x22d0, 0x22d8,
+        0x22df, 0x22e6, 0x22e8, 0x22e9, 0x22ec, 0x22ec, 0x22f0, 0x22f7,
+        0x22ff, 0x22ff, 0x2340, 0x2343, 0x2348, 0x2349, 0x2350, 0x2356,
+        0x2360, 0x2360, 0x2440, 0x2440, 0x2444, 0x2444, 0x2448, 0x244d,
+        0x2468, 0x2469, 0x246c, 0x246d, 0x2470, 0x2470, 0x2472, 0x2472,
+        0x2474, 0x2475, 0x2479, 0x247a, 0x24c0, 0x24d3, 0x24e4, 0x24ef,
+        0x2500, 0x2509, 0x250c, 0x250c, 0x250e, 0x250e, 0x2510, 0x2511,
+        0x2514, 0x2515, 0x25e4, 0x25e4, 0x25ea, 0x25ea, 0x25ec, 0x25ed,
+        0x25f0, 0x25f0, 0x2600, 0x2612, 0x2614, 0x2617, 0x261a, 0x261a,
+        0x2640, 0x267e, 0x2680, 0x268b, 0x26c0, 0x26c0, 0x26c4, 0x26ce,
+        0x26d0, 0x26d8, 0x26df, 0x26e6, 0x26e8, 0x26e9, 0x26ec, 0x26ec,
+        0x26f0, 0x26f7, 0x26ff, 0x26ff, 0x2740, 0x2743, 0x2748, 0x2749,
+        0x2750, 0x2756, 0x2760, 0x2760, 0x300c, 0x300e, 0x301c, 0x301d,
+        0x302a, 0x302a, 0x302c, 0x302d, 0x3030, 0x3031, 0x3034, 0x3036,
+        0x303c, 0x303c, 0x305e, 0x305f,
+};
+
+static void a3xx_show(struct msm_gpu *gpu, struct seq_file *m)
+{
+        int i;
+
+        adreno_show(gpu, m);
+        seq_printf(m, "status:   %08x\n",
+                        gpu_read(gpu, REG_A3XX_RBBM_STATUS));
+
+        /* dump these out in a form that can be parsed by demsm: */
+        seq_printf(m, "IO:region %s 00000000 00020000\n", gpu->name);
+        for (i = 0; i < ARRAY_SIZE(a3xx_registers); i += 2) {
+                uint32_t start = a3xx_registers[i];
+                uint32_t end   = a3xx_registers[i+1];
+                uint32_t addr;
+
+                for (addr = start; addr <= end; addr++) {
+                        uint32_t val = gpu_read(gpu, addr);
+                        seq_printf(m, "IO:R %08x %08x\n", addr<<2, val);
+                }
+        }
+}
+#endif
+
+static const struct adreno_gpu_funcs funcs = {
+        .base = {
+                .get_param = adreno_get_param,
+                .hw_init = a3xx_hw_init,
+                .pm_suspend = msm_gpu_pm_suspend,
+                .pm_resume = msm_gpu_pm_resume,
+                .recover = adreno_recover,
+                .last_fence = adreno_last_fence,
+                .submit = adreno_submit,
+                .flush = adreno_flush,
+                .idle = a3xx_idle,
+                .irq = a3xx_irq,
+                .destroy = a3xx_destroy,
+#ifdef CONFIG_DEBUG_FS
+                .show = a3xx_show,
+#endif
+        },
+};
+
+struct msm_gpu *a3xx_gpu_init(struct drm_device *dev)
+{
+        struct a3xx_gpu *a3xx_gpu = NULL;
+        struct msm_gpu *gpu;
+        struct platform_device *pdev = a3xx_pdev;
+        struct adreno_platform_config *config;
+        int ret;
+
+        if (!pdev) {
+                dev_err(dev->dev, "no a3xx device\n");
+                ret = -ENXIO;
+                goto fail;
+        }
+
+        config = pdev->dev.platform_data;
+
+        a3xx_gpu = kzalloc(sizeof(*a3xx_gpu), GFP_KERNEL);
+        if (!a3xx_gpu) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        gpu = &a3xx_gpu->base.base;
+
+        get_device(&pdev->dev);
+        a3xx_gpu->pdev = pdev;
+
+        gpu->fast_rate = config->fast_rate;
+        gpu->slow_rate = config->slow_rate;
+        gpu->bus_freq  = config->bus_freq;
+
+        DBG("fast_rate=%u, slow_rate=%u, bus_freq=%u",
+                        gpu->fast_rate, gpu->slow_rate, gpu->bus_freq);
+
+        ret = adreno_gpu_init(dev, pdev, &a3xx_gpu->base,
+                        &funcs, config->rev);
+        if (ret)
+                goto fail;
+
+        return &a3xx_gpu->base.base;
+
+fail:
+        if (a3xx_gpu)
+                a3xx_destroy(&a3xx_gpu->base.base);
+
+        return ERR_PTR(ret);
+}
+
+/*
+ * The a3xx device:
+ */
+
+static int a3xx_probe(struct platform_device *pdev)
+{
+        static struct adreno_platform_config config = {};
+#ifdef CONFIG_OF
+        /* TODO */
+#else
+        uint32_t version = socinfo_get_version();
+        if (cpu_is_apq8064ab()) {
+                config.fast_rate = 450000000;
+                config.slow_rate = 27000000;
+                config.bus_freq  = 4;
+                config.rev = ADRENO_REV(3, 2, 1, 0);
+        } else if (cpu_is_apq8064() || cpu_is_msm8960ab()) {
+                config.fast_rate = 400000000;
+                config.slow_rate = 27000000;
+                config.bus_freq  = 4;
+
+                if (SOCINFO_VERSION_MAJOR(version) == 2)
+                        config.rev = ADRENO_REV(3, 2, 0, 2);
+                else if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
+                                (SOCINFO_VERSION_MINOR(version) == 1))
+                        config.rev = ADRENO_REV(3, 2, 0, 1);
+                else
+                        config.rev = ADRENO_REV(3, 2, 0, 0);
+
+        } else if (cpu_is_msm8930()) {
+                config.fast_rate = 400000000;
+                config.slow_rate = 27000000;
+                config.bus_freq  = 3;
+
+                if ((SOCINFO_VERSION_MAJOR(version) == 1) &&
+                        (SOCINFO_VERSION_MINOR(version) == 2))
+                        config.rev = ADRENO_REV(3, 0, 5, 2);
+                else
+                        config.rev = ADRENO_REV(3, 0, 5, 0);
+
+        }
+#endif
+        pdev->dev.platform_data = &config;
+        a3xx_pdev = pdev;
+        return 0;
+}
+
+static int a3xx_remove(struct platform_device *pdev)
+{
+        a3xx_pdev = NULL;
+        return 0;
+}
+
+static struct platform_driver a3xx_driver = {
+        .probe = a3xx_probe,
+        .remove = a3xx_remove,
+        .driver.name = "kgsl-3d0",
+};
+
+void __init a3xx_register(void)
+{
+        platform_driver_register(&a3xx_driver);
+}
+
+void __exit a3xx_unregister(void)
+{
+        platform_driver_unregister(&a3xx_driver);
+}
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
new file mode 100644
index 000000000000..32c398c2d00a
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __A3XX_GPU_H__
+#define __A3XX_GPU_H__
+
+#include "adreno_gpu.h"
+#include "a3xx.xml.h"
+
+struct a3xx_gpu {
+        struct adreno_gpu base;
+        struct platform_device *pdev;
+};
+#define to_a3xx_gpu(x) container_of(x, struct a3xx_gpu, base)
+
+#endif /* __A3XX_GPU_H__ */
diff --git a/drivers/gpu/drm/msm/adreno/adreno_common.xml.h b/drivers/gpu/drm/msm/adreno/adreno_common.xml.h
new file mode 100644
index 000000000000..61979d458ac0
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/adreno_common.xml.h
@@ -0,0 +1,432 @@
+#ifndef ADRENO_COMMON_XML
+#define ADRENO_COMMON_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml              (    327 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  30005 bytes, from 2013-07-19 21:30:48)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9712 bytes, from 2013-05-26 15:22:37)
+- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51415 bytes, from 2013-08-03 14:26:05)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum adreno_pa_su_sc_draw {
+        PC_DRAW_POINTS = 0,
+        PC_DRAW_LINES = 1,
+        PC_DRAW_TRIANGLES = 2,
+};
+
+enum adreno_compare_func {
+        FUNC_NEVER = 0,
+        FUNC_LESS = 1,
+        FUNC_EQUAL = 2,
+        FUNC_LEQUAL = 3,
+        FUNC_GREATER = 4,
+        FUNC_NOTEQUAL = 5,
+        FUNC_GEQUAL = 6,
+        FUNC_ALWAYS = 7,
+};
+
+enum adreno_stencil_op {
+        STENCIL_KEEP = 0,
+        STENCIL_ZERO = 1,
+        STENCIL_REPLACE = 2,
+        STENCIL_INCR_CLAMP = 3,
+        STENCIL_DECR_CLAMP = 4,
+        STENCIL_INVERT = 5,
+        STENCIL_INCR_WRAP = 6,
+        STENCIL_DECR_WRAP = 7,
+};
+
+enum adreno_rb_blend_factor {
+        FACTOR_ZERO = 0,
+        FACTOR_ONE = 1,
+        FACTOR_SRC_COLOR = 4,
+        FACTOR_ONE_MINUS_SRC_COLOR = 5,
+        FACTOR_SRC_ALPHA = 6,
+        FACTOR_ONE_MINUS_SRC_ALPHA = 7,
+        FACTOR_DST_COLOR = 8,
+        FACTOR_ONE_MINUS_DST_COLOR = 9,
+        FACTOR_DST_ALPHA = 10,
+        FACTOR_ONE_MINUS_DST_ALPHA = 11,
+        FACTOR_CONSTANT_COLOR = 12,
+        FACTOR_ONE_MINUS_CONSTANT_COLOR = 13,
+        FACTOR_CONSTANT_ALPHA = 14,
+        FACTOR_ONE_MINUS_CONSTANT_ALPHA = 15,
+        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,
+        ENDIAN_8IN32 = 2,
+        ENDIAN_16IN32 = 3,
+        ENDIAN_8IN64 = 4,
+        ENDIAN_8IN128 = 5,
+};
+
+enum adreno_rb_dither_mode {
+        DITHER_DISABLE = 0,
+        DITHER_ALWAYS = 1,
+        DITHER_IF_ALPHA_OFF = 2,
+};
+
+enum adreno_rb_depth_format {
+        DEPTHX_16 = 0,
+        DEPTHX_24_8 = 1,
+};
+
+enum adreno_mmu_clnt_beh {
+        BEH_NEVR = 0,
+        BEH_TRAN_RNG = 1,
+        BEH_TRAN_FLT = 2,
+};
+
+#define REG_AXXX_MH_MMU_CONFIG                                  0x00000040
+#define AXXX_MH_MMU_CONFIG_MMU_ENABLE                           0x00000001
+#define AXXX_MH_MMU_CONFIG_SPLIT_MODE_ENABLE                    0x00000002
+#define AXXX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__MASK             0x00000030
+#define AXXX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__SHIFT            4
+static inline uint32_t AXXX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_RB_W_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__MASK             0x000000c0
+#define AXXX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__SHIFT            6
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_W_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__MASK            0x00000300
+#define AXXX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__SHIFT           8
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_R0_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__MASK            0x00000c00
+#define AXXX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__SHIFT           10
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_R1_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__MASK            0x00003000
+#define AXXX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__SHIFT           12
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_R2_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__MASK            0x0000c000
+#define AXXX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__SHIFT           14
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_R3_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__MASK            0x00030000
+#define AXXX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__SHIFT           16
+static inline uint32_t AXXX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_CP_R4_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__MASK           0x000c0000
+#define AXXX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__SHIFT          18
+static inline uint32_t AXXX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_VGT_R0_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__MASK           0x00300000
+#define AXXX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__SHIFT          20
+static inline uint32_t AXXX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_VGT_R1_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__MASK             0x00c00000
+#define AXXX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__SHIFT            22
+static inline uint32_t AXXX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_TC_R_CLNT_BEHAVIOR__MASK;
+}
+#define AXXX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__MASK             0x03000000
+#define AXXX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__SHIFT            24
+static inline uint32_t AXXX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR(enum adreno_mmu_clnt_beh val)
+{
+        return ((val) << AXXX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__SHIFT) & AXXX_MH_MMU_CONFIG_PA_W_CLNT_BEHAVIOR__MASK;
+}
+
+#define REG_AXXX_MH_MMU_VA_RANGE                                0x00000041
+
+#define REG_AXXX_MH_MMU_PT_BASE                                 0x00000042
+
+#define REG_AXXX_MH_MMU_PAGE_FAULT                              0x00000043
+
+#define REG_AXXX_MH_MMU_TRAN_ERROR                              0x00000044
+
+#define REG_AXXX_MH_MMU_INVALIDATE                              0x00000045
+
+#define REG_AXXX_MH_MMU_MPU_BASE                                0x00000046
+
+#define REG_AXXX_MH_MMU_MPU_END                                 0x00000047
+
+#define REG_AXXX_CP_RB_BASE                                     0x000001c0
+
+#define REG_AXXX_CP_RB_CNTL                                     0x000001c1
+#define AXXX_CP_RB_CNTL_BUFSZ__MASK                             0x0000003f
+#define AXXX_CP_RB_CNTL_BUFSZ__SHIFT                            0
+static inline uint32_t AXXX_CP_RB_CNTL_BUFSZ(uint32_t val)
+{
+        return ((val) << AXXX_CP_RB_CNTL_BUFSZ__SHIFT) & AXXX_CP_RB_CNTL_BUFSZ__MASK;
+}
+#define AXXX_CP_RB_CNTL_BLKSZ__MASK                             0x00003f00
+#define AXXX_CP_RB_CNTL_BLKSZ__SHIFT                            8
+static inline uint32_t AXXX_CP_RB_CNTL_BLKSZ(uint32_t val)
+{
+        return ((val) << AXXX_CP_RB_CNTL_BLKSZ__SHIFT) & AXXX_CP_RB_CNTL_BLKSZ__MASK;
+}
+#define AXXX_CP_RB_CNTL_BUF_SWAP__MASK                          0x00030000
+#define AXXX_CP_RB_CNTL_BUF_SWAP__SHIFT                         16
+static inline uint32_t AXXX_CP_RB_CNTL_BUF_SWAP(uint32_t val)
+{
+        return ((val) << AXXX_CP_RB_CNTL_BUF_SWAP__SHIFT) & AXXX_CP_RB_CNTL_BUF_SWAP__MASK;
+}
+#define AXXX_CP_RB_CNTL_POLL_EN                                 0x00100000
+#define AXXX_CP_RB_CNTL_NO_UPDATE                               0x08000000
+#define AXXX_CP_RB_CNTL_RPTR_WR_EN                              0x80000000
+
+#define REG_AXXX_CP_RB_RPTR_ADDR                                0x000001c3
+#define AXXX_CP_RB_RPTR_ADDR_SWAP__MASK                         0x00000003
+#define AXXX_CP_RB_RPTR_ADDR_SWAP__SHIFT                        0
+static inline uint32_t AXXX_CP_RB_RPTR_ADDR_SWAP(uint32_t val)
+{
+        return ((val) << AXXX_CP_RB_RPTR_ADDR_SWAP__SHIFT) & AXXX_CP_RB_RPTR_ADDR_SWAP__MASK;
+}
+#define AXXX_CP_RB_RPTR_ADDR_ADDR__MASK                         0xfffffffc
+#define AXXX_CP_RB_RPTR_ADDR_ADDR__SHIFT                        2
+static inline uint32_t AXXX_CP_RB_RPTR_ADDR_ADDR(uint32_t val)
+{
+        return ((val >> 2) << AXXX_CP_RB_RPTR_ADDR_ADDR__SHIFT) & AXXX_CP_RB_RPTR_ADDR_ADDR__MASK;
+}
+
+#define REG_AXXX_CP_RB_RPTR                                     0x000001c4
+
+#define REG_AXXX_CP_RB_WPTR                                     0x000001c5
+
+#define REG_AXXX_CP_RB_WPTR_DELAY                               0x000001c6
+
+#define REG_AXXX_CP_RB_RPTR_WR                                  0x000001c7
+
+#define REG_AXXX_CP_RB_WPTR_BASE                                0x000001c8
+
+#define REG_AXXX_CP_QUEUE_THRESHOLDS                            0x000001d5
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START__MASK            0x0000000f
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START__SHIFT           0
+static inline uint32_t AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START(uint32_t val)
+{
+        return ((val) << AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START__SHIFT) & AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB1_START__MASK;
+}
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START__MASK            0x00000f00
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START__SHIFT           8
+static inline uint32_t AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START(uint32_t val)
+{
+        return ((val) << AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START__SHIFT) & AXXX_CP_QUEUE_THRESHOLDS_CSQ_IB2_START__MASK;
+}
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START__MASK             0x000f0000
+#define AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START__SHIFT            16
+static inline uint32_t AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START(uint32_t val)
+{
+        return ((val) << AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START__SHIFT) & AXXX_CP_QUEUE_THRESHOLDS_CSQ_ST_START__MASK;
+}
+
+#define REG_AXXX_CP_MEQ_THRESHOLDS                              0x000001d6
+
+#define REG_AXXX_CP_CSQ_AVAIL                                   0x000001d7
+#define AXXX_CP_CSQ_AVAIL_RING__MASK                            0x0000007f
+#define AXXX_CP_CSQ_AVAIL_RING__SHIFT                           0
+static inline uint32_t AXXX_CP_CSQ_AVAIL_RING(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_AVAIL_RING__SHIFT) & AXXX_CP_CSQ_AVAIL_RING__MASK;
+}
+#define AXXX_CP_CSQ_AVAIL_IB1__MASK                             0x00007f00
+#define AXXX_CP_CSQ_AVAIL_IB1__SHIFT                            8
+static inline uint32_t AXXX_CP_CSQ_AVAIL_IB1(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_AVAIL_IB1__SHIFT) & AXXX_CP_CSQ_AVAIL_IB1__MASK;
+}
+#define AXXX_CP_CSQ_AVAIL_IB2__MASK                             0x007f0000
+#define AXXX_CP_CSQ_AVAIL_IB2__SHIFT                            16
+static inline uint32_t AXXX_CP_CSQ_AVAIL_IB2(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_AVAIL_IB2__SHIFT) & AXXX_CP_CSQ_AVAIL_IB2__MASK;
+}
+
+#define REG_AXXX_CP_STQ_AVAIL                                   0x000001d8
+#define AXXX_CP_STQ_AVAIL_ST__MASK                              0x0000007f
+#define AXXX_CP_STQ_AVAIL_ST__SHIFT                             0
+static inline uint32_t AXXX_CP_STQ_AVAIL_ST(uint32_t val)
+{
+        return ((val) << AXXX_CP_STQ_AVAIL_ST__SHIFT) & AXXX_CP_STQ_AVAIL_ST__MASK;
+}
+
+#define REG_AXXX_CP_MEQ_AVAIL                                   0x000001d9
+#define AXXX_CP_MEQ_AVAIL_MEQ__MASK                             0x0000001f
+#define AXXX_CP_MEQ_AVAIL_MEQ__SHIFT                            0
+static inline uint32_t AXXX_CP_MEQ_AVAIL_MEQ(uint32_t val)
+{
+        return ((val) << AXXX_CP_MEQ_AVAIL_MEQ__SHIFT) & AXXX_CP_MEQ_AVAIL_MEQ__MASK;
+}
+
+#define REG_AXXX_SCRATCH_UMSK                                   0x000001dc
+#define AXXX_SCRATCH_UMSK_UMSK__MASK                            0x000000ff
+#define AXXX_SCRATCH_UMSK_UMSK__SHIFT                           0
+static inline uint32_t AXXX_SCRATCH_UMSK_UMSK(uint32_t val)
+{
+        return ((val) << AXXX_SCRATCH_UMSK_UMSK__SHIFT) & AXXX_SCRATCH_UMSK_UMSK__MASK;
+}
+#define AXXX_SCRATCH_UMSK_SWAP__MASK                            0x00030000
+#define AXXX_SCRATCH_UMSK_SWAP__SHIFT                           16
+static inline uint32_t AXXX_SCRATCH_UMSK_SWAP(uint32_t val)
+{
+        return ((val) << AXXX_SCRATCH_UMSK_SWAP__SHIFT) & AXXX_SCRATCH_UMSK_SWAP__MASK;
+}
+
+#define REG_AXXX_SCRATCH_ADDR                                   0x000001dd
+
+#define REG_AXXX_CP_ME_RDADDR                                   0x000001ea
+
+#define REG_AXXX_CP_STATE_DEBUG_INDEX                           0x000001ec
+
+#define REG_AXXX_CP_STATE_DEBUG_DATA                            0x000001ed
+
+#define REG_AXXX_CP_INT_CNTL                                    0x000001f2
+
+#define REG_AXXX_CP_INT_STATUS                                  0x000001f3
+
+#define REG_AXXX_CP_INT_ACK                                     0x000001f4
+
+#define REG_AXXX_CP_ME_CNTL                                     0x000001f6
+
+#define REG_AXXX_CP_ME_STATUS                                   0x000001f7
+
+#define REG_AXXX_CP_ME_RAM_WADDR                                0x000001f8
+
+#define REG_AXXX_CP_ME_RAM_RADDR                                0x000001f9
+
+#define REG_AXXX_CP_ME_RAM_DATA                                 0x000001fa
+
+#define REG_AXXX_CP_DEBUG                                       0x000001fc
+#define AXXX_CP_DEBUG_PREDICATE_DISABLE                         0x00800000
+#define AXXX_CP_DEBUG_PROG_END_PTR_ENABLE                       0x01000000
+#define AXXX_CP_DEBUG_MIU_128BIT_WRITE_ENABLE                   0x02000000
+#define AXXX_CP_DEBUG_PREFETCH_PASS_NOPS                        0x04000000
+#define AXXX_CP_DEBUG_DYNAMIC_CLK_DISABLE                       0x08000000
+#define AXXX_CP_DEBUG_PREFETCH_MATCH_DISABLE                    0x10000000
+#define AXXX_CP_DEBUG_SIMPLE_ME_FLOW_CONTROL                    0x40000000
+#define AXXX_CP_DEBUG_MIU_WRITE_PACK_DISABLE                    0x80000000
+
+#define REG_AXXX_CP_CSQ_RB_STAT                                 0x000001fd
+#define AXXX_CP_CSQ_RB_STAT_RPTR__MASK                          0x0000007f
+#define AXXX_CP_CSQ_RB_STAT_RPTR__SHIFT                         0
+static inline uint32_t AXXX_CP_CSQ_RB_STAT_RPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_RB_STAT_RPTR__SHIFT) & AXXX_CP_CSQ_RB_STAT_RPTR__MASK;
+}
+#define AXXX_CP_CSQ_RB_STAT_WPTR__MASK                          0x007f0000
+#define AXXX_CP_CSQ_RB_STAT_WPTR__SHIFT                         16
+static inline uint32_t AXXX_CP_CSQ_RB_STAT_WPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_RB_STAT_WPTR__SHIFT) & AXXX_CP_CSQ_RB_STAT_WPTR__MASK;
+}
+
+#define REG_AXXX_CP_CSQ_IB1_STAT                                0x000001fe
+#define AXXX_CP_CSQ_IB1_STAT_RPTR__MASK                         0x0000007f
+#define AXXX_CP_CSQ_IB1_STAT_RPTR__SHIFT                        0
+static inline uint32_t AXXX_CP_CSQ_IB1_STAT_RPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_IB1_STAT_RPTR__SHIFT) & AXXX_CP_CSQ_IB1_STAT_RPTR__MASK;
+}
+#define AXXX_CP_CSQ_IB1_STAT_WPTR__MASK                         0x007f0000
+#define AXXX_CP_CSQ_IB1_STAT_WPTR__SHIFT                        16
+static inline uint32_t AXXX_CP_CSQ_IB1_STAT_WPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_IB1_STAT_WPTR__SHIFT) & AXXX_CP_CSQ_IB1_STAT_WPTR__MASK;
+}
+
+#define REG_AXXX_CP_CSQ_IB2_STAT                                0x000001ff
+#define AXXX_CP_CSQ_IB2_STAT_RPTR__MASK                         0x0000007f
+#define AXXX_CP_CSQ_IB2_STAT_RPTR__SHIFT                        0
+static inline uint32_t AXXX_CP_CSQ_IB2_STAT_RPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_IB2_STAT_RPTR__SHIFT) & AXXX_CP_CSQ_IB2_STAT_RPTR__MASK;
+}
+#define AXXX_CP_CSQ_IB2_STAT_WPTR__MASK                         0x007f0000
+#define AXXX_CP_CSQ_IB2_STAT_WPTR__SHIFT                        16
+static inline uint32_t AXXX_CP_CSQ_IB2_STAT_WPTR(uint32_t val)
+{
+        return ((val) << AXXX_CP_CSQ_IB2_STAT_WPTR__SHIFT) & AXXX_CP_CSQ_IB2_STAT_WPTR__MASK;
+}
+
+#define REG_AXXX_CP_SCRATCH_REG0                                0x00000578
+
+#define REG_AXXX_CP_SCRATCH_REG1                                0x00000579
+
+#define REG_AXXX_CP_SCRATCH_REG2                                0x0000057a
+
+#define REG_AXXX_CP_SCRATCH_REG3                                0x0000057b
+
+#define REG_AXXX_CP_SCRATCH_REG4                                0x0000057c
+
+#define REG_AXXX_CP_SCRATCH_REG5                                0x0000057d
+
+#define REG_AXXX_CP_SCRATCH_REG6                                0x0000057e
+
+#define REG_AXXX_CP_SCRATCH_REG7                                0x0000057f
+
+#define REG_AXXX_CP_ME_CF_EVENT_SRC                             0x0000060a
+
+#define REG_AXXX_CP_ME_CF_EVENT_ADDR                            0x0000060b
+
+#define REG_AXXX_CP_ME_CF_EVENT_DATA                            0x0000060c
+
+#define REG_AXXX_CP_ME_NRT_ADDR                                 0x0000060d
+
+#define REG_AXXX_CP_ME_NRT_DATA                                 0x0000060e
+
+
+#endif /* ADRENO_COMMON_XML */
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
new file mode 100644
index 000000000000..a60584763b61
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "adreno_gpu.h"
+#include "msm_gem.h"
+
+struct adreno_info {
+        struct adreno_rev rev;
+        uint32_t revn;
+        const char *name;
+        const char *pm4fw, *pfpfw;
+        uint32_t gmem;
+};
+
+#define ANY_ID 0xff
+
+static const struct adreno_info gpulist[] = {
+        {
+                .rev   = ADRENO_REV(3, 0, 5, ANY_ID),
+                .revn  = 305,
+                .name  = "A305",
+                .pm4fw = "a300_pm4.fw",
+                .pfpfw = "a300_pfp.fw",
+                .gmem  = SZ_256K,
+        }, {
+                .rev   = ADRENO_REV(3, 2, ANY_ID, ANY_ID),
+                .revn  = 320,
+                .name  = "A320",
+                .pm4fw = "a300_pm4.fw",
+                .pfpfw = "a300_pfp.fw",
+                .gmem  = SZ_512K,
+        }, {
+                .rev   = ADRENO_REV(3, 3, 0, 0),
+                .revn  = 330,
+                .name  = "A330",
+                .pm4fw = "a330_pm4.fw",
+                .pfpfw = "a330_pfp.fw",
+                .gmem  = SZ_1M,
+        },
+};
+
+#define RB_SIZE    SZ_32K
+#define RB_BLKSIZE 16
+
+int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+
+        switch (param) {
+        case MSM_PARAM_GPU_ID:
+                *value = adreno_gpu->info->revn;
+                return 0;
+        case MSM_PARAM_GMEM_SIZE:
+                *value = adreno_gpu->info->gmem;
+                return 0;
+        default:
+                DBG("%s: invalid param: %u", gpu->name, param);
+                return -EINVAL;
+        }
+}
+
+#define rbmemptr(adreno_gpu, member)  \
+        ((adreno_gpu)->memptrs_iova + offsetof(struct adreno_rbmemptrs, member))
+
+int adreno_hw_init(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+
+        DBG("%s", gpu->name);
+
+        /* Setup REG_CP_RB_CNTL: */
+        gpu_write(gpu, REG_AXXX_CP_RB_CNTL,
+                        /* size is log2(quad-words): */
+                        AXXX_CP_RB_CNTL_BUFSZ(ilog2(gpu->rb->size / 8)) |
+                        AXXX_CP_RB_CNTL_BLKSZ(RB_BLKSIZE));
+
+        /* Setup ringbuffer address: */
+        gpu_write(gpu, REG_AXXX_CP_RB_BASE, gpu->rb_iova);
+        gpu_write(gpu, REG_AXXX_CP_RB_RPTR_ADDR, rbmemptr(adreno_gpu, rptr));
+
+        /* Setup scratch/timestamp: */
+        gpu_write(gpu, REG_AXXX_SCRATCH_ADDR, rbmemptr(adreno_gpu, fence));
+
+        gpu_write(gpu, REG_AXXX_SCRATCH_UMSK, 0x1);
+
+        return 0;
+}
+
+static uint32_t get_wptr(struct msm_ringbuffer *ring)
+{
+        return ring->cur - ring->start;
+}
+
+uint32_t adreno_last_fence(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        return adreno_gpu->memptrs->fence;
+}
+
+void adreno_recover(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        struct drm_device *dev = gpu->dev;
+        int ret;
+
+        gpu->funcs->pm_suspend(gpu);
+
+        /* reset ringbuffer: */
+        gpu->rb->cur = gpu->rb->start;
+
+        /* reset completed fence seqno, just discard anything pending: */
+        adreno_gpu->memptrs->fence = gpu->submitted_fence;
+
+        gpu->funcs->pm_resume(gpu);
+        ret = gpu->funcs->hw_init(gpu);
+        if (ret) {
+                dev_err(dev->dev, "gpu hw init failed: %d\n", ret);
+                /* hmm, oh well? */
+        }
+}
+
+int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
+                struct msm_file_private *ctx)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        struct msm_drm_private *priv = gpu->dev->dev_private;
+        struct msm_ringbuffer *ring = gpu->rb;
+        unsigned i, ibs = 0;
+
+        for (i = 0; i < submit->nr_cmds; i++) {
+                switch (submit->cmd[i].type) {
+                case MSM_SUBMIT_CMD_IB_TARGET_BUF:
+                        /* ignore IB-targets */
+                        break;
+                case MSM_SUBMIT_CMD_CTX_RESTORE_BUF:
+                        /* ignore if there has not been a ctx switch: */
+                        if (priv->lastctx == ctx)
+                                break;
+                case MSM_SUBMIT_CMD_BUF:
+                        OUT_PKT3(ring, CP_INDIRECT_BUFFER_PFD, 2);
+                        OUT_RING(ring, submit->cmd[i].iova);
+                        OUT_RING(ring, submit->cmd[i].size);
+                        ibs++;
+                        break;
+                }
+        }
+
+        /* on a320, at least, we seem to need to pad things out to an
+         * even number of qwords to avoid issue w/ CP hanging on wrap-
+         * around:
+         */
+        if (ibs % 2)
+                OUT_PKT2(ring);
+
+        OUT_PKT0(ring, REG_AXXX_CP_SCRATCH_REG2, 1);
+        OUT_RING(ring, submit->fence);
+
+        if (adreno_is_a3xx(adreno_gpu)) {
+                /* Flush HLSQ lazy updates to make sure there is nothing
+                 * pending for indirect loads after the timestamp has
+                 * passed:
+                 */
+                OUT_PKT3(ring, CP_EVENT_WRITE, 1);
+                OUT_RING(ring, HLSQ_FLUSH);
+
+                OUT_PKT3(ring, CP_WAIT_FOR_IDLE, 1);
+                OUT_RING(ring, 0x00000000);
+        }
+
+        OUT_PKT3(ring, CP_EVENT_WRITE, 3);
+        OUT_RING(ring, CACHE_FLUSH_TS);
+        OUT_RING(ring, rbmemptr(adreno_gpu, fence));
+        OUT_RING(ring, submit->fence);
+
+        /* we could maybe be clever and only CP_COND_EXEC the interrupt: */
+        OUT_PKT3(ring, CP_INTERRUPT, 1);
+        OUT_RING(ring, 0x80000000);
+
+#if 0
+        if (adreno_is_a3xx(adreno_gpu)) {
+                /* Dummy set-constant to trigger context rollover */
+                OUT_PKT3(ring, CP_SET_CONSTANT, 2);
+                OUT_RING(ring, CP_REG(REG_A3XX_HLSQ_CL_KERNEL_GROUP_X_REG));
+                OUT_RING(ring, 0x00000000);
+        }
+#endif
+
+        gpu->funcs->flush(gpu);
+
+        return 0;
+}
+
+void adreno_flush(struct msm_gpu *gpu)
+{
+        uint32_t wptr = get_wptr(gpu->rb);
+
+        /* ensure writes to ringbuffer have hit system memory: */
+        mb();
+
+        gpu_write(gpu, REG_AXXX_CP_RB_WPTR, wptr);
+}
+
+void adreno_idle(struct msm_gpu *gpu)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        uint32_t rptr, wptr = get_wptr(gpu->rb);
+        unsigned long t;
+
+        t = jiffies + ADRENO_IDLE_TIMEOUT;
+
+        /* then wait for CP to drain ringbuffer: */
+        do {
+                rptr = adreno_gpu->memptrs->rptr;
+                if (rptr == wptr)
+                        return;
+        } while(time_before(jiffies, t));
+
+        DRM_ERROR("timeout waiting for %s to drain ringbuffer!\n", gpu->name);
+
+        /* TODO maybe we need to reset GPU here to recover from hang? */
+}
+
+#ifdef CONFIG_DEBUG_FS
+void adreno_show(struct msm_gpu *gpu, struct seq_file *m)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+
+        seq_printf(m, "revision: %d (%d.%d.%d.%d)\n",
+                        adreno_gpu->info->revn, adreno_gpu->rev.core,
+                        adreno_gpu->rev.major, adreno_gpu->rev.minor,
+                        adreno_gpu->rev.patchid);
+
+        seq_printf(m, "fence:    %d/%d\n", adreno_gpu->memptrs->fence,
+                        gpu->submitted_fence);
+        seq_printf(m, "rptr:     %d\n", adreno_gpu->memptrs->rptr);
+        seq_printf(m, "wptr:     %d\n", adreno_gpu->memptrs->wptr);
+        seq_printf(m, "rb wptr:  %d\n", get_wptr(gpu->rb));
+}
+#endif
+
+void adreno_wait_ring(struct msm_gpu *gpu, uint32_t ndwords)
+{
+        struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);
+        uint32_t freedwords;
+        do {
+                uint32_t size = gpu->rb->size / 4;
+                uint32_t wptr = get_wptr(gpu->rb);
+                uint32_t rptr = adreno_gpu->memptrs->rptr;
+                freedwords = (rptr + (size - 1) - wptr) % size;
+        } while(freedwords < ndwords);
+}
+
+static const char *iommu_ports[] = {
+                "gfx3d_user", "gfx3d_priv",
+                "gfx3d1_user", "gfx3d1_priv",
+};
+
+static inline bool _rev_match(uint8_t entry, uint8_t id)
+{
+        return (entry == ANY_ID) || (entry == id);
+}
+
+int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+                struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,
+                struct adreno_rev rev)
+{
+        int i, ret;
+
+        /* identify gpu: */
+        for (i = 0; i < ARRAY_SIZE(gpulist); i++) {
+                const struct adreno_info *info = &gpulist[i];
+                if (_rev_match(info->rev.core, rev.core) &&
+                                _rev_match(info->rev.major, rev.major) &&
+                                _rev_match(info->rev.minor, rev.minor) &&
+                                _rev_match(info->rev.patchid, rev.patchid)) {
+                        gpu->info = info;
+                        gpu->revn = info->revn;
+                        break;
+                }
+        }
+
+        if (i == ARRAY_SIZE(gpulist)) {
+                dev_err(drm->dev, "Unknown GPU revision: %u.%u.%u.%u\n",
+                                rev.core, rev.major, rev.minor, rev.patchid);
+                return -ENXIO;
+        }
+
+        DBG("Found GPU: %s (%u.%u.%u.%u)", gpu->info->name,
+                        rev.core, rev.major, rev.minor, rev.patchid);
+
+        gpu->funcs = funcs;
+        gpu->rev = rev;
+
+        ret = request_firmware(&gpu->pm4, gpu->info->pm4fw, drm->dev);
+        if (ret) {
+                dev_err(drm->dev, "failed to load %s PM4 firmware: %d\n",
+                                gpu->info->pm4fw, ret);
+                return ret;
+        }
+
+        ret = request_firmware(&gpu->pfp, gpu->info->pfpfw, drm->dev);
+        if (ret) {
+                dev_err(drm->dev, "failed to load %s PFP firmware: %d\n",
+                                gpu->info->pfpfw, ret);
+                return ret;
+        }
+
+        ret = msm_gpu_init(drm, pdev, &gpu->base, &funcs->base,
+                        gpu->info->name, "kgsl_3d0_reg_memory", "kgsl_3d0_irq",
+                        RB_SIZE);
+        if (ret)
+                return ret;
+
+        ret = msm_iommu_attach(drm, gpu->base.iommu,
+                        iommu_ports, ARRAY_SIZE(iommu_ports));
+        if (ret)
+                return ret;
+
+        gpu->memptrs_bo = msm_gem_new(drm, sizeof(*gpu->memptrs),
+                        MSM_BO_UNCACHED);
+        if (IS_ERR(gpu->memptrs_bo)) {
+                ret = PTR_ERR(gpu->memptrs_bo);
+                gpu->memptrs_bo = NULL;
+                dev_err(drm->dev, "could not allocate memptrs: %d\n", ret);
+                return ret;
+        }
+
+        gpu->memptrs = msm_gem_vaddr_locked(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,
+                        &gpu->memptrs_iova);
+        if (ret) {
+                dev_err(drm->dev, "could not map memptrs: %d\n", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+void adreno_gpu_cleanup(struct adreno_gpu *gpu)
+{
+        if (gpu->memptrs_bo) {
+                if (gpu->memptrs_iova)
+                        msm_gem_put_iova(gpu->memptrs_bo, gpu->base.id);
+                drm_gem_object_unreference(gpu->memptrs_bo);
+        }
+        if (gpu->pm4)
+                release_firmware(gpu->pm4);
+        if (gpu->pfp)
+                release_firmware(gpu->pfp);
+        msm_gpu_cleanup(&gpu->base);
+}
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
new file mode 100644
index 000000000000..f73abfba7c22
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ADRENO_GPU_H__
+#define __ADRENO_GPU_H__
+
+#include <linux/firmware.h>
+
+#include "msm_gpu.h"
+
+#include "adreno_common.xml.h"
+#include "adreno_pm4.xml.h"
+
+struct adreno_rev {
+        uint8_t  core;
+        uint8_t  major;
+        uint8_t  minor;
+        uint8_t  patchid;
+};
+
+#define ADRENO_REV(core, major, minor, patchid) \
+        ((struct adreno_rev){ core, major, minor, patchid })
+
+struct adreno_gpu_funcs {
+        struct msm_gpu_funcs base;
+};
+
+struct adreno_info;
+
+struct adreno_rbmemptrs {
+        volatile uint32_t rptr;
+        volatile uint32_t wptr;
+        volatile uint32_t fence;
+};
+
+struct adreno_gpu {
+        struct msm_gpu base;
+        struct adreno_rev rev;
+        const struct adreno_info *info;
+        uint32_t revn;  /* numeric revision name */
+        const struct adreno_gpu_funcs *funcs;
+
+        /* firmware: */
+        const struct firmware *pm4, *pfp;
+
+        /* ringbuffer rptr/wptr: */
+        // TODO should this be in msm_ringbuffer?  I think it would be
+        // different for z180..
+        struct adreno_rbmemptrs *memptrs;
+        struct drm_gem_object *memptrs_bo;
+        uint32_t memptrs_iova;
+};
+#define to_adreno_gpu(x) container_of(x, struct adreno_gpu, base)
+
+/* platform config data (ie. from DT, or pdata) */
+struct adreno_platform_config {
+        struct adreno_rev rev;
+        uint32_t fast_rate, slow_rate, bus_freq;
+};
+
+#define ADRENO_IDLE_TIMEOUT (20 * 1000)
+
+static inline bool adreno_is_a3xx(struct adreno_gpu *gpu)
+{
+        return (gpu->revn >= 300) && (gpu->revn < 400);
+}
+
+static inline bool adreno_is_a305(struct adreno_gpu *gpu)
+{
+        return gpu->revn == 305;
+}
+
+static inline bool adreno_is_a320(struct adreno_gpu *gpu)
+{
+        return gpu->revn == 320;
+}
+
+static inline bool adreno_is_a330(struct adreno_gpu *gpu)
+{
+        return gpu->revn == 330;
+}
+
+int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value);
+int adreno_hw_init(struct msm_gpu *gpu);
+uint32_t adreno_last_fence(struct msm_gpu *gpu);
+void adreno_recover(struct msm_gpu *gpu);
+int adreno_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
+                struct msm_file_private *ctx);
+void adreno_flush(struct msm_gpu *gpu);
+void adreno_idle(struct msm_gpu *gpu);
+#ifdef CONFIG_DEBUG_FS
+void adreno_show(struct msm_gpu *gpu, struct seq_file *m);
+#endif
+void adreno_wait_ring(struct msm_gpu *gpu, uint32_t ndwords);
+
+int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+                struct adreno_gpu *gpu, const struct adreno_gpu_funcs *funcs,
+                struct adreno_rev rev);
+void adreno_gpu_cleanup(struct adreno_gpu *gpu);
+
+
+/* ringbuffer helpers (the parts that are adreno specific) */
+
+static inline void
+OUT_PKT0(struct msm_ringbuffer *ring, uint16_t regindx, uint16_t cnt)
+{
+        adreno_wait_ring(ring->gpu, cnt+1);
+        OUT_RING(ring, CP_TYPE0_PKT | ((cnt-1) << 16) | (regindx & 0x7FFF));
+}
+
+/* no-op packet: */
+static inline void
+OUT_PKT2(struct msm_ringbuffer *ring)
+{
+        adreno_wait_ring(ring->gpu, 1);
+        OUT_RING(ring, CP_TYPE2_PKT);
+}
+
+static inline void
+OUT_PKT3(struct msm_ringbuffer *ring, uint8_t opcode, uint16_t cnt)
+{
+        adreno_wait_ring(ring->gpu, cnt+1);
+        OUT_RING(ring, CP_TYPE3_PKT | ((cnt-1) << 16) | ((opcode & 0xFF) << 8));
+}
+
+
+#endif /* __ADRENO_GPU_H__ */
diff --git a/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h b/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h
new file mode 100644
index 000000000000..94c13f418e75
--- /dev/null
+++ b/drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h
@@ -0,0 +1,254 @@
+#ifndef ADRENO_PM4_XML
+#define ADRENO_PM4_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/adreno.xml              (    327 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/a2xx/a2xx.xml           (  30005 bytes, from 2013-07-19 21:30:48)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_common.xml       (   8983 bytes, from 2013-07-24 01:38:36)
+- /home/robclark/src/freedreno/envytools/rnndb/adreno_pm4.xml          (   9712 bytes, from 2013-05-26 15:22:37)
+- /home/robclark/src/freedreno/envytools/rnndb/a3xx/a3xx.xml           (  51415 bytes, from 2013-08-03 14:26:05)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum vgt_event_type {
+        VS_DEALLOC = 0,
+        PS_DEALLOC = 1,
+        VS_DONE_TS = 2,
+        PS_DONE_TS = 3,
+        CACHE_FLUSH_TS = 4,
+        CONTEXT_DONE = 5,
+        CACHE_FLUSH = 6,
+        HLSQ_FLUSH = 7,
+        VIZQUERY_START = 7,
+        VIZQUERY_END = 8,
+        SC_WAIT_WC = 9,
+        RST_PIX_CNT = 13,
+        RST_VTX_CNT = 14,
+        TILE_FLUSH = 15,
+        CACHE_FLUSH_AND_INV_TS_EVENT = 20,
+        ZPASS_DONE = 21,
+        CACHE_FLUSH_AND_INV_EVENT = 22,
+        PERFCOUNTER_START = 23,
+        PERFCOUNTER_STOP = 24,
+        VS_FETCH_DONE = 27,
+        FACENESS_FLUSH = 28,
+};
+
+enum pc_di_primtype {
+        DI_PT_NONE = 0,
+        DI_PT_POINTLIST = 1,
+        DI_PT_LINELIST = 2,
+        DI_PT_LINESTRIP = 3,
+        DI_PT_TRILIST = 4,
+        DI_PT_TRIFAN = 5,
+        DI_PT_TRISTRIP = 6,
+        DI_PT_RECTLIST = 8,
+        DI_PT_QUADLIST = 13,
+        DI_PT_QUADSTRIP = 14,
+        DI_PT_POLYGON = 15,
+        DI_PT_2D_COPY_RECT_LIST_V0 = 16,
+        DI_PT_2D_COPY_RECT_LIST_V1 = 17,
+        DI_PT_2D_COPY_RECT_LIST_V2 = 18,
+        DI_PT_2D_COPY_RECT_LIST_V3 = 19,
+        DI_PT_2D_FILL_RECT_LIST = 20,
+        DI_PT_2D_LINE_STRIP = 21,
+        DI_PT_2D_TRI_STRIP = 22,
+};
+
+enum pc_di_src_sel {
+        DI_SRC_SEL_DMA = 0,
+        DI_SRC_SEL_IMMEDIATE = 1,
+        DI_SRC_SEL_AUTO_INDEX = 2,
+        DI_SRC_SEL_RESERVED = 3,
+};
+
+enum pc_di_index_size {
+        INDEX_SIZE_IGN = 0,
+        INDEX_SIZE_16_BIT = 0,
+        INDEX_SIZE_32_BIT = 1,
+        INDEX_SIZE_8_BIT = 2,
+        INDEX_SIZE_INVALID = 0,
+};
+
+enum pc_di_vis_cull_mode {
+        IGNORE_VISIBILITY = 0,
+};
+
+enum adreno_pm4_packet_type {
+        CP_TYPE0_PKT = 0,
+        CP_TYPE1_PKT = 0x40000000,
+        CP_TYPE2_PKT = 0x80000000,
+        CP_TYPE3_PKT = 0xc0000000,
+};
+
+enum adreno_pm4_type3_packets {
+        CP_ME_INIT = 72,
+        CP_NOP = 16,
+        CP_INDIRECT_BUFFER = 63,
+        CP_INDIRECT_BUFFER_PFD = 55,
+        CP_WAIT_FOR_IDLE = 38,
+        CP_WAIT_REG_MEM = 60,
+        CP_WAIT_REG_EQ = 82,
+        CP_WAT_REG_GTE = 83,
+        CP_WAIT_UNTIL_READ = 92,
+        CP_WAIT_IB_PFD_COMPLETE = 93,
+        CP_REG_RMW = 33,
+        CP_SET_BIN_DATA = 47,
+        CP_REG_TO_MEM = 62,
+        CP_MEM_WRITE = 61,
+        CP_MEM_WRITE_CNTR = 79,
+        CP_COND_EXEC = 68,
+        CP_COND_WRITE = 69,
+        CP_EVENT_WRITE = 70,
+        CP_EVENT_WRITE_SHD = 88,
+        CP_EVENT_WRITE_CFL = 89,
+        CP_EVENT_WRITE_ZPD = 91,
+        CP_RUN_OPENCL = 49,
+        CP_DRAW_INDX = 34,
+        CP_DRAW_INDX_2 = 54,
+        CP_DRAW_INDX_BIN = 52,
+        CP_DRAW_INDX_2_BIN = 53,
+        CP_VIZ_QUERY = 35,
+        CP_SET_STATE = 37,
+        CP_SET_CONSTANT = 45,
+        CP_IM_LOAD = 39,
+        CP_IM_LOAD_IMMEDIATE = 43,
+        CP_LOAD_CONSTANT_CONTEXT = 46,
+        CP_INVALIDATE_STATE = 59,
+        CP_SET_SHADER_BASES = 74,
+        CP_SET_BIN_MASK = 80,
+        CP_SET_BIN_SELECT = 81,
+        CP_CONTEXT_UPDATE = 94,
+        CP_INTERRUPT = 64,
+        CP_IM_STORE = 44,
+        CP_SET_BIN_BASE_OFFSET = 75,
+        CP_SET_DRAW_INIT_FLAGS = 75,
+        CP_SET_PROTECTED_MODE = 95,
+        CP_LOAD_STATE = 48,
+        CP_COND_INDIRECT_BUFFER_PFE = 58,
+        CP_COND_INDIRECT_BUFFER_PFD = 50,
+        CP_INDIRECT_BUFFER_PFE = 63,
+        CP_SET_BIN = 76,
+};
+
+enum adreno_state_block {
+        SB_VERT_TEX = 0,
+        SB_VERT_MIPADDR = 1,
+        SB_FRAG_TEX = 2,
+        SB_FRAG_MIPADDR = 3,
+        SB_VERT_SHADER = 4,
+        SB_FRAG_SHADER = 6,
+};
+
+enum adreno_state_type {
+        ST_SHADER = 0,
+        ST_CONSTANTS = 1,
+};
+
+enum adreno_state_src {
+        SS_DIRECT = 0,
+        SS_INDIRECT = 4,
+};
+
+#define REG_CP_LOAD_STATE_0                                     0x00000000
+#define CP_LOAD_STATE_0_DST_OFF__MASK                           0x0000ffff
+#define CP_LOAD_STATE_0_DST_OFF__SHIFT                          0
+static inline uint32_t CP_LOAD_STATE_0_DST_OFF(uint32_t val)
+{
+        return ((val) << CP_LOAD_STATE_0_DST_OFF__SHIFT) & CP_LOAD_STATE_0_DST_OFF__MASK;
+}
+#define CP_LOAD_STATE_0_STATE_SRC__MASK                         0x00070000
+#define CP_LOAD_STATE_0_STATE_SRC__SHIFT                        16
+static inline uint32_t CP_LOAD_STATE_0_STATE_SRC(enum adreno_state_src val)
+{
+        return ((val) << CP_LOAD_STATE_0_STATE_SRC__SHIFT) & CP_LOAD_STATE_0_STATE_SRC__MASK;
+}
+#define CP_LOAD_STATE_0_STATE_BLOCK__MASK                       0x00380000
+#define CP_LOAD_STATE_0_STATE_BLOCK__SHIFT                      19
+static inline uint32_t CP_LOAD_STATE_0_STATE_BLOCK(enum adreno_state_block val)
+{
+        return ((val) << CP_LOAD_STATE_0_STATE_BLOCK__SHIFT) & CP_LOAD_STATE_0_STATE_BLOCK__MASK;
+}
+#define CP_LOAD_STATE_0_NUM_UNIT__MASK                          0x7fc00000
+#define CP_LOAD_STATE_0_NUM_UNIT__SHIFT                         22
+static inline uint32_t CP_LOAD_STATE_0_NUM_UNIT(uint32_t val)
+{
+        return ((val) << CP_LOAD_STATE_0_NUM_UNIT__SHIFT) & CP_LOAD_STATE_0_NUM_UNIT__MASK;
+}
+
+#define REG_CP_LOAD_STATE_1                                     0x00000001
+#define CP_LOAD_STATE_1_STATE_TYPE__MASK                        0x00000003
+#define CP_LOAD_STATE_1_STATE_TYPE__SHIFT                       0
+static inline uint32_t CP_LOAD_STATE_1_STATE_TYPE(enum adreno_state_type val)
+{
+        return ((val) << CP_LOAD_STATE_1_STATE_TYPE__SHIFT) & CP_LOAD_STATE_1_STATE_TYPE__MASK;
+}
+#define CP_LOAD_STATE_1_EXT_SRC_ADDR__MASK                      0xfffffffc
+#define CP_LOAD_STATE_1_EXT_SRC_ADDR__SHIFT                     2
+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_SET_BIN_0                                        0x00000000
+
+#define REG_CP_SET_BIN_1                                        0x00000001
+#define CP_SET_BIN_1_X1__MASK                                   0x0000ffff
+#define CP_SET_BIN_1_X1__SHIFT                                  0
+static inline uint32_t CP_SET_BIN_1_X1(uint32_t val)
+{
+        return ((val) << CP_SET_BIN_1_X1__SHIFT) & CP_SET_BIN_1_X1__MASK;
+}
+#define CP_SET_BIN_1_Y1__MASK                                   0xffff0000
+#define CP_SET_BIN_1_Y1__SHIFT                                  16
+static inline uint32_t CP_SET_BIN_1_Y1(uint32_t val)
+{
+        return ((val) << CP_SET_BIN_1_Y1__SHIFT) & CP_SET_BIN_1_Y1__MASK;
+}
+
+#define REG_CP_SET_BIN_2                                        0x00000002
+#define CP_SET_BIN_2_X2__MASK                                   0x0000ffff
+#define CP_SET_BIN_2_X2__SHIFT                                  0
+static inline uint32_t CP_SET_BIN_2_X2(uint32_t val)
+{
+        return ((val) << CP_SET_BIN_2_X2__SHIFT) & CP_SET_BIN_2_X2__MASK;
+}
+#define CP_SET_BIN_2_Y2__MASK                                   0xffff0000
+#define CP_SET_BIN_2_Y2__SHIFT                                  16
+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;
+}
+
+
+#endif /* ADRENO_PM4_XML */
diff --git a/drivers/gpu/drm/msm/dsi/dsi.xml.h b/drivers/gpu/drm/msm/dsi/dsi.xml.h
new file mode 100644
index 000000000000..6f8396be431d
--- /dev/null
+++ b/drivers/gpu/drm/msm/dsi/dsi.xml.h
@@ -0,0 +1,502 @@
+#ifndef DSI_XML
+#define DSI_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum dsi_traffic_mode {
+        NON_BURST_SYNCH_PULSE = 0,
+        NON_BURST_SYNCH_EVENT = 1,
+        BURST_MODE = 2,
+};
+
+enum dsi_dst_format {
+        DST_FORMAT_RGB565 = 0,
+        DST_FORMAT_RGB666 = 1,
+        DST_FORMAT_RGB666_LOOSE = 2,
+        DST_FORMAT_RGB888 = 3,
+};
+
+enum dsi_rgb_swap {
+        SWAP_RGB = 0,
+        SWAP_RBG = 1,
+        SWAP_BGR = 2,
+        SWAP_BRG = 3,
+        SWAP_GRB = 4,
+        SWAP_GBR = 5,
+};
+
+enum dsi_cmd_trigger {
+        TRIGGER_NONE = 0,
+        TRIGGER_TE = 2,
+        TRIGGER_SW = 4,
+        TRIGGER_SW_SEOF = 5,
+        TRIGGER_SW_TE = 6,
+};
+
+#define DSI_IRQ_CMD_DMA_DONE                                    0x00000001
+#define DSI_IRQ_MASK_CMD_DMA_DONE                               0x00000002
+#define DSI_IRQ_CMD_MDP_DONE                                    0x00000100
+#define DSI_IRQ_MASK_CMD_MDP_DONE                               0x00000200
+#define DSI_IRQ_VIDEO_DONE                                      0x00010000
+#define DSI_IRQ_MASK_VIDEO_DONE                                 0x00020000
+#define DSI_IRQ_ERROR                                           0x01000000
+#define DSI_IRQ_MASK_ERROR                                      0x02000000
+#define REG_DSI_CTRL                                            0x00000000
+#define DSI_CTRL_ENABLE                                         0x00000001
+#define DSI_CTRL_VID_MODE_EN                                    0x00000002
+#define DSI_CTRL_CMD_MODE_EN                                    0x00000004
+#define DSI_CTRL_LANE0                                          0x00000010
+#define DSI_CTRL_LANE1                                          0x00000020
+#define DSI_CTRL_LANE2                                          0x00000040
+#define DSI_CTRL_LANE3                                          0x00000080
+#define DSI_CTRL_CLK_EN                                         0x00000100
+#define DSI_CTRL_ECC_CHECK                                      0x00100000
+#define DSI_CTRL_CRC_CHECK                                      0x01000000
+
+#define REG_DSI_STATUS0                                         0x00000004
+#define DSI_STATUS0_CMD_MODE_DMA_BUSY                           0x00000002
+#define DSI_STATUS0_VIDEO_MODE_ENGINE_BUSY                      0x00000008
+#define DSI_STATUS0_DSI_BUSY                                    0x00000010
+
+#define REG_DSI_FIFO_STATUS                                     0x00000008
+
+#define REG_DSI_VID_CFG0                                        0x0000000c
+#define DSI_VID_CFG0_VIRT_CHANNEL__MASK                         0x00000003
+#define DSI_VID_CFG0_VIRT_CHANNEL__SHIFT                        0
+static inline uint32_t DSI_VID_CFG0_VIRT_CHANNEL(uint32_t val)
+{
+        return ((val) << DSI_VID_CFG0_VIRT_CHANNEL__SHIFT) & DSI_VID_CFG0_VIRT_CHANNEL__MASK;
+}
+#define DSI_VID_CFG0_DST_FORMAT__MASK                           0x00000030
+#define DSI_VID_CFG0_DST_FORMAT__SHIFT                          4
+static inline uint32_t DSI_VID_CFG0_DST_FORMAT(enum dsi_dst_format val)
+{
+        return ((val) << DSI_VID_CFG0_DST_FORMAT__SHIFT) & DSI_VID_CFG0_DST_FORMAT__MASK;
+}
+#define DSI_VID_CFG0_TRAFFIC_MODE__MASK                         0x00000300
+#define DSI_VID_CFG0_TRAFFIC_MODE__SHIFT                        8
+static inline uint32_t DSI_VID_CFG0_TRAFFIC_MODE(enum dsi_traffic_mode val)
+{
+        return ((val) << DSI_VID_CFG0_TRAFFIC_MODE__SHIFT) & DSI_VID_CFG0_TRAFFIC_MODE__MASK;
+}
+#define DSI_VID_CFG0_BLLP_POWER_STOP                            0x00001000
+#define DSI_VID_CFG0_EOF_BLLP_POWER_STOP                        0x00008000
+#define DSI_VID_CFG0_HSA_POWER_STOP                             0x00010000
+#define DSI_VID_CFG0_HBP_POWER_STOP                             0x00100000
+#define DSI_VID_CFG0_HFP_POWER_STOP                             0x01000000
+#define DSI_VID_CFG0_PULSE_MODE_HSA_HE                          0x10000000
+
+#define REG_DSI_VID_CFG1                                        0x0000001c
+#define DSI_VID_CFG1_R_SEL                                      0x00000010
+#define DSI_VID_CFG1_G_SEL                                      0x00000100
+#define DSI_VID_CFG1_B_SEL                                      0x00001000
+#define DSI_VID_CFG1_RGB_SWAP__MASK                             0x00070000
+#define DSI_VID_CFG1_RGB_SWAP__SHIFT                            16
+static inline uint32_t DSI_VID_CFG1_RGB_SWAP(enum dsi_rgb_swap val)
+{
+        return ((val) << DSI_VID_CFG1_RGB_SWAP__SHIFT) & DSI_VID_CFG1_RGB_SWAP__MASK;
+}
+#define DSI_VID_CFG1_INTERLEAVE_MAX__MASK                       0x00f00000
+#define DSI_VID_CFG1_INTERLEAVE_MAX__SHIFT                      20
+static inline uint32_t DSI_VID_CFG1_INTERLEAVE_MAX(uint32_t val)
+{
+        return ((val) << DSI_VID_CFG1_INTERLEAVE_MAX__SHIFT) & DSI_VID_CFG1_INTERLEAVE_MAX__MASK;
+}
+
+#define REG_DSI_ACTIVE_H                                        0x00000020
+#define DSI_ACTIVE_H_START__MASK                                0x00000fff
+#define DSI_ACTIVE_H_START__SHIFT                               0
+static inline uint32_t DSI_ACTIVE_H_START(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_H_START__SHIFT) & DSI_ACTIVE_H_START__MASK;
+}
+#define DSI_ACTIVE_H_END__MASK                                  0x0fff0000
+#define DSI_ACTIVE_H_END__SHIFT                                 16
+static inline uint32_t DSI_ACTIVE_H_END(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_H_END__SHIFT) & DSI_ACTIVE_H_END__MASK;
+}
+
+#define REG_DSI_ACTIVE_V                                        0x00000024
+#define DSI_ACTIVE_V_START__MASK                                0x00000fff
+#define DSI_ACTIVE_V_START__SHIFT                               0
+static inline uint32_t DSI_ACTIVE_V_START(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_V_START__SHIFT) & DSI_ACTIVE_V_START__MASK;
+}
+#define DSI_ACTIVE_V_END__MASK                                  0x0fff0000
+#define DSI_ACTIVE_V_END__SHIFT                                 16
+static inline uint32_t DSI_ACTIVE_V_END(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_V_END__SHIFT) & DSI_ACTIVE_V_END__MASK;
+}
+
+#define REG_DSI_TOTAL                                           0x00000028
+#define DSI_TOTAL_H_TOTAL__MASK                                 0x00000fff
+#define DSI_TOTAL_H_TOTAL__SHIFT                                0
+static inline uint32_t DSI_TOTAL_H_TOTAL(uint32_t val)
+{
+        return ((val) << DSI_TOTAL_H_TOTAL__SHIFT) & DSI_TOTAL_H_TOTAL__MASK;
+}
+#define DSI_TOTAL_V_TOTAL__MASK                                 0x0fff0000
+#define DSI_TOTAL_V_TOTAL__SHIFT                                16
+static inline uint32_t DSI_TOTAL_V_TOTAL(uint32_t val)
+{
+        return ((val) << DSI_TOTAL_V_TOTAL__SHIFT) & DSI_TOTAL_V_TOTAL__MASK;
+}
+
+#define REG_DSI_ACTIVE_HSYNC                                    0x0000002c
+#define DSI_ACTIVE_HSYNC_START__MASK                            0x00000fff
+#define DSI_ACTIVE_HSYNC_START__SHIFT                           0
+static inline uint32_t DSI_ACTIVE_HSYNC_START(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_HSYNC_START__SHIFT) & DSI_ACTIVE_HSYNC_START__MASK;
+}
+#define DSI_ACTIVE_HSYNC_END__MASK                              0x0fff0000
+#define DSI_ACTIVE_HSYNC_END__SHIFT                             16
+static inline uint32_t DSI_ACTIVE_HSYNC_END(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_HSYNC_END__SHIFT) & DSI_ACTIVE_HSYNC_END__MASK;
+}
+
+#define REG_DSI_ACTIVE_VSYNC                                    0x00000034
+#define DSI_ACTIVE_VSYNC_START__MASK                            0x00000fff
+#define DSI_ACTIVE_VSYNC_START__SHIFT                           0
+static inline uint32_t DSI_ACTIVE_VSYNC_START(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_VSYNC_START__SHIFT) & DSI_ACTIVE_VSYNC_START__MASK;
+}
+#define DSI_ACTIVE_VSYNC_END__MASK                              0x0fff0000
+#define DSI_ACTIVE_VSYNC_END__SHIFT                             16
+static inline uint32_t DSI_ACTIVE_VSYNC_END(uint32_t val)
+{
+        return ((val) << DSI_ACTIVE_VSYNC_END__SHIFT) & DSI_ACTIVE_VSYNC_END__MASK;
+}
+
+#define REG_DSI_CMD_DMA_CTRL                                    0x00000038
+#define DSI_CMD_DMA_CTRL_FROM_FRAME_BUFFER                      0x10000000
+#define DSI_CMD_DMA_CTRL_LOW_POWER                              0x04000000
+
+#define REG_DSI_CMD_CFG0                                        0x0000003c
+
+#define REG_DSI_CMD_CFG1                                        0x00000040
+
+#define REG_DSI_DMA_BASE                                        0x00000044
+
+#define REG_DSI_DMA_LEN                                         0x00000048
+
+#define REG_DSI_ACK_ERR_STATUS                                  0x00000064
+
+static inline uint32_t REG_DSI_RDBK(uint32_t i0) { return 0x00000068 + 0x4*i0; }
+
+static inline uint32_t REG_DSI_RDBK_DATA(uint32_t i0) { return 0x00000068 + 0x4*i0; }
+
+#define REG_DSI_TRIG_CTRL                                       0x00000080
+#define DSI_TRIG_CTRL_DMA_TRIGGER__MASK                         0x0000000f
+#define DSI_TRIG_CTRL_DMA_TRIGGER__SHIFT                        0
+static inline uint32_t DSI_TRIG_CTRL_DMA_TRIGGER(enum dsi_cmd_trigger val)
+{
+        return ((val) << DSI_TRIG_CTRL_DMA_TRIGGER__SHIFT) & DSI_TRIG_CTRL_DMA_TRIGGER__MASK;
+}
+#define DSI_TRIG_CTRL_MDP_TRIGGER__MASK                         0x000000f0
+#define DSI_TRIG_CTRL_MDP_TRIGGER__SHIFT                        4
+static inline uint32_t DSI_TRIG_CTRL_MDP_TRIGGER(enum dsi_cmd_trigger val)
+{
+        return ((val) << DSI_TRIG_CTRL_MDP_TRIGGER__SHIFT) & DSI_TRIG_CTRL_MDP_TRIGGER__MASK;
+}
+#define DSI_TRIG_CTRL_STREAM                                    0x00000100
+#define DSI_TRIG_CTRL_TE                                        0x80000000
+
+#define REG_DSI_TRIG_DMA                                        0x0000008c
+
+#define REG_DSI_DLN0_PHY_ERR                                    0x000000b0
+
+#define REG_DSI_TIMEOUT_STATUS                                  0x000000bc
+
+#define REG_DSI_CLKOUT_TIMING_CTRL                              0x000000c0
+#define DSI_CLKOUT_TIMING_CTRL_T_CLK_PRE__MASK                  0x0000003f
+#define DSI_CLKOUT_TIMING_CTRL_T_CLK_PRE__SHIFT                 0
+static inline uint32_t DSI_CLKOUT_TIMING_CTRL_T_CLK_PRE(uint32_t val)
+{
+        return ((val) << DSI_CLKOUT_TIMING_CTRL_T_CLK_PRE__SHIFT) & DSI_CLKOUT_TIMING_CTRL_T_CLK_PRE__MASK;
+}
+#define DSI_CLKOUT_TIMING_CTRL_T_CLK_POST__MASK                 0x00003f00
+#define DSI_CLKOUT_TIMING_CTRL_T_CLK_POST__SHIFT                8
+static inline uint32_t DSI_CLKOUT_TIMING_CTRL_T_CLK_POST(uint32_t val)
+{
+        return ((val) << DSI_CLKOUT_TIMING_CTRL_T_CLK_POST__SHIFT) & DSI_CLKOUT_TIMING_CTRL_T_CLK_POST__MASK;
+}
+
+#define REG_DSI_EOT_PACKET_CTRL                                 0x000000c8
+#define DSI_EOT_PACKET_CTRL_TX_EOT_APPEND                       0x00000001
+#define DSI_EOT_PACKET_CTRL_RX_EOT_IGNORE                       0x00000010
+
+#define REG_DSI_LANE_SWAP_CTRL                                  0x000000ac
+
+#define REG_DSI_ERR_INT_MASK0                                   0x00000108
+
+#define REG_DSI_INTR_CTRL                                       0x0000010c
+
+#define REG_DSI_RESET                                           0x00000114
+
+#define REG_DSI_CLK_CTRL                                        0x00000118
+
+#define REG_DSI_PHY_RESET                                       0x00000128
+
+#define REG_DSI_PHY_PLL_CTRL_0                                  0x00000200
+#define DSI_PHY_PLL_CTRL_0_ENABLE                               0x00000001
+
+#define REG_DSI_PHY_PLL_CTRL_1                                  0x00000204
+
+#define REG_DSI_PHY_PLL_CTRL_2                                  0x00000208
+
+#define REG_DSI_PHY_PLL_CTRL_3                                  0x0000020c
+
+#define REG_DSI_PHY_PLL_CTRL_4                                  0x00000210
+
+#define REG_DSI_PHY_PLL_CTRL_5                                  0x00000214
+
+#define REG_DSI_PHY_PLL_CTRL_6                                  0x00000218
+
+#define REG_DSI_PHY_PLL_CTRL_7                                  0x0000021c
+
+#define REG_DSI_PHY_PLL_CTRL_8                                  0x00000220
+
+#define REG_DSI_PHY_PLL_CTRL_9                                  0x00000224
+
+#define REG_DSI_PHY_PLL_CTRL_10                                 0x00000228
+
+#define REG_DSI_PHY_PLL_CTRL_11                                 0x0000022c
+
+#define REG_DSI_PHY_PLL_CTRL_12                                 0x00000230
+
+#define REG_DSI_PHY_PLL_CTRL_13                                 0x00000234
+
+#define REG_DSI_PHY_PLL_CTRL_14                                 0x00000238
+
+#define REG_DSI_PHY_PLL_CTRL_15                                 0x0000023c
+
+#define REG_DSI_PHY_PLL_CTRL_16                                 0x00000240
+
+#define REG_DSI_PHY_PLL_CTRL_17                                 0x00000244
+
+#define REG_DSI_PHY_PLL_CTRL_18                                 0x00000248
+
+#define REG_DSI_PHY_PLL_CTRL_19                                 0x0000024c
+
+#define REG_DSI_PHY_PLL_CTRL_20                                 0x00000250
+
+#define REG_DSI_PHY_PLL_STATUS                                  0x00000280
+#define DSI_PHY_PLL_STATUS_PLL_BUSY                             0x00000001
+
+#define REG_DSI_8x60_PHY_TPA_CTRL_1                             0x00000258
+
+#define REG_DSI_8x60_PHY_TPA_CTRL_2                             0x0000025c
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_0                          0x00000260
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_1                          0x00000264
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_2                          0x00000268
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_3                          0x0000026c
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_4                          0x00000270
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_5                          0x00000274
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_6                          0x00000278
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_7                          0x0000027c
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_8                          0x00000280
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_9                          0x00000284
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_10                         0x00000288
+
+#define REG_DSI_8x60_PHY_TIMING_CTRL_11                         0x0000028c
+
+#define REG_DSI_8x60_PHY_CTRL_0                                 0x00000290
+
+#define REG_DSI_8x60_PHY_CTRL_1                                 0x00000294
+
+#define REG_DSI_8x60_PHY_CTRL_2                                 0x00000298
+
+#define REG_DSI_8x60_PHY_CTRL_3                                 0x0000029c
+
+#define REG_DSI_8x60_PHY_STRENGTH_0                             0x000002a0
+
+#define REG_DSI_8x60_PHY_STRENGTH_1                             0x000002a4
+
+#define REG_DSI_8x60_PHY_STRENGTH_2                             0x000002a8
+
+#define REG_DSI_8x60_PHY_STRENGTH_3                             0x000002ac
+
+#define REG_DSI_8x60_PHY_REGULATOR_CTRL_0                       0x000002cc
+
+#define REG_DSI_8x60_PHY_REGULATOR_CTRL_1                       0x000002d0
+
+#define REG_DSI_8x60_PHY_REGULATOR_CTRL_2                       0x000002d4
+
+#define REG_DSI_8x60_PHY_REGULATOR_CTRL_3                       0x000002d8
+
+#define REG_DSI_8x60_PHY_REGULATOR_CTRL_4                       0x000002dc
+
+#define REG_DSI_8x60_PHY_CAL_HW_TRIGGER                         0x000000f0
+
+#define REG_DSI_8x60_PHY_CAL_CTRL                               0x000000f4
+
+#define REG_DSI_8x60_PHY_CAL_STATUS                             0x000000fc
+#define DSI_8x60_PHY_CAL_STATUS_CAL_BUSY                        0x10000000
+
+static inline uint32_t REG_DSI_8960_LN(uint32_t i0) { return 0x00000300 + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_CFG_0(uint32_t i0) { return 0x00000300 + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_CFG_1(uint32_t i0) { return 0x00000304 + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_CFG_2(uint32_t i0) { return 0x00000308 + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_TEST_DATAPATH(uint32_t i0) { return 0x0000030c + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_TEST_STR_0(uint32_t i0) { return 0x00000314 + 0x40*i0; }
+
+static inline uint32_t REG_DSI_8960_LN_TEST_STR_1(uint32_t i0) { return 0x00000318 + 0x40*i0; }
+
+#define REG_DSI_8960_PHY_LNCK_CFG_0                             0x00000400
+
+#define REG_DSI_8960_PHY_LNCK_CFG_1                             0x00000404
+
+#define REG_DSI_8960_PHY_LNCK_CFG_2                             0x00000408
+
+#define REG_DSI_8960_PHY_LNCK_TEST_DATAPATH                     0x0000040c
+
+#define REG_DSI_8960_PHY_LNCK_TEST_STR0                         0x00000414
+
+#define REG_DSI_8960_PHY_LNCK_TEST_STR1                         0x00000418
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_0                          0x00000440
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_1                          0x00000444
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_2                          0x00000448
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_3                          0x0000044c
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_4                          0x00000450
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_5                          0x00000454
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_6                          0x00000458
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_7                          0x0000045c
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_8                          0x00000460
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_9                          0x00000464
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_10                         0x00000468
+
+#define REG_DSI_8960_PHY_TIMING_CTRL_11                         0x0000046c
+
+#define REG_DSI_8960_PHY_CTRL_0                                 0x00000470
+
+#define REG_DSI_8960_PHY_CTRL_1                                 0x00000474
+
+#define REG_DSI_8960_PHY_CTRL_2                                 0x00000478
+
+#define REG_DSI_8960_PHY_CTRL_3                                 0x0000047c
+
+#define REG_DSI_8960_PHY_STRENGTH_0                             0x00000480
+
+#define REG_DSI_8960_PHY_STRENGTH_1                             0x00000484
+
+#define REG_DSI_8960_PHY_STRENGTH_2                             0x00000488
+
+#define REG_DSI_8960_PHY_BIST_CTRL_0                            0x0000048c
+
+#define REG_DSI_8960_PHY_BIST_CTRL_1                            0x00000490
+
+#define REG_DSI_8960_PHY_BIST_CTRL_2                            0x00000494
+
+#define REG_DSI_8960_PHY_BIST_CTRL_3                            0x00000498
+
+#define REG_DSI_8960_PHY_BIST_CTRL_4                            0x0000049c
+
+#define REG_DSI_8960_PHY_LDO_CTRL                               0x000004b0
+
+#define REG_DSI_8960_PHY_REGULATOR_CTRL_0                       0x00000500
+
+#define REG_DSI_8960_PHY_REGULATOR_CTRL_1                       0x00000504
+
+#define REG_DSI_8960_PHY_REGULATOR_CTRL_2                       0x00000508
+
+#define REG_DSI_8960_PHY_REGULATOR_CTRL_3                       0x0000050c
+
+#define REG_DSI_8960_PHY_REGULATOR_CTRL_4                       0x00000510
+
+#define REG_DSI_8960_PHY_REGULATOR_CAL_PWR_CFG                  0x00000518
+
+#define REG_DSI_8960_PHY_CAL_HW_TRIGGER                         0x00000528
+
+#define REG_DSI_8960_PHY_CAL_SW_CFG_0                           0x0000052c
+
+#define REG_DSI_8960_PHY_CAL_SW_CFG_1                           0x00000530
+
+#define REG_DSI_8960_PHY_CAL_SW_CFG_2                           0x00000534
+
+#define REG_DSI_8960_PHY_CAL_HW_CFG_0                           0x00000538
+
+#define REG_DSI_8960_PHY_CAL_HW_CFG_1                           0x0000053c
+
+#define REG_DSI_8960_PHY_CAL_HW_CFG_2                           0x00000540
+
+#define REG_DSI_8960_PHY_CAL_HW_CFG_3                           0x00000544
+
+#define REG_DSI_8960_PHY_CAL_HW_CFG_4                           0x00000548
+
+#define REG_DSI_8960_PHY_CAL_STATUS                             0x00000550
+#define DSI_8960_PHY_CAL_STATUS_CAL_BUSY                        0x00000010
+
+
+#endif /* DSI_XML */
diff --git a/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h b/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h
new file mode 100644
index 000000000000..aefc1b8feae9
--- /dev/null
+++ b/drivers/gpu/drm/msm/dsi/mmss_cc.xml.h
@@ -0,0 +1,114 @@
+#ifndef MMSS_CC_XML
+#define MMSS_CC_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum mmss_cc_clk {
+        CLK = 0,
+        PCLK = 1,
+};
+
+#define REG_MMSS_CC_AHB                                         0x00000008
+
+static inline uint32_t __offset_CLK(enum mmss_cc_clk idx)
+{
+        switch (idx) {
+                case CLK: return 0x0000004c;
+                case PCLK: return 0x00000130;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MMSS_CC_CLK(enum mmss_cc_clk i0) { return 0x00000000 + __offset_CLK(i0); }
+
+static inline uint32_t REG_MMSS_CC_CLK_CC(enum mmss_cc_clk i0) { return 0x00000000 + __offset_CLK(i0); }
+#define MMSS_CC_CLK_CC_CLK_EN                                   0x00000001
+#define MMSS_CC_CLK_CC_ROOT_EN                                  0x00000004
+#define MMSS_CC_CLK_CC_MND_EN                                   0x00000020
+#define MMSS_CC_CLK_CC_MND_MODE__MASK                           0x000000c0
+#define MMSS_CC_CLK_CC_MND_MODE__SHIFT                          6
+static inline uint32_t MMSS_CC_CLK_CC_MND_MODE(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_CC_MND_MODE__SHIFT) & MMSS_CC_CLK_CC_MND_MODE__MASK;
+}
+#define MMSS_CC_CLK_CC_PMXO_SEL__MASK                           0x00000300
+#define MMSS_CC_CLK_CC_PMXO_SEL__SHIFT                          8
+static inline uint32_t MMSS_CC_CLK_CC_PMXO_SEL(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_CC_PMXO_SEL__SHIFT) & MMSS_CC_CLK_CC_PMXO_SEL__MASK;
+}
+
+static inline uint32_t REG_MMSS_CC_CLK_MD(enum mmss_cc_clk i0) { return 0x00000004 + __offset_CLK(i0); }
+#define MMSS_CC_CLK_MD_D__MASK                                  0x000000ff
+#define MMSS_CC_CLK_MD_D__SHIFT                                 0
+static inline uint32_t MMSS_CC_CLK_MD_D(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_MD_D__SHIFT) & MMSS_CC_CLK_MD_D__MASK;
+}
+#define MMSS_CC_CLK_MD_M__MASK                                  0x0000ff00
+#define MMSS_CC_CLK_MD_M__SHIFT                                 8
+static inline uint32_t MMSS_CC_CLK_MD_M(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_MD_M__SHIFT) & MMSS_CC_CLK_MD_M__MASK;
+}
+
+static inline uint32_t REG_MMSS_CC_CLK_NS(enum mmss_cc_clk i0) { return 0x00000008 + __offset_CLK(i0); }
+#define MMSS_CC_CLK_NS_SRC__MASK                                0x0000000f
+#define MMSS_CC_CLK_NS_SRC__SHIFT                               0
+static inline uint32_t MMSS_CC_CLK_NS_SRC(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_NS_SRC__SHIFT) & MMSS_CC_CLK_NS_SRC__MASK;
+}
+#define MMSS_CC_CLK_NS_PRE_DIV_FUNC__MASK                       0x00fff000
+#define MMSS_CC_CLK_NS_PRE_DIV_FUNC__SHIFT                      12
+static inline uint32_t MMSS_CC_CLK_NS_PRE_DIV_FUNC(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_NS_PRE_DIV_FUNC__SHIFT) & MMSS_CC_CLK_NS_PRE_DIV_FUNC__MASK;
+}
+#define MMSS_CC_CLK_NS_VAL__MASK                                0xff000000
+#define MMSS_CC_CLK_NS_VAL__SHIFT                               24
+static inline uint32_t MMSS_CC_CLK_NS_VAL(uint32_t val)
+{
+        return ((val) << MMSS_CC_CLK_NS_VAL__SHIFT) & MMSS_CC_CLK_NS_VAL__MASK;
+}
+
+
+#endif /* MMSS_CC_XML */
diff --git a/drivers/gpu/drm/msm/dsi/sfpb.xml.h b/drivers/gpu/drm/msm/dsi/sfpb.xml.h
new file mode 100644
index 000000000000..a225e8170b2a
--- /dev/null
+++ b/drivers/gpu/drm/msm/dsi/sfpb.xml.h
@@ -0,0 +1,48 @@
+#ifndef SFPB_XML
+#define SFPB_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+#define REG_SFPB_CFG                                            0x00000058
+
+
+#endif /* SFPB_XML */
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c
new file mode 100644
index 000000000000..12ecfb928f75
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hdmi.h"
+
+static struct platform_device *hdmi_pdev;
+
+void hdmi_set_mode(struct hdmi *hdmi, bool power_on)
+{
+        uint32_t ctrl = 0;
+
+        if (power_on) {
+                ctrl |= HDMI_CTRL_ENABLE;
+                if (!hdmi->hdmi_mode) {
+                        ctrl |= HDMI_CTRL_HDMI;
+                        hdmi_write(hdmi, REG_HDMI_CTRL, ctrl);
+                        ctrl &= ~HDMI_CTRL_HDMI;
+                } else {
+                        ctrl |= HDMI_CTRL_HDMI;
+                }
+        } else {
+                ctrl = HDMI_CTRL_HDMI;
+        }
+
+        hdmi_write(hdmi, REG_HDMI_CTRL, ctrl);
+        DBG("HDMI Core: %s, HDMI_CTRL=0x%08x",
+                        power_on ? "Enable" : "Disable", ctrl);
+}
+
+static irqreturn_t hdmi_irq(int irq, void *dev_id)
+{
+        struct hdmi *hdmi = dev_id;
+
+        /* Process HPD: */
+        hdmi_connector_irq(hdmi->connector);
+
+        /* Process DDC: */
+        hdmi_i2c_irq(hdmi->i2c);
+
+        /* TODO audio.. */
+
+        return IRQ_HANDLED;
+}
+
+void hdmi_destroy(struct hdmi *hdmi)
+{
+        struct hdmi_phy *phy = hdmi->phy;
+
+        if (phy)
+                phy->funcs->destroy(phy);
+
+        if (hdmi->i2c)
+                hdmi_i2c_destroy(hdmi->i2c);
+
+        put_device(&hdmi->pdev->dev);
+}
+
+/* initialize connector */
+int hdmi_init(struct hdmi *hdmi, struct drm_device *dev,
+                struct drm_connector *connector)
+{
+        struct platform_device *pdev = hdmi_pdev;
+        struct hdmi_platform_config *config;
+        int ret;
+
+        if (!pdev) {
+                dev_err(dev->dev, "no hdmi device\n");
+                ret = -ENXIO;
+                goto fail;
+        }
+
+        config = pdev->dev.platform_data;
+
+        get_device(&pdev->dev);
+
+        hdmi->dev = dev;
+        hdmi->pdev = pdev;
+        hdmi->connector = connector;
+
+        /* not sure about which phy maps to which msm.. probably I miss some */
+        if (config->phy_init)
+                hdmi->phy = config->phy_init(hdmi);
+        else
+                hdmi->phy = ERR_PTR(-ENXIO);
+
+        if (IS_ERR(hdmi->phy)) {
+                ret = PTR_ERR(hdmi->phy);
+                dev_err(dev->dev, "failed to load phy: %d\n", ret);
+                hdmi->phy = NULL;
+                goto fail;
+        }
+
+        hdmi->mmio = msm_ioremap(pdev, "hdmi_msm_hdmi_addr", "HDMI");
+        if (IS_ERR(hdmi->mmio)) {
+                ret = PTR_ERR(hdmi->mmio);
+                goto fail;
+        }
+
+        hdmi->mvs = devm_regulator_get(&pdev->dev, "8901_hdmi_mvs");
+        if (IS_ERR(hdmi->mvs))
+                hdmi->mvs = devm_regulator_get(&pdev->dev, "hdmi_mvs");
+        if (IS_ERR(hdmi->mvs)) {
+                ret = PTR_ERR(hdmi->mvs);
+                dev_err(dev->dev, "failed to get mvs regulator: %d\n", ret);
+                goto fail;
+        }
+
+        hdmi->mpp0 = devm_regulator_get(&pdev->dev, "8901_mpp0");
+        if (IS_ERR(hdmi->mpp0))
+                hdmi->mpp0 = NULL;
+
+        hdmi->clk = devm_clk_get(&pdev->dev, "core_clk");
+        if (IS_ERR(hdmi->clk)) {
+                ret = PTR_ERR(hdmi->clk);
+                dev_err(dev->dev, "failed to get 'clk': %d\n", ret);
+                goto fail;
+        }
+
+        hdmi->m_pclk = devm_clk_get(&pdev->dev, "master_iface_clk");
+        if (IS_ERR(hdmi->m_pclk)) {
+                ret = PTR_ERR(hdmi->m_pclk);
+                dev_err(dev->dev, "failed to get 'm_pclk': %d\n", ret);
+                goto fail;
+        }
+
+        hdmi->s_pclk = devm_clk_get(&pdev->dev, "slave_iface_clk");
+        if (IS_ERR(hdmi->s_pclk)) {
+                ret = PTR_ERR(hdmi->s_pclk);
+                dev_err(dev->dev, "failed to get 's_pclk': %d\n", ret);
+                goto fail;
+        }
+
+        hdmi->i2c = hdmi_i2c_init(hdmi);
+        if (IS_ERR(hdmi->i2c)) {
+                ret = PTR_ERR(hdmi->i2c);
+                dev_err(dev->dev, "failed to get i2c: %d\n", ret);
+                hdmi->i2c = NULL;
+                goto fail;
+        }
+
+        hdmi->irq = platform_get_irq(pdev, 0);
+        if (hdmi->irq < 0) {
+                ret = hdmi->irq;
+                dev_err(dev->dev, "failed to get irq: %d\n", ret);
+                goto fail;
+        }
+
+        ret = devm_request_threaded_irq(&pdev->dev, hdmi->irq,
+                        NULL, hdmi_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+                        "hdmi_isr", hdmi);
+        if (ret < 0) {
+                dev_err(dev->dev, "failed to request IRQ%u: %d\n",
+                                hdmi->irq, ret);
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        if (hdmi)
+                hdmi_destroy(hdmi);
+
+        return ret;
+}
+
+/*
+ * The hdmi device:
+ */
+
+static int hdmi_dev_probe(struct platform_device *pdev)
+{
+        static struct hdmi_platform_config config = {};
+#ifdef CONFIG_OF
+        /* TODO */
+#else
+        if (cpu_is_apq8064()) {
+                config.phy_init      = hdmi_phy_8960_init;
+                config.ddc_clk_gpio  = 70;
+                config.ddc_data_gpio = 71;
+                config.hpd_gpio      = 72;
+                config.pmic_gpio     = 13 + NR_GPIO_IRQS;
+        } else if (cpu_is_msm8960()) {
+                config.phy_init      = hdmi_phy_8960_init;
+                config.ddc_clk_gpio  = 100;
+                config.ddc_data_gpio = 101;
+                config.hpd_gpio      = 102;
+                config.pmic_gpio     = -1;
+        } else if (cpu_is_msm8x60()) {
+                config.phy_init      = hdmi_phy_8x60_init;
+                config.ddc_clk_gpio  = 170;
+                config.ddc_data_gpio = 171;
+                config.hpd_gpio      = 172;
+                config.pmic_gpio     = -1;
+        }
+#endif
+        pdev->dev.platform_data = &config;
+        hdmi_pdev = pdev;
+        return 0;
+}
+
+static int hdmi_dev_remove(struct platform_device *pdev)
+{
+        hdmi_pdev = NULL;
+        return 0;
+}
+
+static struct platform_driver hdmi_driver = {
+        .probe = hdmi_dev_probe,
+        .remove = hdmi_dev_remove,
+        .driver.name = "hdmi_msm",
+};
+
+void __init hdmi_register(void)
+{
+        platform_driver_register(&hdmi_driver);
+}
+
+void __exit hdmi_unregister(void)
+{
+        platform_driver_unregister(&hdmi_driver);
+}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h
new file mode 100644
index 000000000000..34703fea22ca
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __HDMI_CONNECTOR_H__
+#define __HDMI_CONNECTOR_H__
+
+#include <linux/i2c.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#include "msm_drv.h"
+#include "hdmi.xml.h"
+
+
+struct hdmi_phy;
+
+struct hdmi {
+        struct drm_device *dev;
+        struct platform_device *pdev;
+
+        void __iomem *mmio;
+
+        struct regulator *mvs;        /* HDMI_5V */
+        struct regulator *mpp0;       /* External 5V */
+
+        struct clk *clk;
+        struct clk *m_pclk;
+        struct clk *s_pclk;
+
+        struct hdmi_phy *phy;
+        struct i2c_adapter *i2c;
+        struct drm_connector *connector;
+
+        bool hdmi_mode;               /* are we in hdmi mode? */
+
+        int irq;
+};
+
+/* platform config data (ie. from DT, or pdata) */
+struct hdmi_platform_config {
+        struct hdmi_phy *(*phy_init)(struct hdmi *hdmi);
+        int ddc_clk_gpio, ddc_data_gpio, hpd_gpio, pmic_gpio;
+};
+
+void hdmi_set_mode(struct hdmi *hdmi, bool power_on);
+void hdmi_destroy(struct hdmi *hdmi);
+int hdmi_init(struct hdmi *hdmi, struct drm_device *dev,
+                struct drm_connector *connector);
+
+static inline void hdmi_write(struct hdmi *hdmi, u32 reg, u32 data)
+{
+        msm_writel(data, hdmi->mmio + reg);
+}
+
+static inline u32 hdmi_read(struct hdmi *hdmi, u32 reg)
+{
+        return msm_readl(hdmi->mmio + reg);
+}
+
+/*
+ * The phy appears to be different, for example between 8960 and 8x60,
+ * so split the phy related functions out and load the correct one at
+ * runtime:
+ */
+
+struct hdmi_phy_funcs {
+        void (*destroy)(struct hdmi_phy *phy);
+        void (*reset)(struct hdmi_phy *phy);
+        void (*powerup)(struct hdmi_phy *phy, unsigned long int pixclock);
+        void (*powerdown)(struct hdmi_phy *phy);
+};
+
+struct hdmi_phy {
+        const struct hdmi_phy_funcs *funcs;
+};
+
+/*
+ * phy can be different on different generations:
+ */
+struct hdmi_phy *hdmi_phy_8960_init(struct hdmi *hdmi);
+struct hdmi_phy *hdmi_phy_8x60_init(struct hdmi *hdmi);
+
+/*
+ * hdmi connector:
+ */
+
+void hdmi_connector_irq(struct drm_connector *connector);
+
+/*
+ * i2c adapter for ddc:
+ */
+
+void hdmi_i2c_irq(struct i2c_adapter *i2c);
+void hdmi_i2c_destroy(struct i2c_adapter *i2c);
+struct i2c_adapter *hdmi_i2c_init(struct hdmi *hdmi);
+
+#endif /* __HDMI_CONNECTOR_H__ */
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.xml.h b/drivers/gpu/drm/msm/hdmi/hdmi.xml.h
new file mode 100644
index 000000000000..f5fa4865e059
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.xml.h
@@ -0,0 +1,508 @@
+#ifndef HDMI_XML
+#define HDMI_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum hdmi_hdcp_key_state {
+        NO_KEYS = 0,
+        NOT_CHECKED = 1,
+        CHECKING = 2,
+        KEYS_VALID = 3,
+        AKSV_INVALID = 4,
+        CHECKSUM_MISMATCH = 5,
+};
+
+enum hdmi_ddc_read_write {
+        DDC_WRITE = 0,
+        DDC_READ = 1,
+};
+
+enum hdmi_acr_cts {
+        ACR_NONE = 0,
+        ACR_32 = 1,
+        ACR_44 = 2,
+        ACR_48 = 3,
+};
+
+#define REG_HDMI_CTRL                                           0x00000000
+#define HDMI_CTRL_ENABLE                                        0x00000001
+#define HDMI_CTRL_HDMI                                          0x00000002
+#define HDMI_CTRL_ENCRYPTED                                     0x00000004
+
+#define REG_HDMI_AUDIO_PKT_CTRL1                                0x00000020
+#define HDMI_AUDIO_PKT_CTRL1_AUDIO_SAMPLE_SEND                  0x00000001
+
+#define REG_HDMI_ACR_PKT_CTRL                                   0x00000024
+#define HDMI_ACR_PKT_CTRL_CONT                                  0x00000001
+#define HDMI_ACR_PKT_CTRL_SEND                                  0x00000002
+#define HDMI_ACR_PKT_CTRL_SELECT__MASK                          0x00000030
+#define HDMI_ACR_PKT_CTRL_SELECT__SHIFT                         4
+static inline uint32_t HDMI_ACR_PKT_CTRL_SELECT(enum hdmi_acr_cts val)
+{
+        return ((val) << HDMI_ACR_PKT_CTRL_SELECT__SHIFT) & HDMI_ACR_PKT_CTRL_SELECT__MASK;
+}
+#define HDMI_ACR_PKT_CTRL_SOURCE                                0x00000100
+#define HDMI_ACR_PKT_CTRL_N_MULTIPLIER__MASK                    0x00070000
+#define HDMI_ACR_PKT_CTRL_N_MULTIPLIER__SHIFT                   16
+static inline uint32_t HDMI_ACR_PKT_CTRL_N_MULTIPLIER(uint32_t val)
+{
+        return ((val) << HDMI_ACR_PKT_CTRL_N_MULTIPLIER__SHIFT) & HDMI_ACR_PKT_CTRL_N_MULTIPLIER__MASK;
+}
+#define HDMI_ACR_PKT_CTRL_AUDIO_PRIORITY                        0x80000000
+
+#define REG_HDMI_VBI_PKT_CTRL                                   0x00000028
+#define HDMI_VBI_PKT_CTRL_GC_ENABLE                             0x00000010
+#define HDMI_VBI_PKT_CTRL_GC_EVERY_FRAME                        0x00000020
+#define HDMI_VBI_PKT_CTRL_ISRC_SEND                             0x00000100
+#define HDMI_VBI_PKT_CTRL_ISRC_CONTINUOUS                       0x00000200
+#define HDMI_VBI_PKT_CTRL_ACP_SEND                              0x00001000
+#define HDMI_VBI_PKT_CTRL_ACP_SRC_SW                            0x00002000
+
+#define REG_HDMI_INFOFRAME_CTRL0                                0x0000002c
+#define HDMI_INFOFRAME_CTRL0_AVI_SEND                           0x00000001
+#define HDMI_INFOFRAME_CTRL0_AVI_CONT                           0x00000002
+#define HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SEND                    0x00000010
+#define HDMI_INFOFRAME_CTRL0_AUDIO_INFO_CONT                    0x00000020
+#define HDMI_INFOFRAME_CTRL0_AUDIO_INFO_SOURCE                  0x00000040
+#define HDMI_INFOFRAME_CTRL0_AUDIO_INFO_UPDATE                  0x00000080
+
+#define REG_HDMI_GEN_PKT_CTRL                                   0x00000034
+#define HDMI_GEN_PKT_CTRL_GENERIC0_SEND                         0x00000001
+#define HDMI_GEN_PKT_CTRL_GENERIC0_CONT                         0x00000002
+#define HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE__MASK                 0x0000000c
+#define HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE__SHIFT                2
+static inline uint32_t HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE(uint32_t val)
+{
+        return ((val) << HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE__SHIFT) & HDMI_GEN_PKT_CTRL_GENERIC0_UPDATE__MASK;
+}
+#define HDMI_GEN_PKT_CTRL_GENERIC1_SEND                         0x00000010
+#define HDMI_GEN_PKT_CTRL_GENERIC1_CONT                         0x00000020
+#define HDMI_GEN_PKT_CTRL_GENERIC0_LINE__MASK                   0x003f0000
+#define HDMI_GEN_PKT_CTRL_GENERIC0_LINE__SHIFT                  16
+static inline uint32_t HDMI_GEN_PKT_CTRL_GENERIC0_LINE(uint32_t val)
+{
+        return ((val) << HDMI_GEN_PKT_CTRL_GENERIC0_LINE__SHIFT) & HDMI_GEN_PKT_CTRL_GENERIC0_LINE__MASK;
+}
+#define HDMI_GEN_PKT_CTRL_GENERIC1_LINE__MASK                   0x3f000000
+#define HDMI_GEN_PKT_CTRL_GENERIC1_LINE__SHIFT                  24
+static inline uint32_t HDMI_GEN_PKT_CTRL_GENERIC1_LINE(uint32_t val)
+{
+        return ((val) << HDMI_GEN_PKT_CTRL_GENERIC1_LINE__SHIFT) & HDMI_GEN_PKT_CTRL_GENERIC1_LINE__MASK;
+}
+
+#define REG_HDMI_GC                                             0x00000040
+#define HDMI_GC_MUTE                                            0x00000001
+
+#define REG_HDMI_AUDIO_PKT_CTRL2                                0x00000044
+#define HDMI_AUDIO_PKT_CTRL2_OVERRIDE                           0x00000001
+#define HDMI_AUDIO_PKT_CTRL2_LAYOUT                             0x00000002
+
+static inline uint32_t REG_HDMI_AVI_INFO(uint32_t i0) { return 0x0000006c + 0x4*i0; }
+
+#define REG_HDMI_GENERIC0_HDR                                   0x00000084
+
+static inline uint32_t REG_HDMI_GENERIC0(uint32_t i0) { return 0x00000088 + 0x4*i0; }
+
+#define REG_HDMI_GENERIC1_HDR                                   0x000000a4
+
+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_0(uint32_t 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)
+{
+        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; }
+#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)
+{
+        return ((val) << HDMI_ACR_1_N__SHIFT) & HDMI_ACR_1_N__MASK;
+}
+
+#define REG_HDMI_AUDIO_INFO0                                    0x000000e4
+#define HDMI_AUDIO_INFO0_CHECKSUM__MASK                         0x000000ff
+#define HDMI_AUDIO_INFO0_CHECKSUM__SHIFT                        0
+static inline uint32_t HDMI_AUDIO_INFO0_CHECKSUM(uint32_t val)
+{
+        return ((val) << HDMI_AUDIO_INFO0_CHECKSUM__SHIFT) & HDMI_AUDIO_INFO0_CHECKSUM__MASK;
+}
+#define HDMI_AUDIO_INFO0_CC__MASK                               0x00000700
+#define HDMI_AUDIO_INFO0_CC__SHIFT                              8
+static inline uint32_t HDMI_AUDIO_INFO0_CC(uint32_t val)
+{
+        return ((val) << HDMI_AUDIO_INFO0_CC__SHIFT) & HDMI_AUDIO_INFO0_CC__MASK;
+}
+
+#define REG_HDMI_AUDIO_INFO1                                    0x000000e8
+#define HDMI_AUDIO_INFO1_CA__MASK                               0x000000ff
+#define HDMI_AUDIO_INFO1_CA__SHIFT                              0
+static inline uint32_t HDMI_AUDIO_INFO1_CA(uint32_t val)
+{
+        return ((val) << HDMI_AUDIO_INFO1_CA__SHIFT) & HDMI_AUDIO_INFO1_CA__MASK;
+}
+#define HDMI_AUDIO_INFO1_LSV__MASK                              0x00007800
+#define HDMI_AUDIO_INFO1_LSV__SHIFT                             11
+static inline uint32_t HDMI_AUDIO_INFO1_LSV(uint32_t val)
+{
+        return ((val) << HDMI_AUDIO_INFO1_LSV__SHIFT) & HDMI_AUDIO_INFO1_LSV__MASK;
+}
+#define HDMI_AUDIO_INFO1_DM_INH                                 0x00008000
+
+#define REG_HDMI_HDCP_CTRL                                      0x00000110
+#define HDMI_HDCP_CTRL_ENABLE                                   0x00000001
+#define HDMI_HDCP_CTRL_ENCRYPTION_ENABLE                        0x00000100
+
+#define REG_HDMI_HDCP_INT_CTRL                                  0x00000118
+
+#define REG_HDMI_HDCP_LINK0_STATUS                              0x0000011c
+#define HDMI_HDCP_LINK0_STATUS_AN_0_READY                       0x00000100
+#define HDMI_HDCP_LINK0_STATUS_AN_1_READY                       0x00000200
+#define HDMI_HDCP_LINK0_STATUS_KEY_STATE__MASK                  0x70000000
+#define HDMI_HDCP_LINK0_STATUS_KEY_STATE__SHIFT                 28
+static inline uint32_t HDMI_HDCP_LINK0_STATUS_KEY_STATE(enum hdmi_hdcp_key_state val)
+{
+        return ((val) << HDMI_HDCP_LINK0_STATUS_KEY_STATE__SHIFT) & HDMI_HDCP_LINK0_STATUS_KEY_STATE__MASK;
+}
+
+#define REG_HDMI_HDCP_RESET                                     0x00000130
+#define HDMI_HDCP_RESET_LINK0_DEAUTHENTICATE                    0x00000001
+
+#define REG_HDMI_AUDIO_CFG                                      0x000001d0
+#define HDMI_AUDIO_CFG_ENGINE_ENABLE                            0x00000001
+#define HDMI_AUDIO_CFG_FIFO_WATERMARK__MASK                     0x000000f0
+#define HDMI_AUDIO_CFG_FIFO_WATERMARK__SHIFT                    4
+static inline uint32_t HDMI_AUDIO_CFG_FIFO_WATERMARK(uint32_t val)
+{
+        return ((val) << HDMI_AUDIO_CFG_FIFO_WATERMARK__SHIFT) & HDMI_AUDIO_CFG_FIFO_WATERMARK__MASK;
+}
+
+#define REG_HDMI_USEC_REFTIMER                                  0x00000208
+
+#define REG_HDMI_DDC_CTRL                                       0x0000020c
+#define HDMI_DDC_CTRL_GO                                        0x00000001
+#define HDMI_DDC_CTRL_SOFT_RESET                                0x00000002
+#define HDMI_DDC_CTRL_SEND_RESET                                0x00000004
+#define HDMI_DDC_CTRL_SW_STATUS_RESET                           0x00000008
+#define HDMI_DDC_CTRL_TRANSACTION_CNT__MASK                     0x00300000
+#define HDMI_DDC_CTRL_TRANSACTION_CNT__SHIFT                    20
+static inline uint32_t HDMI_DDC_CTRL_TRANSACTION_CNT(uint32_t val)
+{
+        return ((val) << HDMI_DDC_CTRL_TRANSACTION_CNT__SHIFT) & HDMI_DDC_CTRL_TRANSACTION_CNT__MASK;
+}
+
+#define REG_HDMI_DDC_INT_CTRL                                   0x00000214
+#define HDMI_DDC_INT_CTRL_SW_DONE_INT                           0x00000001
+#define HDMI_DDC_INT_CTRL_SW_DONE_ACK                           0x00000002
+#define HDMI_DDC_INT_CTRL_SW_DONE_MASK                          0x00000004
+
+#define REG_HDMI_DDC_SW_STATUS                                  0x00000218
+#define HDMI_DDC_SW_STATUS_NACK0                                0x00001000
+#define HDMI_DDC_SW_STATUS_NACK1                                0x00002000
+#define HDMI_DDC_SW_STATUS_NACK2                                0x00004000
+#define HDMI_DDC_SW_STATUS_NACK3                                0x00008000
+
+#define REG_HDMI_DDC_HW_STATUS                                  0x0000021c
+
+#define REG_HDMI_DDC_SPEED                                      0x00000220
+#define HDMI_DDC_SPEED_THRESHOLD__MASK                          0x00000003
+#define HDMI_DDC_SPEED_THRESHOLD__SHIFT                         0
+static inline uint32_t HDMI_DDC_SPEED_THRESHOLD(uint32_t val)
+{
+        return ((val) << HDMI_DDC_SPEED_THRESHOLD__SHIFT) & HDMI_DDC_SPEED_THRESHOLD__MASK;
+}
+#define HDMI_DDC_SPEED_PRESCALE__MASK                           0xffff0000
+#define HDMI_DDC_SPEED_PRESCALE__SHIFT                          16
+static inline uint32_t HDMI_DDC_SPEED_PRESCALE(uint32_t val)
+{
+        return ((val) << HDMI_DDC_SPEED_PRESCALE__SHIFT) & HDMI_DDC_SPEED_PRESCALE__MASK;
+}
+
+#define REG_HDMI_DDC_SETUP                                      0x00000224
+#define HDMI_DDC_SETUP_TIMEOUT__MASK                            0xff000000
+#define HDMI_DDC_SETUP_TIMEOUT__SHIFT                           24
+static inline uint32_t HDMI_DDC_SETUP_TIMEOUT(uint32_t val)
+{
+        return ((val) << HDMI_DDC_SETUP_TIMEOUT__SHIFT) & HDMI_DDC_SETUP_TIMEOUT__MASK;
+}
+
+static inline uint32_t REG_HDMI_I2C_TRANSACTION(uint32_t i0) { return 0x00000228 + 0x4*i0; }
+
+static inline uint32_t REG_HDMI_I2C_TRANSACTION_REG(uint32_t i0) { return 0x00000228 + 0x4*i0; }
+#define HDMI_I2C_TRANSACTION_REG_RW__MASK                       0x00000001
+#define HDMI_I2C_TRANSACTION_REG_RW__SHIFT                      0
+static inline uint32_t HDMI_I2C_TRANSACTION_REG_RW(enum hdmi_ddc_read_write val)
+{
+        return ((val) << HDMI_I2C_TRANSACTION_REG_RW__SHIFT) & HDMI_I2C_TRANSACTION_REG_RW__MASK;
+}
+#define HDMI_I2C_TRANSACTION_REG_STOP_ON_NACK                   0x00000100
+#define HDMI_I2C_TRANSACTION_REG_START                          0x00001000
+#define HDMI_I2C_TRANSACTION_REG_STOP                           0x00002000
+#define HDMI_I2C_TRANSACTION_REG_CNT__MASK                      0x00ff0000
+#define HDMI_I2C_TRANSACTION_REG_CNT__SHIFT                     16
+static inline uint32_t HDMI_I2C_TRANSACTION_REG_CNT(uint32_t val)
+{
+        return ((val) << HDMI_I2C_TRANSACTION_REG_CNT__SHIFT) & HDMI_I2C_TRANSACTION_REG_CNT__MASK;
+}
+
+#define REG_HDMI_DDC_DATA                                       0x00000238
+#define HDMI_DDC_DATA_DATA_RW__MASK                             0x00000001
+#define HDMI_DDC_DATA_DATA_RW__SHIFT                            0
+static inline uint32_t HDMI_DDC_DATA_DATA_RW(enum hdmi_ddc_read_write val)
+{
+        return ((val) << HDMI_DDC_DATA_DATA_RW__SHIFT) & HDMI_DDC_DATA_DATA_RW__MASK;
+}
+#define HDMI_DDC_DATA_DATA__MASK                                0x0000ff00
+#define HDMI_DDC_DATA_DATA__SHIFT                               8
+static inline uint32_t HDMI_DDC_DATA_DATA(uint32_t val)
+{
+        return ((val) << HDMI_DDC_DATA_DATA__SHIFT) & HDMI_DDC_DATA_DATA__MASK;
+}
+#define HDMI_DDC_DATA_INDEX__MASK                               0x00ff0000
+#define HDMI_DDC_DATA_INDEX__SHIFT                              16
+static inline uint32_t HDMI_DDC_DATA_INDEX(uint32_t val)
+{
+        return ((val) << HDMI_DDC_DATA_INDEX__SHIFT) & HDMI_DDC_DATA_INDEX__MASK;
+}
+#define HDMI_DDC_DATA_INDEX_WRITE                               0x80000000
+
+#define REG_HDMI_HPD_INT_STATUS                                 0x00000250
+#define HDMI_HPD_INT_STATUS_INT                                 0x00000001
+#define HDMI_HPD_INT_STATUS_CABLE_DETECTED                      0x00000002
+
+#define REG_HDMI_HPD_INT_CTRL                                   0x00000254
+#define HDMI_HPD_INT_CTRL_INT_ACK                               0x00000001
+#define HDMI_HPD_INT_CTRL_INT_CONNECT                           0x00000002
+#define HDMI_HPD_INT_CTRL_INT_EN                                0x00000004
+#define HDMI_HPD_INT_CTRL_RX_INT_ACK                            0x00000010
+#define HDMI_HPD_INT_CTRL_RX_INT_EN                             0x00000020
+#define HDMI_HPD_INT_CTRL_RCV_PLUGIN_DET_MASK                   0x00000200
+
+#define REG_HDMI_HPD_CTRL                                       0x00000258
+#define HDMI_HPD_CTRL_TIMEOUT__MASK                             0x00001fff
+#define HDMI_HPD_CTRL_TIMEOUT__SHIFT                            0
+static inline uint32_t HDMI_HPD_CTRL_TIMEOUT(uint32_t val)
+{
+        return ((val) << HDMI_HPD_CTRL_TIMEOUT__SHIFT) & HDMI_HPD_CTRL_TIMEOUT__MASK;
+}
+#define HDMI_HPD_CTRL_ENABLE                                    0x10000000
+
+#define REG_HDMI_DDC_REF                                        0x0000027c
+#define HDMI_DDC_REF_REFTIMER_ENABLE                            0x00010000
+#define HDMI_DDC_REF_REFTIMER__MASK                             0x0000ffff
+#define HDMI_DDC_REF_REFTIMER__SHIFT                            0
+static inline uint32_t HDMI_DDC_REF_REFTIMER(uint32_t val)
+{
+        return ((val) << HDMI_DDC_REF_REFTIMER__SHIFT) & HDMI_DDC_REF_REFTIMER__MASK;
+}
+
+#define REG_HDMI_ACTIVE_HSYNC                                   0x000002b4
+#define HDMI_ACTIVE_HSYNC_START__MASK                           0x00000fff
+#define HDMI_ACTIVE_HSYNC_START__SHIFT                          0
+static inline uint32_t HDMI_ACTIVE_HSYNC_START(uint32_t val)
+{
+        return ((val) << HDMI_ACTIVE_HSYNC_START__SHIFT) & HDMI_ACTIVE_HSYNC_START__MASK;
+}
+#define HDMI_ACTIVE_HSYNC_END__MASK                             0x0fff0000
+#define HDMI_ACTIVE_HSYNC_END__SHIFT                            16
+static inline uint32_t HDMI_ACTIVE_HSYNC_END(uint32_t val)
+{
+        return ((val) << HDMI_ACTIVE_HSYNC_END__SHIFT) & HDMI_ACTIVE_HSYNC_END__MASK;
+}
+
+#define REG_HDMI_ACTIVE_VSYNC                                   0x000002b8
+#define HDMI_ACTIVE_VSYNC_START__MASK                           0x00000fff
+#define HDMI_ACTIVE_VSYNC_START__SHIFT                          0
+static inline uint32_t HDMI_ACTIVE_VSYNC_START(uint32_t val)
+{
+        return ((val) << HDMI_ACTIVE_VSYNC_START__SHIFT) & HDMI_ACTIVE_VSYNC_START__MASK;
+}
+#define HDMI_ACTIVE_VSYNC_END__MASK                             0x0fff0000
+#define HDMI_ACTIVE_VSYNC_END__SHIFT                            16
+static inline uint32_t HDMI_ACTIVE_VSYNC_END(uint32_t val)
+{
+        return ((val) << HDMI_ACTIVE_VSYNC_END__SHIFT) & HDMI_ACTIVE_VSYNC_END__MASK;
+}
+
+#define REG_HDMI_VSYNC_ACTIVE_F2                                0x000002bc
+#define HDMI_VSYNC_ACTIVE_F2_START__MASK                        0x00000fff
+#define HDMI_VSYNC_ACTIVE_F2_START__SHIFT                       0
+static inline uint32_t HDMI_VSYNC_ACTIVE_F2_START(uint32_t val)
+{
+        return ((val) << HDMI_VSYNC_ACTIVE_F2_START__SHIFT) & HDMI_VSYNC_ACTIVE_F2_START__MASK;
+}
+#define HDMI_VSYNC_ACTIVE_F2_END__MASK                          0x0fff0000
+#define HDMI_VSYNC_ACTIVE_F2_END__SHIFT                         16
+static inline uint32_t HDMI_VSYNC_ACTIVE_F2_END(uint32_t val)
+{
+        return ((val) << HDMI_VSYNC_ACTIVE_F2_END__SHIFT) & HDMI_VSYNC_ACTIVE_F2_END__MASK;
+}
+
+#define REG_HDMI_TOTAL                                          0x000002c0
+#define HDMI_TOTAL_H_TOTAL__MASK                                0x00000fff
+#define HDMI_TOTAL_H_TOTAL__SHIFT                               0
+static inline uint32_t HDMI_TOTAL_H_TOTAL(uint32_t val)
+{
+        return ((val) << HDMI_TOTAL_H_TOTAL__SHIFT) & HDMI_TOTAL_H_TOTAL__MASK;
+}
+#define HDMI_TOTAL_V_TOTAL__MASK                                0x0fff0000
+#define HDMI_TOTAL_V_TOTAL__SHIFT                               16
+static inline uint32_t HDMI_TOTAL_V_TOTAL(uint32_t val)
+{
+        return ((val) << HDMI_TOTAL_V_TOTAL__SHIFT) & HDMI_TOTAL_V_TOTAL__MASK;
+}
+
+#define REG_HDMI_VSYNC_TOTAL_F2                                 0x000002c4
+#define HDMI_VSYNC_TOTAL_F2_V_TOTAL__MASK                       0x00000fff
+#define HDMI_VSYNC_TOTAL_F2_V_TOTAL__SHIFT                      0
+static inline uint32_t HDMI_VSYNC_TOTAL_F2_V_TOTAL(uint32_t val)
+{
+        return ((val) << HDMI_VSYNC_TOTAL_F2_V_TOTAL__SHIFT) & HDMI_VSYNC_TOTAL_F2_V_TOTAL__MASK;
+}
+
+#define REG_HDMI_FRAME_CTRL                                     0x000002c8
+#define HDMI_FRAME_CTRL_RGB_MUX_SEL_BGR                         0x00001000
+#define HDMI_FRAME_CTRL_VSYNC_LOW                               0x10000000
+#define HDMI_FRAME_CTRL_HSYNC_LOW                               0x20000000
+#define HDMI_FRAME_CTRL_INTERLACED_EN                           0x80000000
+
+#define REG_HDMI_PHY_CTRL                                       0x000002d4
+#define HDMI_PHY_CTRL_SW_RESET_PLL                              0x00000001
+#define HDMI_PHY_CTRL_SW_RESET_PLL_LOW                          0x00000002
+#define HDMI_PHY_CTRL_SW_RESET                                  0x00000004
+#define HDMI_PHY_CTRL_SW_RESET_LOW                              0x00000008
+
+#define REG_HDMI_AUD_INT                                        0x000002cc
+#define HDMI_AUD_INT_AUD_FIFO_URUN_INT                          0x00000001
+#define HDMI_AUD_INT_AUD_FIFO_URAN_MASK                         0x00000002
+#define HDMI_AUD_INT_AUD_SAM_DROP_INT                           0x00000004
+#define HDMI_AUD_INT_AUD_SAM_DROP_MASK                          0x00000008
+
+#define REG_HDMI_8x60_PHY_REG0                                  0x00000300
+#define HDMI_8x60_PHY_REG0_DESER_DEL_CTRL__MASK                 0x0000001c
+#define HDMI_8x60_PHY_REG0_DESER_DEL_CTRL__SHIFT                2
+static inline uint32_t HDMI_8x60_PHY_REG0_DESER_DEL_CTRL(uint32_t val)
+{
+        return ((val) << HDMI_8x60_PHY_REG0_DESER_DEL_CTRL__SHIFT) & HDMI_8x60_PHY_REG0_DESER_DEL_CTRL__MASK;
+}
+
+#define REG_HDMI_8x60_PHY_REG1                                  0x00000304
+#define HDMI_8x60_PHY_REG1_DTEST_MUX_SEL__MASK                  0x000000f0
+#define HDMI_8x60_PHY_REG1_DTEST_MUX_SEL__SHIFT                 4
+static inline uint32_t HDMI_8x60_PHY_REG1_DTEST_MUX_SEL(uint32_t val)
+{
+        return ((val) << HDMI_8x60_PHY_REG1_DTEST_MUX_SEL__SHIFT) & HDMI_8x60_PHY_REG1_DTEST_MUX_SEL__MASK;
+}
+#define HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL__MASK              0x0000000f
+#define HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL__SHIFT             0
+static inline uint32_t HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL(uint32_t val)
+{
+        return ((val) << HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL__SHIFT) & HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL__MASK;
+}
+
+#define REG_HDMI_8x60_PHY_REG2                                  0x00000308
+#define HDMI_8x60_PHY_REG2_PD_DESER                             0x00000001
+#define HDMI_8x60_PHY_REG2_PD_DRIVE_1                           0x00000002
+#define HDMI_8x60_PHY_REG2_PD_DRIVE_2                           0x00000004
+#define HDMI_8x60_PHY_REG2_PD_DRIVE_3                           0x00000008
+#define HDMI_8x60_PHY_REG2_PD_DRIVE_4                           0x00000010
+#define HDMI_8x60_PHY_REG2_PD_PLL                               0x00000020
+#define HDMI_8x60_PHY_REG2_PD_PWRGEN                            0x00000040
+#define HDMI_8x60_PHY_REG2_RCV_SENSE_EN                         0x00000080
+
+#define REG_HDMI_8x60_PHY_REG3                                  0x0000030c
+#define HDMI_8x60_PHY_REG3_PLL_ENABLE                           0x00000001
+
+#define REG_HDMI_8x60_PHY_REG4                                  0x00000310
+
+#define REG_HDMI_8x60_PHY_REG5                                  0x00000314
+
+#define REG_HDMI_8x60_PHY_REG6                                  0x00000318
+
+#define REG_HDMI_8x60_PHY_REG7                                  0x0000031c
+
+#define REG_HDMI_8x60_PHY_REG8                                  0x00000320
+
+#define REG_HDMI_8x60_PHY_REG9                                  0x00000324
+
+#define REG_HDMI_8x60_PHY_REG10                                 0x00000328
+
+#define REG_HDMI_8x60_PHY_REG11                                 0x0000032c
+
+#define REG_HDMI_8x60_PHY_REG12                                 0x00000330
+#define HDMI_8x60_PHY_REG12_RETIMING_EN                         0x00000001
+#define HDMI_8x60_PHY_REG12_PLL_LOCK_DETECT_EN                  0x00000002
+#define HDMI_8x60_PHY_REG12_FORCE_LOCK                          0x00000010
+
+#define REG_HDMI_8960_PHY_REG0                                  0x00000400
+
+#define REG_HDMI_8960_PHY_REG1                                  0x00000404
+
+#define REG_HDMI_8960_PHY_REG2                                  0x00000408
+
+#define REG_HDMI_8960_PHY_REG3                                  0x0000040c
+
+#define REG_HDMI_8960_PHY_REG4                                  0x00000410
+
+#define REG_HDMI_8960_PHY_REG5                                  0x00000414
+
+#define REG_HDMI_8960_PHY_REG6                                  0x00000418
+
+#define REG_HDMI_8960_PHY_REG7                                  0x0000041c
+
+#define REG_HDMI_8960_PHY_REG8                                  0x00000420
+
+#define REG_HDMI_8960_PHY_REG9                                  0x00000424
+
+#define REG_HDMI_8960_PHY_REG10                                 0x00000428
+
+#define REG_HDMI_8960_PHY_REG11                                 0x0000042c
+
+#define REG_HDMI_8960_PHY_REG12                                 0x00000430
+
+
+#endif /* HDMI_XML */
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
new file mode 100644
index 000000000000..7d63f5ffa7ba
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -0,0 +1,461 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/gpio.h>
+
+#include "msm_connector.h"
+#include "hdmi.h"
+
+struct hdmi_connector {
+        struct msm_connector base;
+        struct hdmi hdmi;
+        unsigned long int pixclock;
+        bool enabled;
+};
+#define to_hdmi_connector(x) container_of(x, struct hdmi_connector, base)
+
+static int gpio_config(struct hdmi *hdmi, bool on)
+{
+        struct drm_device *dev = hdmi->dev;
+        struct hdmi_platform_config *config =
+                        hdmi->pdev->dev.platform_data;
+        int ret;
+
+        if (on) {
+                ret = gpio_request(config->ddc_clk_gpio, "HDMI_DDC_CLK");
+                if (ret) {
+                        dev_err(dev->dev, "'%s'(%d) gpio_request failed: %d\n",
+                                "HDMI_DDC_CLK", config->ddc_clk_gpio, ret);
+                        goto error1;
+                }
+                ret = gpio_request(config->ddc_data_gpio, "HDMI_DDC_DATA");
+                if (ret) {
+                        dev_err(dev->dev, "'%s'(%d) gpio_request failed: %d\n",
+                                "HDMI_DDC_DATA", config->ddc_data_gpio, ret);
+                        goto error2;
+                }
+                ret = gpio_request(config->hpd_gpio, "HDMI_HPD");
+                if (ret) {
+                        dev_err(dev->dev, "'%s'(%d) gpio_request failed: %d\n",
+                                "HDMI_HPD", config->hpd_gpio, ret);
+                        goto error3;
+                }
+                if (config->pmic_gpio != -1) {
+                        ret = gpio_request(config->pmic_gpio, "PMIC_HDMI_MUX_SEL");
+                        if (ret) {
+                                dev_err(dev->dev, "'%s'(%d) gpio_request failed: %d\n",
+                                        "PMIC_HDMI_MUX_SEL", config->pmic_gpio, ret);
+                                goto error4;
+                        }
+                        gpio_set_value_cansleep(config->pmic_gpio, 0);
+                }
+                DBG("gpio on");
+        } else {
+                gpio_free(config->ddc_clk_gpio);
+                gpio_free(config->ddc_data_gpio);
+                gpio_free(config->hpd_gpio);
+
+                if (config->pmic_gpio != -1) {
+                        gpio_set_value_cansleep(config->pmic_gpio, 1);
+                        gpio_free(config->pmic_gpio);
+                }
+                DBG("gpio off");
+        }
+
+        return 0;
+
+error4:
+        gpio_free(config->hpd_gpio);
+error3:
+        gpio_free(config->ddc_data_gpio);
+error2:
+        gpio_free(config->ddc_clk_gpio);
+error1:
+        return ret;
+}
+
+static int hpd_enable(struct hdmi_connector *hdmi_connector)
+{
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        struct drm_device *dev = hdmi_connector->base.base.dev;
+        struct hdmi_phy *phy = hdmi->phy;
+        uint32_t hpd_ctrl;
+        int ret;
+
+        ret = gpio_config(hdmi, true);
+        if (ret) {
+                dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret);
+                goto fail;
+        }
+
+        ret = clk_prepare_enable(hdmi->clk);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable 'clk': %d\n", ret);
+                goto fail;
+        }
+
+        ret = clk_prepare_enable(hdmi->m_pclk);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable 'm_pclk': %d\n", ret);
+                goto fail;
+        }
+
+        ret = clk_prepare_enable(hdmi->s_pclk);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable 's_pclk': %d\n", ret);
+                goto fail;
+        }
+
+        if (hdmi->mpp0)
+                ret = regulator_enable(hdmi->mpp0);
+        if (!ret)
+                ret = regulator_enable(hdmi->mvs);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable regulators: %d\n", ret);
+                goto fail;
+        }
+
+        hdmi_set_mode(hdmi, false);
+        phy->funcs->reset(phy);
+        hdmi_set_mode(hdmi, true);
+
+        hdmi_write(hdmi, REG_HDMI_USEC_REFTIMER, 0x0001001b);
+
+        /* enable HPD events: */
+        hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
+                        HDMI_HPD_INT_CTRL_INT_CONNECT |
+                        HDMI_HPD_INT_CTRL_INT_EN);
+
+        /* set timeout to 4.1ms (max) for hardware debounce */
+        hpd_ctrl = hdmi_read(hdmi, REG_HDMI_HPD_CTRL);
+        hpd_ctrl |= HDMI_HPD_CTRL_TIMEOUT(0x1fff);
+
+        /* Toggle HPD circuit to trigger HPD sense */
+        hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
+                        ~HDMI_HPD_CTRL_ENABLE & hpd_ctrl);
+        hdmi_write(hdmi, REG_HDMI_HPD_CTRL,
+                        HDMI_HPD_CTRL_ENABLE | hpd_ctrl);
+
+        return 0;
+
+fail:
+        return ret;
+}
+
+static int hdp_disable(struct hdmi_connector *hdmi_connector)
+{
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        struct drm_device *dev = hdmi_connector->base.base.dev;
+        int ret = 0;
+
+        /* Disable HPD interrupt */
+        hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, 0);
+
+        hdmi_set_mode(hdmi, false);
+
+        if (hdmi->mpp0)
+                ret = regulator_disable(hdmi->mpp0);
+        if (!ret)
+                ret = regulator_disable(hdmi->mvs);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable regulators: %d\n", ret);
+                goto fail;
+        }
+
+        clk_disable_unprepare(hdmi->clk);
+        clk_disable_unprepare(hdmi->m_pclk);
+        clk_disable_unprepare(hdmi->s_pclk);
+
+        ret = gpio_config(hdmi, false);
+        if (ret) {
+                dev_err(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        return ret;
+}
+
+void hdmi_connector_irq(struct drm_connector *connector)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        uint32_t hpd_int_status, hpd_int_ctrl;
+
+        /* Process HPD: */
+        hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
+        hpd_int_ctrl   = hdmi_read(hdmi, REG_HDMI_HPD_INT_CTRL);
+
+        if ((hpd_int_ctrl & HDMI_HPD_INT_CTRL_INT_EN) &&
+                        (hpd_int_status & HDMI_HPD_INT_STATUS_INT)) {
+                bool detected = !!(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED);
+
+                DBG("status=%04x, ctrl=%04x", hpd_int_status, hpd_int_ctrl);
+
+                /* ack the irq: */
+                hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL,
+                                hpd_int_ctrl | HDMI_HPD_INT_CTRL_INT_ACK);
+
+                drm_helper_hpd_irq_event(connector->dev);
+
+                /* detect disconnect if we are connected or visa versa: */
+                hpd_int_ctrl = HDMI_HPD_INT_CTRL_INT_EN;
+                if (!detected)
+                        hpd_int_ctrl |= HDMI_HPD_INT_CTRL_INT_CONNECT;
+                hdmi_write(hdmi, REG_HDMI_HPD_INT_CTRL, hpd_int_ctrl);
+        }
+}
+
+static enum drm_connector_status hdmi_connector_detect(
+                struct drm_connector *connector, bool force)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        uint32_t hpd_int_status;
+        int retry = 20;
+
+        hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
+
+        /* sense seems to in some cases be momentarily de-asserted, don't
+         * let that trick us into thinking the monitor is gone:
+         */
+        while (retry-- && !(hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED)) {
+                mdelay(10);
+                hpd_int_status = hdmi_read(hdmi, REG_HDMI_HPD_INT_STATUS);
+                DBG("status=%08x", hpd_int_status);
+        }
+
+        return (hpd_int_status & HDMI_HPD_INT_STATUS_CABLE_DETECTED) ?
+                        connector_status_connected : connector_status_disconnected;
+}
+
+static void hdmi_connector_destroy(struct drm_connector *connector)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+
+        hdp_disable(hdmi_connector);
+
+        drm_sysfs_connector_remove(connector);
+        drm_connector_cleanup(connector);
+
+        hdmi_destroy(&hdmi_connector->hdmi);
+
+        kfree(hdmi_connector);
+}
+
+static int hdmi_connector_get_modes(struct drm_connector *connector)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        struct edid *edid;
+        uint32_t hdmi_ctrl;
+        int ret = 0;
+
+        hdmi_ctrl = hdmi_read(hdmi, REG_HDMI_CTRL);
+        hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl | HDMI_CTRL_ENABLE);
+
+        edid = drm_get_edid(connector, hdmi->i2c);
+
+        hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
+
+        drm_mode_connector_update_edid_property(connector, edid);
+
+        if (edid) {
+                ret = drm_add_edid_modes(connector, edid);
+                kfree(edid);
+        }
+
+        return ret;
+}
+
+static int hdmi_connector_mode_valid(struct drm_connector *connector,
+                                 struct drm_display_mode *mode)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        struct msm_drm_private *priv = connector->dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        long actual, requested;
+
+        requested = 1000 * mode->clock;
+        actual = kms->funcs->round_pixclk(kms,
+                        requested, msm_connector->encoder);
+
+        DBG("requested=%ld, actual=%ld", requested, actual);
+
+        if (actual != requested)
+                return MODE_CLOCK_RANGE;
+
+        return 0;
+}
+
+static const struct drm_connector_funcs hdmi_connector_funcs = {
+        .dpms = drm_helper_connector_dpms,
+        .detect = hdmi_connector_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = hdmi_connector_destroy,
+};
+
+static const struct drm_connector_helper_funcs hdmi_connector_helper_funcs = {
+        .get_modes = hdmi_connector_get_modes,
+        .mode_valid = hdmi_connector_mode_valid,
+        .best_encoder = msm_connector_attached_encoder,
+};
+
+static void hdmi_connector_dpms(struct msm_connector *msm_connector, int mode)
+{
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        struct hdmi_phy *phy = hdmi->phy;
+        bool enabled = (mode == DRM_MODE_DPMS_ON);
+
+        DBG("mode=%d", mode);
+
+        if (enabled == hdmi_connector->enabled)
+                return;
+
+        if (enabled) {
+                phy->funcs->powerup(phy, hdmi_connector->pixclock);
+                hdmi_set_mode(hdmi, true);
+        } else {
+                hdmi_set_mode(hdmi, false);
+                phy->funcs->powerdown(phy);
+        }
+
+        hdmi_connector->enabled = enabled;
+}
+
+static void hdmi_connector_mode_set(struct msm_connector *msm_connector,
+                struct drm_display_mode *mode)
+{
+        struct hdmi_connector *hdmi_connector = to_hdmi_connector(msm_connector);
+        struct hdmi *hdmi = &hdmi_connector->hdmi;
+        int hstart, hend, vstart, vend;
+        uint32_t frame_ctrl;
+
+        hdmi_connector->pixclock = mode->clock * 1000;
+
+        hdmi->hdmi_mode = drm_match_cea_mode(mode) > 1;
+
+        hstart = mode->htotal - mode->hsync_start;
+        hend   = mode->htotal - mode->hsync_start + mode->hdisplay;
+
+        vstart = mode->vtotal - mode->vsync_start - 1;
+        vend   = mode->vtotal - mode->vsync_start + mode->vdisplay - 1;
+
+        DBG("htotal=%d, vtotal=%d, hstart=%d, hend=%d, vstart=%d, vend=%d",
+                        mode->htotal, mode->vtotal, hstart, hend, vstart, vend);
+
+        hdmi_write(hdmi, REG_HDMI_TOTAL,
+                        HDMI_TOTAL_H_TOTAL(mode->htotal - 1) |
+                        HDMI_TOTAL_V_TOTAL(mode->vtotal - 1));
+
+        hdmi_write(hdmi, REG_HDMI_ACTIVE_HSYNC,
+                        HDMI_ACTIVE_HSYNC_START(hstart) |
+                        HDMI_ACTIVE_HSYNC_END(hend));
+        hdmi_write(hdmi, REG_HDMI_ACTIVE_VSYNC,
+                        HDMI_ACTIVE_VSYNC_START(vstart) |
+                        HDMI_ACTIVE_VSYNC_END(vend));
+
+        if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
+                hdmi_write(hdmi, REG_HDMI_VSYNC_TOTAL_F2,
+                                HDMI_VSYNC_TOTAL_F2_V_TOTAL(mode->vtotal));
+                hdmi_write(hdmi, REG_HDMI_VSYNC_ACTIVE_F2,
+                                HDMI_VSYNC_ACTIVE_F2_START(vstart + 1) |
+                                HDMI_VSYNC_ACTIVE_F2_END(vend + 1));
+        } else {
+                hdmi_write(hdmi, REG_HDMI_VSYNC_TOTAL_F2,
+                                HDMI_VSYNC_TOTAL_F2_V_TOTAL(0));
+                hdmi_write(hdmi, REG_HDMI_VSYNC_ACTIVE_F2,
+                                HDMI_VSYNC_ACTIVE_F2_START(0) |
+                                HDMI_VSYNC_ACTIVE_F2_END(0));
+        }
+
+        frame_ctrl = 0;
+        if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+                frame_ctrl |= HDMI_FRAME_CTRL_HSYNC_LOW;
+        if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+                frame_ctrl |= HDMI_FRAME_CTRL_VSYNC_LOW;
+        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
+                frame_ctrl |= HDMI_FRAME_CTRL_INTERLACED_EN;
+        DBG("frame_ctrl=%08x", frame_ctrl);
+        hdmi_write(hdmi, REG_HDMI_FRAME_CTRL, frame_ctrl);
+
+        // TODO until we have audio, this might be safest:
+        if (hdmi->hdmi_mode)
+                hdmi_write(hdmi, REG_HDMI_GC, HDMI_GC_MUTE);
+}
+
+static const struct msm_connector_funcs msm_connector_funcs = {
+                .dpms = hdmi_connector_dpms,
+                .mode_set = hdmi_connector_mode_set,
+};
+
+/* initialize connector */
+struct drm_connector *hdmi_connector_init(struct drm_device *dev,
+                struct drm_encoder *encoder)
+{
+        struct drm_connector *connector = NULL;
+        struct hdmi_connector *hdmi_connector;
+        int ret;
+
+        hdmi_connector = kzalloc(sizeof(*hdmi_connector), GFP_KERNEL);
+        if (!hdmi_connector) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        connector = &hdmi_connector->base.base;
+
+        msm_connector_init(&hdmi_connector->base,
+                        &msm_connector_funcs, encoder);
+        drm_connector_init(dev, connector, &hdmi_connector_funcs,
+                        DRM_MODE_CONNECTOR_HDMIA);
+        drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
+
+        connector->polled = DRM_CONNECTOR_POLL_HPD;
+
+        connector->interlace_allowed = 1;
+        connector->doublescan_allowed = 0;
+
+        drm_sysfs_connector_add(connector);
+
+        ret = hdmi_init(&hdmi_connector->hdmi, dev, connector);
+        if (ret)
+                goto fail;
+
+        ret = hpd_enable(hdmi_connector);
+        if (ret) {
+                dev_err(dev->dev, "failed to enable HPD: %d\n", ret);
+                goto fail;
+        }
+
+        drm_mode_connector_attach_encoder(connector, encoder);
+
+        return connector;
+
+fail:
+        if (connector)
+                hdmi_connector_destroy(connector);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c b/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
new file mode 100644
index 000000000000..f4ab7f70fed1
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_i2c.c
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hdmi.h"
+
+struct hdmi_i2c_adapter {
+        struct i2c_adapter base;
+        struct hdmi *hdmi;
+        bool sw_done;
+        wait_queue_head_t ddc_event;
+};
+#define to_hdmi_i2c_adapter(x) container_of(x, struct hdmi_i2c_adapter, base)
+
+static void init_ddc(struct hdmi_i2c_adapter *hdmi_i2c)
+{
+        struct hdmi *hdmi = hdmi_i2c->hdmi;
+
+        hdmi_write(hdmi, REG_HDMI_DDC_CTRL,
+                        HDMI_DDC_CTRL_SW_STATUS_RESET);
+        hdmi_write(hdmi, REG_HDMI_DDC_CTRL,
+                        HDMI_DDC_CTRL_SOFT_RESET);
+
+        hdmi_write(hdmi, REG_HDMI_DDC_SPEED,
+                        HDMI_DDC_SPEED_THRESHOLD(2) |
+                        HDMI_DDC_SPEED_PRESCALE(10));
+
+        hdmi_write(hdmi, REG_HDMI_DDC_SETUP,
+                        HDMI_DDC_SETUP_TIMEOUT(0xff));
+
+        /* enable reference timer for 27us */
+        hdmi_write(hdmi, REG_HDMI_DDC_REF,
+                        HDMI_DDC_REF_REFTIMER_ENABLE |
+                        HDMI_DDC_REF_REFTIMER(27));
+}
+
+static int ddc_clear_irq(struct hdmi_i2c_adapter *hdmi_i2c)
+{
+        struct hdmi *hdmi = hdmi_i2c->hdmi;
+        struct drm_device *dev = hdmi->dev;
+        uint32_t retry = 0xffff;
+        uint32_t ddc_int_ctrl;
+
+        do {
+                --retry;
+
+                hdmi_write(hdmi, REG_HDMI_DDC_INT_CTRL,
+                                HDMI_DDC_INT_CTRL_SW_DONE_ACK |
+                                HDMI_DDC_INT_CTRL_SW_DONE_MASK);
+
+                ddc_int_ctrl = hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL);
+
+        } while ((ddc_int_ctrl & HDMI_DDC_INT_CTRL_SW_DONE_INT) && retry);
+
+        if (!retry) {
+                dev_err(dev->dev, "timeout waiting for DDC\n");
+                return -ETIMEDOUT;
+        }
+
+        hdmi_i2c->sw_done = false;
+
+        return 0;
+}
+
+#define MAX_TRANSACTIONS 4
+
+static bool sw_done(struct hdmi_i2c_adapter *hdmi_i2c)
+{
+        struct hdmi *hdmi = hdmi_i2c->hdmi;
+
+        if (!hdmi_i2c->sw_done) {
+                uint32_t ddc_int_ctrl;
+
+                ddc_int_ctrl = hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL);
+
+                if ((ddc_int_ctrl & HDMI_DDC_INT_CTRL_SW_DONE_MASK) &&
+                                (ddc_int_ctrl & HDMI_DDC_INT_CTRL_SW_DONE_INT)) {
+                        hdmi_i2c->sw_done = true;
+                        hdmi_write(hdmi, REG_HDMI_DDC_INT_CTRL,
+                                        HDMI_DDC_INT_CTRL_SW_DONE_ACK);
+                }
+        }
+
+        return hdmi_i2c->sw_done;
+}
+
+static int hdmi_i2c_xfer(struct i2c_adapter *i2c,
+                struct i2c_msg *msgs, int num)
+{
+        struct hdmi_i2c_adapter *hdmi_i2c = to_hdmi_i2c_adapter(i2c);
+        struct hdmi *hdmi = hdmi_i2c->hdmi;
+        struct drm_device *dev = hdmi->dev;
+        static const uint32_t nack[] = {
+                        HDMI_DDC_SW_STATUS_NACK0, HDMI_DDC_SW_STATUS_NACK1,
+                        HDMI_DDC_SW_STATUS_NACK2, HDMI_DDC_SW_STATUS_NACK3,
+        };
+        int indices[MAX_TRANSACTIONS];
+        int ret, i, j, index = 0;
+        uint32_t ddc_status, ddc_data, i2c_trans;
+
+        num = min(num, MAX_TRANSACTIONS);
+
+        WARN_ON(!(hdmi_read(hdmi, REG_HDMI_CTRL) & HDMI_CTRL_ENABLE));
+
+        if (num == 0)
+                return num;
+
+        init_ddc(hdmi_i2c);
+
+        ret = ddc_clear_irq(hdmi_i2c);
+        if (ret)
+                return ret;
+
+        for (i = 0; i < num; i++) {
+                struct i2c_msg *p = &msgs[i];
+                uint32_t raw_addr = p->addr << 1;
+
+                if (p->flags & I2C_M_RD)
+                        raw_addr |= 1;
+
+                ddc_data = HDMI_DDC_DATA_DATA(raw_addr) |
+                                HDMI_DDC_DATA_DATA_RW(DDC_WRITE);
+
+                if (i == 0) {
+                        ddc_data |= HDMI_DDC_DATA_INDEX(0) |
+                                        HDMI_DDC_DATA_INDEX_WRITE;
+                }
+
+                hdmi_write(hdmi, REG_HDMI_DDC_DATA, ddc_data);
+                index++;
+
+                indices[i] = index;
+
+                if (p->flags & I2C_M_RD) {
+                        index += p->len;
+                } else {
+                        for (j = 0; j < p->len; j++) {
+                                ddc_data = HDMI_DDC_DATA_DATA(p->buf[j]) |
+                                                HDMI_DDC_DATA_DATA_RW(DDC_WRITE);
+                                hdmi_write(hdmi, REG_HDMI_DDC_DATA, ddc_data);
+                                index++;
+                        }
+                }
+
+                i2c_trans = HDMI_I2C_TRANSACTION_REG_CNT(p->len) |
+                                HDMI_I2C_TRANSACTION_REG_RW(
+                                                (p->flags & I2C_M_RD) ? DDC_READ : DDC_WRITE) |
+                                HDMI_I2C_TRANSACTION_REG_START;
+
+                if (i == (num - 1))
+                        i2c_trans |= HDMI_I2C_TRANSACTION_REG_STOP;
+
+                hdmi_write(hdmi, REG_HDMI_I2C_TRANSACTION(i), i2c_trans);
+        }
+
+        /* trigger the transfer: */
+        hdmi_write(hdmi, REG_HDMI_DDC_CTRL,
+                        HDMI_DDC_CTRL_TRANSACTION_CNT(num - 1) |
+                        HDMI_DDC_CTRL_GO);
+
+        ret = wait_event_timeout(hdmi_i2c->ddc_event, sw_done(hdmi_i2c), HZ/4);
+        if (ret <= 0) {
+                if (ret == 0)
+                        ret = -ETIMEDOUT;
+                dev_warn(dev->dev, "DDC timeout: %d\n", ret);
+                DBG("sw_status=%08x, hw_status=%08x, int_ctrl=%08x",
+                                hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS),
+                                hdmi_read(hdmi, REG_HDMI_DDC_HW_STATUS),
+                                hdmi_read(hdmi, REG_HDMI_DDC_INT_CTRL));
+                return ret;
+        }
+
+        ddc_status = hdmi_read(hdmi, REG_HDMI_DDC_SW_STATUS);
+
+        /* read back results of any read transactions: */
+        for (i = 0; i < num; i++) {
+                struct i2c_msg *p = &msgs[i];
+
+                if (!(p->flags & I2C_M_RD))
+                        continue;
+
+                /* check for NACK: */
+                if (ddc_status & nack[i]) {
+                        DBG("ddc_status=%08x", ddc_status);
+                        break;
+                }
+
+                ddc_data = HDMI_DDC_DATA_DATA_RW(DDC_READ) |
+                                HDMI_DDC_DATA_INDEX(indices[i]) |
+                                HDMI_DDC_DATA_INDEX_WRITE;
+
+                hdmi_write(hdmi, REG_HDMI_DDC_DATA, ddc_data);
+
+                /* discard first byte: */
+                hdmi_read(hdmi, REG_HDMI_DDC_DATA);
+
+                for (j = 0; j < p->len; j++) {
+                        ddc_data = hdmi_read(hdmi, REG_HDMI_DDC_DATA);
+                        p->buf[j] = FIELD(ddc_data, HDMI_DDC_DATA_DATA);
+                }
+        }
+
+        return i;
+}
+
+static u32 hdmi_i2c_func(struct i2c_adapter *adapter)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+}
+
+static const struct i2c_algorithm hdmi_i2c_algorithm = {
+        .master_xfer    = hdmi_i2c_xfer,
+        .functionality  = hdmi_i2c_func,
+};
+
+void hdmi_i2c_irq(struct i2c_adapter *i2c)
+{
+        struct hdmi_i2c_adapter *hdmi_i2c = to_hdmi_i2c_adapter(i2c);
+
+        if (sw_done(hdmi_i2c))
+                wake_up_all(&hdmi_i2c->ddc_event);
+}
+
+void hdmi_i2c_destroy(struct i2c_adapter *i2c)
+{
+        struct hdmi_i2c_adapter *hdmi_i2c = to_hdmi_i2c_adapter(i2c);
+        i2c_del_adapter(i2c);
+        kfree(hdmi_i2c);
+}
+
+struct i2c_adapter *hdmi_i2c_init(struct hdmi *hdmi)
+{
+        struct drm_device *dev = hdmi->dev;
+        struct hdmi_i2c_adapter *hdmi_i2c;
+        struct i2c_adapter *i2c = NULL;
+        int ret;
+
+        hdmi_i2c = kzalloc(sizeof(*hdmi_i2c), GFP_KERNEL);
+        if (!hdmi_i2c) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        i2c = &hdmi_i2c->base;
+
+        hdmi_i2c->hdmi = hdmi;
+        init_waitqueue_head(&hdmi_i2c->ddc_event);
+
+
+        i2c->owner = THIS_MODULE;
+        i2c->class = I2C_CLASS_DDC;
+        snprintf(i2c->name, sizeof(i2c->name), "msm hdmi i2c");
+        i2c->dev.parent = &hdmi->pdev->dev;
+        i2c->algo = &hdmi_i2c_algorithm;
+
+        ret = i2c_add_adapter(i2c);
+        if (ret) {
+                dev_err(dev->dev, "failed to register hdmi i2c: %d\n", ret);
+                goto fail;
+        }
+
+        return i2c;
+
+fail:
+        if (i2c)
+                hdmi_i2c_destroy(i2c);
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
new file mode 100644
index 000000000000..e5b7ed5b8f01
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hdmi.h"
+
+struct hdmi_phy_8960 {
+        struct hdmi_phy base;
+        struct hdmi *hdmi;
+};
+#define to_hdmi_phy_8960(x) container_of(x, struct hdmi_phy_8960, base)
+
+static void hdmi_phy_8960_destroy(struct hdmi_phy *phy)
+{
+        struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
+        kfree(phy_8960);
+}
+
+static void hdmi_phy_8960_reset(struct hdmi_phy *phy)
+{
+        struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
+        struct hdmi *hdmi = phy_8960->hdmi;
+        unsigned int val;
+
+        val = hdmi_read(hdmi, REG_HDMI_PHY_CTRL);
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET);
+        } else {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET);
+        }
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
+        } else {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET_PLL);
+        }
+
+        msleep(100);
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET);
+        } else {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET);
+        }
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_PLL_LOW) {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET_PLL);
+        } else {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET_PLL);
+        }
+}
+
+static void hdmi_phy_8960_powerup(struct hdmi_phy *phy,
+                unsigned long int pixclock)
+{
+        struct hdmi_phy_8960 *phy_8960 = to_hdmi_phy_8960(phy);
+        struct hdmi *hdmi = phy_8960->hdmi;
+
+        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);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG5, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG6, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG7, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG8, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG9, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG10, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG11, 0x00);
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG3, 0x20);
+}
+
+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;
+
+        hdmi_write(hdmi, REG_HDMI_8960_PHY_REG2, 0x7f);
+}
+
+static const struct hdmi_phy_funcs hdmi_phy_8960_funcs = {
+                .destroy = hdmi_phy_8960_destroy,
+                .reset = hdmi_phy_8960_reset,
+                .powerup = hdmi_phy_8960_powerup,
+                .powerdown = hdmi_phy_8960_powerdown,
+};
+
+struct hdmi_phy *hdmi_phy_8960_init(struct hdmi *hdmi)
+{
+        struct hdmi_phy_8960 *phy_8960;
+        struct hdmi_phy *phy = NULL;
+        int ret;
+
+        phy_8960 = kzalloc(sizeof(*phy_8960), GFP_KERNEL);
+        if (!phy_8960) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        phy = &phy_8960->base;
+
+        phy->funcs = &hdmi_phy_8960_funcs;
+
+        phy_8960->hdmi = hdmi;
+
+        return phy;
+
+fail:
+        if (phy)
+                hdmi_phy_8960_destroy(phy);
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c
new file mode 100644
index 000000000000..391433c1af7c
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "hdmi.h"
+
+struct hdmi_phy_8x60 {
+        struct hdmi_phy base;
+        struct hdmi *hdmi;
+};
+#define to_hdmi_phy_8x60(x) container_of(x, struct hdmi_phy_8x60, base)
+
+static void hdmi_phy_8x60_destroy(struct hdmi_phy *phy)
+{
+        struct hdmi_phy_8x60 *phy_8x60 = to_hdmi_phy_8x60(phy);
+        kfree(phy_8x60);
+}
+
+static void hdmi_phy_8x60_reset(struct hdmi_phy *phy)
+{
+        struct hdmi_phy_8x60 *phy_8x60 = to_hdmi_phy_8x60(phy);
+        struct hdmi *hdmi = phy_8x60->hdmi;
+        unsigned int val;
+
+        val = hdmi_read(hdmi, REG_HDMI_PHY_CTRL);
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET);
+        } else {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET);
+        }
+
+        msleep(100);
+
+        if (val & HDMI_PHY_CTRL_SW_RESET_LOW) {
+                /* pull high */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val | HDMI_PHY_CTRL_SW_RESET);
+        } else {
+                /* pull low */
+                hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                                val & ~HDMI_PHY_CTRL_SW_RESET);
+        }
+}
+
+static void hdmi_phy_8x60_powerup(struct hdmi_phy *phy,
+                unsigned long int pixclock)
+{
+        struct hdmi_phy_8x60 *phy_8x60 = to_hdmi_phy_8x60(phy);
+        struct hdmi *hdmi = phy_8x60->hdmi;
+
+        /* De-serializer delay D/C for non-lbk mode: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG0,
+                        HDMI_8x60_PHY_REG0_DESER_DEL_CTRL(3));
+
+        if (pixclock == 27000000) {
+                /* video_format == HDMI_VFRMT_720x480p60_16_9 */
+                hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG1,
+                                HDMI_8x60_PHY_REG1_DTEST_MUX_SEL(5) |
+                                HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL(3));
+        } else {
+                hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG1,
+                                HDMI_8x60_PHY_REG1_DTEST_MUX_SEL(5) |
+                                HDMI_8x60_PHY_REG1_OUTVOL_SWING_CTRL(4));
+        }
+
+        /* No matter what, start from the power down mode: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_PD_PWRGEN |
+                        HDMI_8x60_PHY_REG2_PD_PLL |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_4 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_3 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_2 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_1 |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+
+        /* Turn PowerGen on: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_PD_PLL |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_4 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_3 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_2 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_1 |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+
+        /* Turn PLL power on: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_4 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_3 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_2 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_1 |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+
+        /* Write to HIGH after PLL power down de-assert: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG3,
+                        HDMI_8x60_PHY_REG3_PLL_ENABLE);
+
+        /* ASIC power on; PHY REG9 = 0 */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG9, 0);
+
+        /* Enable PLL lock detect, PLL lock det will go high after lock
+         * Enable the re-time logic
+         */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG12,
+                        HDMI_8x60_PHY_REG12_RETIMING_EN |
+                        HDMI_8x60_PHY_REG12_PLL_LOCK_DETECT_EN);
+
+        /* Drivers are on: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+
+        /* If the RX detector is needed: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_RCV_SENSE_EN |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG4, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG5, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG6, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG7, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG8, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG9, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG10, 0);
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG11, 0);
+
+        /* If we want to use lock enable based on counting: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG12,
+                        HDMI_8x60_PHY_REG12_RETIMING_EN |
+                        HDMI_8x60_PHY_REG12_PLL_LOCK_DETECT_EN |
+                        HDMI_8x60_PHY_REG12_FORCE_LOCK);
+}
+
+static void hdmi_phy_8x60_powerdown(struct hdmi_phy *phy)
+{
+        struct hdmi_phy_8x60 *phy_8x60 = to_hdmi_phy_8x60(phy);
+        struct hdmi *hdmi = phy_8x60->hdmi;
+
+        /* Assert RESET PHY from controller */
+        hdmi_write(hdmi, REG_HDMI_PHY_CTRL,
+                        HDMI_PHY_CTRL_SW_RESET);
+        udelay(10);
+        /* De-assert RESET PHY from controller */
+        hdmi_write(hdmi, REG_HDMI_PHY_CTRL, 0);
+        /* Turn off Driver */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_4 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_3 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_2 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_1 |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+        udelay(10);
+        /* Disable PLL */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG3, 0);
+        /* Power down PHY, but keep RX-sense: */
+        hdmi_write(hdmi, REG_HDMI_8x60_PHY_REG2,
+                        HDMI_8x60_PHY_REG2_RCV_SENSE_EN |
+                        HDMI_8x60_PHY_REG2_PD_PWRGEN |
+                        HDMI_8x60_PHY_REG2_PD_PLL |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_4 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_3 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_2 |
+                        HDMI_8x60_PHY_REG2_PD_DRIVE_1 |
+                        HDMI_8x60_PHY_REG2_PD_DESER);
+}
+
+static const struct hdmi_phy_funcs hdmi_phy_8x60_funcs = {
+                .destroy = hdmi_phy_8x60_destroy,
+                .reset = hdmi_phy_8x60_reset,
+                .powerup = hdmi_phy_8x60_powerup,
+                .powerdown = hdmi_phy_8x60_powerdown,
+};
+
+struct hdmi_phy *hdmi_phy_8x60_init(struct hdmi *hdmi)
+{
+        struct hdmi_phy_8x60 *phy_8x60;
+        struct hdmi_phy *phy = NULL;
+        int ret;
+
+        phy_8x60 = kzalloc(sizeof(*phy_8x60), GFP_KERNEL);
+        if (!phy_8x60) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        phy = &phy_8x60->base;
+
+        phy->funcs = &hdmi_phy_8x60_funcs;
+
+        phy_8x60->hdmi = hdmi;
+
+        return phy;
+
+fail:
+        if (phy)
+                hdmi_phy_8x60_destroy(phy);
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/hdmi/qfprom.xml.h b/drivers/gpu/drm/msm/hdmi/qfprom.xml.h
new file mode 100644
index 000000000000..bee36363bcd0
--- /dev/null
+++ b/drivers/gpu/drm/msm/hdmi/qfprom.xml.h
@@ -0,0 +1,50 @@
+#ifndef QFPROM_XML
+#define QFPROM_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+#define REG_QFPROM_CONFIG_ROW0_LSB                              0x00000238
+#define QFPROM_CONFIG_ROW0_LSB_HDMI_DISABLE                     0x00200000
+#define QFPROM_CONFIG_ROW0_LSB_HDCP_DISABLE                     0x00400000
+
+
+#endif /* QFPROM_XML */
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4.xml.h b/drivers/gpu/drm/msm/mdp4/mdp4.xml.h
new file mode 100644
index 000000000000..bbeeebe2db55
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4.xml.h
@@ -0,0 +1,1061 @@
+#ifndef MDP4_XML
+#define MDP4_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- /home/robclark/src/freedreno/envytools/rnndb/msm.xml                 (    595 bytes, from 2013-07-05 19:21:12)
+- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml (   1453 bytes, from 2013-03-31 16:51:27)
+- /home/robclark/src/freedreno/envytools/rnndb/mdp4/mdp4.xml           (  19332 bytes, from 2013-08-16 22:16:36)
+- /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           (  19288 bytes, from 2013-08-11 18:14:15)
+
+Copyright (C) 2013 by the following authors:
+- Rob Clark <robdclark@gmail.com> (robclark)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+enum mpd4_bpc {
+        BPC1 = 0,
+        BPC5 = 1,
+        BPC6 = 2,
+        BPC8 = 3,
+};
+
+enum mpd4_bpc_alpha {
+        BPC1A = 0,
+        BPC4A = 1,
+        BPC6A = 2,
+        BPC8A = 3,
+};
+
+enum mpd4_alpha_type {
+        FG_CONST = 0,
+        BG_CONST = 1,
+        FG_PIXEL = 2,
+        BG_PIXEL = 3,
+};
+
+enum mpd4_pipe {
+        VG1 = 0,
+        VG2 = 1,
+        RGB1 = 2,
+        RGB2 = 3,
+        RGB3 = 4,
+        VG3 = 5,
+        VG4 = 6,
+};
+
+enum mpd4_mixer {
+        MIXER0 = 0,
+        MIXER1 = 1,
+        MIXER2 = 2,
+};
+
+enum mpd4_mixer_stage_id {
+        STAGE_UNUSED = 0,
+        STAGE_BASE = 1,
+        STAGE0 = 2,
+        STAGE1 = 3,
+        STAGE2 = 4,
+        STAGE3 = 5,
+};
+
+enum mdp4_intf {
+        INTF_LCDC_DTV = 0,
+        INTF_DSI_VIDEO = 1,
+        INTF_DSI_CMD = 2,
+        INTF_EBI2_TV = 3,
+};
+
+enum mdp4_cursor_format {
+        CURSOR_ARGB = 1,
+        CURSOR_XRGB = 2,
+};
+
+enum mdp4_dma {
+        DMA_P = 0,
+        DMA_S = 1,
+        DMA_E = 2,
+};
+
+#define MDP4_IRQ_OVERLAY0_DONE                                  0x00000001
+#define MDP4_IRQ_OVERLAY1_DONE                                  0x00000002
+#define MDP4_IRQ_DMA_S_DONE                                     0x00000004
+#define MDP4_IRQ_DMA_E_DONE                                     0x00000008
+#define MDP4_IRQ_DMA_P_DONE                                     0x00000010
+#define MDP4_IRQ_VG1_HISTOGRAM                                  0x00000020
+#define MDP4_IRQ_VG2_HISTOGRAM                                  0x00000040
+#define MDP4_IRQ_PRIMARY_VSYNC                                  0x00000080
+#define MDP4_IRQ_PRIMARY_INTF_UDERRUN                           0x00000100
+#define MDP4_IRQ_EXTERNAL_VSYNC                                 0x00000200
+#define MDP4_IRQ_EXTERNAL_INTF_UDERRUN                          0x00000400
+#define MDP4_IRQ_PRIMARY_RDPTR                                  0x00000800
+#define MDP4_IRQ_DMA_P_HISTOGRAM                                0x00020000
+#define MDP4_IRQ_DMA_S_HISTOGRAM                                0x04000000
+#define MDP4_IRQ_OVERLAY2_DONE                                  0x40000000
+#define REG_MDP4_VERSION                                        0x00000000
+#define MDP4_VERSION_MINOR__MASK                                0x00ff0000
+#define MDP4_VERSION_MINOR__SHIFT                               16
+static inline uint32_t MDP4_VERSION_MINOR(uint32_t val)
+{
+        return ((val) << MDP4_VERSION_MINOR__SHIFT) & MDP4_VERSION_MINOR__MASK;
+}
+#define MDP4_VERSION_MAJOR__MASK                                0xff000000
+#define MDP4_VERSION_MAJOR__SHIFT                               24
+static inline uint32_t MDP4_VERSION_MAJOR(uint32_t val)
+{
+        return ((val) << MDP4_VERSION_MAJOR__SHIFT) & MDP4_VERSION_MAJOR__MASK;
+}
+
+#define REG_MDP4_OVLP0_KICK                                     0x00000004
+
+#define REG_MDP4_OVLP1_KICK                                     0x00000008
+
+#define REG_MDP4_OVLP2_KICK                                     0x000000d0
+
+#define REG_MDP4_DMA_P_KICK                                     0x0000000c
+
+#define REG_MDP4_DMA_S_KICK                                     0x00000010
+
+#define REG_MDP4_DMA_E_KICK                                     0x00000014
+
+#define REG_MDP4_DISP_STATUS                                    0x00000018
+
+#define REG_MDP4_DISP_INTF_SEL                                  0x00000038
+#define MDP4_DISP_INTF_SEL_PRIM__MASK                           0x00000003
+#define MDP4_DISP_INTF_SEL_PRIM__SHIFT                          0
+static inline uint32_t MDP4_DISP_INTF_SEL_PRIM(enum mdp4_intf val)
+{
+        return ((val) << MDP4_DISP_INTF_SEL_PRIM__SHIFT) & MDP4_DISP_INTF_SEL_PRIM__MASK;
+}
+#define MDP4_DISP_INTF_SEL_SEC__MASK                            0x0000000c
+#define MDP4_DISP_INTF_SEL_SEC__SHIFT                           2
+static inline uint32_t MDP4_DISP_INTF_SEL_SEC(enum mdp4_intf val)
+{
+        return ((val) << MDP4_DISP_INTF_SEL_SEC__SHIFT) & MDP4_DISP_INTF_SEL_SEC__MASK;
+}
+#define MDP4_DISP_INTF_SEL_EXT__MASK                            0x00000030
+#define MDP4_DISP_INTF_SEL_EXT__SHIFT                           4
+static inline uint32_t MDP4_DISP_INTF_SEL_EXT(enum mdp4_intf val)
+{
+        return ((val) << MDP4_DISP_INTF_SEL_EXT__SHIFT) & MDP4_DISP_INTF_SEL_EXT__MASK;
+}
+#define MDP4_DISP_INTF_SEL_DSI_VIDEO                            0x00000040
+#define MDP4_DISP_INTF_SEL_DSI_CMD                              0x00000080
+
+#define REG_MDP4_RESET_STATUS                                   0x0000003c
+
+#define REG_MDP4_READ_CNFG                                      0x0000004c
+
+#define REG_MDP4_INTR_ENABLE                                    0x00000050
+
+#define REG_MDP4_INTR_STATUS                                    0x00000054
+
+#define REG_MDP4_INTR_CLEAR                                     0x00000058
+
+#define REG_MDP4_EBI2_LCD0                                      0x00000060
+
+#define REG_MDP4_EBI2_LCD1                                      0x00000064
+
+#define REG_MDP4_PORTMAP_MODE                                   0x00000070
+
+#define REG_MDP4_CS_CONTROLLER0                                 0x000000c0
+
+#define REG_MDP4_CS_CONTROLLER1                                 0x000000c4
+
+#define REG_MDP4_LAYERMIXER2_IN_CFG                             0x000100f0
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE0__MASK                     0x00000007
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE0__SHIFT                    0
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE0(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE0__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE0__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE0_MIXER1                    0x00000008
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE1__MASK                     0x00000070
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE1__SHIFT                    4
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE1(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE1__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE1__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE1_MIXER1                    0x00000080
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE2__MASK                     0x00000700
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE2__SHIFT                    8
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE2(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE2__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE2__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE2_MIXER1                    0x00000800
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE3__MASK                     0x00007000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE3__SHIFT                    12
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE3(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE3__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE3__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE3_MIXER1                    0x00008000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE4__MASK                     0x00070000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE4__SHIFT                    16
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE4(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE4__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE4__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE4_MIXER1                    0x00080000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE5__MASK                     0x00700000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE5__SHIFT                    20
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE5(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE5__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE5__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE5_MIXER1                    0x00800000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE6__MASK                     0x07000000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE6__SHIFT                    24
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE6(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE6__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE6__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE6_MIXER1                    0x08000000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE7__MASK                     0x70000000
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE7__SHIFT                    28
+static inline uint32_t MDP4_LAYERMIXER2_IN_CFG_PIPE7(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER2_IN_CFG_PIPE7__SHIFT) & MDP4_LAYERMIXER2_IN_CFG_PIPE7__MASK;
+}
+#define MDP4_LAYERMIXER2_IN_CFG_PIPE7_MIXER1                    0x80000000
+
+#define REG_MDP4_LAYERMIXER_IN_CFG_UPDATE_METHOD                0x000100fc
+
+#define REG_MDP4_LAYERMIXER_IN_CFG                              0x00010100
+#define MDP4_LAYERMIXER_IN_CFG_PIPE0__MASK                      0x00000007
+#define MDP4_LAYERMIXER_IN_CFG_PIPE0__SHIFT                     0
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE0(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE0__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE0__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE0_MIXER1                     0x00000008
+#define MDP4_LAYERMIXER_IN_CFG_PIPE1__MASK                      0x00000070
+#define MDP4_LAYERMIXER_IN_CFG_PIPE1__SHIFT                     4
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE1(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE1__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE1__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE1_MIXER1                     0x00000080
+#define MDP4_LAYERMIXER_IN_CFG_PIPE2__MASK                      0x00000700
+#define MDP4_LAYERMIXER_IN_CFG_PIPE2__SHIFT                     8
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE2(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE2__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE2__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE2_MIXER1                     0x00000800
+#define MDP4_LAYERMIXER_IN_CFG_PIPE3__MASK                      0x00007000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE3__SHIFT                     12
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE3(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE3__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE3__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE3_MIXER1                     0x00008000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE4__MASK                      0x00070000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE4__SHIFT                     16
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE4(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE4__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE4__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE4_MIXER1                     0x00080000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE5__MASK                      0x00700000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE5__SHIFT                     20
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE5(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE5__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE5__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE5_MIXER1                     0x00800000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE6__MASK                      0x07000000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE6__SHIFT                     24
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE6(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE6__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE6__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE6_MIXER1                     0x08000000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE7__MASK                      0x70000000
+#define MDP4_LAYERMIXER_IN_CFG_PIPE7__SHIFT                     28
+static inline uint32_t MDP4_LAYERMIXER_IN_CFG_PIPE7(enum mpd4_mixer_stage_id val)
+{
+        return ((val) << MDP4_LAYERMIXER_IN_CFG_PIPE7__SHIFT) & MDP4_LAYERMIXER_IN_CFG_PIPE7__MASK;
+}
+#define MDP4_LAYERMIXER_IN_CFG_PIPE7_MIXER1                     0x80000000
+
+#define REG_MDP4_VG2_SRC_FORMAT                                 0x00030050
+
+#define REG_MDP4_VG2_CONST_COLOR                                0x00031008
+
+#define REG_MDP4_OVERLAY_FLUSH                                  0x00018000
+#define MDP4_OVERLAY_FLUSH_OVLP0                                0x00000001
+#define MDP4_OVERLAY_FLUSH_OVLP1                                0x00000002
+#define MDP4_OVERLAY_FLUSH_VG1                                  0x00000004
+#define MDP4_OVERLAY_FLUSH_VG2                                  0x00000008
+#define MDP4_OVERLAY_FLUSH_RGB1                                 0x00000010
+#define MDP4_OVERLAY_FLUSH_RGB2                                 0x00000020
+
+static inline uint32_t __offset_OVLP(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return 0x00010000;
+                case 1: return 0x00018000;
+                case 2: return 0x00088000;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP4_OVLP(uint32_t i0) { return 0x00000000 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_CFG(uint32_t i0) { return 0x00000004 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_SIZE(uint32_t i0) { return 0x00000008 + __offset_OVLP(i0); }
+#define MDP4_OVLP_SIZE_HEIGHT__MASK                             0xffff0000
+#define MDP4_OVLP_SIZE_HEIGHT__SHIFT                            16
+static inline uint32_t MDP4_OVLP_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_OVLP_SIZE_HEIGHT__SHIFT) & MDP4_OVLP_SIZE_HEIGHT__MASK;
+}
+#define MDP4_OVLP_SIZE_WIDTH__MASK                              0x0000ffff
+#define MDP4_OVLP_SIZE_WIDTH__SHIFT                             0
+static inline uint32_t MDP4_OVLP_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_OVLP_SIZE_WIDTH__SHIFT) & MDP4_OVLP_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_OVLP_BASE(uint32_t i0) { return 0x0000000c + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_STRIDE(uint32_t i0) { return 0x00000010 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_OPMODE(uint32_t i0) { return 0x00000014 + __offset_OVLP(i0); }
+
+static inline uint32_t __offset_STAGE(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return 0x00000104;
+                case 1: return 0x00000124;
+                case 2: return 0x00000144;
+                case 3: return 0x00000160;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP4_OVLP_STAGE(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_OP(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+#define MDP4_OVLP_STAGE_OP_FG_ALPHA__MASK                       0x00000003
+#define MDP4_OVLP_STAGE_OP_FG_ALPHA__SHIFT                      0
+static inline uint32_t MDP4_OVLP_STAGE_OP_FG_ALPHA(enum mpd4_alpha_type val)
+{
+        return ((val) << MDP4_OVLP_STAGE_OP_FG_ALPHA__SHIFT) & MDP4_OVLP_STAGE_OP_FG_ALPHA__MASK;
+}
+#define MDP4_OVLP_STAGE_OP_FG_INV_ALPHA                         0x00000004
+#define MDP4_OVLP_STAGE_OP_FG_MOD_ALPHA                         0x00000008
+#define MDP4_OVLP_STAGE_OP_BG_ALPHA__MASK                       0x00000030
+#define MDP4_OVLP_STAGE_OP_BG_ALPHA__SHIFT                      4
+static inline uint32_t MDP4_OVLP_STAGE_OP_BG_ALPHA(enum mpd4_alpha_type val)
+{
+        return ((val) << MDP4_OVLP_STAGE_OP_BG_ALPHA__SHIFT) & MDP4_OVLP_STAGE_OP_BG_ALPHA__MASK;
+}
+#define MDP4_OVLP_STAGE_OP_BG_INV_ALPHA                         0x00000040
+#define MDP4_OVLP_STAGE_OP_BG_MOD_ALPHA                         0x00000080
+#define MDP4_OVLP_STAGE_OP_FG_TRANSP                            0x00000100
+#define MDP4_OVLP_STAGE_OP_BG_TRANSP                            0x00000200
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_FG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00000004 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_BG_ALPHA(uint32_t i0, uint32_t i1) { return 0x00000008 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_TRANSP_LOW0(uint32_t i0, uint32_t i1) { return 0x0000000c + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_TRANSP_LOW1(uint32_t i0, uint32_t i1) { return 0x00000010 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_TRANSP_HIGH0(uint32_t i0, uint32_t i1) { return 0x00000014 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_TRANSP_HIGH1(uint32_t i0, uint32_t i1) { return 0x00000018 + __offset_OVLP(i0) + __offset_STAGE(i1); }
+
+static inline uint32_t __offset_STAGE_CO3(uint32_t idx)
+{
+        switch (idx) {
+                case 0: return 0x00001004;
+                case 1: return 0x00001404;
+                case 2: return 0x00001804;
+                case 3: return 0x00001b84;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP4_OVLP_STAGE_CO3(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_OVLP(i0) + __offset_STAGE_CO3(i1); }
+
+static inline uint32_t REG_MDP4_OVLP_STAGE_CO3_SEL(uint32_t i0, uint32_t i1) { return 0x00000000 + __offset_OVLP(i0) + __offset_STAGE_CO3(i1); }
+#define MDP4_OVLP_STAGE_CO3_SEL_FG_ALPHA                        0x00000001
+
+static inline uint32_t REG_MDP4_OVLP_TRANSP_LOW0(uint32_t i0) { return 0x00000180 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_TRANSP_LOW1(uint32_t i0) { return 0x00000184 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_TRANSP_HIGH0(uint32_t i0) { return 0x00000188 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_TRANSP_HIGH1(uint32_t i0) { return 0x0000018c + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_CONFIG(uint32_t i0) { return 0x00000200 + __offset_OVLP(i0); }
+
+static inline uint32_t REG_MDP4_OVLP_CSC(uint32_t i0) { return 0x00002000 + __offset_OVLP(i0); }
+
+
+static inline uint32_t REG_MDP4_OVLP_CSC_MV(uint32_t i0, uint32_t i1) { return 0x00002400 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_MV_VAL(uint32_t i0, uint32_t i1) { return 0x00002400 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_PRE_BV(uint32_t i0, uint32_t i1) { return 0x00002500 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_PRE_BV_VAL(uint32_t i0, uint32_t i1) { return 0x00002500 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_POST_BV(uint32_t i0, uint32_t i1) { return 0x00002580 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_POST_BV_VAL(uint32_t i0, uint32_t i1) { return 0x00002580 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_PRE_LV(uint32_t i0, uint32_t i1) { return 0x00002600 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_PRE_LV_VAL(uint32_t i0, uint32_t i1) { return 0x00002600 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_POST_LV(uint32_t i0, uint32_t i1) { return 0x00002680 + __offset_OVLP(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_OVLP_CSC_POST_LV_VAL(uint32_t i0, uint32_t i1) { return 0x00002680 + __offset_OVLP(i0) + 0x4*i1; }
+
+#define REG_MDP4_DMA_P_OP_MODE                                  0x00090070
+
+static inline uint32_t REG_MDP4_LUTN(uint32_t i0) { return 0x00094800 + 0x400*i0; }
+
+static inline uint32_t REG_MDP4_LUTN_LUT(uint32_t i0, uint32_t i1) { return 0x00094800 + 0x400*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_LUTN_LUT_VAL(uint32_t i0, uint32_t i1) { return 0x00094800 + 0x400*i0 + 0x4*i1; }
+
+#define REG_MDP4_DMA_S_OP_MODE                                  0x000a0028
+
+static inline uint32_t REG_MDP4_DMA_E_QUANT(uint32_t i0) { return 0x000b0070 + 0x4*i0; }
+
+static inline uint32_t __offset_DMA(enum mdp4_dma idx)
+{
+        switch (idx) {
+                case DMA_P: return 0x00090000;
+                case DMA_S: return 0x000a0000;
+                case DMA_E: return 0x000b0000;
+                default: return INVALID_IDX(idx);
+        }
+}
+static inline uint32_t REG_MDP4_DMA(enum mdp4_dma i0) { return 0x00000000 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_CONFIG(enum mdp4_dma i0) { return 0x00000000 + __offset_DMA(i0); }
+#define MDP4_DMA_CONFIG_G_BPC__MASK                             0x00000003
+#define MDP4_DMA_CONFIG_G_BPC__SHIFT                            0
+static inline uint32_t MDP4_DMA_CONFIG_G_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_DMA_CONFIG_G_BPC__SHIFT) & MDP4_DMA_CONFIG_G_BPC__MASK;
+}
+#define MDP4_DMA_CONFIG_B_BPC__MASK                             0x0000000c
+#define MDP4_DMA_CONFIG_B_BPC__SHIFT                            2
+static inline uint32_t MDP4_DMA_CONFIG_B_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_DMA_CONFIG_B_BPC__SHIFT) & MDP4_DMA_CONFIG_B_BPC__MASK;
+}
+#define MDP4_DMA_CONFIG_R_BPC__MASK                             0x00000030
+#define MDP4_DMA_CONFIG_R_BPC__SHIFT                            4
+static inline uint32_t MDP4_DMA_CONFIG_R_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_DMA_CONFIG_R_BPC__SHIFT) & MDP4_DMA_CONFIG_R_BPC__MASK;
+}
+#define MDP4_DMA_CONFIG_PACK_ALIGN_MSB                          0x00000080
+#define MDP4_DMA_CONFIG_PACK__MASK                              0x0000ff00
+#define MDP4_DMA_CONFIG_PACK__SHIFT                             8
+static inline uint32_t MDP4_DMA_CONFIG_PACK(uint32_t val)
+{
+        return ((val) << MDP4_DMA_CONFIG_PACK__SHIFT) & MDP4_DMA_CONFIG_PACK__MASK;
+}
+#define MDP4_DMA_CONFIG_DEFLKR_EN                               0x01000000
+#define MDP4_DMA_CONFIG_DITHER_EN                               0x01000000
+
+static inline uint32_t REG_MDP4_DMA_SRC_SIZE(enum mdp4_dma i0) { return 0x00000004 + __offset_DMA(i0); }
+#define MDP4_DMA_SRC_SIZE_HEIGHT__MASK                          0xffff0000
+#define MDP4_DMA_SRC_SIZE_HEIGHT__SHIFT                         16
+static inline uint32_t MDP4_DMA_SRC_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_DMA_SRC_SIZE_HEIGHT__SHIFT) & MDP4_DMA_SRC_SIZE_HEIGHT__MASK;
+}
+#define MDP4_DMA_SRC_SIZE_WIDTH__MASK                           0x0000ffff
+#define MDP4_DMA_SRC_SIZE_WIDTH__SHIFT                          0
+static inline uint32_t MDP4_DMA_SRC_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_DMA_SRC_SIZE_WIDTH__SHIFT) & MDP4_DMA_SRC_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_DMA_SRC_BASE(enum mdp4_dma i0) { return 0x00000008 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_SRC_STRIDE(enum mdp4_dma i0) { return 0x0000000c + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_DST_SIZE(enum mdp4_dma i0) { return 0x00000010 + __offset_DMA(i0); }
+#define MDP4_DMA_DST_SIZE_HEIGHT__MASK                          0xffff0000
+#define MDP4_DMA_DST_SIZE_HEIGHT__SHIFT                         16
+static inline uint32_t MDP4_DMA_DST_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_DMA_DST_SIZE_HEIGHT__SHIFT) & MDP4_DMA_DST_SIZE_HEIGHT__MASK;
+}
+#define MDP4_DMA_DST_SIZE_WIDTH__MASK                           0x0000ffff
+#define MDP4_DMA_DST_SIZE_WIDTH__SHIFT                          0
+static inline uint32_t MDP4_DMA_DST_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_DMA_DST_SIZE_WIDTH__SHIFT) & MDP4_DMA_DST_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_DMA_CURSOR_SIZE(enum mdp4_dma i0) { return 0x00000044 + __offset_DMA(i0); }
+#define MDP4_DMA_CURSOR_SIZE_WIDTH__MASK                        0x0000007f
+#define MDP4_DMA_CURSOR_SIZE_WIDTH__SHIFT                       0
+static inline uint32_t MDP4_DMA_CURSOR_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_DMA_CURSOR_SIZE_WIDTH__SHIFT) & MDP4_DMA_CURSOR_SIZE_WIDTH__MASK;
+}
+#define MDP4_DMA_CURSOR_SIZE_HEIGHT__MASK                       0x007f0000
+#define MDP4_DMA_CURSOR_SIZE_HEIGHT__SHIFT                      16
+static inline uint32_t MDP4_DMA_CURSOR_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_DMA_CURSOR_SIZE_HEIGHT__SHIFT) & MDP4_DMA_CURSOR_SIZE_HEIGHT__MASK;
+}
+
+static inline uint32_t REG_MDP4_DMA_CURSOR_BASE(enum mdp4_dma i0) { return 0x00000048 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_CURSOR_POS(enum mdp4_dma i0) { return 0x0000004c + __offset_DMA(i0); }
+#define MDP4_DMA_CURSOR_POS_X__MASK                             0x0000ffff
+#define MDP4_DMA_CURSOR_POS_X__SHIFT                            0
+static inline uint32_t MDP4_DMA_CURSOR_POS_X(uint32_t val)
+{
+        return ((val) << MDP4_DMA_CURSOR_POS_X__SHIFT) & MDP4_DMA_CURSOR_POS_X__MASK;
+}
+#define MDP4_DMA_CURSOR_POS_Y__MASK                             0xffff0000
+#define MDP4_DMA_CURSOR_POS_Y__SHIFT                            16
+static inline uint32_t MDP4_DMA_CURSOR_POS_Y(uint32_t val)
+{
+        return ((val) << MDP4_DMA_CURSOR_POS_Y__SHIFT) & MDP4_DMA_CURSOR_POS_Y__MASK;
+}
+
+static inline uint32_t REG_MDP4_DMA_CURSOR_BLEND_CONFIG(enum mdp4_dma i0) { return 0x00000060 + __offset_DMA(i0); }
+#define MDP4_DMA_CURSOR_BLEND_CONFIG_CURSOR_EN                  0x00000001
+#define MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT__MASK               0x00000006
+#define MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT__SHIFT              1
+static inline uint32_t MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT(enum mdp4_cursor_format val)
+{
+        return ((val) << MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT__SHIFT) & MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT__MASK;
+}
+#define MDP4_DMA_CURSOR_BLEND_CONFIG_TRANSP_EN                  0x00000008
+
+static inline uint32_t REG_MDP4_DMA_CURSOR_BLEND_PARAM(enum mdp4_dma i0) { return 0x00000064 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_BLEND_TRANS_LOW(enum mdp4_dma i0) { return 0x00000068 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_BLEND_TRANS_HIGH(enum mdp4_dma i0) { return 0x0000006c + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_FETCH_CONFIG(enum mdp4_dma i0) { return 0x00001004 + __offset_DMA(i0); }
+
+static inline uint32_t REG_MDP4_DMA_CSC(enum mdp4_dma i0) { return 0x00003000 + __offset_DMA(i0); }
+
+
+static inline uint32_t REG_MDP4_DMA_CSC_MV(enum mdp4_dma i0, uint32_t i1) { return 0x00003400 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_MV_VAL(enum mdp4_dma i0, uint32_t i1) { return 0x00003400 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_PRE_BV(enum mdp4_dma i0, uint32_t i1) { return 0x00003500 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_PRE_BV_VAL(enum mdp4_dma i0, uint32_t i1) { return 0x00003500 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_POST_BV(enum mdp4_dma i0, uint32_t i1) { return 0x00003580 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_POST_BV_VAL(enum mdp4_dma i0, uint32_t i1) { return 0x00003580 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_PRE_LV(enum mdp4_dma i0, uint32_t i1) { return 0x00003600 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_PRE_LV_VAL(enum mdp4_dma i0, uint32_t i1) { return 0x00003600 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_POST_LV(enum mdp4_dma i0, uint32_t i1) { return 0x00003680 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_DMA_CSC_POST_LV_VAL(enum mdp4_dma i0, uint32_t i1) { return 0x00003680 + __offset_DMA(i0) + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE(enum mpd4_pipe i0) { return 0x00020000 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_SRC_SIZE(enum mpd4_pipe i0) { return 0x00020000 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_SIZE_HEIGHT__MASK                         0xffff0000
+#define MDP4_PIPE_SRC_SIZE_HEIGHT__SHIFT                        16
+static inline uint32_t MDP4_PIPE_SRC_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_SIZE_HEIGHT__SHIFT) & MDP4_PIPE_SRC_SIZE_HEIGHT__MASK;
+}
+#define MDP4_PIPE_SRC_SIZE_WIDTH__MASK                          0x0000ffff
+#define MDP4_PIPE_SRC_SIZE_WIDTH__SHIFT                         0
+static inline uint32_t MDP4_PIPE_SRC_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_SIZE_WIDTH__SHIFT) & MDP4_PIPE_SRC_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_SRC_XY(enum mpd4_pipe i0) { return 0x00020004 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_XY_Y__MASK                                0xffff0000
+#define MDP4_PIPE_SRC_XY_Y__SHIFT                               16
+static inline uint32_t MDP4_PIPE_SRC_XY_Y(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_XY_Y__SHIFT) & MDP4_PIPE_SRC_XY_Y__MASK;
+}
+#define MDP4_PIPE_SRC_XY_X__MASK                                0x0000ffff
+#define MDP4_PIPE_SRC_XY_X__SHIFT                               0
+static inline uint32_t MDP4_PIPE_SRC_XY_X(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_XY_X__SHIFT) & MDP4_PIPE_SRC_XY_X__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_DST_SIZE(enum mpd4_pipe i0) { return 0x00020008 + 0x10000*i0; }
+#define MDP4_PIPE_DST_SIZE_HEIGHT__MASK                         0xffff0000
+#define MDP4_PIPE_DST_SIZE_HEIGHT__SHIFT                        16
+static inline uint32_t MDP4_PIPE_DST_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_DST_SIZE_HEIGHT__SHIFT) & MDP4_PIPE_DST_SIZE_HEIGHT__MASK;
+}
+#define MDP4_PIPE_DST_SIZE_WIDTH__MASK                          0x0000ffff
+#define MDP4_PIPE_DST_SIZE_WIDTH__SHIFT                         0
+static inline uint32_t MDP4_PIPE_DST_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_DST_SIZE_WIDTH__SHIFT) & MDP4_PIPE_DST_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_DST_XY(enum mpd4_pipe i0) { return 0x0002000c + 0x10000*i0; }
+#define MDP4_PIPE_DST_XY_Y__MASK                                0xffff0000
+#define MDP4_PIPE_DST_XY_Y__SHIFT                               16
+static inline uint32_t MDP4_PIPE_DST_XY_Y(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_DST_XY_Y__SHIFT) & MDP4_PIPE_DST_XY_Y__MASK;
+}
+#define MDP4_PIPE_DST_XY_X__MASK                                0x0000ffff
+#define MDP4_PIPE_DST_XY_X__SHIFT                               0
+static inline uint32_t MDP4_PIPE_DST_XY_X(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_DST_XY_X__SHIFT) & MDP4_PIPE_DST_XY_X__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_SRCP0_BASE(enum mpd4_pipe i0) { return 0x00020010 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_SRCP1_BASE(enum mpd4_pipe i0) { return 0x00020014 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_SRCP2_BASE(enum mpd4_pipe i0) { return 0x00020018 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_SRC_STRIDE_A(enum mpd4_pipe i0) { return 0x00020040 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_STRIDE_A_P0__MASK                         0x0000ffff
+#define MDP4_PIPE_SRC_STRIDE_A_P0__SHIFT                        0
+static inline uint32_t MDP4_PIPE_SRC_STRIDE_A_P0(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_STRIDE_A_P0__SHIFT) & MDP4_PIPE_SRC_STRIDE_A_P0__MASK;
+}
+#define MDP4_PIPE_SRC_STRIDE_A_P1__MASK                         0xffff0000
+#define MDP4_PIPE_SRC_STRIDE_A_P1__SHIFT                        16
+static inline uint32_t MDP4_PIPE_SRC_STRIDE_A_P1(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_STRIDE_A_P1__SHIFT) & MDP4_PIPE_SRC_STRIDE_A_P1__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_SRC_STRIDE_B(enum mpd4_pipe i0) { return 0x00020044 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_STRIDE_B_P2__MASK                         0x0000ffff
+#define MDP4_PIPE_SRC_STRIDE_B_P2__SHIFT                        0
+static inline uint32_t MDP4_PIPE_SRC_STRIDE_B_P2(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_STRIDE_B_P2__SHIFT) & MDP4_PIPE_SRC_STRIDE_B_P2__MASK;
+}
+#define MDP4_PIPE_SRC_STRIDE_B_P3__MASK                         0xffff0000
+#define MDP4_PIPE_SRC_STRIDE_B_P3__SHIFT                        16
+static inline uint32_t MDP4_PIPE_SRC_STRIDE_B_P3(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_STRIDE_B_P3__SHIFT) & MDP4_PIPE_SRC_STRIDE_B_P3__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_FRAME_SIZE(enum mpd4_pipe i0) { return 0x00020048 + 0x10000*i0; }
+#define MDP4_PIPE_FRAME_SIZE_HEIGHT__MASK                       0xffff0000
+#define MDP4_PIPE_FRAME_SIZE_HEIGHT__SHIFT                      16
+static inline uint32_t MDP4_PIPE_FRAME_SIZE_HEIGHT(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_FRAME_SIZE_HEIGHT__SHIFT) & MDP4_PIPE_FRAME_SIZE_HEIGHT__MASK;
+}
+#define MDP4_PIPE_FRAME_SIZE_WIDTH__MASK                        0x0000ffff
+#define MDP4_PIPE_FRAME_SIZE_WIDTH__SHIFT                       0
+static inline uint32_t MDP4_PIPE_FRAME_SIZE_WIDTH(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_FRAME_SIZE_WIDTH__SHIFT) & MDP4_PIPE_FRAME_SIZE_WIDTH__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_SRC_FORMAT(enum mpd4_pipe i0) { return 0x00020050 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_FORMAT_G_BPC__MASK                        0x00000003
+#define MDP4_PIPE_SRC_FORMAT_G_BPC__SHIFT                       0
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_G_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_G_BPC__SHIFT) & MDP4_PIPE_SRC_FORMAT_G_BPC__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_B_BPC__MASK                        0x0000000c
+#define MDP4_PIPE_SRC_FORMAT_B_BPC__SHIFT                       2
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_B_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_B_BPC__SHIFT) & MDP4_PIPE_SRC_FORMAT_B_BPC__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_R_BPC__MASK                        0x00000030
+#define MDP4_PIPE_SRC_FORMAT_R_BPC__SHIFT                       4
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_R_BPC(enum mpd4_bpc val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_R_BPC__SHIFT) & MDP4_PIPE_SRC_FORMAT_R_BPC__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_A_BPC__MASK                        0x000000c0
+#define MDP4_PIPE_SRC_FORMAT_A_BPC__SHIFT                       6
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_A_BPC(enum mpd4_bpc_alpha val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_A_BPC__SHIFT) & MDP4_PIPE_SRC_FORMAT_A_BPC__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_ALPHA_ENABLE                       0x00000100
+#define MDP4_PIPE_SRC_FORMAT_CPP__MASK                          0x00000600
+#define MDP4_PIPE_SRC_FORMAT_CPP__SHIFT                         9
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_CPP(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_CPP__SHIFT) & MDP4_PIPE_SRC_FORMAT_CPP__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_ROTATED_90                         0x00001000
+#define MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT__MASK                 0x00006000
+#define MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT__SHIFT                13
+static inline uint32_t MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT__SHIFT) & MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT__MASK;
+}
+#define MDP4_PIPE_SRC_FORMAT_UNPACK_TIGHT                       0x00020000
+#define MDP4_PIPE_SRC_FORMAT_UNPACK_ALIGN_MSB                   0x00040000
+#define MDP4_PIPE_SRC_FORMAT_SOLID_FILL                         0x00400000
+
+static inline uint32_t REG_MDP4_PIPE_SRC_UNPACK(enum mpd4_pipe i0) { return 0x00020054 + 0x10000*i0; }
+#define MDP4_PIPE_SRC_UNPACK_ELEM0__MASK                        0x000000ff
+#define MDP4_PIPE_SRC_UNPACK_ELEM0__SHIFT                       0
+static inline uint32_t MDP4_PIPE_SRC_UNPACK_ELEM0(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_UNPACK_ELEM0__SHIFT) & MDP4_PIPE_SRC_UNPACK_ELEM0__MASK;
+}
+#define MDP4_PIPE_SRC_UNPACK_ELEM1__MASK                        0x0000ff00
+#define MDP4_PIPE_SRC_UNPACK_ELEM1__SHIFT                       8
+static inline uint32_t MDP4_PIPE_SRC_UNPACK_ELEM1(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_UNPACK_ELEM1__SHIFT) & MDP4_PIPE_SRC_UNPACK_ELEM1__MASK;
+}
+#define MDP4_PIPE_SRC_UNPACK_ELEM2__MASK                        0x00ff0000
+#define MDP4_PIPE_SRC_UNPACK_ELEM2__SHIFT                       16
+static inline uint32_t MDP4_PIPE_SRC_UNPACK_ELEM2(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_UNPACK_ELEM2__SHIFT) & MDP4_PIPE_SRC_UNPACK_ELEM2__MASK;
+}
+#define MDP4_PIPE_SRC_UNPACK_ELEM3__MASK                        0xff000000
+#define MDP4_PIPE_SRC_UNPACK_ELEM3__SHIFT                       24
+static inline uint32_t MDP4_PIPE_SRC_UNPACK_ELEM3(uint32_t val)
+{
+        return ((val) << MDP4_PIPE_SRC_UNPACK_ELEM3__SHIFT) & MDP4_PIPE_SRC_UNPACK_ELEM3__MASK;
+}
+
+static inline uint32_t REG_MDP4_PIPE_OP_MODE(enum mpd4_pipe i0) { return 0x00020058 + 0x10000*i0; }
+#define MDP4_PIPE_OP_MODE_SCALEX_EN                             0x00000001
+#define MDP4_PIPE_OP_MODE_SCALEY_EN                             0x00000002
+#define MDP4_PIPE_OP_MODE_SRC_YCBCR                             0x00000200
+#define MDP4_PIPE_OP_MODE_DST_YCBCR                             0x00000400
+#define MDP4_PIPE_OP_MODE_CSC_EN                                0x00000800
+#define MDP4_PIPE_OP_MODE_FLIP_LR                               0x00002000
+#define MDP4_PIPE_OP_MODE_FLIP_UD                               0x00004000
+#define MDP4_PIPE_OP_MODE_DITHER_EN                             0x00008000
+#define MDP4_PIPE_OP_MODE_IGC_LUT_EN                            0x00010000
+#define MDP4_PIPE_OP_MODE_DEINT_EN                              0x00040000
+#define MDP4_PIPE_OP_MODE_DEINT_ODD_REF                         0x00080000
+
+static inline uint32_t REG_MDP4_PIPE_PHASEX_STEP(enum mpd4_pipe i0) { return 0x0002005c + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_PHASEY_STEP(enum mpd4_pipe i0) { return 0x00020060 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_FETCH_CONFIG(enum mpd4_pipe i0) { return 0x00021004 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_SOLID_COLOR(enum mpd4_pipe i0) { return 0x00021008 + 0x10000*i0; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC(enum mpd4_pipe i0) { return 0x00024000 + 0x10000*i0; }
+
+
+static inline uint32_t REG_MDP4_PIPE_CSC_MV(enum mpd4_pipe i0, uint32_t i1) { return 0x00024400 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_MV_VAL(enum mpd4_pipe i0, uint32_t i1) { return 0x00024400 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_PRE_BV(enum mpd4_pipe i0, uint32_t i1) { return 0x00024500 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_PRE_BV_VAL(enum mpd4_pipe i0, uint32_t i1) { return 0x00024500 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_POST_BV(enum mpd4_pipe i0, uint32_t i1) { return 0x00024580 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_POST_BV_VAL(enum mpd4_pipe i0, uint32_t i1) { return 0x00024580 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_PRE_LV(enum mpd4_pipe i0, uint32_t i1) { return 0x00024600 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_PRE_LV_VAL(enum mpd4_pipe i0, uint32_t i1) { return 0x00024600 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_POST_LV(enum mpd4_pipe i0, uint32_t i1) { return 0x00024680 + 0x10000*i0 + 0x4*i1; }
+
+static inline uint32_t REG_MDP4_PIPE_CSC_POST_LV_VAL(enum mpd4_pipe i0, uint32_t i1) { return 0x00024680 + 0x10000*i0 + 0x4*i1; }
+
+#define REG_MDP4_LCDC                                           0x000c0000
+
+#define REG_MDP4_LCDC_ENABLE                                    0x000c0000
+
+#define REG_MDP4_LCDC_HSYNC_CTRL                                0x000c0004
+#define MDP4_LCDC_HSYNC_CTRL_PULSEW__MASK                       0x0000ffff
+#define MDP4_LCDC_HSYNC_CTRL_PULSEW__SHIFT                      0
+static inline uint32_t MDP4_LCDC_HSYNC_CTRL_PULSEW(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_HSYNC_CTRL_PULSEW__SHIFT) & MDP4_LCDC_HSYNC_CTRL_PULSEW__MASK;
+}
+#define MDP4_LCDC_HSYNC_CTRL_PERIOD__MASK                       0xffff0000
+#define MDP4_LCDC_HSYNC_CTRL_PERIOD__SHIFT                      16
+static inline uint32_t MDP4_LCDC_HSYNC_CTRL_PERIOD(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_HSYNC_CTRL_PERIOD__SHIFT) & MDP4_LCDC_HSYNC_CTRL_PERIOD__MASK;
+}
+
+#define REG_MDP4_LCDC_VSYNC_PERIOD                              0x000c0008
+
+#define REG_MDP4_LCDC_VSYNC_LEN                                 0x000c000c
+
+#define REG_MDP4_LCDC_DISPLAY_HCTRL                             0x000c0010
+#define MDP4_LCDC_DISPLAY_HCTRL_START__MASK                     0x0000ffff
+#define MDP4_LCDC_DISPLAY_HCTRL_START__SHIFT                    0
+static inline uint32_t MDP4_LCDC_DISPLAY_HCTRL_START(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_DISPLAY_HCTRL_START__SHIFT) & MDP4_LCDC_DISPLAY_HCTRL_START__MASK;
+}
+#define MDP4_LCDC_DISPLAY_HCTRL_END__MASK                       0xffff0000
+#define MDP4_LCDC_DISPLAY_HCTRL_END__SHIFT                      16
+static inline uint32_t MDP4_LCDC_DISPLAY_HCTRL_END(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_DISPLAY_HCTRL_END__SHIFT) & MDP4_LCDC_DISPLAY_HCTRL_END__MASK;
+}
+
+#define REG_MDP4_LCDC_DISPLAY_VSTART                            0x000c0014
+
+#define REG_MDP4_LCDC_DISPLAY_VEND                              0x000c0018
+
+#define REG_MDP4_LCDC_ACTIVE_HCTL                               0x000c001c
+#define MDP4_LCDC_ACTIVE_HCTL_START__MASK                       0x00007fff
+#define MDP4_LCDC_ACTIVE_HCTL_START__SHIFT                      0
+static inline uint32_t MDP4_LCDC_ACTIVE_HCTL_START(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_ACTIVE_HCTL_START__SHIFT) & MDP4_LCDC_ACTIVE_HCTL_START__MASK;
+}
+#define MDP4_LCDC_ACTIVE_HCTL_END__MASK                         0x7fff0000
+#define MDP4_LCDC_ACTIVE_HCTL_END__SHIFT                        16
+static inline uint32_t MDP4_LCDC_ACTIVE_HCTL_END(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_ACTIVE_HCTL_END__SHIFT) & MDP4_LCDC_ACTIVE_HCTL_END__MASK;
+}
+#define MDP4_LCDC_ACTIVE_HCTL_ACTIVE_START_X                    0x80000000
+
+#define REG_MDP4_LCDC_ACTIVE_VSTART                             0x000c0020
+
+#define REG_MDP4_LCDC_ACTIVE_VEND                               0x000c0024
+
+#define REG_MDP4_LCDC_BORDER_CLR                                0x000c0028
+
+#define REG_MDP4_LCDC_UNDERFLOW_CLR                             0x000c002c
+#define MDP4_LCDC_UNDERFLOW_CLR_COLOR__MASK                     0x00ffffff
+#define MDP4_LCDC_UNDERFLOW_CLR_COLOR__SHIFT                    0
+static inline uint32_t MDP4_LCDC_UNDERFLOW_CLR_COLOR(uint32_t val)
+{
+        return ((val) << MDP4_LCDC_UNDERFLOW_CLR_COLOR__SHIFT) & MDP4_LCDC_UNDERFLOW_CLR_COLOR__MASK;
+}
+#define MDP4_LCDC_UNDERFLOW_CLR_ENABLE_RECOVERY                 0x80000000
+
+#define REG_MDP4_LCDC_HSYNC_SKEW                                0x000c0030
+
+#define REG_MDP4_LCDC_TEST_CNTL                                 0x000c0034
+
+#define REG_MDP4_LCDC_CTRL_POLARITY                             0x000c0038
+#define MDP4_LCDC_CTRL_POLARITY_HSYNC_LOW                       0x00000001
+#define MDP4_LCDC_CTRL_POLARITY_VSYNC_LOW                       0x00000002
+#define MDP4_LCDC_CTRL_POLARITY_DATA_EN_LOW                     0x00000004
+
+#define REG_MDP4_DTV                                            0x000d0000
+
+#define REG_MDP4_DTV_ENABLE                                     0x000d0000
+
+#define REG_MDP4_DTV_HSYNC_CTRL                                 0x000d0004
+#define MDP4_DTV_HSYNC_CTRL_PULSEW__MASK                        0x0000ffff
+#define MDP4_DTV_HSYNC_CTRL_PULSEW__SHIFT                       0
+static inline uint32_t MDP4_DTV_HSYNC_CTRL_PULSEW(uint32_t val)
+{
+        return ((val) << MDP4_DTV_HSYNC_CTRL_PULSEW__SHIFT) & MDP4_DTV_HSYNC_CTRL_PULSEW__MASK;
+}
+#define MDP4_DTV_HSYNC_CTRL_PERIOD__MASK                        0xffff0000
+#define MDP4_DTV_HSYNC_CTRL_PERIOD__SHIFT                       16
+static inline uint32_t MDP4_DTV_HSYNC_CTRL_PERIOD(uint32_t val)
+{
+        return ((val) << MDP4_DTV_HSYNC_CTRL_PERIOD__SHIFT) & MDP4_DTV_HSYNC_CTRL_PERIOD__MASK;
+}
+
+#define REG_MDP4_DTV_VSYNC_PERIOD                               0x000d0008
+
+#define REG_MDP4_DTV_VSYNC_LEN                                  0x000d000c
+
+#define REG_MDP4_DTV_DISPLAY_HCTRL                              0x000d0018
+#define MDP4_DTV_DISPLAY_HCTRL_START__MASK                      0x0000ffff
+#define MDP4_DTV_DISPLAY_HCTRL_START__SHIFT                     0
+static inline uint32_t MDP4_DTV_DISPLAY_HCTRL_START(uint32_t val)
+{
+        return ((val) << MDP4_DTV_DISPLAY_HCTRL_START__SHIFT) & MDP4_DTV_DISPLAY_HCTRL_START__MASK;
+}
+#define MDP4_DTV_DISPLAY_HCTRL_END__MASK                        0xffff0000
+#define MDP4_DTV_DISPLAY_HCTRL_END__SHIFT                       16
+static inline uint32_t MDP4_DTV_DISPLAY_HCTRL_END(uint32_t val)
+{
+        return ((val) << MDP4_DTV_DISPLAY_HCTRL_END__SHIFT) & MDP4_DTV_DISPLAY_HCTRL_END__MASK;
+}
+
+#define REG_MDP4_DTV_DISPLAY_VSTART                             0x000d001c
+
+#define REG_MDP4_DTV_DISPLAY_VEND                               0x000d0020
+
+#define REG_MDP4_DTV_ACTIVE_HCTL                                0x000d002c
+#define MDP4_DTV_ACTIVE_HCTL_START__MASK                        0x00007fff
+#define MDP4_DTV_ACTIVE_HCTL_START__SHIFT                       0
+static inline uint32_t MDP4_DTV_ACTIVE_HCTL_START(uint32_t val)
+{
+        return ((val) << MDP4_DTV_ACTIVE_HCTL_START__SHIFT) & MDP4_DTV_ACTIVE_HCTL_START__MASK;
+}
+#define MDP4_DTV_ACTIVE_HCTL_END__MASK                          0x7fff0000
+#define MDP4_DTV_ACTIVE_HCTL_END__SHIFT                         16
+static inline uint32_t MDP4_DTV_ACTIVE_HCTL_END(uint32_t val)
+{
+        return ((val) << MDP4_DTV_ACTIVE_HCTL_END__SHIFT) & MDP4_DTV_ACTIVE_HCTL_END__MASK;
+}
+#define MDP4_DTV_ACTIVE_HCTL_ACTIVE_START_X                     0x80000000
+
+#define REG_MDP4_DTV_ACTIVE_VSTART                              0x000d0030
+
+#define REG_MDP4_DTV_ACTIVE_VEND                                0x000d0038
+
+#define REG_MDP4_DTV_BORDER_CLR                                 0x000d0040
+
+#define REG_MDP4_DTV_UNDERFLOW_CLR                              0x000d0044
+#define MDP4_DTV_UNDERFLOW_CLR_COLOR__MASK                      0x00ffffff
+#define MDP4_DTV_UNDERFLOW_CLR_COLOR__SHIFT                     0
+static inline uint32_t MDP4_DTV_UNDERFLOW_CLR_COLOR(uint32_t val)
+{
+        return ((val) << MDP4_DTV_UNDERFLOW_CLR_COLOR__SHIFT) & MDP4_DTV_UNDERFLOW_CLR_COLOR__MASK;
+}
+#define MDP4_DTV_UNDERFLOW_CLR_ENABLE_RECOVERY                  0x80000000
+
+#define REG_MDP4_DTV_HSYNC_SKEW                                 0x000d0048
+
+#define REG_MDP4_DTV_TEST_CNTL                                  0x000d004c
+
+#define REG_MDP4_DTV_CTRL_POLARITY                              0x000d0050
+#define MDP4_DTV_CTRL_POLARITY_HSYNC_LOW                        0x00000001
+#define MDP4_DTV_CTRL_POLARITY_VSYNC_LOW                        0x00000002
+#define MDP4_DTV_CTRL_POLARITY_DATA_EN_LOW                      0x00000004
+
+#define REG_MDP4_DSI                                            0x000e0000
+
+#define REG_MDP4_DSI_ENABLE                                     0x000e0000
+
+#define REG_MDP4_DSI_HSYNC_CTRL                                 0x000e0004
+#define MDP4_DSI_HSYNC_CTRL_PULSEW__MASK                        0x0000ffff
+#define MDP4_DSI_HSYNC_CTRL_PULSEW__SHIFT                       0
+static inline uint32_t MDP4_DSI_HSYNC_CTRL_PULSEW(uint32_t val)
+{
+        return ((val) << MDP4_DSI_HSYNC_CTRL_PULSEW__SHIFT) & MDP4_DSI_HSYNC_CTRL_PULSEW__MASK;
+}
+#define MDP4_DSI_HSYNC_CTRL_PERIOD__MASK                        0xffff0000
+#define MDP4_DSI_HSYNC_CTRL_PERIOD__SHIFT                       16
+static inline uint32_t MDP4_DSI_HSYNC_CTRL_PERIOD(uint32_t val)
+{
+        return ((val) << MDP4_DSI_HSYNC_CTRL_PERIOD__SHIFT) & MDP4_DSI_HSYNC_CTRL_PERIOD__MASK;
+}
+
+#define REG_MDP4_DSI_VSYNC_PERIOD                               0x000e0008
+
+#define REG_MDP4_DSI_VSYNC_LEN                                  0x000e000c
+
+#define REG_MDP4_DSI_DISPLAY_HCTRL                              0x000e0010
+#define MDP4_DSI_DISPLAY_HCTRL_START__MASK                      0x0000ffff
+#define MDP4_DSI_DISPLAY_HCTRL_START__SHIFT                     0
+static inline uint32_t MDP4_DSI_DISPLAY_HCTRL_START(uint32_t val)
+{
+        return ((val) << MDP4_DSI_DISPLAY_HCTRL_START__SHIFT) & MDP4_DSI_DISPLAY_HCTRL_START__MASK;
+}
+#define MDP4_DSI_DISPLAY_HCTRL_END__MASK                        0xffff0000
+#define MDP4_DSI_DISPLAY_HCTRL_END__SHIFT                       16
+static inline uint32_t MDP4_DSI_DISPLAY_HCTRL_END(uint32_t val)
+{
+        return ((val) << MDP4_DSI_DISPLAY_HCTRL_END__SHIFT) & MDP4_DSI_DISPLAY_HCTRL_END__MASK;
+}
+
+#define REG_MDP4_DSI_DISPLAY_VSTART                             0x000e0014
+
+#define REG_MDP4_DSI_DISPLAY_VEND                               0x000e0018
+
+#define REG_MDP4_DSI_ACTIVE_HCTL                                0x000e001c
+#define MDP4_DSI_ACTIVE_HCTL_START__MASK                        0x00007fff
+#define MDP4_DSI_ACTIVE_HCTL_START__SHIFT                       0
+static inline uint32_t MDP4_DSI_ACTIVE_HCTL_START(uint32_t val)
+{
+        return ((val) << MDP4_DSI_ACTIVE_HCTL_START__SHIFT) & MDP4_DSI_ACTIVE_HCTL_START__MASK;
+}
+#define MDP4_DSI_ACTIVE_HCTL_END__MASK                          0x7fff0000
+#define MDP4_DSI_ACTIVE_HCTL_END__SHIFT                         16
+static inline uint32_t MDP4_DSI_ACTIVE_HCTL_END(uint32_t val)
+{
+        return ((val) << MDP4_DSI_ACTIVE_HCTL_END__SHIFT) & MDP4_DSI_ACTIVE_HCTL_END__MASK;
+}
+#define MDP4_DSI_ACTIVE_HCTL_ACTIVE_START_X                     0x80000000
+
+#define REG_MDP4_DSI_ACTIVE_VSTART                              0x000e0020
+
+#define REG_MDP4_DSI_ACTIVE_VEND                                0x000e0024
+
+#define REG_MDP4_DSI_BORDER_CLR                                 0x000e0028
+
+#define REG_MDP4_DSI_UNDERFLOW_CLR                              0x000e002c
+#define MDP4_DSI_UNDERFLOW_CLR_COLOR__MASK                      0x00ffffff
+#define MDP4_DSI_UNDERFLOW_CLR_COLOR__SHIFT                     0
+static inline uint32_t MDP4_DSI_UNDERFLOW_CLR_COLOR(uint32_t val)
+{
+        return ((val) << MDP4_DSI_UNDERFLOW_CLR_COLOR__SHIFT) & MDP4_DSI_UNDERFLOW_CLR_COLOR__MASK;
+}
+#define MDP4_DSI_UNDERFLOW_CLR_ENABLE_RECOVERY                  0x80000000
+
+#define REG_MDP4_DSI_HSYNC_SKEW                                 0x000e0030
+
+#define REG_MDP4_DSI_TEST_CNTL                                  0x000e0034
+
+#define REG_MDP4_DSI_CTRL_POLARITY                              0x000e0038
+#define MDP4_DSI_CTRL_POLARITY_HSYNC_LOW                        0x00000001
+#define MDP4_DSI_CTRL_POLARITY_VSYNC_LOW                        0x00000002
+#define MDP4_DSI_CTRL_POLARITY_DATA_EN_LOW                      0x00000004
+
+
+#endif /* MDP4_XML */
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp4/mdp4_crtc.c
new file mode 100644
index 000000000000..de6bea297cda
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_crtc.c
@@ -0,0 +1,685 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mdp4_kms.h"
+
+#include <drm/drm_mode.h>
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+#include "drm_flip_work.h"
+
+struct mdp4_crtc {
+        struct drm_crtc base;
+        char name[8];
+        struct drm_plane *plane;
+        int id;
+        int ovlp;
+        enum mdp4_dma dma;
+        bool enabled;
+
+        /* which mixer/encoder we route output to: */
+        int mixer;
+
+        struct {
+                spinlock_t lock;
+                bool stale;
+                uint32_t width, height;
+
+                /* next cursor to scan-out: */
+                uint32_t next_iova;
+                struct drm_gem_object *next_bo;
+
+                /* current cursor being scanned out: */
+                struct drm_gem_object *scanout_bo;
+        } cursor;
+
+
+        /* if there is a pending flip, these will be non-null: */
+        struct drm_pending_vblank_event *event;
+        struct work_struct pageflip_work;
+
+        /* the fb that we currently hold a scanout ref to: */
+        struct drm_framebuffer *fb;
+
+        /* for unref'ing framebuffers after scanout completes: */
+        struct drm_flip_work unref_fb_work;
+
+        /* for unref'ing cursor bo's after scanout completes: */
+        struct drm_flip_work unref_cursor_work;
+
+        struct mdp4_irq vblank;
+        struct mdp4_irq err;
+};
+#define to_mdp4_crtc(x) container_of(x, struct mdp4_crtc, base)
+
+static struct mdp4_kms *get_kms(struct drm_crtc *crtc)
+{
+        struct msm_drm_private *priv = crtc->dev->dev_private;
+        return to_mdp4_kms(priv->kms);
+}
+
+static void update_fb(struct drm_crtc *crtc, bool async,
+                struct drm_framebuffer *new_fb)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct drm_framebuffer *old_fb = mdp4_crtc->fb;
+
+        if (old_fb)
+                drm_flip_work_queue(&mdp4_crtc->unref_fb_work, old_fb);
+
+        /* grab reference to incoming scanout fb: */
+        drm_framebuffer_reference(new_fb);
+        mdp4_crtc->base.fb = new_fb;
+        mdp4_crtc->fb = new_fb;
+
+        if (!async) {
+                /* enable vblank to pick up the old_fb */
+                mdp4_irq_register(get_kms(crtc), &mdp4_crtc->vblank);
+        }
+}
+
+static void complete_flip(struct drm_crtc *crtc, bool canceled)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct drm_pending_vblank_event *event;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dev->event_lock, flags);
+        event = mdp4_crtc->event;
+        if (event) {
+                mdp4_crtc->event = NULL;
+                if (canceled)
+                        event->base.destroy(&event->base);
+                else
+                        drm_send_vblank_event(dev, mdp4_crtc->id, event);
+        }
+        spin_unlock_irqrestore(&dev->event_lock, flags);
+}
+
+static void crtc_flush(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        uint32_t flush = 0;
+
+        flush |= pipe2flush(mdp4_plane_pipe(mdp4_crtc->plane));
+        flush |= ovlp2flush(mdp4_crtc->ovlp);
+
+        DBG("%s: flush=%08x", mdp4_crtc->name, flush);
+
+        mdp4_write(mdp4_kms, REG_MDP4_OVERLAY_FLUSH, flush);
+}
+
+static void pageflip_worker(struct work_struct *work)
+{
+        struct mdp4_crtc *mdp4_crtc =
+                container_of(work, struct mdp4_crtc, pageflip_work);
+        struct drm_crtc *crtc = &mdp4_crtc->base;
+
+        mdp4_plane_set_scanout(mdp4_crtc->plane, crtc->fb);
+        crtc_flush(crtc);
+
+        /* enable vblank to complete flip: */
+        mdp4_irq_register(get_kms(crtc), &mdp4_crtc->vblank);
+}
+
+static void unref_fb_worker(struct drm_flip_work *work, void *val)
+{
+        struct mdp4_crtc *mdp4_crtc =
+                container_of(work, struct mdp4_crtc, unref_fb_work);
+        struct drm_device *dev = mdp4_crtc->base.dev;
+
+        mutex_lock(&dev->mode_config.mutex);
+        drm_framebuffer_unreference(val);
+        mutex_unlock(&dev->mode_config.mutex);
+}
+
+static void unref_cursor_worker(struct drm_flip_work *work, void *val)
+{
+        struct mdp4_crtc *mdp4_crtc =
+                container_of(work, struct mdp4_crtc, unref_cursor_work);
+        struct mdp4_kms *mdp4_kms = get_kms(&mdp4_crtc->base);
+
+        msm_gem_put_iova(val, mdp4_kms->id);
+        drm_gem_object_unreference_unlocked(val);
+}
+
+static void mdp4_crtc_destroy(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+
+        mdp4_crtc->plane->funcs->destroy(mdp4_crtc->plane);
+
+        drm_crtc_cleanup(crtc);
+        drm_flip_work_cleanup(&mdp4_crtc->unref_fb_work);
+        drm_flip_work_cleanup(&mdp4_crtc->unref_cursor_work);
+
+        kfree(mdp4_crtc);
+}
+
+static void mdp4_crtc_dpms(struct drm_crtc *crtc, int mode)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        bool enabled = (mode == DRM_MODE_DPMS_ON);
+
+        DBG("%s: mode=%d", mdp4_crtc->name, mode);
+
+        if (enabled != mdp4_crtc->enabled) {
+                if (enabled) {
+                        mdp4_enable(mdp4_kms);
+                        mdp4_irq_register(mdp4_kms, &mdp4_crtc->err);
+                } else {
+                        mdp4_irq_unregister(mdp4_kms, &mdp4_crtc->err);
+                        mdp4_disable(mdp4_kms);
+                }
+                mdp4_crtc->enabled = enabled;
+        }
+}
+
+static bool mdp4_crtc_mode_fixup(struct drm_crtc *crtc,
+                const struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+
+static void blend_setup(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        int i, ovlp = mdp4_crtc->ovlp;
+        uint32_t mixer_cfg = 0;
+
+        /*
+         * This probably would also need to be triggered by any attached
+         * plane when it changes.. for now since we are only using a single
+         * private plane, the configuration is hard-coded:
+         */
+
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_TRANSP_LOW0(ovlp), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_TRANSP_LOW1(ovlp), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_TRANSP_HIGH0(ovlp), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_TRANSP_HIGH1(ovlp), 0);
+
+        for (i = 0; i < 4; i++) {
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_FG_ALPHA(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_BG_ALPHA(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_OP(ovlp, i),
+                                MDP4_OVLP_STAGE_OP_FG_ALPHA(FG_CONST) |
+                                MDP4_OVLP_STAGE_OP_BG_ALPHA(BG_CONST));
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_CO3(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_TRANSP_LOW0(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_TRANSP_LOW1(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_TRANSP_HIGH0(ovlp, i), 0);
+                mdp4_write(mdp4_kms, REG_MDP4_OVLP_STAGE_TRANSP_HIGH1(ovlp, i), 0);
+        }
+
+        /* TODO single register for all CRTCs, so this won't work properly
+         * when multiple CRTCs are active..
+         */
+        switch (mdp4_plane_pipe(mdp4_crtc->plane)) {
+        case VG1:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE0(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE0_MIXER1);
+                break;
+        case VG2:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE1(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE1_MIXER1);
+                break;
+        case RGB1:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE2(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE2_MIXER1);
+                break;
+        case RGB2:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE3(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE3_MIXER1);
+                break;
+        case RGB3:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE4(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE4_MIXER1);
+                break;
+        case VG3:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE5(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE5_MIXER1);
+                break;
+        case VG4:
+                mixer_cfg = MDP4_LAYERMIXER_IN_CFG_PIPE6(STAGE_BASE) |
+                        COND(mdp4_crtc->mixer == 1, MDP4_LAYERMIXER_IN_CFG_PIPE6_MIXER1);
+                break;
+        default:
+                WARN_ON("invalid pipe");
+                break;
+        }
+        mdp4_write(mdp4_kms, REG_MDP4_LAYERMIXER_IN_CFG, mixer_cfg);
+}
+
+static int mdp4_crtc_mode_set(struct drm_crtc *crtc,
+                struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode,
+                int x, int y,
+                struct drm_framebuffer *old_fb)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        enum mdp4_dma dma = mdp4_crtc->dma;
+        int ret, ovlp = mdp4_crtc->ovlp;
+
+        mode = adjusted_mode;
+
+        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
+                        mdp4_crtc->name, mode->base.id, mode->name,
+                        mode->vrefresh, mode->clock,
+                        mode->hdisplay, mode->hsync_start,
+                        mode->hsync_end, mode->htotal,
+                        mode->vdisplay, mode->vsync_start,
+                        mode->vsync_end, mode->vtotal,
+                        mode->type, mode->flags);
+
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_SIZE(dma),
+                        MDP4_DMA_SRC_SIZE_WIDTH(mode->hdisplay) |
+                        MDP4_DMA_SRC_SIZE_HEIGHT(mode->vdisplay));
+
+        /* take data from pipe: */
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_BASE(dma), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_STRIDE(dma),
+                        crtc->fb->pitches[0]);
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_DST_SIZE(dma),
+                        MDP4_DMA_DST_SIZE_WIDTH(0) |
+                        MDP4_DMA_DST_SIZE_HEIGHT(0));
+
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_BASE(ovlp), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_SIZE(ovlp),
+                        MDP4_OVLP_SIZE_WIDTH(mode->hdisplay) |
+                        MDP4_OVLP_SIZE_HEIGHT(mode->vdisplay));
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_STRIDE(ovlp),
+                        crtc->fb->pitches[0]);
+
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_CFG(ovlp), 1);
+
+        update_fb(crtc, false, crtc->fb);
+
+        ret = mdp4_plane_mode_set(mdp4_crtc->plane, crtc, crtc->fb,
+                        0, 0, mode->hdisplay, mode->vdisplay,
+                        x << 16, y << 16,
+                        mode->hdisplay << 16, mode->vdisplay << 16);
+        if (ret) {
+                dev_err(crtc->dev->dev, "%s: failed to set mode on plane: %d\n",
+                                mdp4_crtc->name, ret);
+                return ret;
+        }
+
+        if (dma == DMA_E) {
+                mdp4_write(mdp4_kms, REG_MDP4_DMA_E_QUANT(0), 0x00ff0000);
+                mdp4_write(mdp4_kms, REG_MDP4_DMA_E_QUANT(1), 0x00ff0000);
+                mdp4_write(mdp4_kms, REG_MDP4_DMA_E_QUANT(2), 0x00ff0000);
+        }
+
+        return 0;
+}
+
+static void mdp4_crtc_prepare(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        DBG("%s", mdp4_crtc->name);
+        /* make sure we hold a ref to mdp clks while setting up mode: */
+        mdp4_enable(get_kms(crtc));
+        mdp4_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
+}
+
+static void mdp4_crtc_commit(struct drm_crtc *crtc)
+{
+        mdp4_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
+        crtc_flush(crtc);
+        /* drop the ref to mdp clk's that we got in prepare: */
+        mdp4_disable(get_kms(crtc));
+}
+
+static int mdp4_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
+                struct drm_framebuffer *old_fb)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct drm_plane *plane = mdp4_crtc->plane;
+        struct drm_display_mode *mode = &crtc->mode;
+
+        update_fb(crtc, false, crtc->fb);
+
+        return mdp4_plane_mode_set(plane, crtc, crtc->fb,
+                        0, 0, mode->hdisplay, mode->vdisplay,
+                        x << 16, y << 16,
+                        mode->hdisplay << 16, mode->vdisplay << 16);
+}
+
+static void mdp4_crtc_load_lut(struct drm_crtc *crtc)
+{
+}
+
+static int mdp4_crtc_page_flip(struct drm_crtc *crtc,
+                struct drm_framebuffer *new_fb,
+                struct drm_pending_vblank_event *event,
+                uint32_t page_flip_flags)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct drm_gem_object *obj;
+
+        if (mdp4_crtc->event) {
+                dev_err(dev->dev, "already pending flip!\n");
+                return -EBUSY;
+        }
+
+        obj = msm_framebuffer_bo(new_fb, 0);
+
+        mdp4_crtc->event = event;
+        update_fb(crtc, true, new_fb);
+
+        return msm_gem_queue_inactive_work(obj,
+                        &mdp4_crtc->pageflip_work);
+}
+
+static int mdp4_crtc_set_property(struct drm_crtc *crtc,
+                struct drm_property *property, uint64_t val)
+{
+        // XXX
+        return -EINVAL;
+}
+
+#define CURSOR_WIDTH 64
+#define CURSOR_HEIGHT 64
+
+/* called from IRQ to update cursor related registers (if needed).  The
+ * cursor registers, other than x/y position, appear not to be double
+ * buffered, and changing them other than from vblank seems to trigger
+ * underflow.
+ */
+static void update_cursor(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        enum mdp4_dma dma = mdp4_crtc->dma;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mdp4_crtc->cursor.lock, flags);
+        if (mdp4_crtc->cursor.stale) {
+                struct mdp4_kms *mdp4_kms = get_kms(crtc);
+                struct drm_gem_object *next_bo = mdp4_crtc->cursor.next_bo;
+                struct drm_gem_object *prev_bo = mdp4_crtc->cursor.scanout_bo;
+                uint32_t iova = mdp4_crtc->cursor.next_iova;
+
+                if (next_bo) {
+                        /* take a obj ref + iova ref when we start scanning out: */
+                        drm_gem_object_reference(next_bo);
+                        msm_gem_get_iova_locked(next_bo, mdp4_kms->id, &iova);
+
+                        /* enable cursor: */
+                        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),
+                                        MDP4_DMA_CURSOR_SIZE_WIDTH(mdp4_crtc->cursor.width) |
+                                        MDP4_DMA_CURSOR_SIZE_HEIGHT(mdp4_crtc->cursor.height));
+                        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_BASE(dma), iova);
+                        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_BLEND_CONFIG(dma),
+                                        MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT(CURSOR_ARGB) |
+                                        MDP4_DMA_CURSOR_BLEND_CONFIG_CURSOR_EN);
+                } else {
+                        /* disable cursor: */
+                        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_BASE(dma), 0);
+                        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_BLEND_CONFIG(dma),
+                                        MDP4_DMA_CURSOR_BLEND_CONFIG_FORMAT(CURSOR_ARGB));
+                }
+
+                /* and drop the iova ref + obj rev when done scanning out: */
+                if (prev_bo)
+                        drm_flip_work_queue(&mdp4_crtc->unref_cursor_work, prev_bo);
+
+                mdp4_crtc->cursor.scanout_bo = next_bo;
+                mdp4_crtc->cursor.stale = false;
+        }
+        spin_unlock_irqrestore(&mdp4_crtc->cursor.lock, flags);
+}
+
+static int mdp4_crtc_cursor_set(struct drm_crtc *crtc,
+                struct drm_file *file_priv, uint32_t handle,
+                uint32_t width, uint32_t height)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        struct drm_device *dev = crtc->dev;
+        struct drm_gem_object *cursor_bo, *old_bo;
+        unsigned long flags;
+        uint32_t iova;
+        int ret;
+
+        if ((width > CURSOR_WIDTH) || (height > CURSOR_HEIGHT)) {
+                dev_err(dev->dev, "bad cursor size: %dx%d\n", width, height);
+                return -EINVAL;
+        }
+
+        if (handle) {
+                cursor_bo = drm_gem_object_lookup(dev, file_priv, handle);
+                if (!cursor_bo)
+                        return -ENOENT;
+        } else {
+                cursor_bo = NULL;
+        }
+
+        if (cursor_bo) {
+                ret = msm_gem_get_iova(cursor_bo, mdp4_kms->id, &iova);
+                if (ret)
+                        goto fail;
+        } else {
+                iova = 0;
+        }
+
+        spin_lock_irqsave(&mdp4_crtc->cursor.lock, flags);
+        old_bo = mdp4_crtc->cursor.next_bo;
+        mdp4_crtc->cursor.next_bo   = cursor_bo;
+        mdp4_crtc->cursor.next_iova = iova;
+        mdp4_crtc->cursor.width     = width;
+        mdp4_crtc->cursor.height    = height;
+        mdp4_crtc->cursor.stale     = true;
+        spin_unlock_irqrestore(&mdp4_crtc->cursor.lock, flags);
+
+        if (old_bo) {
+                /* drop our previous reference: */
+                msm_gem_put_iova(old_bo, mdp4_kms->id);
+                drm_gem_object_unreference_unlocked(old_bo);
+        }
+
+        return 0;
+
+fail:
+        drm_gem_object_unreference_unlocked(cursor_bo);
+        return ret;
+}
+
+static int mdp4_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        enum mdp4_dma dma = mdp4_crtc->dma;
+
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_POS(dma),
+                        MDP4_DMA_CURSOR_POS_X(x) |
+                        MDP4_DMA_CURSOR_POS_Y(y));
+
+        return 0;
+}
+
+static const struct drm_crtc_funcs mdp4_crtc_funcs = {
+        .set_config = drm_crtc_helper_set_config,
+        .destroy = mdp4_crtc_destroy,
+        .page_flip = mdp4_crtc_page_flip,
+        .set_property = mdp4_crtc_set_property,
+        .cursor_set = mdp4_crtc_cursor_set,
+        .cursor_move = mdp4_crtc_cursor_move,
+};
+
+static const struct drm_crtc_helper_funcs mdp4_crtc_helper_funcs = {
+        .dpms = mdp4_crtc_dpms,
+        .mode_fixup = mdp4_crtc_mode_fixup,
+        .mode_set = mdp4_crtc_mode_set,
+        .prepare = mdp4_crtc_prepare,
+        .commit = mdp4_crtc_commit,
+        .mode_set_base = mdp4_crtc_mode_set_base,
+        .load_lut = mdp4_crtc_load_lut,
+};
+
+static void mdp4_crtc_vblank_irq(struct mdp4_irq *irq, uint32_t irqstatus)
+{
+        struct mdp4_crtc *mdp4_crtc = container_of(irq, struct mdp4_crtc, vblank);
+        struct drm_crtc *crtc = &mdp4_crtc->base;
+        struct msm_drm_private *priv = crtc->dev->dev_private;
+
+        update_cursor(crtc);
+        complete_flip(crtc, false);
+        mdp4_irq_unregister(get_kms(crtc), &mdp4_crtc->vblank);
+
+        drm_flip_work_commit(&mdp4_crtc->unref_fb_work, priv->wq);
+        drm_flip_work_commit(&mdp4_crtc->unref_cursor_work, priv->wq);
+}
+
+static void mdp4_crtc_err_irq(struct mdp4_irq *irq, uint32_t irqstatus)
+{
+        struct mdp4_crtc *mdp4_crtc = container_of(irq, struct mdp4_crtc, err);
+        struct drm_crtc *crtc = &mdp4_crtc->base;
+        DBG("%s: error: %08x", mdp4_crtc->name, irqstatus);
+        crtc_flush(crtc);
+}
+
+uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        return mdp4_crtc->vblank.irqmask;
+}
+
+void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc)
+{
+        complete_flip(crtc, true);
+}
+
+/* set dma config, ie. the format the encoder wants. */
+void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_CONFIG(mdp4_crtc->dma), config);
+}
+
+/* set interface for routing crtc->encoder: */
+void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf)
+{
+        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
+        struct mdp4_kms *mdp4_kms = get_kms(crtc);
+        uint32_t intf_sel;
+
+        intf_sel = mdp4_read(mdp4_kms, REG_MDP4_DISP_INTF_SEL);
+
+        switch (mdp4_crtc->dma) {
+        case DMA_P:
+                intf_sel &= ~MDP4_DISP_INTF_SEL_PRIM__MASK;
+                intf_sel |= MDP4_DISP_INTF_SEL_PRIM(intf);
+                break;
+        case DMA_S:
+                intf_sel &= ~MDP4_DISP_INTF_SEL_SEC__MASK;
+                intf_sel |= MDP4_DISP_INTF_SEL_SEC(intf);
+                break;
+        case DMA_E:
+                intf_sel &= ~MDP4_DISP_INTF_SEL_EXT__MASK;
+                intf_sel |= MDP4_DISP_INTF_SEL_EXT(intf);
+                break;
+        }
+
+        if (intf == INTF_DSI_VIDEO) {
+                intf_sel &= ~MDP4_DISP_INTF_SEL_DSI_CMD;
+                intf_sel |= MDP4_DISP_INTF_SEL_DSI_VIDEO;
+                mdp4_crtc->mixer = 0;
+        } else if (intf == INTF_DSI_CMD) {
+                intf_sel &= ~MDP4_DISP_INTF_SEL_DSI_VIDEO;
+                intf_sel |= MDP4_DISP_INTF_SEL_DSI_CMD;
+                mdp4_crtc->mixer = 0;
+        } else if (intf == INTF_LCDC_DTV){
+                mdp4_crtc->mixer = 1;
+        }
+
+        blend_setup(crtc);
+
+        DBG("%s: intf_sel=%08x", mdp4_crtc->name, intf_sel);
+
+        mdp4_write(mdp4_kms, REG_MDP4_DISP_INTF_SEL, intf_sel);
+}
+
+static const char *dma_names[] = {
+                "DMA_P", "DMA_S", "DMA_E",
+};
+
+/* initialize crtc */
+struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
+                struct drm_plane *plane, int id, int ovlp_id,
+                enum mdp4_dma dma_id)
+{
+        struct drm_crtc *crtc = NULL;
+        struct mdp4_crtc *mdp4_crtc;
+        int ret;
+
+        mdp4_crtc = kzalloc(sizeof(*mdp4_crtc), GFP_KERNEL);
+        if (!mdp4_crtc) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        crtc = &mdp4_crtc->base;
+
+        mdp4_crtc->plane = plane;
+        mdp4_crtc->plane->crtc = crtc;
+
+        mdp4_crtc->ovlp = ovlp_id;
+        mdp4_crtc->dma = dma_id;
+
+        mdp4_crtc->vblank.irqmask = dma2irq(mdp4_crtc->dma);
+        mdp4_crtc->vblank.irq = mdp4_crtc_vblank_irq;
+
+        mdp4_crtc->err.irqmask = dma2err(mdp4_crtc->dma);
+        mdp4_crtc->err.irq = mdp4_crtc_err_irq;
+
+        snprintf(mdp4_crtc->name, sizeof(mdp4_crtc->name), "%s:%d",
+                        dma_names[dma_id], ovlp_id);
+
+        spin_lock_init(&mdp4_crtc->cursor.lock);
+
+        ret = drm_flip_work_init(&mdp4_crtc->unref_fb_work, 16,
+                        "unref fb", unref_fb_worker);
+        if (ret)
+                goto fail;
+
+        ret = drm_flip_work_init(&mdp4_crtc->unref_cursor_work, 64,
+                        "unref cursor", unref_cursor_worker);
+
+        INIT_WORK(&mdp4_crtc->pageflip_work, pageflip_worker);
+
+        drm_crtc_init(dev, crtc, &mdp4_crtc_funcs);
+        drm_crtc_helper_add(crtc, &mdp4_crtc_helper_funcs);
+
+        mdp4_plane_install_properties(mdp4_crtc->plane, &crtc->base);
+
+        return crtc;
+
+fail:
+        if (crtc)
+                mdp4_crtc_destroy(crtc);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c
new file mode 100644
index 000000000000..06d49e309d34
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mach/clk.h>
+
+#include "mdp4_kms.h"
+#include "msm_connector.h"
+
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+
+struct mdp4_dtv_encoder {
+        struct drm_encoder base;
+        struct clk *src_clk;
+        struct clk *hdmi_clk;
+        struct clk *mdp_clk;
+        unsigned long int pixclock;
+        bool enabled;
+        uint32_t bsc;
+};
+#define to_mdp4_dtv_encoder(x) container_of(x, struct mdp4_dtv_encoder, base)
+
+static struct mdp4_kms *get_kms(struct drm_encoder *encoder)
+{
+        struct msm_drm_private *priv = encoder->dev->dev_private;
+        return to_mdp4_kms(priv->kms);
+}
+
+#ifdef CONFIG_MSM_BUS_SCALING
+#include <mach/board.h>
+/* not ironically named at all.. no, really.. */
+static void bs_init(struct mdp4_dtv_encoder *mdp4_dtv_encoder)
+{
+        struct drm_device *dev = mdp4_dtv_encoder->base.dev;
+        struct lcdc_platform_data *dtv_pdata = mdp4_find_pdata("dtv.0");
+
+        if (!dtv_pdata) {
+                dev_err(dev->dev, "could not find dtv pdata\n");
+                return;
+        }
+
+        if (dtv_pdata->bus_scale_table) {
+                mdp4_dtv_encoder->bsc = msm_bus_scale_register_client(
+                                dtv_pdata->bus_scale_table);
+                DBG("bus scale client: %08x", mdp4_dtv_encoder->bsc);
+                DBG("lcdc_power_save: %p", dtv_pdata->lcdc_power_save);
+                if (dtv_pdata->lcdc_power_save)
+                        dtv_pdata->lcdc_power_save(1);
+        }
+}
+
+static void bs_fini(struct mdp4_dtv_encoder *mdp4_dtv_encoder)
+{
+        if (mdp4_dtv_encoder->bsc) {
+                msm_bus_scale_unregister_client(mdp4_dtv_encoder->bsc);
+                mdp4_dtv_encoder->bsc = 0;
+        }
+}
+
+static void bs_set(struct mdp4_dtv_encoder *mdp4_dtv_encoder, int idx)
+{
+        if (mdp4_dtv_encoder->bsc) {
+                DBG("set bus scaling: %d", idx);
+                msm_bus_scale_client_update_request(mdp4_dtv_encoder->bsc, idx);
+        }
+}
+#else
+static void bs_init(struct mdp4_dtv_encoder *mdp4_dtv_encoder) {}
+static void bs_fini(struct mdp4_dtv_encoder *mdp4_dtv_encoder) {}
+static void bs_set(struct mdp4_dtv_encoder *mdp4_dtv_encoder, int idx) {}
+#endif
+
+static void mdp4_dtv_encoder_destroy(struct drm_encoder *encoder)
+{
+        struct mdp4_dtv_encoder *mdp4_dtv_encoder = to_mdp4_dtv_encoder(encoder);
+        bs_fini(mdp4_dtv_encoder);
+        drm_encoder_cleanup(encoder);
+        kfree(mdp4_dtv_encoder);
+}
+
+static const struct drm_encoder_funcs mdp4_dtv_encoder_funcs = {
+        .destroy = mdp4_dtv_encoder_destroy,
+};
+
+static void mdp4_dtv_encoder_dpms(struct drm_encoder *encoder, int mode)
+{
+        struct drm_device *dev = encoder->dev;
+        struct mdp4_dtv_encoder *mdp4_dtv_encoder = to_mdp4_dtv_encoder(encoder);
+        struct msm_connector *msm_connector = get_connector(encoder);
+        struct mdp4_kms *mdp4_kms = get_kms(encoder);
+        bool enabled = (mode == DRM_MODE_DPMS_ON);
+
+        DBG("mode=%d", mode);
+
+        if (enabled == mdp4_dtv_encoder->enabled)
+                return;
+
+        if (enabled) {
+                unsigned long pc = mdp4_dtv_encoder->pixclock;
+                int ret;
+
+                bs_set(mdp4_dtv_encoder, 1);
+
+                if (msm_connector)
+                        msm_connector->funcs->dpms(msm_connector, mode);
+
+                DBG("setting src_clk=%lu", pc);
+
+                ret = clk_set_rate(mdp4_dtv_encoder->src_clk, pc);
+                if (ret)
+                        dev_err(dev->dev, "failed to set src_clk to %lu: %d\n", pc, ret);
+                clk_prepare_enable(mdp4_dtv_encoder->src_clk);
+                ret = clk_prepare_enable(mdp4_dtv_encoder->hdmi_clk);
+                if (ret)
+                        dev_err(dev->dev, "failed to enable hdmi_clk: %d\n", ret);
+                ret = clk_prepare_enable(mdp4_dtv_encoder->mdp_clk);
+                if (ret)
+                        dev_err(dev->dev, "failed to enabled mdp_clk: %d\n", ret);
+
+                mdp4_write(mdp4_kms, REG_MDP4_DTV_ENABLE, 1);
+        } else {
+                mdp4_write(mdp4_kms, REG_MDP4_DTV_ENABLE, 0);
+
+                /*
+                 * Wait for a vsync so we know the ENABLE=0 latched before
+                 * the (connector) source of the vsync's gets disabled,
+                 * otherwise we end up in a funny state if we re-enable
+                 * before the disable latches, which results that some of
+                 * the settings changes for the new modeset (like new
+                 * scanout buffer) don't latch properly..
+                 */
+                mdp4_irq_wait(mdp4_kms, MDP4_IRQ_EXTERNAL_VSYNC);
+
+                clk_disable_unprepare(mdp4_dtv_encoder->src_clk);
+                clk_disable_unprepare(mdp4_dtv_encoder->hdmi_clk);
+                clk_disable_unprepare(mdp4_dtv_encoder->mdp_clk);
+
+                if (msm_connector)
+                        msm_connector->funcs->dpms(msm_connector, mode);
+
+                bs_set(mdp4_dtv_encoder, 0);
+        }
+
+        mdp4_dtv_encoder->enabled = enabled;
+}
+
+static bool mdp4_dtv_encoder_mode_fixup(struct drm_encoder *encoder,
+                const struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+
+static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder,
+                struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
+{
+        struct mdp4_dtv_encoder *mdp4_dtv_encoder = to_mdp4_dtv_encoder(encoder);
+        struct msm_connector *msm_connector = get_connector(encoder);
+        struct mdp4_kms *mdp4_kms = get_kms(encoder);
+        uint32_t dtv_hsync_skew, vsync_period, vsync_len, ctrl_pol;
+        uint32_t display_v_start, display_v_end;
+        uint32_t hsync_start_x, hsync_end_x;
+
+        mode = adjusted_mode;
+
+        DBG("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
+                        mode->base.id, mode->name,
+                        mode->vrefresh, mode->clock,
+                        mode->hdisplay, mode->hsync_start,
+                        mode->hsync_end, mode->htotal,
+                        mode->vdisplay, mode->vsync_start,
+                        mode->vsync_end, mode->vtotal,
+                        mode->type, mode->flags);
+
+        mdp4_dtv_encoder->pixclock = mode->clock * 1000;
+
+        DBG("pixclock=%lu", mdp4_dtv_encoder->pixclock);
+
+        ctrl_pol = 0;
+        if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+                ctrl_pol |= MDP4_DTV_CTRL_POLARITY_HSYNC_LOW;
+        if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+                ctrl_pol |= MDP4_DTV_CTRL_POLARITY_VSYNC_LOW;
+        /* probably need to get DATA_EN polarity from panel.. */
+
+        dtv_hsync_skew = 0;  /* get this from panel? */
+
+        hsync_start_x = (mode->htotal - mode->hsync_start);
+        hsync_end_x = mode->htotal - (mode->hsync_start - mode->hdisplay) - 1;
+
+        vsync_period = mode->vtotal * mode->htotal;
+        vsync_len = (mode->vsync_end - mode->vsync_start) * mode->htotal;
+        display_v_start = (mode->vtotal - mode->vsync_start) * mode->htotal + dtv_hsync_skew;
+        display_v_end = vsync_period - ((mode->vsync_start - mode->vdisplay) * mode->htotal) + dtv_hsync_skew - 1;
+
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_HSYNC_CTRL,
+                        MDP4_DTV_HSYNC_CTRL_PULSEW(mode->hsync_end - mode->hsync_start) |
+                        MDP4_DTV_HSYNC_CTRL_PERIOD(mode->htotal));
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_VSYNC_PERIOD, vsync_period);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_VSYNC_LEN, vsync_len);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_DISPLAY_HCTRL,
+                        MDP4_DTV_DISPLAY_HCTRL_START(hsync_start_x) |
+                        MDP4_DTV_DISPLAY_HCTRL_END(hsync_end_x));
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_DISPLAY_VSTART, display_v_start);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_DISPLAY_VEND, display_v_end);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_BORDER_CLR, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_UNDERFLOW_CLR,
+                        MDP4_DTV_UNDERFLOW_CLR_ENABLE_RECOVERY |
+                        MDP4_DTV_UNDERFLOW_CLR_COLOR(0xff));
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_HSYNC_SKEW, dtv_hsync_skew);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_CTRL_POLARITY, ctrl_pol);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_ACTIVE_HCTL,
+                        MDP4_DTV_ACTIVE_HCTL_START(0) |
+                        MDP4_DTV_ACTIVE_HCTL_END(0));
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_ACTIVE_VSTART, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_ACTIVE_VEND, 0);
+
+        if (msm_connector)
+                msm_connector->funcs->mode_set(msm_connector, mode);
+}
+
+static void mdp4_dtv_encoder_prepare(struct drm_encoder *encoder)
+{
+        mdp4_dtv_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+}
+
+static void mdp4_dtv_encoder_commit(struct drm_encoder *encoder)
+{
+        mdp4_crtc_set_config(encoder->crtc,
+                        MDP4_DMA_CONFIG_R_BPC(BPC8) |
+                        MDP4_DMA_CONFIG_G_BPC(BPC8) |
+                        MDP4_DMA_CONFIG_B_BPC(BPC8) |
+                        MDP4_DMA_CONFIG_PACK(0x21));
+        mdp4_crtc_set_intf(encoder->crtc, INTF_LCDC_DTV);
+        mdp4_dtv_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
+}
+
+static const struct drm_encoder_helper_funcs mdp4_dtv_encoder_helper_funcs = {
+        .dpms = mdp4_dtv_encoder_dpms,
+        .mode_fixup = mdp4_dtv_encoder_mode_fixup,
+        .mode_set = mdp4_dtv_encoder_mode_set,
+        .prepare = mdp4_dtv_encoder_prepare,
+        .commit = mdp4_dtv_encoder_commit,
+};
+
+long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate)
+{
+        struct mdp4_dtv_encoder *mdp4_dtv_encoder = to_mdp4_dtv_encoder(encoder);
+        return clk_round_rate(mdp4_dtv_encoder->src_clk, rate);
+}
+
+/* initialize encoder */
+struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev)
+{
+        struct drm_encoder *encoder = NULL;
+        struct mdp4_dtv_encoder *mdp4_dtv_encoder;
+        int ret;
+
+        mdp4_dtv_encoder = kzalloc(sizeof(*mdp4_dtv_encoder), GFP_KERNEL);
+        if (!mdp4_dtv_encoder) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        encoder = &mdp4_dtv_encoder->base;
+
+        drm_encoder_init(dev, encoder, &mdp4_dtv_encoder_funcs,
+                         DRM_MODE_ENCODER_TMDS);
+        drm_encoder_helper_add(encoder, &mdp4_dtv_encoder_helper_funcs);
+
+        mdp4_dtv_encoder->src_clk = devm_clk_get(dev->dev, "src_clk");
+        if (IS_ERR(mdp4_dtv_encoder->src_clk)) {
+                dev_err(dev->dev, "failed to get src_clk\n");
+                ret = PTR_ERR(mdp4_dtv_encoder->src_clk);
+                goto fail;
+        }
+
+        mdp4_dtv_encoder->hdmi_clk = devm_clk_get(dev->dev, "hdmi_clk");
+        if (IS_ERR(mdp4_dtv_encoder->hdmi_clk)) {
+                dev_err(dev->dev, "failed to get hdmi_clk\n");
+                ret = PTR_ERR(mdp4_dtv_encoder->hdmi_clk);
+                goto fail;
+        }
+
+        mdp4_dtv_encoder->mdp_clk = devm_clk_get(dev->dev, "mdp_clk");
+        if (IS_ERR(mdp4_dtv_encoder->mdp_clk)) {
+                dev_err(dev->dev, "failed to get mdp_clk\n");
+                ret = PTR_ERR(mdp4_dtv_encoder->mdp_clk);
+                goto fail;
+        }
+
+        bs_init(mdp4_dtv_encoder);
+
+        return encoder;
+
+fail:
+        if (encoder)
+                mdp4_dtv_encoder_destroy(encoder);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_format.c b/drivers/gpu/drm/msm/mdp4/mdp4_format.c
new file mode 100644
index 000000000000..7b645f2e837a
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_format.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "msm_drv.h"
+#include "mdp4_kms.h"
+
+#define FMT(name, a, r, g, b, e0, e1, e2, e3, alpha, tight, c, cnt) { \
+                .base = { .pixel_format = DRM_FORMAT_ ## name }, \
+                .bpc_a = BPC ## a ## A,                          \
+                .bpc_r = BPC ## r,                               \
+                .bpc_g = BPC ## g,                               \
+                .bpc_b = BPC ## b,                               \
+                .unpack = { e0, e1, e2, e3 },                    \
+                .alpha_enable = alpha,                           \
+                .unpack_tight = tight,                           \
+                .cpp = c,                                        \
+                .unpack_count = cnt,                             \
+        }
+
+#define BPC0A 0
+
+static const struct mdp4_format formats[] = {
+        /*  name      a  r  g  b   e0 e1 e2 e3  alpha   tight  cpp cnt */
+        FMT(ARGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  true,   true,  4,  4),
+        FMT(XRGB8888, 8, 8, 8, 8,  1, 0, 2, 3,  false,  true,  4,  4),
+        FMT(RGB888,   0, 8, 8, 8,  1, 0, 2, 0,  false,  true,  3,  3),
+        FMT(BGR888,   0, 8, 8, 8,  2, 0, 1, 0,  false,  true,  3,  3),
+        FMT(RGB565,   0, 5, 6, 5,  1, 0, 2, 0,  false,  true,  2,  3),
+        FMT(BGR565,   0, 5, 6, 5,  2, 0, 1, 0,  false,  true,  2,  3),
+};
+
+const struct msm_format *mdp4_get_format(struct msm_kms *kms, uint32_t format)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(formats); i++) {
+                const struct mdp4_format *f = &formats[i];
+                if (f->base.pixel_format == format)
+                        return &f->base;
+        }
+        return NULL;
+}
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/mdp4/mdp4_irq.c
new file mode 100644
index 000000000000..5c6b7fca4edd
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_irq.c
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "msm_drv.h"
+#include "mdp4_kms.h"
+
+
+struct mdp4_irq_wait {
+        struct mdp4_irq irq;
+        int count;
+};
+
+static DECLARE_WAIT_QUEUE_HEAD(wait_event);
+
+static DEFINE_SPINLOCK(list_lock);
+
+static void update_irq(struct mdp4_kms *mdp4_kms)
+{
+        struct mdp4_irq *irq;
+        uint32_t irqmask = mdp4_kms->vblank_mask;
+
+        BUG_ON(!spin_is_locked(&list_lock));
+
+        list_for_each_entry(irq, &mdp4_kms->irq_list, node)
+                irqmask |= irq->irqmask;
+
+        mdp4_write(mdp4_kms, REG_MDP4_INTR_ENABLE, irqmask);
+}
+
+static void update_irq_unlocked(struct mdp4_kms *mdp4_kms)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&list_lock, flags);
+        update_irq(mdp4_kms);
+        spin_unlock_irqrestore(&list_lock, flags);
+}
+
+static void mdp4_irq_error_handler(struct mdp4_irq *irq, uint32_t irqstatus)
+{
+        DRM_ERROR("errors: %08x\n", irqstatus);
+}
+
+void mdp4_irq_preinstall(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        mdp4_write(mdp4_kms, REG_MDP4_INTR_CLEAR, 0xffffffff);
+}
+
+int mdp4_irq_postinstall(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        struct mdp4_irq *error_handler = &mdp4_kms->error_handler;
+
+        INIT_LIST_HEAD(&mdp4_kms->irq_list);
+
+        error_handler->irq = mdp4_irq_error_handler;
+        error_handler->irqmask = MDP4_IRQ_PRIMARY_INTF_UDERRUN |
+                        MDP4_IRQ_EXTERNAL_INTF_UDERRUN;
+
+        mdp4_irq_register(mdp4_kms, error_handler);
+
+        return 0;
+}
+
+void mdp4_irq_uninstall(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        mdp4_write(mdp4_kms, REG_MDP4_INTR_ENABLE, 0x00000000);
+}
+
+irqreturn_t mdp4_irq(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        struct drm_device *dev = mdp4_kms->dev;
+        struct msm_drm_private *priv = dev->dev_private;
+        struct mdp4_irq *handler, *n;
+        unsigned long flags;
+        unsigned int id;
+        uint32_t status;
+
+        status = mdp4_read(mdp4_kms, REG_MDP4_INTR_STATUS);
+        mdp4_write(mdp4_kms, REG_MDP4_INTR_CLEAR, status);
+
+        VERB("status=%08x", status);
+
+        for (id = 0; id < priv->num_crtcs; id++)
+                if (status & mdp4_crtc_vblank(priv->crtcs[id]))
+                        drm_handle_vblank(dev, id);
+
+        spin_lock_irqsave(&list_lock, flags);
+        mdp4_kms->in_irq = true;
+        list_for_each_entry_safe(handler, n, &mdp4_kms->irq_list, node) {
+                if (handler->irqmask & status) {
+                        spin_unlock_irqrestore(&list_lock, flags);
+                        handler->irq(handler, handler->irqmask & status);
+                        spin_lock_irqsave(&list_lock, flags);
+                }
+        }
+        mdp4_kms->in_irq = false;
+        update_irq(mdp4_kms);
+        spin_unlock_irqrestore(&list_lock, flags);
+
+        return IRQ_HANDLED;
+}
+
+int mdp4_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        unsigned long flags;
+
+        spin_lock_irqsave(&list_lock, flags);
+        mdp4_kms->vblank_mask |= mdp4_crtc_vblank(crtc);
+        update_irq(mdp4_kms);
+        spin_unlock_irqrestore(&list_lock, flags);
+
+        return 0;
+}
+
+void mdp4_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        unsigned long flags;
+
+        spin_lock_irqsave(&list_lock, flags);
+        mdp4_kms->vblank_mask &= ~mdp4_crtc_vblank(crtc);
+        update_irq(mdp4_kms);
+        spin_unlock_irqrestore(&list_lock, flags);
+}
+
+static void wait_irq(struct mdp4_irq *irq, uint32_t irqstatus)
+{
+        struct mdp4_irq_wait *wait =
+                        container_of(irq, struct mdp4_irq_wait, irq);
+        wait->count--;
+        wake_up_all(&wait_event);
+}
+
+void mdp4_irq_wait(struct mdp4_kms *mdp4_kms, uint32_t irqmask)
+{
+        struct mdp4_irq_wait wait = {
+                .irq = {
+                        .irq = wait_irq,
+                        .irqmask = irqmask,
+                },
+                .count = 1,
+        };
+        mdp4_irq_register(mdp4_kms, &wait.irq);
+        wait_event(wait_event, (wait.count <= 0));
+        mdp4_irq_unregister(mdp4_kms, &wait.irq);
+}
+
+void mdp4_irq_register(struct mdp4_kms *mdp4_kms, struct mdp4_irq *irq)
+{
+        unsigned long flags;
+        bool needs_update = false;
+
+        spin_lock_irqsave(&list_lock, flags);
+
+        if (!irq->registered) {
+                irq->registered = true;
+                list_add(&irq->node, &mdp4_kms->irq_list);
+                needs_update = !mdp4_kms->in_irq;
+        }
+
+        spin_unlock_irqrestore(&list_lock, flags);
+
+        if (needs_update)
+                update_irq_unlocked(mdp4_kms);
+}
+
+void mdp4_irq_unregister(struct mdp4_kms *mdp4_kms, struct mdp4_irq *irq)
+{
+        unsigned long flags;
+        bool needs_update = false;
+
+        spin_lock_irqsave(&list_lock, flags);
+
+        if (irq->registered) {
+                irq->registered = false;
+                list_del(&irq->node);
+                needs_update = !mdp4_kms->in_irq;
+        }
+
+        spin_unlock_irqrestore(&list_lock, flags);
+
+        if (needs_update)
+                update_irq_unlocked(mdp4_kms);
+}
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c
new file mode 100644
index 000000000000..960cd894da78
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_kms.c
@@ -0,0 +1,368 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "msm_drv.h"
+#include "mdp4_kms.h"
+
+#include <mach/iommu.h>
+
+static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev);
+
+static int mdp4_hw_init(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        struct drm_device *dev = mdp4_kms->dev;
+        uint32_t version, major, minor, dmap_cfg, vg_cfg;
+        unsigned long clk;
+        int ret = 0;
+
+        pm_runtime_get_sync(dev->dev);
+
+        version = mdp4_read(mdp4_kms, REG_MDP4_VERSION);
+
+        major = FIELD(version, MDP4_VERSION_MAJOR);
+        minor = FIELD(version, MDP4_VERSION_MINOR);
+
+        DBG("found MDP version v%d.%d", major, minor);
+
+        if (major != 4) {
+                dev_err(dev->dev, "unexpected MDP version: v%d.%d\n",
+                                major, minor);
+                ret = -ENXIO;
+                goto out;
+        }
+
+        mdp4_kms->rev = minor;
+
+        if (mdp4_kms->dsi_pll_vdda) {
+                if ((mdp4_kms->rev == 2) || (mdp4_kms->rev == 4)) {
+                        ret = regulator_set_voltage(mdp4_kms->dsi_pll_vdda,
+                                        1200000, 1200000);
+                        if (ret) {
+                                dev_err(dev->dev,
+                                        "failed to set dsi_pll_vdda voltage: %d\n", ret);
+                                goto out;
+                        }
+                }
+        }
+
+        if (mdp4_kms->dsi_pll_vddio) {
+                if (mdp4_kms->rev == 2) {
+                        ret = regulator_set_voltage(mdp4_kms->dsi_pll_vddio,
+                                        1800000, 1800000);
+                        if (ret) {
+                                dev_err(dev->dev,
+                                        "failed to set dsi_pll_vddio voltage: %d\n", ret);
+                                goto out;
+                        }
+                }
+        }
+
+        if (mdp4_kms->rev > 1) {
+                mdp4_write(mdp4_kms, REG_MDP4_CS_CONTROLLER0, 0x0707ffff);
+                mdp4_write(mdp4_kms, REG_MDP4_CS_CONTROLLER1, 0x03073f3f);
+        }
+
+        mdp4_write(mdp4_kms, REG_MDP4_PORTMAP_MODE, 0x3);
+
+        /* max read pending cmd config, 3 pending requests: */
+        mdp4_write(mdp4_kms, REG_MDP4_READ_CNFG, 0x02222);
+
+        clk = clk_get_rate(mdp4_kms->clk);
+
+        if ((mdp4_kms->rev >= 1) || (clk >= 90000000)) {
+                dmap_cfg = 0x47;     /* 16 bytes-burst x 8 req */
+                vg_cfg = 0x47;       /* 16 bytes-burs x 8 req */
+        } else {
+                dmap_cfg = 0x27;     /* 8 bytes-burst x 8 req */
+                vg_cfg = 0x43;       /* 16 bytes-burst x 4 req */
+        }
+
+        DBG("fetch config: dmap=%02x, vg=%02x", dmap_cfg, vg_cfg);
+
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_FETCH_CONFIG(DMA_P), dmap_cfg);
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_FETCH_CONFIG(DMA_E), dmap_cfg);
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_FETCH_CONFIG(VG1), vg_cfg);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_FETCH_CONFIG(VG2), vg_cfg);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_FETCH_CONFIG(RGB1), vg_cfg);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_FETCH_CONFIG(RGB2), vg_cfg);
+
+        if (mdp4_kms->rev >= 2)
+                mdp4_write(mdp4_kms, REG_MDP4_LAYERMIXER_IN_CFG_UPDATE_METHOD, 1);
+
+        /* disable CSC matrix / YUV by default: */
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_OP_MODE(VG1), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_OP_MODE(VG2), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_P_OP_MODE, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DMA_S_OP_MODE, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_CSC_CONFIG(1), 0);
+        mdp4_write(mdp4_kms, REG_MDP4_OVLP_CSC_CONFIG(2), 0);
+
+        if (mdp4_kms->rev > 1)
+                mdp4_write(mdp4_kms, REG_MDP4_RESET_STATUS, 1);
+
+out:
+        pm_runtime_put_sync(dev->dev);
+
+        return ret;
+}
+
+static long mdp4_round_pixclk(struct msm_kms *kms, unsigned long rate,
+                struct drm_encoder *encoder)
+{
+        /* if we had >1 encoder, we'd need something more clever: */
+        return mdp4_dtv_round_pixclk(encoder, rate);
+}
+
+static void mdp4_preclose(struct msm_kms *kms, struct drm_file *file)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        struct msm_drm_private *priv = mdp4_kms->dev->dev_private;
+        unsigned i;
+
+        for (i = 0; i < priv->num_crtcs; i++)
+                mdp4_crtc_cancel_pending_flip(priv->crtcs[i]);
+}
+
+static void mdp4_destroy(struct msm_kms *kms)
+{
+        struct mdp4_kms *mdp4_kms = to_mdp4_kms(kms);
+        kfree(mdp4_kms);
+}
+
+static const struct msm_kms_funcs kms_funcs = {
+                .hw_init         = mdp4_hw_init,
+                .irq_preinstall  = mdp4_irq_preinstall,
+                .irq_postinstall = mdp4_irq_postinstall,
+                .irq_uninstall   = mdp4_irq_uninstall,
+                .irq             = mdp4_irq,
+                .enable_vblank   = mdp4_enable_vblank,
+                .disable_vblank  = mdp4_disable_vblank,
+                .get_format      = mdp4_get_format,
+                .round_pixclk    = mdp4_round_pixclk,
+                .preclose        = mdp4_preclose,
+                .destroy         = mdp4_destroy,
+};
+
+int mdp4_disable(struct mdp4_kms *mdp4_kms)
+{
+        DBG("");
+
+        clk_disable_unprepare(mdp4_kms->clk);
+        if (mdp4_kms->pclk)
+                clk_disable_unprepare(mdp4_kms->pclk);
+        clk_disable_unprepare(mdp4_kms->lut_clk);
+
+        return 0;
+}
+
+int mdp4_enable(struct mdp4_kms *mdp4_kms)
+{
+        DBG("");
+
+        clk_prepare_enable(mdp4_kms->clk);
+        if (mdp4_kms->pclk)
+                clk_prepare_enable(mdp4_kms->pclk);
+        clk_prepare_enable(mdp4_kms->lut_clk);
+
+        return 0;
+}
+
+static int modeset_init(struct mdp4_kms *mdp4_kms)
+{
+        struct drm_device *dev = mdp4_kms->dev;
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_plane *plane;
+        struct drm_crtc *crtc;
+        struct drm_encoder *encoder;
+        struct drm_connector *connector;
+        int ret;
+
+        /*
+         *  NOTE: this is a bit simplistic until we add support
+         * for more than just RGB1->DMA_E->DTV->HDMI
+         */
+
+        /* the CRTCs get constructed with a private plane: */
+        plane = mdp4_plane_init(dev, RGB1, true);
+        if (IS_ERR(plane)) {
+                dev_err(dev->dev, "failed to construct plane for RGB1\n");
+                ret = PTR_ERR(plane);
+                goto fail;
+        }
+
+        crtc  = mdp4_crtc_init(dev, plane, priv->num_crtcs, 1, DMA_E);
+        if (IS_ERR(crtc)) {
+                dev_err(dev->dev, "failed to construct crtc for DMA_E\n");
+                ret = PTR_ERR(crtc);
+                goto fail;
+        }
+        priv->crtcs[priv->num_crtcs++] = crtc;
+
+        encoder = mdp4_dtv_encoder_init(dev);
+        if (IS_ERR(encoder)) {
+                dev_err(dev->dev, "failed to construct DTV encoder\n");
+                ret = PTR_ERR(encoder);
+                goto fail;
+        }
+        encoder->possible_crtcs = 0x1;     /* DTV can be hooked to DMA_E */
+        priv->encoders[priv->num_encoders++] = encoder;
+
+        connector = hdmi_connector_init(dev, encoder);
+        if (IS_ERR(connector)) {
+                dev_err(dev->dev, "failed to construct HDMI connector\n");
+                ret = PTR_ERR(connector);
+                goto fail;
+        }
+        priv->connectors[priv->num_connectors++] = connector;
+
+        return 0;
+
+fail:
+        return ret;
+}
+
+static const char *iommu_ports[] = {
+                "mdp_port0_cb0", "mdp_port1_cb0",
+};
+
+struct msm_kms *mdp4_kms_init(struct drm_device *dev)
+{
+        struct platform_device *pdev = dev->platformdev;
+        struct mdp4_platform_config *config = mdp4_get_config(pdev);
+        struct mdp4_kms *mdp4_kms;
+        struct msm_kms *kms = NULL;
+        int ret;
+
+        mdp4_kms = kzalloc(sizeof(*mdp4_kms), GFP_KERNEL);
+        if (!mdp4_kms) {
+                dev_err(dev->dev, "failed to allocate kms\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        kms = &mdp4_kms->base;
+        kms->funcs = &kms_funcs;
+
+        mdp4_kms->dev = dev;
+
+        mdp4_kms->mmio = msm_ioremap(pdev, NULL, "MDP4");
+        if (IS_ERR(mdp4_kms->mmio)) {
+                ret = PTR_ERR(mdp4_kms->mmio);
+                goto fail;
+        }
+
+        mdp4_kms->dsi_pll_vdda = devm_regulator_get(&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");
+        if (IS_ERR(mdp4_kms->dsi_pll_vddio))
+                mdp4_kms->dsi_pll_vddio = NULL;
+
+        mdp4_kms->vdd = devm_regulator_get(&pdev->dev, "vdd");
+        if (IS_ERR(mdp4_kms->vdd))
+                mdp4_kms->vdd = NULL;
+
+        if (mdp4_kms->vdd) {
+                ret = regulator_enable(mdp4_kms->vdd);
+                if (ret) {
+                        dev_err(dev->dev, "failed to enable regulator vdd: %d\n", ret);
+                        goto fail;
+                }
+        }
+
+        mdp4_kms->clk = devm_clk_get(&pdev->dev, "core_clk");
+        if (IS_ERR(mdp4_kms->clk)) {
+                dev_err(dev->dev, "failed to get core_clk\n");
+                ret = PTR_ERR(mdp4_kms->clk);
+                goto fail;
+        }
+
+        mdp4_kms->pclk = devm_clk_get(&pdev->dev, "iface_clk");
+        if (IS_ERR(mdp4_kms->pclk))
+                mdp4_kms->pclk = NULL;
+
+        // XXX if (rev >= MDP_REV_42) { ???
+        mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk");
+        if (IS_ERR(mdp4_kms->lut_clk)) {
+                dev_err(dev->dev, "failed to get lut_clk\n");
+                ret = PTR_ERR(mdp4_kms->lut_clk);
+                goto fail;
+        }
+
+        clk_set_rate(mdp4_kms->clk, config->max_clk);
+        clk_set_rate(mdp4_kms->lut_clk, config->max_clk);
+
+        if (!config->iommu) {
+                dev_err(dev->dev, "no iommu\n");
+                ret = -ENXIO;
+                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):
+         */
+        mdp4_write(mdp4_kms, REG_MDP4_DTV_ENABLE, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_LCDC_ENABLE, 0);
+        mdp4_write(mdp4_kms, REG_MDP4_DSI_ENABLE, 0);
+        mdelay(16);
+
+        ret = msm_iommu_attach(dev, config->iommu,
+                        iommu_ports, ARRAY_SIZE(iommu_ports));
+        if (ret)
+                goto fail;
+
+        mdp4_kms->id = msm_register_iommu(dev, config->iommu);
+        if (mdp4_kms->id < 0) {
+                ret = mdp4_kms->id;
+                dev_err(dev->dev, "failed to register mdp4 iommu: %d\n", ret);
+                goto fail;
+        }
+
+        ret = modeset_init(mdp4_kms);
+        if (ret) {
+                dev_err(dev->dev, "modeset_init failed: %d\n", ret);
+                goto fail;
+        }
+
+        return kms;
+
+fail:
+        if (kms)
+                mdp4_destroy(kms);
+        return ERR_PTR(ret);
+}
+
+static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev)
+{
+        static struct mdp4_platform_config config = {};
+#ifdef CONFIG_OF
+        /* TODO */
+#else
+        if (cpu_is_apq8064())
+                config.max_clk = 266667000;
+        else
+                config.max_clk = 200000000;
+
+        config.iommu = msm_get_iommu_domain(DISPLAY_READ_DOMAIN);
+#endif
+        return &config;
+}
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp4/mdp4_kms.h
new file mode 100644
index 000000000000..1e83554955f3
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_kms.h
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MDP4_KMS_H__
+#define __MDP4_KMS_H__
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#include "msm_drv.h"
+#include "mdp4.xml.h"
+
+
+/* For transiently registering for different MDP4 irqs that various parts
+ * of the KMS code need during setup/configuration.  We these are not
+ * necessarily the same as what drm_vblank_get/put() are requesting, and
+ * the hysteresis in drm_vblank_put() is not necessarily desirable for
+ * internal housekeeping related irq usage.
+ */
+struct mdp4_irq {
+        struct list_head node;
+        uint32_t irqmask;
+        bool registered;
+        void (*irq)(struct mdp4_irq *irq, uint32_t irqstatus);
+};
+
+struct mdp4_kms {
+        struct msm_kms base;
+
+        struct drm_device *dev;
+
+        int rev;
+
+        /* mapper-id used to request GEM buffer mapped for scanout: */
+        int id;
+
+        void __iomem *mmio;
+
+        struct regulator *dsi_pll_vdda;
+        struct regulator *dsi_pll_vddio;
+        struct regulator *vdd;
+
+        struct clk *clk;
+        struct clk *pclk;
+        struct clk *lut_clk;
+
+        /* irq handling: */
+        bool in_irq;
+        struct list_head irq_list;    /* list of mdp4_irq */
+        uint32_t vblank_mask;         /* irq bits set for userspace vblank */
+        struct mdp4_irq error_handler;
+};
+#define to_mdp4_kms(x) container_of(x, struct mdp4_kms, base)
+
+/* platform config data (ie. from DT, or pdata) */
+struct mdp4_platform_config {
+        struct iommu_domain *iommu;
+        uint32_t max_clk;
+};
+
+struct mdp4_format {
+        struct msm_format base;
+        enum mpd4_bpc bpc_r, bpc_g, bpc_b;
+        enum mpd4_bpc_alpha bpc_a;
+        uint8_t unpack[4];
+        bool alpha_enable, unpack_tight;
+        uint8_t cpp, unpack_count;
+};
+#define to_mdp4_format(x) container_of(x, struct mdp4_format, base)
+
+static inline void mdp4_write(struct mdp4_kms *mdp4_kms, u32 reg, u32 data)
+{
+        msm_writel(data, mdp4_kms->mmio + reg);
+}
+
+static inline u32 mdp4_read(struct mdp4_kms *mdp4_kms, u32 reg)
+{
+        return msm_readl(mdp4_kms->mmio + reg);
+}
+
+static inline uint32_t pipe2flush(enum mpd4_pipe pipe)
+{
+        switch (pipe) {
+        case VG1:      return MDP4_OVERLAY_FLUSH_VG1;
+        case VG2:      return MDP4_OVERLAY_FLUSH_VG2;
+        case RGB1:     return MDP4_OVERLAY_FLUSH_RGB1;
+        case RGB2:     return MDP4_OVERLAY_FLUSH_RGB1;
+        default:       return 0;
+        }
+}
+
+static inline uint32_t ovlp2flush(int ovlp)
+{
+        switch (ovlp) {
+        case 0:        return MDP4_OVERLAY_FLUSH_OVLP0;
+        case 1:        return MDP4_OVERLAY_FLUSH_OVLP1;
+        default:       return 0;
+        }
+}
+
+static inline uint32_t dma2irq(enum mdp4_dma dma)
+{
+        switch (dma) {
+        case DMA_P:    return MDP4_IRQ_DMA_P_DONE;
+        case DMA_S:    return MDP4_IRQ_DMA_S_DONE;
+        case DMA_E:    return MDP4_IRQ_DMA_E_DONE;
+        default:       return 0;
+        }
+}
+
+static inline uint32_t dma2err(enum mdp4_dma dma)
+{
+        switch (dma) {
+        case DMA_P:    return MDP4_IRQ_PRIMARY_INTF_UDERRUN;
+        case DMA_S:    return 0;  // ???
+        case DMA_E:    return MDP4_IRQ_EXTERNAL_INTF_UDERRUN;
+        default:       return 0;
+        }
+}
+
+int mdp4_disable(struct mdp4_kms *mdp4_kms);
+int mdp4_enable(struct mdp4_kms *mdp4_kms);
+
+void mdp4_irq_preinstall(struct msm_kms *kms);
+int mdp4_irq_postinstall(struct msm_kms *kms);
+void mdp4_irq_uninstall(struct msm_kms *kms);
+irqreturn_t mdp4_irq(struct msm_kms *kms);
+void mdp4_irq_wait(struct mdp4_kms *mdp4_kms, uint32_t irqmask);
+void mdp4_irq_register(struct mdp4_kms *mdp4_kms, struct mdp4_irq *irq);
+void mdp4_irq_unregister(struct mdp4_kms *mdp4_kms, struct mdp4_irq *irq);
+int mdp4_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc);
+void mdp4_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc);
+
+const struct msm_format *mdp4_get_format(struct msm_kms *kms, uint32_t format);
+
+void mdp4_plane_install_properties(struct drm_plane *plane,
+                struct drm_mode_object *obj);
+void mdp4_plane_set_scanout(struct drm_plane *plane,
+                struct drm_framebuffer *fb);
+int mdp4_plane_mode_set(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h);
+enum mpd4_pipe mdp4_plane_pipe(struct drm_plane *plane);
+struct drm_plane *mdp4_plane_init(struct drm_device *dev,
+                enum mpd4_pipe pipe_id, bool private_plane);
+
+uint32_t mdp4_crtc_vblank(struct drm_crtc *crtc);
+void mdp4_crtc_cancel_pending_flip(struct drm_crtc *crtc);
+void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);
+void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf);
+struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
+                struct drm_plane *plane, int id, int ovlp_id,
+                enum mdp4_dma dma_id);
+
+long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate);
+struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev);
+
+#ifdef CONFIG_MSM_BUS_SCALING
+static inline int match_dev_name(struct device *dev, void *data)
+{
+        return !strcmp(dev_name(dev), data);
+}
+/* bus scaling data is associated with extra pointless platform devices,
+ * "dtv", etc.. this is a bit of a hack, but we need a way for encoders
+ * to find their pdata to make the bus-scaling stuff work.
+ */
+static inline void *mdp4_find_pdata(const char *devname)
+{
+        struct device *dev;
+        dev = bus_find_device(&platform_bus_type, NULL,
+                        (void *)devname, match_dev_name);
+        return dev ? dev->platform_data : NULL;
+}
+#endif
+
+#endif /* __MDP4_KMS_H__ */
diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/mdp4/mdp4_plane.c
new file mode 100644
index 000000000000..3468229d58b3
--- /dev/null
+++ b/drivers/gpu/drm/msm/mdp4/mdp4_plane.c
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mdp4_kms.h"
+
+
+struct mdp4_plane {
+        struct drm_plane base;
+        const char *name;
+
+        enum mpd4_pipe pipe;
+
+        uint32_t nformats;
+        uint32_t formats[32];
+
+        bool enabled;
+};
+#define to_mdp4_plane(x) container_of(x, struct mdp4_plane, base)
+
+static struct mdp4_kms *get_kms(struct drm_plane *plane)
+{
+        struct msm_drm_private *priv = plane->dev->dev_private;
+        return to_mdp4_kms(priv->kms);
+}
+
+static int mdp4_plane_update(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+
+        mdp4_plane->enabled = true;
+
+        if (plane->fb)
+                drm_framebuffer_unreference(plane->fb);
+
+        drm_framebuffer_reference(fb);
+
+        return mdp4_plane_mode_set(plane, crtc, fb,
+                        crtc_x, crtc_y, crtc_w, crtc_h,
+                        src_x, src_y, src_w, src_h);
+}
+
+static int mdp4_plane_disable(struct drm_plane *plane)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+        DBG("%s: TODO", mdp4_plane->name); // XXX
+        return 0;
+}
+
+static void mdp4_plane_destroy(struct drm_plane *plane)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+
+        mdp4_plane_disable(plane);
+        drm_plane_cleanup(plane);
+
+        kfree(mdp4_plane);
+}
+
+/* helper to install properties which are common to planes and crtcs */
+void mdp4_plane_install_properties(struct drm_plane *plane,
+                struct drm_mode_object *obj)
+{
+        // XXX
+}
+
+int mdp4_plane_set_property(struct drm_plane *plane,
+                struct drm_property *property, uint64_t val)
+{
+        // XXX
+        return -EINVAL;
+}
+
+static const struct drm_plane_funcs mdp4_plane_funcs = {
+                .update_plane = mdp4_plane_update,
+                .disable_plane = mdp4_plane_disable,
+                .destroy = mdp4_plane_destroy,
+                .set_property = mdp4_plane_set_property,
+};
+
+void mdp4_plane_set_scanout(struct drm_plane *plane,
+                struct drm_framebuffer *fb)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+        struct mdp4_kms *mdp4_kms = get_kms(plane);
+        enum mpd4_pipe pipe = mdp4_plane->pipe;
+        uint32_t iova;
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe),
+                        MDP4_PIPE_SRC_STRIDE_A_P0(fb->pitches[0]) |
+                        MDP4_PIPE_SRC_STRIDE_A_P1(fb->pitches[1]));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_B(pipe),
+                        MDP4_PIPE_SRC_STRIDE_B_P2(fb->pitches[2]) |
+                        MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));
+
+        msm_gem_get_iova(msm_framebuffer_bo(fb, 0), mdp4_kms->id, &iova);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRCP0_BASE(pipe), iova);
+
+        plane->fb = fb;
+}
+
+#define MDP4_VG_PHASE_STEP_DEFAULT      0x20000000
+
+int mdp4_plane_mode_set(struct drm_plane *plane,
+                struct drm_crtc *crtc, struct drm_framebuffer *fb,
+                int crtc_x, int crtc_y,
+                unsigned int crtc_w, unsigned int crtc_h,
+                uint32_t src_x, uint32_t src_y,
+                uint32_t src_w, uint32_t src_h)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+        struct mdp4_kms *mdp4_kms = get_kms(plane);
+        enum mpd4_pipe pipe = mdp4_plane->pipe;
+        const struct mdp4_format *format;
+        uint32_t op_mode = 0;
+        uint32_t phasex_step = MDP4_VG_PHASE_STEP_DEFAULT;
+        uint32_t phasey_step = MDP4_VG_PHASE_STEP_DEFAULT;
+
+        /* src values are in Q16 fixed point, convert to integer: */
+        src_x = src_x >> 16;
+        src_y = src_y >> 16;
+        src_w = src_w >> 16;
+        src_h = src_h >> 16;
+
+        if (src_w != crtc_w) {
+                op_mode |= MDP4_PIPE_OP_MODE_SCALEX_EN;
+                /* TODO calc phasex_step */
+        }
+
+        if (src_h != crtc_h) {
+                op_mode |= MDP4_PIPE_OP_MODE_SCALEY_EN;
+                /* TODO calc phasey_step */
+        }
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_SIZE(pipe),
+                        MDP4_PIPE_SRC_SIZE_WIDTH(src_w) |
+                        MDP4_PIPE_SRC_SIZE_HEIGHT(src_h));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_XY(pipe),
+                        MDP4_PIPE_SRC_XY_X(src_x) |
+                        MDP4_PIPE_SRC_XY_Y(src_y));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_DST_SIZE(pipe),
+                        MDP4_PIPE_DST_SIZE_WIDTH(crtc_w) |
+                        MDP4_PIPE_DST_SIZE_HEIGHT(crtc_h));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_DST_XY(pipe),
+                        MDP4_PIPE_SRC_XY_X(crtc_x) |
+                        MDP4_PIPE_SRC_XY_Y(crtc_y));
+
+        mdp4_plane_set_scanout(plane, fb);
+
+        format = to_mdp4_format(msm_framebuffer_format(fb));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_FORMAT(pipe),
+                        MDP4_PIPE_SRC_FORMAT_A_BPC(format->bpc_a) |
+                        MDP4_PIPE_SRC_FORMAT_R_BPC(format->bpc_r) |
+                        MDP4_PIPE_SRC_FORMAT_G_BPC(format->bpc_g) |
+                        MDP4_PIPE_SRC_FORMAT_B_BPC(format->bpc_b) |
+                        COND(format->alpha_enable, MDP4_PIPE_SRC_FORMAT_ALPHA_ENABLE) |
+                        MDP4_PIPE_SRC_FORMAT_CPP(format->cpp - 1) |
+                        MDP4_PIPE_SRC_FORMAT_UNPACK_COUNT(format->unpack_count - 1) |
+                        COND(format->unpack_tight, MDP4_PIPE_SRC_FORMAT_UNPACK_TIGHT));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_UNPACK(pipe),
+                        MDP4_PIPE_SRC_UNPACK_ELEM0(format->unpack[0]) |
+                        MDP4_PIPE_SRC_UNPACK_ELEM1(format->unpack[1]) |
+                        MDP4_PIPE_SRC_UNPACK_ELEM2(format->unpack[2]) |
+                        MDP4_PIPE_SRC_UNPACK_ELEM3(format->unpack[3]));
+
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_OP_MODE(pipe), op_mode);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_PHASEX_STEP(pipe), phasex_step);
+        mdp4_write(mdp4_kms, REG_MDP4_PIPE_PHASEY_STEP(pipe), phasey_step);
+
+        plane->crtc = crtc;
+
+        return 0;
+}
+
+static const char *pipe_names[] = {
+                "VG1", "VG2",
+                "RGB1", "RGB2", "RGB3",
+                "VG3", "VG4",
+};
+
+enum mpd4_pipe mdp4_plane_pipe(struct drm_plane *plane)
+{
+        struct mdp4_plane *mdp4_plane = to_mdp4_plane(plane);
+        return mdp4_plane->pipe;
+}
+
+/* initialize plane */
+struct drm_plane *mdp4_plane_init(struct drm_device *dev,
+                enum mpd4_pipe pipe_id, bool private_plane)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_plane *plane = NULL;
+        struct mdp4_plane *mdp4_plane;
+        int ret;
+
+        mdp4_plane = kzalloc(sizeof(*mdp4_plane), GFP_KERNEL);
+        if (!mdp4_plane) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        plane = &mdp4_plane->base;
+
+        mdp4_plane->pipe = pipe_id;
+        mdp4_plane->name = pipe_names[pipe_id];
+
+        drm_plane_init(dev, plane, (1 << priv->num_crtcs) - 1, &mdp4_plane_funcs,
+                        mdp4_plane->formats, mdp4_plane->nformats, private_plane);
+
+        mdp4_plane_install_properties(plane, &plane->base);
+
+        return plane;
+
+fail:
+        if (plane)
+                mdp4_plane_destroy(plane);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/msm_connector.c b/drivers/gpu/drm/msm/msm_connector.c
new file mode 100644
index 000000000000..aeea8879e36f
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_connector.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_drv.h"
+#include "msm_connector.h"
+
+void msm_connector_init(struct msm_connector *connector,
+                const struct msm_connector_funcs *funcs,
+                struct drm_encoder *encoder)
+{
+        connector->funcs = funcs;
+        connector->encoder = encoder;
+}
+
+struct drm_encoder *msm_connector_attached_encoder(
+                struct drm_connector *connector)
+{
+        struct msm_connector *msm_connector = to_msm_connector(connector);
+        return msm_connector->encoder;
+}
diff --git a/drivers/gpu/drm/msm/msm_connector.h b/drivers/gpu/drm/msm/msm_connector.h
new file mode 100644
index 000000000000..0b41866adc08
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_connector.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MSM_CONNECTOR_H__
+#define __MSM_CONNECTOR_H__
+
+#include "msm_drv.h"
+
+/*
+ * Base class for MSM connectors.  Typically a connector is a bit more
+ * passive.  But with the split between (for example) DTV within MDP4,
+ * and HDMI encoder, we really need two parts to an encoder.  Instead
+ * what we do is have the part external to the display controller block
+ * in the connector, which is called from the encoder to delegate the
+ * appropriate parts of modeset.
+ */
+
+struct msm_connector;
+
+struct msm_connector_funcs {
+        void (*dpms)(struct msm_connector *connector, int mode);
+        void (*mode_set)(struct msm_connector *connector,
+                        struct drm_display_mode *mode);
+};
+
+struct msm_connector {
+        struct drm_connector base;
+        struct drm_encoder *encoder;
+        const struct msm_connector_funcs *funcs;
+};
+#define to_msm_connector(x) container_of(x, struct msm_connector, base)
+
+void msm_connector_init(struct msm_connector *connector,
+                const struct msm_connector_funcs *funcs,
+                struct drm_encoder *encoder);
+
+struct drm_encoder *msm_connector_attached_encoder(
+                struct drm_connector *connector);
+
+static inline struct msm_connector *get_connector(struct drm_encoder *encoder)
+{
+        struct msm_drm_private *priv = encoder->dev->dev_private;
+        int i;
+
+        for (i = 0; i < priv->num_connectors; i++) {
+                struct drm_connector *connector = priv->connectors[i];
+                if (msm_connector_attached_encoder(connector) == encoder)
+                        return to_msm_connector(connector);
+        }
+
+        return NULL;
+}
+
+#endif /* __MSM_CONNECTOR_H__ */
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
new file mode 100644
index 000000000000..864c9773636b
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -0,0 +1,776 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_drv.h"
+#include "msm_gpu.h"
+
+#include <mach/iommu.h>
+
+static void msm_fb_output_poll_changed(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        if (priv->fbdev)
+                drm_fb_helper_hotplug_event(priv->fbdev);
+}
+
+static const struct drm_mode_config_funcs mode_config_funcs = {
+        .fb_create = msm_framebuffer_create,
+        .output_poll_changed = msm_fb_output_poll_changed,
+};
+
+static int msm_fault_handler(struct iommu_domain *iommu, struct device *dev,
+                unsigned long iova, int flags, void *arg)
+{
+        DBG("*** fault: iova=%08lx, flags=%d", iova, flags);
+        return 0;
+}
+
+int msm_register_iommu(struct drm_device *dev, struct iommu_domain *iommu)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        int idx = priv->num_iommus++;
+
+        if (WARN_ON(idx >= ARRAY_SIZE(priv->iommus)))
+                return -EINVAL;
+
+        priv->iommus[idx] = iommu;
+
+        iommu_set_fault_handler(iommu, msm_fault_handler, dev);
+
+        /* need to iommu_attach_device() somewhere??  on resume?? */
+
+        return idx;
+}
+
+int msm_iommu_attach(struct drm_device *dev, struct iommu_domain *iommu,
+                const char **names, int cnt)
+{
+        int i, ret;
+
+        for (i = 0; i < cnt; i++) {
+                struct device *ctx = msm_iommu_get_ctx(names[i]);
+                if (!ctx)
+                        continue;
+                ret = iommu_attach_device(iommu, ctx);
+                if (ret) {
+                        dev_warn(dev->dev, "could not attach iommu to %s", names[i]);
+                        return ret;
+                }
+        }
+        return 0;
+}
+
+#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING
+static bool reglog = false;
+MODULE_PARM_DESC(reglog, "Enable register read/write logging");
+module_param(reglog, bool, 0600);
+#else
+#define reglog 0
+#endif
+
+void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
+                const char *dbgname)
+{
+        struct resource *res;
+        unsigned long size;
+        void __iomem *ptr;
+
+        if (name)
+                res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
+        else
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get memory resource: %s\n", name);
+                return ERR_PTR(-EINVAL);
+        }
+
+        size = resource_size(res);
+
+        ptr = devm_ioremap_nocache(&pdev->dev, res->start, size);
+        if (!ptr) {
+                dev_err(&pdev->dev, "failed to ioremap: %s\n", name);
+                return ERR_PTR(-ENOMEM);
+        }
+
+        if (reglog)
+                printk(KERN_DEBUG "IO:region %s %08x %08lx\n", dbgname, (u32)ptr, size);
+
+        return ptr;
+}
+
+void msm_writel(u32 data, void __iomem *addr)
+{
+        if (reglog)
+                printk(KERN_DEBUG "IO:W %08x %08x\n", (u32)addr, data);
+        writel(data, addr);
+}
+
+u32 msm_readl(const void __iomem *addr)
+{
+        u32 val = readl(addr);
+        if (reglog)
+                printk(KERN_ERR "IO:R %08x %08x\n", (u32)addr, val);
+        return val;
+}
+
+/*
+ * DRM operations:
+ */
+
+static int msm_unload(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        struct msm_gpu *gpu = priv->gpu;
+
+        drm_kms_helper_poll_fini(dev);
+        drm_mode_config_cleanup(dev);
+        drm_vblank_cleanup(dev);
+
+        pm_runtime_get_sync(dev->dev);
+        drm_irq_uninstall(dev);
+        pm_runtime_put_sync(dev->dev);
+
+        flush_workqueue(priv->wq);
+        destroy_workqueue(priv->wq);
+
+        if (kms) {
+                pm_runtime_disable(dev->dev);
+                kms->funcs->destroy(kms);
+        }
+
+        if (gpu) {
+                mutex_lock(&dev->struct_mutex);
+                gpu->funcs->pm_suspend(gpu);
+                gpu->funcs->destroy(gpu);
+                mutex_unlock(&dev->struct_mutex);
+        }
+
+        dev->dev_private = NULL;
+
+        kfree(priv);
+
+        return 0;
+}
+
+static int msm_load(struct drm_device *dev, unsigned long flags)
+{
+        struct platform_device *pdev = dev->platformdev;
+        struct msm_drm_private *priv;
+        struct msm_kms *kms;
+        int ret;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(dev->dev, "failed to allocate private data\n");
+                return -ENOMEM;
+        }
+
+        dev->dev_private = priv;
+
+        priv->wq = alloc_ordered_workqueue("msm", 0);
+        init_waitqueue_head(&priv->fence_event);
+
+        INIT_LIST_HEAD(&priv->inactive_list);
+
+        drm_mode_config_init(dev);
+
+        kms = mdp4_kms_init(dev);
+        if (IS_ERR(kms)) {
+                /*
+                 * NOTE: once we have GPU support, having no kms should not
+                 * be considered fatal.. ideally we would still support gpu
+                 * and (for example) use dmabuf/prime to share buffers with
+                 * imx drm driver on iMX5
+                 */
+                dev_err(dev->dev, "failed to load kms\n");
+                ret = PTR_ERR(priv->kms);
+                goto fail;
+        }
+
+        priv->kms = kms;
+
+        if (kms) {
+                pm_runtime_enable(dev->dev);
+                ret = kms->funcs->hw_init(kms);
+                if (ret) {
+                        dev_err(dev->dev, "kms hw init failed: %d\n", ret);
+                        goto fail;
+                }
+        }
+
+        dev->mode_config.min_width = 0;
+        dev->mode_config.min_height = 0;
+        dev->mode_config.max_width = 2048;
+        dev->mode_config.max_height = 2048;
+        dev->mode_config.funcs = &mode_config_funcs;
+
+        ret = drm_vblank_init(dev, 1);
+        if (ret < 0) {
+                dev_err(dev->dev, "failed to initialize vblank\n");
+                goto fail;
+        }
+
+        pm_runtime_get_sync(dev->dev);
+        ret = drm_irq_install(dev);
+        pm_runtime_put_sync(dev->dev);
+        if (ret < 0) {
+                dev_err(dev->dev, "failed to install IRQ handler\n");
+                goto fail;
+        }
+
+        platform_set_drvdata(pdev, dev);
+
+#ifdef CONFIG_DRM_MSM_FBDEV
+        priv->fbdev = msm_fbdev_init(dev);
+#endif
+
+        drm_kms_helper_poll_init(dev);
+
+        return 0;
+
+fail:
+        msm_unload(dev);
+        return ret;
+}
+
+static void load_gpu(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gpu *gpu;
+
+        if (priv->gpu)
+                return;
+
+        mutex_lock(&dev->struct_mutex);
+        gpu = a3xx_gpu_init(dev);
+        if (IS_ERR(gpu)) {
+                dev_warn(dev->dev, "failed to load a3xx gpu\n");
+                gpu = NULL;
+                /* not fatal */
+        }
+        mutex_unlock(&dev->struct_mutex);
+
+        if (gpu) {
+                int ret;
+                gpu->funcs->pm_resume(gpu);
+                ret = gpu->funcs->hw_init(gpu);
+                if (ret) {
+                        dev_err(dev->dev, "gpu hw init failed: %d\n", ret);
+                        gpu->funcs->destroy(gpu);
+                        gpu = NULL;
+                }
+        }
+
+        priv->gpu = gpu;
+}
+
+static int msm_open(struct drm_device *dev, struct drm_file *file)
+{
+        struct msm_file_private *ctx;
+
+        /* For now, load gpu on open.. to avoid the requirement of having
+         * firmware in the initrd.
+         */
+        load_gpu(dev);
+
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+        if (!ctx)
+                return -ENOMEM;
+
+        file->driver_priv = ctx;
+
+        return 0;
+}
+
+static void msm_preclose(struct drm_device *dev, struct drm_file *file)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_file_private *ctx = file->driver_priv;
+        struct msm_kms *kms = priv->kms;
+
+        if (kms)
+                kms->funcs->preclose(kms, file);
+
+        mutex_lock(&dev->struct_mutex);
+        if (ctx == priv->lastctx)
+                priv->lastctx = NULL;
+        mutex_unlock(&dev->struct_mutex);
+
+        kfree(ctx);
+}
+
+static void msm_lastclose(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        if (priv->fbdev) {
+                drm_modeset_lock_all(dev);
+                drm_fb_helper_restore_fbdev_mode(priv->fbdev);
+                drm_modeset_unlock_all(dev);
+        }
+}
+
+static irqreturn_t msm_irq(DRM_IRQ_ARGS)
+{
+        struct drm_device *dev = arg;
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        BUG_ON(!kms);
+        return kms->funcs->irq(kms);
+}
+
+static void msm_irq_preinstall(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        BUG_ON(!kms);
+        kms->funcs->irq_preinstall(kms);
+}
+
+static int msm_irq_postinstall(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        BUG_ON(!kms);
+        return kms->funcs->irq_postinstall(kms);
+}
+
+static void msm_irq_uninstall(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        BUG_ON(!kms);
+        kms->funcs->irq_uninstall(kms);
+}
+
+static int msm_enable_vblank(struct drm_device *dev, int crtc_id)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        if (!kms)
+                return -ENXIO;
+        DBG("dev=%p, crtc=%d", dev, crtc_id);
+        return kms->funcs->enable_vblank(kms, priv->crtcs[crtc_id]);
+}
+
+static void msm_disable_vblank(struct drm_device *dev, int crtc_id)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        if (!kms)
+                return;
+        DBG("dev=%p, crtc=%d", dev, crtc_id);
+        kms->funcs->disable_vblank(kms, priv->crtcs[crtc_id]);
+}
+
+/*
+ * DRM debugfs:
+ */
+
+#ifdef CONFIG_DEBUG_FS
+static int msm_gpu_show(struct drm_device *dev, struct seq_file *m)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gpu *gpu = priv->gpu;
+
+        if (gpu) {
+                seq_printf(m, "%s Status:\n", gpu->name);
+                gpu->funcs->show(gpu, m);
+        }
+
+        return 0;
+}
+
+static int msm_gem_show(struct drm_device *dev, struct seq_file *m)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gpu *gpu = priv->gpu;
+
+        if (gpu) {
+                seq_printf(m, "Active Objects (%s):\n", gpu->name);
+                msm_gem_describe_objects(&gpu->active_list, m);
+        }
+
+        seq_printf(m, "Inactive Objects:\n");
+        msm_gem_describe_objects(&priv->inactive_list, m);
+
+        return 0;
+}
+
+static int msm_mm_show(struct drm_device *dev, struct seq_file *m)
+{
+        return drm_mm_dump_table(m, dev->mm_private);
+}
+
+static int msm_fb_show(struct drm_device *dev, struct seq_file *m)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_framebuffer *fb, *fbdev_fb = NULL;
+
+        if (priv->fbdev) {
+                seq_printf(m, "fbcon ");
+                fbdev_fb = priv->fbdev->fb;
+                msm_framebuffer_describe(fbdev_fb, m);
+        }
+
+        mutex_lock(&dev->mode_config.fb_lock);
+        list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+                if (fb == fbdev_fb)
+                        continue;
+
+                seq_printf(m, "user ");
+                msm_framebuffer_describe(fb, m);
+        }
+        mutex_unlock(&dev->mode_config.fb_lock);
+
+        return 0;
+}
+
+static int show_locked(struct seq_file *m, void *arg)
+{
+        struct drm_info_node *node = (struct drm_info_node *) m->private;
+        struct drm_device *dev = node->minor->dev;
+        int (*show)(struct drm_device *dev, struct seq_file *m) =
+                        node->info_ent->data;
+        int ret;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
+
+        ret = show(dev, m);
+
+        mutex_unlock(&dev->struct_mutex);
+
+        return ret;
+}
+
+static struct drm_info_list msm_debugfs_list[] = {
+                {"gpu", show_locked, 0, msm_gpu_show},
+                {"gem", show_locked, 0, msm_gem_show},
+                { "mm", show_locked, 0, msm_mm_show },
+                { "fb", show_locked, 0, msm_fb_show },
+};
+
+static int msm_debugfs_init(struct drm_minor *minor)
+{
+        struct drm_device *dev = minor->dev;
+        int ret;
+
+        ret = drm_debugfs_create_files(msm_debugfs_list,
+                        ARRAY_SIZE(msm_debugfs_list),
+                        minor->debugfs_root, minor);
+
+        if (ret) {
+                dev_err(dev->dev, "could not install msm_debugfs_list\n");
+                return ret;
+        }
+
+        return ret;
+}
+
+static void msm_debugfs_cleanup(struct drm_minor *minor)
+{
+        drm_debugfs_remove_files(msm_debugfs_list,
+                        ARRAY_SIZE(msm_debugfs_list), minor);
+}
+#endif
+
+/*
+ * Fences:
+ */
+
+int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,
+                struct timespec *timeout)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        unsigned long timeout_jiffies = timespec_to_jiffies(timeout);
+        unsigned long start_jiffies = jiffies;
+        unsigned long remaining_jiffies;
+        int ret;
+
+        if (time_after(start_jiffies, timeout_jiffies))
+                remaining_jiffies = 0;
+        else
+                remaining_jiffies = timeout_jiffies - start_jiffies;
+
+        ret = wait_event_interruptible_timeout(priv->fence_event,
+                        priv->completed_fence >= fence,
+                        remaining_jiffies);
+        if (ret == 0) {
+                DBG("timeout waiting for fence: %u (completed: %u)",
+                                fence, priv->completed_fence);
+                ret = -ETIMEDOUT;
+        } else if (ret != -ERESTARTSYS) {
+                ret = 0;
+        }
+
+        return ret;
+}
+
+/* call under struct_mutex */
+void msm_update_fence(struct drm_device *dev, uint32_t fence)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+
+        if (fence > priv->completed_fence) {
+                priv->completed_fence = fence;
+                wake_up_all(&priv->fence_event);
+        }
+}
+
+/*
+ * DRM ioctls:
+ */
+
+static int msm_ioctl_get_param(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_msm_param *args = data;
+        struct msm_gpu *gpu;
+
+        /* for now, we just have 3d pipe.. eventually this would need to
+         * be more clever to dispatch to appropriate gpu module:
+         */
+        if (args->pipe != MSM_PIPE_3D0)
+                return -EINVAL;
+
+        gpu = priv->gpu;
+
+        if (!gpu)
+                return -ENXIO;
+
+        return gpu->funcs->get_param(gpu, args->param, &args->value);
+}
+
+static int msm_ioctl_gem_new(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct drm_msm_gem_new *args = data;
+        return msm_gem_new_handle(dev, file, args->size,
+                        args->flags, &args->handle);
+}
+
+#define TS(t) ((struct timespec){ .tv_sec = (t).tv_sec, .tv_nsec = (t).tv_nsec })
+
+static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct drm_msm_gem_cpu_prep *args = data;
+        struct drm_gem_object *obj;
+        int ret;
+
+        obj = drm_gem_object_lookup(dev, file, args->handle);
+        if (!obj)
+                return -ENOENT;
+
+        ret = msm_gem_cpu_prep(obj, args->op, &TS(args->timeout));
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct drm_msm_gem_cpu_fini *args = data;
+        struct drm_gem_object *obj;
+        int ret;
+
+        obj = drm_gem_object_lookup(dev, file, args->handle);
+        if (!obj)
+                return -ENOENT;
+
+        ret = msm_gem_cpu_fini(obj);
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct drm_msm_gem_info *args = data;
+        struct drm_gem_object *obj;
+        int ret = 0;
+
+        if (args->pad)
+                return -EINVAL;
+
+        obj = drm_gem_object_lookup(dev, file, args->handle);
+        if (!obj)
+                return -ENOENT;
+
+        args->offset = msm_gem_mmap_offset(obj);
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+static int msm_ioctl_wait_fence(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct drm_msm_wait_fence *args = data;
+        return msm_wait_fence_interruptable(dev, args->fence, &TS(args->timeout));
+}
+
+static const struct drm_ioctl_desc msm_ioctls[] = {
+        DRM_IOCTL_DEF_DRV(MSM_GET_PARAM,    msm_ioctl_get_param,    DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_GEM_NEW,      msm_ioctl_gem_new,      DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_GEM_INFO,     msm_ioctl_gem_info,     DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_PREP, msm_ioctl_gem_cpu_prep, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_FINI, msm_ioctl_gem_cpu_fini, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_GEM_SUBMIT,   msm_ioctl_gem_submit,   DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(MSM_WAIT_FENCE,   msm_ioctl_wait_fence,   DRM_UNLOCKED|DRM_AUTH),
+};
+
+static const struct vm_operations_struct vm_ops = {
+        .fault = msm_gem_fault,
+        .open = drm_gem_vm_open,
+        .close = drm_gem_vm_close,
+};
+
+static const struct file_operations fops = {
+        .owner              = THIS_MODULE,
+        .open               = drm_open,
+        .release            = drm_release,
+        .unlocked_ioctl     = drm_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl       = drm_compat_ioctl,
+#endif
+        .poll               = drm_poll,
+        .read               = drm_read,
+        .llseek             = no_llseek,
+        .mmap               = msm_gem_mmap,
+};
+
+static struct drm_driver msm_driver = {
+        .driver_features    = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET,
+        .load               = msm_load,
+        .unload             = msm_unload,
+        .open               = msm_open,
+        .preclose           = msm_preclose,
+        .lastclose          = msm_lastclose,
+        .irq_handler        = msm_irq,
+        .irq_preinstall     = msm_irq_preinstall,
+        .irq_postinstall    = msm_irq_postinstall,
+        .irq_uninstall      = msm_irq_uninstall,
+        .get_vblank_counter = drm_vblank_count,
+        .enable_vblank      = msm_enable_vblank,
+        .disable_vblank     = msm_disable_vblank,
+        .gem_free_object    = msm_gem_free_object,
+        .gem_vm_ops         = &vm_ops,
+        .dumb_create        = msm_gem_dumb_create,
+        .dumb_map_offset    = msm_gem_dumb_map_offset,
+        .dumb_destroy       = msm_gem_dumb_destroy,
+#ifdef CONFIG_DEBUG_FS
+        .debugfs_init       = msm_debugfs_init,
+        .debugfs_cleanup    = msm_debugfs_cleanup,
+#endif
+        .ioctls             = msm_ioctls,
+        .num_ioctls         = DRM_MSM_NUM_IOCTLS,
+        .fops               = &fops,
+        .name               = "msm",
+        .desc               = "MSM Snapdragon DRM",
+        .date               = "20130625",
+        .major              = 1,
+        .minor              = 0,
+};
+
+#ifdef CONFIG_PM_SLEEP
+static int msm_pm_suspend(struct device *dev)
+{
+        struct drm_device *ddev = dev_get_drvdata(dev);
+
+        drm_kms_helper_poll_disable(ddev);
+
+        return 0;
+}
+
+static int msm_pm_resume(struct device *dev)
+{
+        struct drm_device *ddev = dev_get_drvdata(dev);
+
+        drm_kms_helper_poll_enable(ddev);
+
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops msm_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(msm_pm_suspend, msm_pm_resume)
+};
+
+/*
+ * Platform driver:
+ */
+
+static int msm_pdev_probe(struct platform_device *pdev)
+{
+        return drm_platform_init(&msm_driver, pdev);
+}
+
+static int msm_pdev_remove(struct platform_device *pdev)
+{
+        drm_platform_exit(&msm_driver, pdev);
+
+        return 0;
+}
+
+static const struct platform_device_id msm_id[] = {
+        { "mdp", 0 },
+        { }
+};
+
+static struct platform_driver msm_platform_driver = {
+        .probe      = msm_pdev_probe,
+        .remove     = msm_pdev_remove,
+        .driver     = {
+                .owner  = THIS_MODULE,
+                .name   = "msm",
+                .pm     = &msm_pm_ops,
+        },
+        .id_table   = msm_id,
+};
+
+static int __init msm_drm_register(void)
+{
+        DBG("init");
+        hdmi_register();
+        a3xx_register();
+        return platform_driver_register(&msm_platform_driver);
+}
+
+static void __exit msm_drm_unregister(void)
+{
+        DBG("fini");
+        platform_driver_unregister(&msm_platform_driver);
+        hdmi_unregister();
+        a3xx_unregister();
+}
+
+module_init(msm_drm_register);
+module_exit(msm_drm_unregister);
+
+MODULE_AUTHOR("Rob Clark <robdclark@gmail.com");
+MODULE_DESCRIPTION("MSM DRM Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
new file mode 100644
index 000000000000..34c36b2911d9
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MSM_DRV_H__
+#define __MSM_DRV_H__
+
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/cpufreq.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <linux/iommu.h>
+#include <linux/types.h>
+#include <asm/sizes.h>
+
+#ifndef CONFIG_OF
+#include <mach/board.h>
+#include <mach/socinfo.h>
+#include <mach/iommu_domains.h>
+#endif
+
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/msm_drm.h>
+
+struct msm_kms;
+struct msm_gpu;
+
+#define NUM_DOMAINS 2    /* one for KMS, then one per gpu core (?) */
+
+struct msm_file_private {
+        /* currently we don't do anything useful with this.. but when
+         * per-context address spaces are supported we'd keep track of
+         * the context's page-tables here.
+         */
+        int dummy;
+};
+
+struct msm_drm_private {
+
+        struct msm_kms *kms;
+
+        /* when we have more than one 'msm_gpu' these need to be an array: */
+        struct msm_gpu *gpu;
+        struct msm_file_private *lastctx;
+
+        struct drm_fb_helper *fbdev;
+
+        uint32_t next_fence, completed_fence;
+        wait_queue_head_t fence_event;
+
+        /* list of GEM objects: */
+        struct list_head inactive_list;
+
+        struct workqueue_struct *wq;
+
+        /* registered IOMMU domains: */
+        unsigned int num_iommus;
+        struct iommu_domain *iommus[NUM_DOMAINS];
+
+        unsigned int num_crtcs;
+        struct drm_crtc *crtcs[8];
+
+        unsigned int num_encoders;
+        struct drm_encoder *encoders[8];
+
+        unsigned int num_connectors;
+        struct drm_connector *connectors[8];
+};
+
+struct msm_format {
+        uint32_t pixel_format;
+};
+
+/* As there are different display controller blocks depending on the
+ * snapdragon version, the kms support is split out and the appropriate
+ * implementation is loaded at runtime.  The kms module is responsible
+ * for constructing the appropriate planes/crtcs/encoders/connectors.
+ */
+struct msm_kms_funcs {
+        /* hw initialization: */
+        int (*hw_init)(struct msm_kms *kms);
+        /* irq handling: */
+        void (*irq_preinstall)(struct msm_kms *kms);
+        int (*irq_postinstall)(struct msm_kms *kms);
+        void (*irq_uninstall)(struct msm_kms *kms);
+        irqreturn_t (*irq)(struct msm_kms *kms);
+        int (*enable_vblank)(struct msm_kms *kms, struct drm_crtc *crtc);
+        void (*disable_vblank)(struct msm_kms *kms, struct drm_crtc *crtc);
+        /* misc: */
+        const struct msm_format *(*get_format)(struct msm_kms *kms, uint32_t format);
+        long (*round_pixclk)(struct msm_kms *kms, unsigned long rate,
+                        struct drm_encoder *encoder);
+        /* cleanup: */
+        void (*preclose)(struct msm_kms *kms, struct drm_file *file);
+        void (*destroy)(struct msm_kms *kms);
+};
+
+struct msm_kms {
+        const struct msm_kms_funcs *funcs;
+};
+
+struct msm_kms *mdp4_kms_init(struct drm_device *dev);
+
+int msm_register_iommu(struct drm_device *dev, struct iommu_domain *iommu);
+int msm_iommu_attach(struct drm_device *dev, struct iommu_domain *iommu,
+                const char **names, int cnt);
+
+int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,
+                struct timespec *timeout);
+void msm_update_fence(struct drm_device *dev, uint32_t fence);
+
+int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
+                struct drm_file *file);
+
+int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
+int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
+int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id,
+                uint32_t *iova);
+int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint32_t *iova);
+void msm_gem_put_iova(struct drm_gem_object *obj, int id);
+int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
+                struct drm_mode_create_dumb *args);
+int msm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle);
+int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle, uint64_t *offset);
+void *msm_gem_vaddr_locked(struct drm_gem_object *obj);
+void *msm_gem_vaddr(struct drm_gem_object *obj);
+int msm_gem_queue_inactive_work(struct drm_gem_object *obj,
+                struct work_struct *work);
+void msm_gem_move_to_active(struct drm_gem_object *obj,
+                struct msm_gpu *gpu, uint32_t fence);
+void msm_gem_move_to_inactive(struct drm_gem_object *obj);
+int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op,
+                struct timespec *timeout);
+int msm_gem_cpu_fini(struct drm_gem_object *obj);
+void msm_gem_free_object(struct drm_gem_object *obj);
+int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
+                uint32_t size, uint32_t flags, uint32_t *handle);
+struct drm_gem_object *msm_gem_new(struct drm_device *dev,
+                uint32_t size, uint32_t flags);
+
+struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane);
+const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb);
+struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
+                struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
+struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
+                struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd);
+
+struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev);
+
+struct drm_connector *hdmi_connector_init(struct drm_device *dev,
+                struct drm_encoder *encoder);
+void __init hdmi_register(void);
+void __exit hdmi_unregister(void);
+
+#ifdef CONFIG_DEBUG_FS
+void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m);
+void msm_gem_describe_objects(struct list_head *list, struct seq_file *m);
+void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m);
+#endif
+
+void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
+                const char *dbgname);
+void msm_writel(u32 data, void __iomem *addr);
+u32 msm_readl(const void __iomem *addr);
+
+#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
+#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
+
+static inline int align_pitch(int width, int bpp)
+{
+        int bytespp = (bpp + 7) / 8;
+        /* adreno needs pitch aligned to 32 pixels: */
+        return bytespp * ALIGN(width, 32);
+}
+
+/* for the generated headers: */
+#define INVALID_IDX(idx) ({BUG(); 0;})
+#define fui(x)                ({BUG(); 0;})
+#define util_float_to_half(x) ({BUG(); 0;})
+
+
+#define FIELD(val, name) (((val) & name ## __MASK) >> name ## __SHIFT)
+
+/* for conditionally setting boolean flag(s): */
+#define COND(bool, val) ((bool) ? (val) : 0)
+
+
+#endif /* __MSM_DRV_H__ */
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
new file mode 100644
index 000000000000..0286c0eeb10c
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+struct msm_framebuffer {
+        struct drm_framebuffer base;
+        const struct msm_format *format;
+        struct drm_gem_object *planes[2];
+};
+#define to_msm_framebuffer(x) container_of(x, struct msm_framebuffer, base)
+
+
+static int msm_framebuffer_create_handle(struct drm_framebuffer *fb,
+                struct drm_file *file_priv,
+                unsigned int *handle)
+{
+        struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+        return drm_gem_handle_create(file_priv,
+                        msm_fb->planes[0], handle);
+}
+
+static void msm_framebuffer_destroy(struct drm_framebuffer *fb)
+{
+        struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+        int i, n = drm_format_num_planes(fb->pixel_format);
+
+        DBG("destroy: FB ID: %d (%p)", fb->base.id, fb);
+
+        drm_framebuffer_cleanup(fb);
+
+        for (i = 0; i < n; i++) {
+                struct drm_gem_object *bo = msm_fb->planes[i];
+                if (bo)
+                        drm_gem_object_unreference_unlocked(bo);
+        }
+
+        kfree(msm_fb);
+}
+
+static int msm_framebuffer_dirty(struct drm_framebuffer *fb,
+                struct drm_file *file_priv, unsigned flags, unsigned color,
+                struct drm_clip_rect *clips, unsigned num_clips)
+{
+        return 0;
+}
+
+static const struct drm_framebuffer_funcs msm_framebuffer_funcs = {
+        .create_handle = msm_framebuffer_create_handle,
+        .destroy = msm_framebuffer_destroy,
+        .dirty = msm_framebuffer_dirty,
+};
+
+#ifdef CONFIG_DEBUG_FS
+void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)
+{
+        struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+        int i, n = drm_format_num_planes(fb->pixel_format);
+
+        seq_printf(m, "fb: %dx%d@%4.4s (%2d, ID:%d)\n",
+                        fb->width, fb->height, (char *)&fb->pixel_format,
+                        fb->refcount.refcount.counter, fb->base.id);
+
+        for (i = 0; i < n; i++) {
+                seq_printf(m, "   %d: offset=%d pitch=%d, obj: ",
+                                i, fb->offsets[i], fb->pitches[i]);
+                msm_gem_describe(msm_fb->planes[i], m);
+        }
+}
+#endif
+
+struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane)
+{
+        struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+        return msm_fb->planes[plane];
+}
+
+const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb)
+{
+        struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
+        return msm_fb->format;
+}
+
+struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
+                struct drm_file *file, struct drm_mode_fb_cmd2 *mode_cmd)
+{
+        struct drm_gem_object *bos[4] = {0};
+        struct drm_framebuffer *fb;
+        int ret, i, n = drm_format_num_planes(mode_cmd->pixel_format);
+
+        for (i = 0; i < n; i++) {
+                bos[i] = drm_gem_object_lookup(dev, file,
+                                mode_cmd->handles[i]);
+                if (!bos[i]) {
+                        ret = -ENXIO;
+                        goto out_unref;
+                }
+        }
+
+        fb = msm_framebuffer_init(dev, mode_cmd, bos);
+        if (IS_ERR(fb)) {
+                ret = PTR_ERR(fb);
+                goto out_unref;
+        }
+
+        return fb;
+
+out_unref:
+        for (i = 0; i < n; i++)
+                drm_gem_object_unreference_unlocked(bos[i]);
+        return ERR_PTR(ret);
+}
+
+struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
+                struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_kms *kms = priv->kms;
+        struct msm_framebuffer *msm_fb;
+        struct drm_framebuffer *fb = NULL;
+        const struct msm_format *format;
+        int ret, i, n;
+        unsigned int hsub, vsub;
+
+        DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%4.4s)",
+                        dev, mode_cmd, mode_cmd->width, mode_cmd->height,
+                        (char *)&mode_cmd->pixel_format);
+
+        n = drm_format_num_planes(mode_cmd->pixel_format);
+        hsub = drm_format_horz_chroma_subsampling(mode_cmd->pixel_format);
+        vsub = drm_format_vert_chroma_subsampling(mode_cmd->pixel_format);
+
+        format = kms->funcs->get_format(kms, mode_cmd->pixel_format);
+        if (!format) {
+                dev_err(dev->dev, "unsupported pixel format: %4.4s\n",
+                                (char *)&mode_cmd->pixel_format);
+                ret = -EINVAL;
+                goto fail;
+        }
+
+        msm_fb = kzalloc(sizeof(*msm_fb), GFP_KERNEL);
+        if (!msm_fb) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        fb = &msm_fb->base;
+
+        msm_fb->format = format;
+
+        for (i = 0; i < n; i++) {
+                unsigned int width = mode_cmd->width / (i ? hsub : 1);
+                unsigned int height = mode_cmd->height / (i ? vsub : 1);
+                unsigned int min_size;
+
+                min_size = (height - 1) * mode_cmd->pitches[i]
+                         + width * drm_format_plane_cpp(mode_cmd->pixel_format, i)
+                         + mode_cmd->offsets[i];
+
+                if (bos[i]->size < min_size) {
+                        ret = -EINVAL;
+                        goto fail;
+                }
+
+                msm_fb->planes[i] = bos[i];
+        }
+
+        drm_helper_mode_fill_fb_struct(fb, mode_cmd);
+
+        ret = drm_framebuffer_init(dev, fb, &msm_framebuffer_funcs);
+        if (ret) {
+                dev_err(dev->dev, "framebuffer init failed: %d\n", ret);
+                goto fail;
+        }
+
+        DBG("create: FB ID: %d (%p)", fb->base.id, fb);
+
+        return fb;
+
+fail:
+        if (fb)
+                msm_framebuffer_destroy(fb);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
new file mode 100644
index 000000000000..6c6d7d4c9b4e
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_fb_helper.h"
+
+/*
+ * fbdev funcs, to implement legacy fbdev interface on top of drm driver
+ */
+
+#define to_msm_fbdev(x) container_of(x, struct msm_fbdev, base)
+
+struct msm_fbdev {
+        struct drm_fb_helper base;
+        struct drm_framebuffer *fb;
+        struct drm_gem_object *bo;
+};
+
+static struct fb_ops msm_fb_ops = {
+        .owner = THIS_MODULE,
+
+        /* Note: to properly handle manual update displays, we wrap the
+         * basic fbdev ops which write to the framebuffer
+         */
+        .fb_read = fb_sys_read,
+        .fb_write = fb_sys_write,
+        .fb_fillrect = sys_fillrect,
+        .fb_copyarea = sys_copyarea,
+        .fb_imageblit = sys_imageblit,
+
+        .fb_check_var = drm_fb_helper_check_var,
+        .fb_set_par = drm_fb_helper_set_par,
+        .fb_pan_display = drm_fb_helper_pan_display,
+        .fb_blank = drm_fb_helper_blank,
+        .fb_setcmap = drm_fb_helper_setcmap,
+};
+
+static int msm_fbdev_create(struct drm_fb_helper *helper,
+                struct drm_fb_helper_surface_size *sizes)
+{
+        struct msm_fbdev *fbdev = to_msm_fbdev(helper);
+        struct drm_device *dev = helper->dev;
+        struct drm_framebuffer *fb = NULL;
+        struct fb_info *fbi = NULL;
+        struct drm_mode_fb_cmd2 mode_cmd = {0};
+        dma_addr_t paddr;
+        int ret, size;
+
+        /* only doing ARGB32 since this is what is needed to alpha-blend
+         * with video overlays:
+         */
+        sizes->surface_bpp = 32;
+        sizes->surface_depth = 32;
+
+        DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
+                        sizes->surface_height, sizes->surface_bpp,
+                        sizes->fb_width, sizes->fb_height);
+
+        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
+                        sizes->surface_depth);
+
+        mode_cmd.width = sizes->surface_width;
+        mode_cmd.height = sizes->surface_height;
+
+        mode_cmd.pitches[0] = align_pitch(
+                        mode_cmd.width, sizes->surface_bpp);
+
+        /* allocate backing bo */
+        size = mode_cmd.pitches[0] * mode_cmd.height;
+        DBG("allocating %d bytes for fb %d", size, dev->primary->index);
+        mutex_lock(&dev->struct_mutex);
+        fbdev->bo = msm_gem_new(dev, size, MSM_BO_SCANOUT | MSM_BO_WC);
+        mutex_unlock(&dev->struct_mutex);
+        if (IS_ERR(fbdev->bo)) {
+                ret = PTR_ERR(fbdev->bo);
+                fbdev->bo = NULL;
+                dev_err(dev->dev, "failed to allocate buffer object: %d\n", ret);
+                goto fail;
+        }
+
+        fb = msm_framebuffer_init(dev, &mode_cmd, &fbdev->bo);
+        if (IS_ERR(fb)) {
+                dev_err(dev->dev, "failed to allocate fb\n");
+                /* note: if fb creation failed, we can't rely on fb destroy
+                 * to unref the bo:
+                 */
+                drm_gem_object_unreference(fbdev->bo);
+                ret = PTR_ERR(fb);
+                goto fail;
+        }
+
+        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);
+
+        fbi = framebuffer_alloc(0, dev->dev);
+        if (!fbi) {
+                dev_err(dev->dev, "failed to allocate fb info\n");
+                ret = -ENOMEM;
+                goto fail_unlock;
+        }
+
+        DBG("fbi=%p, dev=%p", fbi, dev);
+
+        fbdev->fb = fb;
+        helper->fb = fb;
+        helper->fbdev = fbi;
+
+        fbi->par = helper;
+        fbi->flags = FBINFO_DEFAULT;
+        fbi->fbops = &msm_fb_ops;
+
+        strcpy(fbi->fix.id, "msm");
+
+        ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
+        if (ret) {
+                ret = -ENOMEM;
+                goto fail_unlock;
+        }
+
+        drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
+        drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
+
+        dev->mode_config.fb_base = paddr;
+
+        fbi->screen_base = msm_gem_vaddr_locked(fbdev->bo);
+        fbi->screen_size = fbdev->bo->size;
+        fbi->fix.smem_start = paddr;
+        fbi->fix.smem_len = fbdev->bo->size;
+
+        DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
+        DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
+
+        mutex_unlock(&dev->struct_mutex);
+
+        return 0;
+
+fail_unlock:
+        mutex_unlock(&dev->struct_mutex);
+fail:
+
+        if (ret) {
+                if (fbi)
+                        framebuffer_release(fbi);
+                if (fb) {
+                        drm_framebuffer_unregister_private(fb);
+                        drm_framebuffer_remove(fb);
+                }
+        }
+
+        return ret;
+}
+
+static void msm_crtc_fb_gamma_set(struct drm_crtc *crtc,
+                u16 red, u16 green, u16 blue, int regno)
+{
+        DBG("fbdev: set gamma");
+}
+
+static void msm_crtc_fb_gamma_get(struct drm_crtc *crtc,
+                u16 *red, u16 *green, u16 *blue, int regno)
+{
+        DBG("fbdev: get gamma");
+}
+
+static struct drm_fb_helper_funcs msm_fb_helper_funcs = {
+        .gamma_set = msm_crtc_fb_gamma_set,
+        .gamma_get = msm_crtc_fb_gamma_get,
+        .fb_probe = msm_fbdev_create,
+};
+
+/* initialize fbdev helper */
+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;
+
+        fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
+        if (!fbdev)
+                goto fail;
+
+        helper = &fbdev->base;
+
+        helper->funcs = &msm_fb_helper_funcs;
+
+        ret = drm_fb_helper_init(dev, helper,
+                        priv->num_crtcs, priv->num_connectors);
+        if (ret) {
+                dev_err(dev->dev, "could not init fbdev: ret=%d\n", ret);
+                goto fail;
+        }
+
+        drm_fb_helper_single_add_all_connectors(helper);
+
+        /* disable all the possible outputs/crtcs before entering KMS mode */
+        drm_helper_disable_unused_functions(dev);
+
+        drm_fb_helper_initial_config(helper, 32);
+
+        priv->fbdev = helper;
+
+        return helper;
+
+fail:
+        kfree(fbdev);
+        return NULL;
+}
+
+void msm_fbdev_free(struct drm_device *dev)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_fb_helper *helper = priv->fbdev;
+        struct msm_fbdev *fbdev;
+        struct fb_info *fbi;
+
+        DBG();
+
+        fbi = helper->fbdev;
+
+        /* only cleanup framebuffer if it is present */
+        if (fbi) {
+                unregister_framebuffer(fbi);
+                framebuffer_release(fbi);
+        }
+
+        drm_fb_helper_fini(helper);
+
+        fbdev = to_msm_fbdev(priv->fbdev);
+
+        /* this will free the backing object */
+        if (fbdev->fb) {
+                drm_framebuffer_unregister_private(fbdev->fb);
+                drm_framebuffer_remove(fbdev->fb);
+        }
+
+        kfree(fbdev);
+
+        priv->fbdev = NULL;
+}
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
new file mode 100644
index 000000000000..6b5a6c8c7658
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -0,0 +1,597 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/spinlock.h>
+#include <linux/shmem_fs.h>
+
+#include "msm_drv.h"
+#include "msm_gem.h"
+#include "msm_gpu.h"
+
+
+/* called with dev->struct_mutex held */
+static struct page **get_pages(struct drm_gem_object *obj)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+        if (!msm_obj->pages) {
+                struct drm_device *dev = obj->dev;
+                struct page **p = drm_gem_get_pages(obj, 0);
+                int npages = obj->size >> PAGE_SHIFT;
+
+                if (IS_ERR(p)) {
+                        dev_err(dev->dev, "could not get pages: %ld\n",
+                                        PTR_ERR(p));
+                        return p;
+                }
+
+                msm_obj->sgt = drm_prime_pages_to_sg(p, npages);
+                if (!msm_obj->sgt) {
+                        dev_err(dev->dev, "failed to allocate sgt\n");
+                        return ERR_PTR(-ENOMEM);
+                }
+
+                msm_obj->pages = p;
+
+                /* For non-cached buffers, ensure the new pages are clean
+                 * because display controller, GPU, etc. are not coherent:
+                 */
+                if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
+                        dma_map_sg(dev->dev, msm_obj->sgt->sgl,
+                                        msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
+        }
+
+        return msm_obj->pages;
+}
+
+static void put_pages(struct drm_gem_object *obj)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+        if (msm_obj->pages) {
+                /* For non-cached buffers, ensure the new pages are clean
+                 * because display controller, GPU, etc. are not coherent:
+                 */
+                if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED))
+                        dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl,
+                                        msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
+                sg_free_table(msm_obj->sgt);
+                kfree(msm_obj->sgt);
+
+                drm_gem_put_pages(obj, msm_obj->pages, true, false);
+                msm_obj->pages = NULL;
+        }
+}
+
+int msm_gem_mmap_obj(struct drm_gem_object *obj,
+                struct vm_area_struct *vma)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+        vma->vm_flags &= ~VM_PFNMAP;
+        vma->vm_flags |= VM_MIXEDMAP;
+
+        if (msm_obj->flags & MSM_BO_WC) {
+                vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+        } else if (msm_obj->flags & MSM_BO_UNCACHED) {
+                vma->vm_page_prot = pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+        } else {
+                /*
+                 * Shunt off cached objs to shmem file so they have their own
+                 * address_space (so unmap_mapping_range does what we want,
+                 * in particular in the case of mmap'd dmabufs)
+                 */
+                fput(vma->vm_file);
+                get_file(obj->filp);
+                vma->vm_pgoff = 0;
+                vma->vm_file  = obj->filp;
+
+                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+        }
+
+        return 0;
+}
+
+int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        int ret;
+
+        ret = drm_gem_mmap(filp, vma);
+        if (ret) {
+                DBG("mmap failed: %d", ret);
+                return ret;
+        }
+
+        return msm_gem_mmap_obj(vma->vm_private_data, vma);
+}
+
+int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        struct drm_gem_object *obj = vma->vm_private_data;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        struct drm_device *dev = obj->dev;
+        struct page **pages;
+        unsigned long pfn;
+        pgoff_t pgoff;
+        int ret;
+
+        /* Make sure we don't parallel update on a fault, nor move or remove
+         * something from beneath our feet
+         */
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                goto out;
+
+        /* make sure we have pages attached now */
+        pages = get_pages(obj);
+        if (IS_ERR(pages)) {
+                ret = PTR_ERR(pages);
+                goto out_unlock;
+        }
+
+        /* We don't use vmf->pgoff since that has the fake offset: */
+        pgoff = ((unsigned long)vmf->virtual_address -
+                        vma->vm_start) >> PAGE_SHIFT;
+
+        pfn = page_to_pfn(msm_obj->pages[pgoff]);
+
+        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+                        pfn, pfn << PAGE_SHIFT);
+
+        ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, pfn);
+
+out_unlock:
+        mutex_unlock(&dev->struct_mutex);
+out:
+        switch (ret) {
+        case -EAGAIN:
+                set_need_resched();
+        case 0:
+        case -ERESTARTSYS:
+        case -EINTR:
+                return VM_FAULT_NOPAGE;
+        case -ENOMEM:
+                return VM_FAULT_OOM;
+        default:
+                return VM_FAULT_SIGBUS;
+        }
+}
+
+/** get mmap offset */
+static uint64_t mmap_offset(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        int ret;
+
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+
+        /* Make it mmapable */
+        ret = drm_gem_create_mmap_offset(obj);
+
+        if (ret) {
+                dev_err(dev->dev, "could not allocate mmap offset\n");
+                return 0;
+        }
+
+        return drm_vma_node_offset_addr(&obj->vma_node);
+}
+
+uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj)
+{
+        uint64_t offset;
+        mutex_lock(&obj->dev->struct_mutex);
+        offset = mmap_offset(obj);
+        mutex_unlock(&obj->dev->struct_mutex);
+        return offset;
+}
+
+/* helpers for dealing w/ iommu: */
+static int map_range(struct iommu_domain *domain, unsigned int iova,
+                struct sg_table *sgt, unsigned int len, int prot)
+{
+        struct scatterlist *sg;
+        unsigned int da = iova;
+        unsigned int i, j;
+        int ret;
+
+        if (!domain || !sgt)
+                return -EINVAL;
+
+        for_each_sg(sgt->sgl, sg, sgt->nents, i) {
+                u32 pa = sg_phys(sg) - sg->offset;
+                size_t bytes = sg->length + sg->offset;
+
+                VERB("map[%d]: %08x %08x(%x)", i, iova, pa, bytes);
+
+                ret = iommu_map(domain, da, pa, bytes, prot);
+                if (ret)
+                        goto fail;
+
+                da += bytes;
+        }
+
+        return 0;
+
+fail:
+        da = iova;
+
+        for_each_sg(sgt->sgl, sg, i, j) {
+                size_t bytes = sg->length + sg->offset;
+                iommu_unmap(domain, da, bytes);
+                da += bytes;
+        }
+        return ret;
+}
+
+static void unmap_range(struct iommu_domain *domain, unsigned int iova,
+                struct sg_table *sgt, unsigned int len)
+{
+        struct scatterlist *sg;
+        unsigned int da = iova;
+        int i;
+
+        for_each_sg(sgt->sgl, sg, sgt->nents, i) {
+                size_t bytes = sg->length + sg->offset;
+                size_t unmapped;
+
+                unmapped = iommu_unmap(domain, da, bytes);
+                if (unmapped < bytes)
+                        break;
+
+                VERB("unmap[%d]: %08x(%x)", i, iova, bytes);
+
+                BUG_ON(!IS_ALIGNED(bytes, PAGE_SIZE));
+
+                da += bytes;
+        }
+}
+
+/* should be called under struct_mutex.. although it can be called
+ * from atomic context without struct_mutex to acquire an extra
+ * iova ref if you know one is already held.
+ *
+ * That means when I do eventually need to add support for unpinning
+ * the refcnt counter needs to be atomic_t.
+ */
+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);
+        int ret = 0;
+
+        if (!msm_obj->domain[id].iova) {
+                struct msm_drm_private *priv = obj->dev->dev_private;
+                uint32_t offset = (uint32_t)mmap_offset(obj);
+                struct page **pages;
+                pages = get_pages(obj);
+                if (IS_ERR(pages))
+                        return PTR_ERR(pages);
+                // XXX ideally we would not map buffers writable when not needed...
+                ret = map_range(priv->iommus[id], offset, msm_obj->sgt,
+                                obj->size, IOMMU_READ | IOMMU_WRITE);
+                msm_obj->domain[id].iova = offset;
+        }
+
+        if (!ret)
+                *iova = msm_obj->domain[id].iova;
+
+        return ret;
+}
+
+int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint32_t *iova)
+{
+        int ret;
+        mutex_lock(&obj->dev->struct_mutex);
+        ret = msm_gem_get_iova_locked(obj, id, iova);
+        mutex_unlock(&obj->dev->struct_mutex);
+        return ret;
+}
+
+void msm_gem_put_iova(struct drm_gem_object *obj, int id)
+{
+        // XXX TODO ..
+        // NOTE: probably don't need a _locked() version.. we wouldn't
+        // normally unmap here, but instead just mark that it could be
+        // unmapped (if the iova refcnt drops to zero), but then later
+        // if another _get_iova_locked() fails we can start unmapping
+        // things that are no longer needed..
+}
+
+int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
+                struct drm_mode_create_dumb *args)
+{
+        args->pitch = align_pitch(args->width, args->bpp);
+        args->size  = PAGE_ALIGN(args->pitch * args->height);
+        return msm_gem_new_handle(dev, file, args->size,
+                        MSM_BO_SCANOUT | MSM_BO_WC, &args->handle);
+}
+
+int msm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle)
+{
+        /* No special work needed, drop the reference and see what falls out */
+        return drm_gem_handle_delete(file, handle);
+}
+
+int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle, uint64_t *offset)
+{
+        struct drm_gem_object *obj;
+        int ret = 0;
+
+        /* GEM does all our handle to object mapping */
+        obj = drm_gem_object_lookup(dev, file, handle);
+        if (obj == NULL) {
+                ret = -ENOENT;
+                goto fail;
+        }
+
+        *offset = msm_gem_mmap_offset(obj);
+
+        drm_gem_object_unreference_unlocked(obj);
+
+fail:
+        return ret;
+}
+
+void *msm_gem_vaddr_locked(struct drm_gem_object *obj)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex));
+        if (!msm_obj->vaddr) {
+                struct page **pages = get_pages(obj);
+                if (IS_ERR(pages))
+                        return ERR_CAST(pages);
+                msm_obj->vaddr = vmap(pages, obj->size >> PAGE_SHIFT,
+                                VM_MAP, pgprot_writecombine(PAGE_KERNEL));
+        }
+        return msm_obj->vaddr;
+}
+
+void *msm_gem_vaddr(struct drm_gem_object *obj)
+{
+        void *ret;
+        mutex_lock(&obj->dev->struct_mutex);
+        ret = msm_gem_vaddr_locked(obj);
+        mutex_unlock(&obj->dev->struct_mutex);
+        return ret;
+}
+
+int msm_gem_queue_inactive_work(struct drm_gem_object *obj,
+                struct work_struct *work)
+{
+        struct drm_device *dev = obj->dev;
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        int ret = 0;
+
+        mutex_lock(&dev->struct_mutex);
+        if (!list_empty(&work->entry)) {
+                ret = -EINVAL;
+        } else if (is_active(msm_obj)) {
+                list_add_tail(&work->entry, &msm_obj->inactive_work);
+        } else {
+                queue_work(priv->wq, work);
+        }
+        mutex_unlock(&dev->struct_mutex);
+
+        return ret;
+}
+
+void msm_gem_move_to_active(struct drm_gem_object *obj,
+                struct msm_gpu *gpu, uint32_t fence)
+{
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        msm_obj->gpu = gpu;
+        msm_obj->fence = fence;
+        list_del_init(&msm_obj->mm_list);
+        list_add_tail(&msm_obj->mm_list, &gpu->active_list);
+}
+
+void msm_gem_move_to_inactive(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+
+        msm_obj->gpu = NULL;
+        msm_obj->fence = 0;
+        list_del_init(&msm_obj->mm_list);
+        list_add_tail(&msm_obj->mm_list, &priv->inactive_list);
+
+        while (!list_empty(&msm_obj->inactive_work)) {
+                struct work_struct *work;
+
+                work = list_first_entry(&msm_obj->inactive_work,
+                                struct work_struct, entry);
+
+                list_del_init(&work->entry);
+                queue_work(priv->wq, work);
+        }
+}
+
+int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op,
+                struct timespec *timeout)
+{
+        struct drm_device *dev = obj->dev;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        int ret = 0;
+
+        if (is_active(msm_obj) && !(op & MSM_PREP_NOSYNC))
+                ret = msm_wait_fence_interruptable(dev, msm_obj->fence, timeout);
+
+        /* TODO cache maintenance */
+
+        return ret;
+}
+
+int msm_gem_cpu_fini(struct drm_gem_object *obj)
+{
+        /* TODO cache maintenance */
+        return 0;
+}
+
+#ifdef CONFIG_DEBUG_FS
+void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
+{
+        struct drm_device *dev = obj->dev;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        uint64_t off = drm_vma_node_start(&obj->vma_node);
+
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+        seq_printf(m, "%08x: %c(%d) %2d (%2d) %08llx %p %d\n",
+                        msm_obj->flags, is_active(msm_obj) ? 'A' : 'I',
+                        msm_obj->fence, obj->name, obj->refcount.refcount.counter,
+                        off, msm_obj->vaddr, obj->size);
+}
+
+void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
+{
+        struct msm_gem_object *msm_obj;
+        int count = 0;
+        size_t size = 0;
+
+        list_for_each_entry(msm_obj, list, mm_list) {
+                struct drm_gem_object *obj = &msm_obj->base;
+                seq_printf(m, "   ");
+                msm_gem_describe(obj, m);
+                count++;
+                size += obj->size;
+        }
+
+        seq_printf(m, "Total %d objects, %zu bytes\n", count, size);
+}
+#endif
+
+void msm_gem_free_object(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct msm_gem_object *msm_obj = to_msm_bo(obj);
+        int id;
+
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+
+        /* object should not be on active list: */
+        WARN_ON(is_active(msm_obj));
+
+        list_del(&msm_obj->mm_list);
+
+        for (id = 0; id < ARRAY_SIZE(msm_obj->domain); id++) {
+                if (msm_obj->domain[id].iova) {
+                        struct msm_drm_private *priv = obj->dev->dev_private;
+                        uint32_t offset = (uint32_t)mmap_offset(obj);
+                        unmap_range(priv->iommus[id], offset,
+                                        msm_obj->sgt, obj->size);
+                }
+        }
+
+        drm_gem_free_mmap_offset(obj);
+
+        if (msm_obj->vaddr)
+                vunmap(msm_obj->vaddr);
+
+        put_pages(obj);
+
+        if (msm_obj->resv == &msm_obj->_resv)
+                reservation_object_fini(msm_obj->resv);
+
+        drm_gem_object_release(obj);
+
+        kfree(msm_obj);
+}
+
+/* convenience method to construct a GEM buffer object, and userspace handle */
+int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,
+                uint32_t size, uint32_t flags, uint32_t *handle)
+{
+        struct drm_gem_object *obj;
+        int ret;
+
+        ret = mutex_lock_interruptible(&dev->struct_mutex);
+        if (ret)
+                return ret;
+
+        obj = msm_gem_new(dev, size, flags);
+
+        mutex_unlock(&dev->struct_mutex);
+
+        if (IS_ERR(obj))
+                return PTR_ERR(obj);
+
+        ret = drm_gem_handle_create(file, obj, handle);
+
+        /* drop reference from allocate - handle holds it now */
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+struct drm_gem_object *msm_gem_new(struct drm_device *dev,
+                uint32_t size, uint32_t flags)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct msm_gem_object *msm_obj;
+        struct drm_gem_object *obj = NULL;
+        int ret;
+
+        WARN_ON(!mutex_is_locked(&dev->struct_mutex));
+
+        size = PAGE_ALIGN(size);
+
+        switch (flags & MSM_BO_CACHE_MASK) {
+        case MSM_BO_UNCACHED:
+        case MSM_BO_CACHED:
+        case MSM_BO_WC:
+                break;
+        default:
+                dev_err(dev->dev, "invalid cache flag: %x\n",
+                                (flags & MSM_BO_CACHE_MASK));
+                ret = -EINVAL;
+                goto fail;
+        }
+
+        msm_obj = kzalloc(sizeof(*msm_obj), GFP_KERNEL);
+        if (!msm_obj) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        obj = &msm_obj->base;
+
+        ret = drm_gem_object_init(dev, obj, size);
+        if (ret)
+                goto fail;
+
+        msm_obj->flags = flags;
+
+        msm_obj->resv = &msm_obj->_resv;
+        reservation_object_init(msm_obj->resv);
+
+        INIT_LIST_HEAD(&msm_obj->submit_entry);
+        INIT_LIST_HEAD(&msm_obj->inactive_work);
+        list_add_tail(&msm_obj->mm_list, &priv->inactive_list);
+
+        return obj;
+
+fail:
+        if (obj)
+                drm_gem_object_unreference_unlocked(obj);
+
+        return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
new file mode 100644
index 000000000000..d746f13d283c
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MSM_GEM_H__
+#define __MSM_GEM_H__
+
+#include <linux/reservation.h>
+#include "msm_drv.h"
+
+struct msm_gem_object {
+        struct drm_gem_object base;
+
+        uint32_t flags;
+
+        /* And object is either:
+         *  inactive - on priv->inactive_list
+         *  active   - on one one of the gpu's active_list..  well, at
+         *     least for now we don't have (I don't think) hw sync between
+         *     2d and 3d one devices which have both, meaning we need to
+         *     block on submit if a bo is already on other ring
+         *
+         */
+        struct list_head mm_list;
+        struct msm_gpu *gpu;     /* non-null if active */
+        uint32_t fence;
+
+        /* Transiently in the process of submit ioctl, objects associated
+         * with the submit are on submit->bo_list.. this only lasts for
+         * the duration of the ioctl, so one bo can never be on multiple
+         * submit lists.
+         */
+        struct list_head submit_entry;
+
+        /* work defered until bo is inactive: */
+        struct list_head inactive_work;
+
+        struct page **pages;
+        struct sg_table *sgt;
+        void *vaddr;
+
+        struct {
+                // XXX
+                uint32_t iova;
+        } domain[NUM_DOMAINS];
+
+        /* normally (resv == &_resv) except for imported bo's */
+        struct reservation_object *resv;
+        struct reservation_object _resv;
+};
+#define to_msm_bo(x) container_of(x, struct msm_gem_object, base)
+
+static inline bool is_active(struct msm_gem_object *msm_obj)
+{
+        return msm_obj->gpu != NULL;
+}
+
+#define MAX_CMDS 4
+
+/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,
+ * associated with the cmdstream submission for synchronization (and
+ * make it easier to unwind when things go wrong, etc).  This only
+ * lasts for the duration of the submit-ioctl.
+ */
+struct msm_gem_submit {
+        struct drm_device *dev;
+        struct msm_gpu *gpu;
+        struct list_head bo_list;
+        struct ww_acquire_ctx ticket;
+        uint32_t fence;
+        bool valid;
+        unsigned int nr_cmds;
+        unsigned int nr_bos;
+        struct {
+                uint32_t type;
+                uint32_t size;  /* in dwords */
+                uint32_t iova;
+        } cmd[MAX_CMDS];
+        struct {
+                uint32_t flags;
+                struct msm_gem_object *obj;
+                uint32_t iova;
+        } bos[0];
+};
+
+#endif /* __MSM_GEM_H__ */
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
new file mode 100644
index 000000000000..3e1ef3a00f60
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_drv.h"
+#include "msm_gpu.h"
+#include "msm_gem.h"
+
+/*
+ * Cmdstream submission:
+ */
+
+#define BO_INVALID_FLAGS ~(MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE)
+/* make sure these don't conflict w/ MSM_SUBMIT_BO_x */
+#define BO_VALID    0x8000
+#define BO_LOCKED   0x4000
+#define BO_PINNED   0x2000
+
+static inline void __user *to_user_ptr(u64 address)
+{
+        return (void __user *)(uintptr_t)address;
+}
+
+static struct msm_gem_submit *submit_create(struct drm_device *dev,
+                struct msm_gpu *gpu, int nr)
+{
+        struct msm_gem_submit *submit;
+        int sz = sizeof(*submit) + (nr * sizeof(submit->bos[0]));
+
+        submit = kmalloc(sz, GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);
+        if (submit) {
+                submit->dev = dev;
+                submit->gpu = gpu;
+
+                /* initially, until copy_from_user() and bo lookup succeeds: */
+                submit->nr_bos = 0;
+                submit->nr_cmds = 0;
+
+                INIT_LIST_HEAD(&submit->bo_list);
+                ww_acquire_init(&submit->ticket, &reservation_ww_class);
+        }
+
+        return submit;
+}
+
+static int submit_lookup_objects(struct msm_gem_submit *submit,
+                struct drm_msm_gem_submit *args, struct drm_file *file)
+{
+        unsigned i;
+        int ret = 0;
+
+        spin_lock(&file->table_lock);
+
+        for (i = 0; i < args->nr_bos; i++) {
+                struct drm_msm_gem_submit_bo submit_bo;
+                struct drm_gem_object *obj;
+                struct msm_gem_object *msm_obj;
+                void __user *userptr =
+                        to_user_ptr(args->bos + (i * sizeof(submit_bo)));
+
+                ret = copy_from_user(&submit_bo, userptr, sizeof(submit_bo));
+                if (ret) {
+                        ret = -EFAULT;
+                        goto out_unlock;
+                }
+
+                if (submit_bo.flags & BO_INVALID_FLAGS) {
+                        DBG("invalid flags: %x", submit_bo.flags);
+                        ret = -EINVAL;
+                        goto out_unlock;
+                }
+
+                submit->bos[i].flags = submit_bo.flags;
+                /* in validate_objects() we figure out if this is true: */
+                submit->bos[i].iova  = submit_bo.presumed;
+
+                /* normally use drm_gem_object_lookup(), but for bulk lookup
+                 * all under single table_lock just hit object_idr directly:
+                 */
+                obj = idr_find(&file->object_idr, submit_bo.handle);
+                if (!obj) {
+                        DBG("invalid handle %u at index %u", submit_bo.handle, i);
+                        ret = -EINVAL;
+                        goto out_unlock;
+                }
+
+                msm_obj = to_msm_bo(obj);
+
+                if (!list_empty(&msm_obj->submit_entry)) {
+                        DBG("handle %u at index %u already on submit list",
+                                        submit_bo.handle, i);
+                        ret = -EINVAL;
+                        goto out_unlock;
+                }
+
+                drm_gem_object_reference(obj);
+
+                submit->bos[i].obj = msm_obj;
+
+                list_add_tail(&msm_obj->submit_entry, &submit->bo_list);
+        }
+
+out_unlock:
+        submit->nr_bos = i;
+        spin_unlock(&file->table_lock);
+
+        return ret;
+}
+
+static void submit_unlock_unpin_bo(struct msm_gem_submit *submit, int i)
+{
+        struct msm_gem_object *msm_obj = submit->bos[i].obj;
+
+        if (submit->bos[i].flags & BO_PINNED)
+                msm_gem_put_iova(&msm_obj->base, submit->gpu->id);
+
+        if (submit->bos[i].flags & BO_LOCKED)
+                ww_mutex_unlock(&msm_obj->resv->lock);
+
+        if (!(submit->bos[i].flags & BO_VALID))
+                submit->bos[i].iova = 0;
+
+        submit->bos[i].flags &= ~(BO_LOCKED | BO_PINNED);
+}
+
+/* This is where we make sure all the bo's are reserved and pin'd: */
+static int submit_validate_objects(struct msm_gem_submit *submit)
+{
+        int contended, slow_locked = -1, i, ret = 0;
+
+retry:
+        submit->valid = true;
+
+        for (i = 0; i < submit->nr_bos; i++) {
+                struct msm_gem_object *msm_obj = submit->bos[i].obj;
+                uint32_t iova;
+
+                if (slow_locked == i)
+                        slow_locked = -1;
+
+                contended = i;
+
+                if (!(submit->bos[i].flags & BO_LOCKED)) {
+                        ret = ww_mutex_lock_interruptible(&msm_obj->resv->lock,
+                                        &submit->ticket);
+                        if (ret)
+                                goto fail;
+                        submit->bos[i].flags |= BO_LOCKED;
+                }
+
+
+                /* if locking succeeded, pin bo: */
+                ret = msm_gem_get_iova(&msm_obj->base,
+                                submit->gpu->id, &iova);
+
+                /* this would break the logic in the fail path.. there is no
+                 * reason for this to happen, but just to be on the safe side
+                 * let's notice if this starts happening in the future:
+                 */
+                WARN_ON(ret == -EDEADLK);
+
+                if (ret)
+                        goto fail;
+
+                submit->bos[i].flags |= BO_PINNED;
+
+                if (iova == submit->bos[i].iova) {
+                        submit->bos[i].flags |= BO_VALID;
+                } else {
+                        submit->bos[i].iova = iova;
+                        submit->bos[i].flags &= ~BO_VALID;
+                        submit->valid = false;
+                }
+        }
+
+        ww_acquire_done(&submit->ticket);
+
+        return 0;
+
+fail:
+        for (; i >= 0; i--)
+                submit_unlock_unpin_bo(submit, i);
+
+        if (slow_locked > 0)
+                submit_unlock_unpin_bo(submit, slow_locked);
+
+        if (ret == -EDEADLK) {
+                struct msm_gem_object *msm_obj = submit->bos[contended].obj;
+                /* we lost out in a seqno race, lock and retry.. */
+                ret = ww_mutex_lock_slow_interruptible(&msm_obj->resv->lock,
+                                &submit->ticket);
+                if (!ret) {
+                        submit->bos[contended].flags |= BO_LOCKED;
+                        slow_locked = contended;
+                        goto retry;
+                }
+        }
+
+        return ret;
+}
+
+static int submit_bo(struct msm_gem_submit *submit, uint32_t idx,
+                struct msm_gem_object **obj, uint32_t *iova, bool *valid)
+{
+        if (idx >= submit->nr_bos) {
+                DBG("invalid buffer index: %u (out of %u)", idx, submit->nr_bos);
+                return EINVAL;
+        }
+
+        if (obj)
+                *obj = submit->bos[idx].obj;
+        if (iova)
+                *iova = submit->bos[idx].iova;
+        if (valid)
+                *valid = !!(submit->bos[idx].flags & BO_VALID);
+
+        return 0;
+}
+
+/* process the reloc's and patch up the cmdstream as needed: */
+static int submit_reloc(struct msm_gem_submit *submit, struct msm_gem_object *obj,
+                uint32_t offset, uint32_t nr_relocs, uint64_t relocs)
+{
+        uint32_t i, last_offset = 0;
+        uint32_t *ptr;
+        int ret;
+
+        if (offset % 4) {
+                DBG("non-aligned cmdstream buffer: %u", offset);
+                return -EINVAL;
+        }
+
+        /* For now, just map the entire thing.  Eventually we probably
+         * to do it page-by-page, w/ kmap() if not vmap()d..
+         */
+        ptr = msm_gem_vaddr(&obj->base);
+
+        if (IS_ERR(ptr)) {
+                ret = PTR_ERR(ptr);
+                DBG("failed to map: %d", ret);
+                return ret;
+        }
+
+        for (i = 0; i < nr_relocs; i++) {
+                struct drm_msm_gem_submit_reloc submit_reloc;
+                void __user *userptr =
+                        to_user_ptr(relocs + (i * sizeof(submit_reloc)));
+                uint32_t iova, off;
+                bool valid;
+
+                ret = copy_from_user(&submit_reloc, userptr, sizeof(submit_reloc));
+                if (ret)
+                        return -EFAULT;
+
+                if (submit_reloc.submit_offset % 4) {
+                        DBG("non-aligned reloc offset: %u",
+                                        submit_reloc.submit_offset);
+                        return -EINVAL;
+                }
+
+                /* offset in dwords: */
+                off = submit_reloc.submit_offset / 4;
+
+                if ((off >= (obj->base.size / 4)) ||
+                                (off < last_offset)) {
+                        DBG("invalid offset %u at reloc %u", off, i);
+                        return -EINVAL;
+                }
+
+                ret = submit_bo(submit, submit_reloc.reloc_idx, NULL, &iova, &valid);
+                if (ret)
+                        return ret;
+
+                if (valid)
+                        continue;
+
+                iova += submit_reloc.reloc_offset;
+
+                if (submit_reloc.shift < 0)
+                        iova >>= -submit_reloc.shift;
+                else
+                        iova <<= submit_reloc.shift;
+
+                ptr[off] = iova | submit_reloc.or;
+
+                last_offset = off;
+        }
+
+        return 0;
+}
+
+static void submit_cleanup(struct msm_gem_submit *submit, bool fail)
+{
+        unsigned i;
+
+        mutex_lock(&submit->dev->struct_mutex);
+        for (i = 0; i < submit->nr_bos; i++) {
+                struct msm_gem_object *msm_obj = submit->bos[i].obj;
+                submit_unlock_unpin_bo(submit, i);
+                list_del_init(&msm_obj->submit_entry);
+                drm_gem_object_unreference(&msm_obj->base);
+        }
+        mutex_unlock(&submit->dev->struct_mutex);
+
+        ww_acquire_fini(&submit->ticket);
+        kfree(submit);
+}
+
+int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
+                struct drm_file *file)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        struct drm_msm_gem_submit *args = data;
+        struct msm_file_private *ctx = file->driver_priv;
+        struct msm_gem_submit *submit;
+        struct msm_gpu *gpu;
+        unsigned i;
+        int ret;
+
+        /* for now, we just have 3d pipe.. eventually this would need to
+         * be more clever to dispatch to appropriate gpu module:
+         */
+        if (args->pipe != MSM_PIPE_3D0)
+                return -EINVAL;
+
+        gpu = priv->gpu;
+
+        if (args->nr_cmds > MAX_CMDS)
+                return -EINVAL;
+
+        submit = submit_create(dev, gpu, args->nr_bos);
+        if (!submit) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
+        ret = submit_lookup_objects(submit, args, file);
+        if (ret)
+                goto out;
+
+        ret = submit_validate_objects(submit);
+        if (ret)
+                goto out;
+
+        for (i = 0; i < args->nr_cmds; i++) {
+                struct drm_msm_gem_submit_cmd submit_cmd;
+                void __user *userptr =
+                        to_user_ptr(args->cmds + (i * sizeof(submit_cmd)));
+                struct msm_gem_object *msm_obj;
+                uint32_t iova;
+
+                ret = copy_from_user(&submit_cmd, userptr, sizeof(submit_cmd));
+                if (ret) {
+                        ret = -EFAULT;
+                        goto out;
+                }
+
+                ret = submit_bo(submit, submit_cmd.submit_idx,
+                                &msm_obj, &iova, NULL);
+                if (ret)
+                        goto out;
+
+                if (submit_cmd.size % 4) {
+                        DBG("non-aligned cmdstream buffer size: %u",
+                                        submit_cmd.size);
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                if (submit_cmd.size >= msm_obj->base.size) {
+                        DBG("invalid cmdstream size: %u", submit_cmd.size);
+                        ret = -EINVAL;
+                        goto out;
+                }
+
+                submit->cmd[i].type = submit_cmd.type;
+                submit->cmd[i].size = submit_cmd.size / 4;
+                submit->cmd[i].iova = iova + submit_cmd.submit_offset;
+
+                if (submit->valid)
+                        continue;
+
+                ret = submit_reloc(submit, msm_obj, submit_cmd.submit_offset,
+                                submit_cmd.nr_relocs, submit_cmd.relocs);
+                if (ret)
+                        goto out;
+        }
+
+        submit->nr_cmds = i;
+
+        ret = msm_gpu_submit(gpu, submit, ctx);
+
+        args->fence = submit->fence;
+
+out:
+        if (submit)
+                submit_cleanup(submit, !!ret);
+        return ret;
+}
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
new file mode 100644
index 000000000000..e1e1ec9321ff
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -0,0 +1,463 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_gpu.h"
+#include "msm_gem.h"
+
+
+/*
+ * Power Management:
+ */
+
+#ifdef CONFIG_MSM_BUS_SCALING
+#include <mach/board.h>
+#include <mach/kgsl.h>
+static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev)
+{
+        struct drm_device *dev = gpu->dev;
+        struct kgsl_device_platform_data *pdata = pdev->dev.platform_data;
+
+        if (!pdev) {
+                dev_err(dev->dev, "could not find dtv pdata\n");
+                return;
+        }
+
+        if (pdata->bus_scale_table) {
+                gpu->bsc = msm_bus_scale_register_client(pdata->bus_scale_table);
+                DBG("bus scale client: %08x", gpu->bsc);
+        }
+}
+
+static void bs_fini(struct msm_gpu *gpu)
+{
+        if (gpu->bsc) {
+                msm_bus_scale_unregister_client(gpu->bsc);
+                gpu->bsc = 0;
+        }
+}
+
+static void bs_set(struct msm_gpu *gpu, int idx)
+{
+        if (gpu->bsc) {
+                DBG("set bus scaling: %d", idx);
+                msm_bus_scale_client_update_request(gpu->bsc, idx);
+        }
+}
+#else
+static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev) {}
+static void bs_fini(struct msm_gpu *gpu) {}
+static void bs_set(struct msm_gpu *gpu, int idx) {}
+#endif
+
+static int enable_pwrrail(struct msm_gpu *gpu)
+{
+        struct drm_device *dev = gpu->dev;
+        int ret = 0;
+
+        if (gpu->gpu_reg) {
+                ret = regulator_enable(gpu->gpu_reg);
+                if (ret) {
+                        dev_err(dev->dev, "failed to enable 'gpu_reg': %d\n", ret);
+                        return ret;
+                }
+        }
+
+        if (gpu->gpu_cx) {
+                ret = regulator_enable(gpu->gpu_cx);
+                if (ret) {
+                        dev_err(dev->dev, "failed to enable 'gpu_cx': %d\n", ret);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+static int disable_pwrrail(struct msm_gpu *gpu)
+{
+        if (gpu->gpu_cx)
+                regulator_disable(gpu->gpu_cx);
+        if (gpu->gpu_reg)
+                regulator_disable(gpu->gpu_reg);
+        return 0;
+}
+
+static int enable_clk(struct msm_gpu *gpu)
+{
+        struct clk *rate_clk = NULL;
+        int i;
+
+        /* NOTE: kgsl_pwrctrl_clk() ignores grp_clks[0].. */
+        for (i = ARRAY_SIZE(gpu->grp_clks) - 1; i > 0; i--) {
+                if (gpu->grp_clks[i]) {
+                        clk_prepare(gpu->grp_clks[i]);
+                        rate_clk = gpu->grp_clks[i];
+                }
+        }
+
+        if (rate_clk && gpu->fast_rate)
+                clk_set_rate(rate_clk, gpu->fast_rate);
+
+        for (i = ARRAY_SIZE(gpu->grp_clks) - 1; i > 0; i--)
+                if (gpu->grp_clks[i])
+                        clk_enable(gpu->grp_clks[i]);
+
+        return 0;
+}
+
+static int disable_clk(struct msm_gpu *gpu)
+{
+        struct clk *rate_clk = NULL;
+        int i;
+
+        /* NOTE: kgsl_pwrctrl_clk() ignores grp_clks[0].. */
+        for (i = ARRAY_SIZE(gpu->grp_clks) - 1; i > 0; i--) {
+                if (gpu->grp_clks[i]) {
+                        clk_disable(gpu->grp_clks[i]);
+                        rate_clk = gpu->grp_clks[i];
+                }
+        }
+
+        if (rate_clk && gpu->slow_rate)
+                clk_set_rate(rate_clk, gpu->slow_rate);
+
+        for (i = ARRAY_SIZE(gpu->grp_clks) - 1; i > 0; i--)
+                if (gpu->grp_clks[i])
+                        clk_unprepare(gpu->grp_clks[i]);
+
+        return 0;
+}
+
+static int enable_axi(struct msm_gpu *gpu)
+{
+        if (gpu->ebi1_clk)
+                clk_prepare_enable(gpu->ebi1_clk);
+        if (gpu->bus_freq)
+                bs_set(gpu, gpu->bus_freq);
+        return 0;
+}
+
+static int disable_axi(struct msm_gpu *gpu)
+{
+        if (gpu->ebi1_clk)
+                clk_disable_unprepare(gpu->ebi1_clk);
+        if (gpu->bus_freq)
+                bs_set(gpu, 0);
+        return 0;
+}
+
+int msm_gpu_pm_resume(struct msm_gpu *gpu)
+{
+        int ret;
+
+        DBG("%s", gpu->name);
+
+        ret = enable_pwrrail(gpu);
+        if (ret)
+                return ret;
+
+        ret = enable_clk(gpu);
+        if (ret)
+                return ret;
+
+        ret = enable_axi(gpu);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+int msm_gpu_pm_suspend(struct msm_gpu *gpu)
+{
+        int ret;
+
+        DBG("%s", gpu->name);
+
+        ret = disable_axi(gpu);
+        if (ret)
+                return ret;
+
+        ret = disable_clk(gpu);
+        if (ret)
+                return ret;
+
+        ret = disable_pwrrail(gpu);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+/*
+ * Hangcheck detection for locked gpu:
+ */
+
+static void recover_worker(struct work_struct *work)
+{
+        struct msm_gpu *gpu = container_of(work, struct msm_gpu, recover_work);
+        struct drm_device *dev = gpu->dev;
+
+        dev_err(dev->dev, "%s: hangcheck recover!\n", gpu->name);
+
+        mutex_lock(&dev->struct_mutex);
+        gpu->funcs->recover(gpu);
+        mutex_unlock(&dev->struct_mutex);
+
+        msm_gpu_retire(gpu);
+}
+
+static void hangcheck_timer_reset(struct msm_gpu *gpu)
+{
+        DBG("%s", gpu->name);
+        mod_timer(&gpu->hangcheck_timer,
+                        round_jiffies_up(jiffies + DRM_MSM_HANGCHECK_JIFFIES));
+}
+
+static void hangcheck_handler(unsigned long data)
+{
+        struct msm_gpu *gpu = (struct msm_gpu *)data;
+        uint32_t fence = gpu->funcs->last_fence(gpu);
+
+        if (fence != gpu->hangcheck_fence) {
+                /* some progress has been made.. ya! */
+                gpu->hangcheck_fence = fence;
+        } else if (fence < gpu->submitted_fence) {
+                /* no progress and not done.. hung! */
+                struct msm_drm_private *priv = gpu->dev->dev_private;
+                gpu->hangcheck_fence = fence;
+                queue_work(priv->wq, &gpu->recover_work);
+        }
+
+        /* if still more pending work, reset the hangcheck timer: */
+        if (gpu->submitted_fence > gpu->hangcheck_fence)
+                hangcheck_timer_reset(gpu);
+}
+
+/*
+ * Cmdstream submission/retirement:
+ */
+
+static void retire_worker(struct work_struct *work)
+{
+        struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work);
+        struct drm_device *dev = gpu->dev;
+        uint32_t fence = gpu->funcs->last_fence(gpu);
+
+        mutex_lock(&dev->struct_mutex);
+
+        while (!list_empty(&gpu->active_list)) {
+                struct msm_gem_object *obj;
+
+                obj = list_first_entry(&gpu->active_list,
+                                struct msm_gem_object, mm_list);
+
+                if (obj->fence <= fence) {
+                        /* move to inactive: */
+                        msm_gem_move_to_inactive(&obj->base);
+                        msm_gem_put_iova(&obj->base, gpu->id);
+                        drm_gem_object_unreference(&obj->base);
+                } else {
+                        break;
+                }
+        }
+
+        msm_update_fence(gpu->dev, fence);
+
+        mutex_unlock(&dev->struct_mutex);
+}
+
+/* call from irq handler to schedule work to retire bo's */
+void msm_gpu_retire(struct msm_gpu *gpu)
+{
+        struct msm_drm_private *priv = gpu->dev->dev_private;
+        queue_work(priv->wq, &gpu->retire_work);
+}
+
+/* add bo's to gpu's ring, and kick gpu: */
+int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
+                struct msm_file_private *ctx)
+{
+        struct drm_device *dev = gpu->dev;
+        struct msm_drm_private *priv = dev->dev_private;
+        int i, ret;
+
+        mutex_lock(&dev->struct_mutex);
+
+        submit->fence = ++priv->next_fence;
+
+        gpu->submitted_fence = submit->fence;
+
+        ret = gpu->funcs->submit(gpu, submit, ctx);
+        priv->lastctx = ctx;
+
+        for (i = 0; i < submit->nr_bos; i++) {
+                struct msm_gem_object *msm_obj = submit->bos[i].obj;
+
+                /* can't happen yet.. but when we add 2d support we'll have
+                 * to deal w/ cross-ring synchronization:
+                 */
+                WARN_ON(is_active(msm_obj) && (msm_obj->gpu != gpu));
+
+                if (!is_active(msm_obj)) {
+                        uint32_t iova;
+
+                        /* ring takes a reference to the bo and iova: */
+                        drm_gem_object_reference(&msm_obj->base);
+                        msm_gem_get_iova_locked(&msm_obj->base,
+                                        submit->gpu->id, &iova);
+                }
+
+                msm_gem_move_to_active(&msm_obj->base, gpu, submit->fence);
+        }
+        hangcheck_timer_reset(gpu);
+        mutex_unlock(&dev->struct_mutex);
+
+        return ret;
+}
+
+/*
+ * Init/Cleanup:
+ */
+
+static irqreturn_t irq_handler(int irq, void *data)
+{
+        struct msm_gpu *gpu = data;
+        return gpu->funcs->irq(gpu);
+}
+
+static const char *clk_names[] = {
+                "src_clk", "core_clk", "iface_clk", "mem_clk", "mem_iface_clk",
+};
+
+int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+                struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs,
+                const char *name, const char *ioname, const char *irqname, int ringsz)
+{
+        int i, ret;
+
+        gpu->dev = drm;
+        gpu->funcs = funcs;
+        gpu->name = name;
+
+        INIT_LIST_HEAD(&gpu->active_list);
+        INIT_WORK(&gpu->retire_work, retire_worker);
+        INIT_WORK(&gpu->recover_work, recover_worker);
+
+        setup_timer(&gpu->hangcheck_timer, hangcheck_handler,
+                        (unsigned long)gpu);
+
+        BUG_ON(ARRAY_SIZE(clk_names) != ARRAY_SIZE(gpu->grp_clks));
+
+        /* Map registers: */
+        gpu->mmio = msm_ioremap(pdev, ioname, name);
+        if (IS_ERR(gpu->mmio)) {
+                ret = PTR_ERR(gpu->mmio);
+                goto fail;
+        }
+
+        /* Get Interrupt: */
+        gpu->irq = platform_get_irq_byname(pdev, irqname);
+        if (gpu->irq < 0) {
+                ret = gpu->irq;
+                dev_err(drm->dev, "failed to get irq: %d\n", ret);
+                goto fail;
+        }
+
+        ret = devm_request_irq(&pdev->dev, gpu->irq, irq_handler,
+                        IRQF_TRIGGER_HIGH, gpu->name, gpu);
+        if (ret) {
+                dev_err(drm->dev, "failed to request IRQ%u: %d\n", gpu->irq, ret);
+                goto fail;
+        }
+
+        /* Acquire clocks: */
+        for (i = 0; i < ARRAY_SIZE(clk_names); i++) {
+                gpu->grp_clks[i] = devm_clk_get(&pdev->dev, clk_names[i]);
+                DBG("grp_clks[%s]: %p", clk_names[i], gpu->grp_clks[i]);
+                if (IS_ERR(gpu->grp_clks[i]))
+                        gpu->grp_clks[i] = NULL;
+        }
+
+        gpu->ebi1_clk = devm_clk_get(&pdev->dev, "bus_clk");
+        DBG("ebi1_clk: %p", gpu->ebi1_clk);
+        if (IS_ERR(gpu->ebi1_clk))
+                gpu->ebi1_clk = NULL;
+
+        /* Acquire regulators: */
+        gpu->gpu_reg = devm_regulator_get(&pdev->dev, "vdd");
+        DBG("gpu_reg: %p", gpu->gpu_reg);
+        if (IS_ERR(gpu->gpu_reg))
+                gpu->gpu_reg = NULL;
+
+        gpu->gpu_cx = devm_regulator_get(&pdev->dev, "vddcx");
+        DBG("gpu_cx: %p", gpu->gpu_cx);
+        if (IS_ERR(gpu->gpu_cx))
+                gpu->gpu_cx = NULL;
+
+        /* Setup IOMMU.. eventually we will (I think) do this once per context
+         * and have separate page tables per context.  For now, to keep things
+         * simple and to get something working, just use a single address space:
+         */
+        gpu->iommu = iommu_domain_alloc(&platform_bus_type);
+        if (!gpu->iommu) {
+                dev_err(drm->dev, "failed to allocate IOMMU\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+        gpu->id = msm_register_iommu(drm, gpu->iommu);
+
+        /* Create ringbuffer: */
+        gpu->rb = msm_ringbuffer_new(gpu, ringsz);
+        if (IS_ERR(gpu->rb)) {
+                ret = PTR_ERR(gpu->rb);
+                gpu->rb = NULL;
+                dev_err(drm->dev, "could not create ringbuffer: %d\n", ret);
+                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, pdev);
+
+        return 0;
+
+fail:
+        return ret;
+}
+
+void msm_gpu_cleanup(struct msm_gpu *gpu)
+{
+        DBG("%s", gpu->name);
+
+        WARN_ON(!list_empty(&gpu->active_list));
+
+        bs_fini(gpu);
+
+        if (gpu->rb) {
+                if (gpu->rb_iova)
+                        msm_gem_put_iova(gpu->rb->bo, gpu->id);
+                msm_ringbuffer_destroy(gpu->rb);
+        }
+
+        if (gpu->iommu)
+                iommu_domain_free(gpu->iommu);
+}
diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
new file mode 100644
index 000000000000..8cd829e520bb
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MSM_GPU_H__
+#define __MSM_GPU_H__
+
+#include <linux/clk.h>
+#include <linux/regulator/consumer.h>
+
+#include "msm_drv.h"
+#include "msm_ringbuffer.h"
+
+struct msm_gem_submit;
+
+/* So far, with hardware that I've seen to date, we can have:
+ *  + zero, one, or two z180 2d cores
+ *  + a3xx or a2xx 3d core, which share a common CP (the firmware
+ *    for the CP seems to implement some different PM4 packet types
+ *    but the basics of cmdstream submission are the same)
+ *
+ * Which means that the eventual complete "class" hierarchy, once
+ * support for all past and present hw is in place, becomes:
+ *  + msm_gpu
+ *    + adreno_gpu
+ *      + a3xx_gpu
+ *      + a2xx_gpu
+ *    + z180_gpu
+ */
+struct msm_gpu_funcs {
+        int (*get_param)(struct msm_gpu *gpu, uint32_t param, uint64_t *value);
+        int (*hw_init)(struct msm_gpu *gpu);
+        int (*pm_suspend)(struct msm_gpu *gpu);
+        int (*pm_resume)(struct msm_gpu *gpu);
+        int (*submit)(struct msm_gpu *gpu, struct msm_gem_submit *submit,
+                        struct msm_file_private *ctx);
+        void (*flush)(struct msm_gpu *gpu);
+        void (*idle)(struct msm_gpu *gpu);
+        irqreturn_t (*irq)(struct msm_gpu *irq);
+        uint32_t (*last_fence)(struct msm_gpu *gpu);
+        void (*recover)(struct msm_gpu *gpu);
+        void (*destroy)(struct msm_gpu *gpu);
+#ifdef CONFIG_DEBUG_FS
+        /* show GPU status in debugfs: */
+        void (*show)(struct msm_gpu *gpu, struct seq_file *m);
+#endif
+};
+
+struct msm_gpu {
+        const char *name;
+        struct drm_device *dev;
+        const struct msm_gpu_funcs *funcs;
+
+        struct msm_ringbuffer *rb;
+        uint32_t rb_iova;
+
+        /* list of GEM active objects: */
+        struct list_head active_list;
+
+        uint32_t submitted_fence;
+
+        /* worker for handling active-list retiring: */
+        struct work_struct retire_work;
+
+        void __iomem *mmio;
+        int irq;
+
+        struct iommu_domain *iommu;
+        int id;
+
+        /* Power Control: */
+        struct regulator *gpu_reg, *gpu_cx;
+        struct clk *ebi1_clk, *grp_clks[5];
+        uint32_t fast_rate, slow_rate, bus_freq;
+        uint32_t bsc;
+
+        /* Hang Detction: */
+#define DRM_MSM_HANGCHECK_PERIOD 500 /* in ms */
+#define DRM_MSM_HANGCHECK_JIFFIES msecs_to_jiffies(DRM_MSM_HANGCHECK_PERIOD)
+        struct timer_list hangcheck_timer;
+        uint32_t hangcheck_fence;
+        struct work_struct recover_work;
+};
+
+static inline void gpu_write(struct msm_gpu *gpu, u32 reg, u32 data)
+{
+        msm_writel(data, gpu->mmio + (reg << 2));
+}
+
+static inline u32 gpu_read(struct msm_gpu *gpu, u32 reg)
+{
+        return msm_readl(gpu->mmio + (reg << 2));
+}
+
+int msm_gpu_pm_suspend(struct msm_gpu *gpu);
+int msm_gpu_pm_resume(struct msm_gpu *gpu);
+
+void msm_gpu_retire(struct msm_gpu *gpu);
+int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,
+                struct msm_file_private *ctx);
+
+int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,
+                struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs,
+                const char *name, const char *ioname, const char *irqname, int ringsz);
+void msm_gpu_cleanup(struct msm_gpu *gpu);
+
+struct msm_gpu *a3xx_gpu_init(struct drm_device *dev);
+void __init a3xx_register(void);
+void __exit a3xx_unregister(void);
+
+#endif /* __MSM_GPU_H__ */
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
new file mode 100644
index 000000000000..8171537dd7d1
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "msm_ringbuffer.h"
+#include "msm_gpu.h"
+
+struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size)
+{
+        struct msm_ringbuffer *ring;
+        int ret;
+
+        size = ALIGN(size, 4);   /* size should be dword aligned */
+
+        ring = kzalloc(sizeof(*ring), GFP_KERNEL);
+        if (!ring) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        ring->gpu = gpu;
+        ring->bo = msm_gem_new(gpu->dev, size, MSM_BO_WC);
+        if (IS_ERR(ring->bo)) {
+                ret = PTR_ERR(ring->bo);
+                ring->bo = NULL;
+                goto fail;
+        }
+
+        ring->start = msm_gem_vaddr_locked(ring->bo);
+        ring->end   = ring->start + (size / 4);
+        ring->cur   = ring->start;
+
+        ring->size = size;
+
+        return ring;
+
+fail:
+        if (ring)
+                msm_ringbuffer_destroy(ring);
+        return ERR_PTR(ret);
+}
+
+void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)
+{
+        if (ring->bo)
+                drm_gem_object_unreference(ring->bo);
+        kfree(ring);
+}
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.h b/drivers/gpu/drm/msm/msm_ringbuffer.h
new file mode 100644
index 000000000000..6e0e1049fa4f
--- /dev/null
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MSM_RINGBUFFER_H__
+#define __MSM_RINGBUFFER_H__
+
+#include "msm_drv.h"
+
+struct msm_ringbuffer {
+        struct msm_gpu *gpu;
+        int size;
+        struct drm_gem_object *bo;
+        uint32_t *start, *end, *cur;
+};
+
+struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int size);
+void msm_ringbuffer_destroy(struct msm_ringbuffer *ring);
+
+/* ringbuffer helpers (the parts that are same for a3xx/a2xx/z180..) */
+
+static inline void
+OUT_RING(struct msm_ringbuffer *ring, uint32_t data)
+{
+        if (ring->cur == ring->end)
+                ring->cur = ring->start;
+        *(ring->cur++) = data;
+}
+
+#endif /* __MSM_RINGBUFFER_H__ */
diff --git a/drivers/gpu/drm/nouveau/core/core/printk.c b/drivers/gpu/drm/nouveau/core/core/printk.c
index 6161eaf5447c..52fb2aa129e8 100644
--- a/drivers/gpu/drm/nouveau/core/core/printk.c
+++ b/drivers/gpu/drm/nouveau/core/core/printk.c
@@ -27,6 +27,8 @@
 #include <core/subdev.h>
 #include <core/printk.h>
 
+int nv_printk_suspend_level = NV_DBG_DEBUG;
+
 void
 nv_printk_(struct nouveau_object *object, const char *pfx, int level,
            const char *fmt, ...)
@@ -72,3 +74,20 @@ nv_printk_(struct nouveau_object *object, const char *pfx, int level,
         vprintk(mfmt, args);
         va_end(args);
 }
+
+#define CONV_LEVEL(x) case NV_DBG_##x: return NV_PRINTK_##x
+
+const char *nv_printk_level_to_pfx(int level)
+{
+        switch (level) {
+        CONV_LEVEL(FATAL);
+        CONV_LEVEL(ERROR);
+        CONV_LEVEL(WARN);
+        CONV_LEVEL(INFO);
+        CONV_LEVEL(DEBUG);
+        CONV_LEVEL(PARANOIA);
+        CONV_LEVEL(TRACE);
+        CONV_LEVEL(SPAM);
+        }
+        return NV_PRINTK_DEBUG;
+}
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dport.c b/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
index 31cc8fe8e7f0..054d9cff4f53 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/dport.c
@@ -150,7 +150,7 @@ dp_link_train_update(struct dp_state *dp, u32 delay)
         if (ret)
                 return ret;
 
-        DBG("status %*ph\n", 6, dp->stat);
+        DBG("status %6ph\n", dp->stat);
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/core/include/core/printk.h b/drivers/gpu/drm/nouveau/core/include/core/printk.h
index febed2ea5c80..d87836e3a704 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/printk.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/printk.h
@@ -15,6 +15,12 @@ struct nouveau_object;
 #define NV_PRINTK_TRACE    KERN_DEBUG
 #define NV_PRINTK_SPAM     KERN_DEBUG
 
+extern int nv_printk_suspend_level;
+
+#define NV_DBG_SUSPEND (nv_printk_suspend_level)
+#define NV_PRINTK_SUSPEND  (nv_printk_level_to_pfx(nv_printk_suspend_level))
+
+const char *nv_printk_level_to_pfx(int level);
 void __printf(4, 5)
 nv_printk_(struct nouveau_object *, const char *, int, const char *, ...);
 
@@ -31,6 +37,13 @@ nv_printk_(struct nouveau_object *, const char *, int, const char *, ...);
 #define nv_trace(o,f,a...) nv_printk((o), TRACE, f, ##a)
 #define nv_spam(o,f,a...) nv_printk((o), SPAM, f, ##a)
 
+#define nv_suspend(o,f,a...) nv_printk((o), SUSPEND, f, ##a)
+
+static inline void nv_suspend_set_printk_level(int level)
+{
+        nv_printk_suspend_level = level;
+}
+
 #define nv_assert(f,a...) do {                                                 \
         if (NV_DBG_FATAL <= CONFIG_NOUVEAU_DEBUG)                              \
                 nv_printk_(NULL, NV_PRINTK_FATAL, NV_DBG_FATAL, f "\n", ##a);  \
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
index 0687e6481438..2e11ea02cf87 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/init.c
@@ -2165,7 +2165,7 @@ nvbios_init(struct nouveau_subdev *subdev, bool execute)
         u16 data;
 
         if (execute)
-                nv_info(bios, "running init tables\n");
+                nv_suspend(bios, "running init tables\n");
         while (!ret && (data = (init_script(bios, ++i)))) {
                 struct nvbios_init init = {
                         .subdev = subdev,
diff --git a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
index 1c0330b8c9a4..2e7c5fd3de3d 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/base.c
@@ -23,16 +23,20 @@
  */
 
 #include <subdev/mc.h>
+#include <linux/pm_runtime.h>
 
 static irqreturn_t
 nouveau_mc_intr(int irq, void *arg)
 {
         struct nouveau_mc *pmc = arg;
         const struct nouveau_mc_intr *map = pmc->intr_map;
+        struct nouveau_device *device = nv_device(pmc);
         struct nouveau_subdev *unit;
         u32 stat, intr;
 
         intr = stat = nv_rd32(pmc, 0x000100);
+        if (intr == 0xffffffff)
+                return IRQ_NONE;
         while (stat && map->stat) {
                 if (stat & map->stat) {
                         unit = nouveau_subdev(pmc, map->unit);
@@ -47,6 +51,8 @@ nouveau_mc_intr(int irq, void *arg)
                 nv_error(pmc, "unknown intr 0x%08x\n", stat);
         }
 
+        if (stat == IRQ_HANDLED)
+                pm_runtime_mark_last_busy(&device->pdev->dev);
         return stat ? IRQ_HANDLED : IRQ_NONE;
 }
 
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 0782bd2f1e04..6413552df21c 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -22,6 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <linux/pm_runtime.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
@@ -1007,13 +1008,59 @@ nv04_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
         return 0;
 }
 
+int
+nouveau_crtc_set_config(struct drm_mode_set *set)
+{
+        struct drm_device *dev;
+        struct nouveau_drm *drm;
+        int ret;
+        struct drm_crtc *crtc;
+        bool active = false;
+        if (!set || !set->crtc)
+                return -EINVAL;
+
+        dev = set->crtc->dev;
+
+        /* get a pm reference here */
+        ret = pm_runtime_get_sync(dev->dev);
+        if (ret < 0)
+                return ret;
+
+        ret = drm_crtc_helper_set_config(set);
+
+        drm = nouveau_drm(dev);
+
+        /* if we get here with no crtcs active then we can drop a reference */
+        list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+                if (crtc->enabled)
+                        active = true;
+        }
+
+        pm_runtime_mark_last_busy(dev->dev);
+        /* if we have active crtcs and we don't have a power ref,
+           take the current one */
+        if (active && !drm->have_disp_power_ref) {
+                drm->have_disp_power_ref = true;
+                return ret;
+        }
+        /* if we have no active crtcs, then drop the power ref
+           we got before */
+        if (!active && drm->have_disp_power_ref) {
+                pm_runtime_put_autosuspend(dev->dev);
+                drm->have_disp_power_ref = false;
+        }
+        /* drop the power reference we got coming in here */
+        pm_runtime_put_autosuspend(dev->dev);
+        return ret;
+}
+
 static const struct drm_crtc_funcs nv04_crtc_funcs = {
         .save = nv_crtc_save,
         .restore = nv_crtc_restore,
         .cursor_set = nv04_crtc_cursor_set,
         .cursor_move = nv04_crtc_cursor_move,
         .gamma_set = nv_crtc_gamma_set,
-        .set_config = drm_crtc_helper_set_config,
+        .set_config = nouveau_crtc_set_config,
         .page_flip = nouveau_crtc_page_flip,
         .destroy = nv_crtc_destroy,
 };
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index d97f20069d3e..dd7d2e182719 100644
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -25,8 +25,27 @@
 #define NOUVEAU_DSM_POWER_SPEED 0x01
 #define NOUVEAU_DSM_POWER_STAMINA 0x02
 
-#define NOUVEAU_DSM_OPTIMUS_FN 0x1A
-#define NOUVEAU_DSM_OPTIMUS_ARGS 0x03000001
+#define NOUVEAU_DSM_OPTIMUS_CAPS 0x1A
+#define NOUVEAU_DSM_OPTIMUS_FLAGS 0x1B
+
+#define NOUVEAU_DSM_OPTIMUS_POWERDOWN_PS3 (3 << 24)
+#define NOUVEAU_DSM_OPTIMUS_NO_POWERDOWN_PS3 (2 << 24)
+#define NOUVEAU_DSM_OPTIMUS_FLAGS_CHANGED (1)
+
+#define NOUVEAU_DSM_OPTIMUS_SET_POWERDOWN (NOUVEAU_DSM_OPTIMUS_POWERDOWN_PS3 | NOUVEAU_DSM_OPTIMUS_FLAGS_CHANGED)
+
+/* result of the optimus caps function */
+#define OPTIMUS_ENABLED (1 << 0)
+#define OPTIMUS_STATUS_MASK (3 << 3)
+#define OPTIMUS_STATUS_OFF  (0 << 3)
+#define OPTIMUS_STATUS_ON_ENABLED  (1 << 3)
+#define OPTIMUS_STATUS_PWR_STABLE  (3 << 3)
+#define OPTIMUS_DISPLAY_HOTPLUG (1 << 6)
+#define OPTIMUS_CAPS_MASK (7 << 24)
+#define OPTIMUS_DYNAMIC_PWR_CAP (1 << 24)
+
+#define OPTIMUS_AUDIO_CAPS_MASK (3 << 27)
+#define OPTIMUS_HDA_CODEC_MASK (2 << 27) /* hda bios control */
 
 static struct nouveau_dsm_priv {
         bool dsm_detected;
@@ -251,9 +270,18 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
                 retval |= NOUVEAU_DSM_HAS_MUX;
 
         if (nouveau_test_dsm(dhandle, nouveau_optimus_dsm,
-                NOUVEAU_DSM_OPTIMUS_FN))
+                NOUVEAU_DSM_OPTIMUS_CAPS))
                 retval |= NOUVEAU_DSM_HAS_OPT;
 
+        if (retval & NOUVEAU_DSM_HAS_OPT) {
+                uint32_t result;
+                nouveau_optimus_dsm(dhandle, NOUVEAU_DSM_OPTIMUS_CAPS, 0,
+                                    &result);
+                dev_info(&pdev->dev, "optimus capabilities: %s, status %s%s\n",
+                         (result & OPTIMUS_ENABLED) ? "enabled" : "disabled",
+                         (result & OPTIMUS_DYNAMIC_PWR_CAP) ? "dynamic power, " : "",
+                         (result & OPTIMUS_HDA_CODEC_MASK) ? "hda bios codec supported" : "");
+        }
         if (retval)
                 nouveau_dsm_priv.dhandle = dhandle;
 
@@ -328,8 +356,12 @@ void nouveau_switcheroo_optimus_dsm(void)
         if (!nouveau_dsm_priv.optimus_detected)
                 return;
 
-        nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_FN,
-                NOUVEAU_DSM_OPTIMUS_ARGS, &result);
+        nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_FLAGS,
+                            0x3, &result);
+
+        nouveau_optimus_dsm(nouveau_dsm_priv.dhandle, NOUVEAU_DSM_OPTIMUS_CAPS,
+                NOUVEAU_DSM_OPTIMUS_SET_POWERDOWN, &result);
+
 }
 
 void nouveau_unregister_dsm_handler(void)
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 4e7ee5f4155c..e4444bacd0b2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1260,7 +1260,9 @@ out:
 static int
 nouveau_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct nouveau_bo *nvbo = nouveau_bo(bo);
+
+        return drm_vma_node_verify_access(&nvbo->gem->vma_node, filp);
 }
 
 static int
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 4da776f344d7..c5b36f9e9a10 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -26,6 +26,8 @@
 
 #include <acpi/button.h>
 
+#include <linux/pm_runtime.h>
+
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_crtc_helper.h>
@@ -240,6 +242,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
         struct nouveau_encoder *nv_partner;
         struct nouveau_i2c_port *i2c;
         int type;
+        int ret;
+        enum drm_connector_status conn_status = connector_status_disconnected;
 
         /* Cleanup the previous EDID block. */
         if (nv_connector->edid) {
@@ -248,6 +252,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                 nv_connector->edid = NULL;
         }
 
+        ret = pm_runtime_get_sync(connector->dev->dev);
+        if (ret < 0)
+                return conn_status;
+
         i2c = nouveau_connector_ddc_detect(connector, &nv_encoder);
         if (i2c) {
                 nv_connector->edid = drm_get_edid(connector, &i2c->adapter);
@@ -263,7 +271,8 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                     !nouveau_dp_detect(to_drm_encoder(nv_encoder))) {
                         NV_ERROR(drm, "Detected %s, but failed init\n",
                                  drm_get_connector_name(connector));
-                        return connector_status_disconnected;
+                        conn_status = connector_status_disconnected;
+                        goto out;
                 }
 
                 /* Override encoder type for DVI-I based on whether EDID
@@ -290,13 +299,15 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
                 }
 
                 nouveau_connector_set_encoder(connector, nv_encoder);
-                return connector_status_connected;
+                conn_status = connector_status_connected;
+                goto out;
         }
 
         nv_encoder = nouveau_connector_of_detect(connector);
         if (nv_encoder) {
                 nouveau_connector_set_encoder(connector, nv_encoder);
-                return connector_status_connected;
+                conn_status = connector_status_connected;
+                goto out;
         }
 
 detect_analog:
@@ -311,12 +322,18 @@ detect_analog:
                 if (helper->detect(encoder, connector) ==
                                                 connector_status_connected) {
                         nouveau_connector_set_encoder(connector, nv_encoder);
-                        return connector_status_connected;
+                        conn_status = connector_status_connected;
+                        goto out;
                 }
 
         }
 
-        return connector_status_disconnected;
+ out:
+
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
+
+        return conn_status;
 }
 
 static enum drm_connector_status
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 907d20ef6d4d..44202bf7b819 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -394,7 +394,7 @@ nouveau_display_suspend(struct drm_device *dev)
 
         nouveau_display_fini(dev);
 
-        NV_INFO(drm, "unpinning framebuffer(s)...\n");
+        NV_SUSPEND(drm, "unpinning framebuffer(s)...\n");
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 struct nouveau_framebuffer *nouveau_fb;
 
@@ -416,7 +416,7 @@ nouveau_display_suspend(struct drm_device *dev)
 }
 
 void
-nouveau_display_resume(struct drm_device *dev)
+nouveau_display_repin(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct drm_crtc *crtc;
@@ -441,10 +441,12 @@ nouveau_display_resume(struct drm_device *dev)
                 if (ret)
                         NV_ERROR(drm, "Could not pin/map cursor.\n");
         }
+}
 
-        nouveau_fbcon_set_suspend(dev, 0);
-        nouveau_fbcon_zfill_all(dev);
-
+void
+nouveau_display_resume(struct drm_device *dev)
+{
+        struct drm_crtc *crtc;
         nouveau_display_init(dev);
 
         /* Force CLUT to get re-loaded during modeset */
@@ -519,7 +521,8 @@ fail:
 
 int
 nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
-                       struct drm_pending_vblank_event *event)
+                       struct drm_pending_vblank_event *event,
+                       uint32_t page_flip_flags)
 {
         struct drm_device *dev = crtc->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
@@ -674,13 +677,6 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
 }
 
 int
-nouveau_display_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,
-                             uint32_t handle)
-{
-        return drm_gem_handle_delete(file_priv, handle);
-}
-
-int
 nouveau_display_dumb_map_offset(struct drm_file *file_priv,
                                 struct drm_device *dev,
                                 uint32_t handle, uint64_t *poffset)
@@ -690,7 +686,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv,
         gem = drm_gem_object_lookup(dev, file_priv, handle);
         if (gem) {
                 struct nouveau_bo *bo = gem->driver_private;
-                *poffset = bo->bo.addr_space_offset;
+                *poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);
                 drm_gem_object_unreference_unlocked(gem);
                 return 0;
         }
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 1ea3e4734b62..025c66f8e0ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -57,10 +57,12 @@ void nouveau_display_destroy(struct drm_device *dev);
 int  nouveau_display_init(struct drm_device *dev);
 void nouveau_display_fini(struct drm_device *dev);
 int  nouveau_display_suspend(struct drm_device *dev);
+void nouveau_display_repin(struct drm_device *dev);
 void nouveau_display_resume(struct drm_device *dev);
 
 int  nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
-                            struct drm_pending_vblank_event *event);
+                            struct drm_pending_vblank_event *event,
+                            uint32_t page_flip_flags);
 int  nouveau_finish_page_flip(struct nouveau_channel *,
                               struct nouveau_page_flip_state *);
 
@@ -68,11 +70,10 @@ int  nouveau_display_dumb_create(struct drm_file *, struct drm_device *,
                                  struct drm_mode_create_dumb *args);
 int  nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *,
                                      u32 handle, u64 *offset);
-int  nouveau_display_dumb_destroy(struct drm_file *, struct drm_device *,
-                                  u32 handle);
 
 void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
 
+int nouveau_crtc_set_config(struct drm_mode_set *set);
 #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
 extern int nouveau_backlight_init(struct drm_device *);
 extern void nouveau_backlight_exit(struct drm_device *);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 61972668fd05..62c6118e94c0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -25,7 +25,10 @@
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-
+#include <linux/pm_runtime.h>
+#include <linux/vga_switcheroo.h>
+#include "drmP.h"
+#include "drm_crtc_helper.h"
 #include <core/device.h>
 #include <core/client.h>
 #include <core/gpuobj.h>
@@ -69,6 +72,10 @@ MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
 int nouveau_modeset = -1;
 module_param_named(modeset, nouveau_modeset, int, 0400);
 
+MODULE_PARM_DESC(runpm, "disable (0), force enable (1), optimus only default (-1)");
+int nouveau_runtime_pm = -1;
+module_param_named(runpm, nouveau_runtime_pm, int, 0400);
+
 static struct drm_driver driver;
 
 static int
@@ -296,6 +303,31 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
         return 0;
 }
 
+#define PCI_CLASS_MULTIMEDIA_HD_AUDIO 0x0403
+
+static void
+nouveau_get_hdmi_dev(struct drm_device *dev)
+{
+        struct nouveau_drm *drm = dev->dev_private;
+        struct pci_dev *pdev = dev->pdev;
+
+        /* subfunction one is a hdmi audio device? */
+        drm->hdmi_device = pci_get_bus_and_slot((unsigned int)pdev->bus->number,
+                                                PCI_DEVFN(PCI_SLOT(pdev->devfn), 1));
+
+        if (!drm->hdmi_device) {
+                DRM_INFO("hdmi device  not found %d %d %d\n", pdev->bus->number, PCI_SLOT(pdev->devfn), 1);
+                return;
+        }
+
+        if ((drm->hdmi_device->class >> 8) != PCI_CLASS_MULTIMEDIA_HD_AUDIO) {
+                DRM_INFO("possible hdmi device  not audio %d\n", drm->hdmi_device->class);
+                pci_dev_put(drm->hdmi_device);
+                drm->hdmi_device = NULL;
+                return;
+        }
+}
+
 static int
 nouveau_drm_load(struct drm_device *dev, unsigned long flags)
 {
@@ -314,6 +346,8 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
         INIT_LIST_HEAD(&drm->clients);
         spin_lock_init(&drm->tile.lock);
 
+        nouveau_get_hdmi_dev(dev);
+
         /* make sure AGP controller is in a consistent state before we
          * (possibly) execute vbios init tables (see nouveau_agp.h)
          */
@@ -388,6 +422,15 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
 
         nouveau_accel_init(drm);
         nouveau_fbcon_init(dev);
+
+        if (nouveau_runtime_pm != 0) {
+                pm_runtime_use_autosuspend(dev->dev);
+                pm_runtime_set_autosuspend_delay(dev->dev, 5000);
+                pm_runtime_set_active(dev->dev);
+                pm_runtime_allow(dev->dev);
+                pm_runtime_mark_last_busy(dev->dev);
+                pm_runtime_put(dev->dev);
+        }
         return 0;
 
 fail_dispinit:
@@ -409,6 +452,7 @@ nouveau_drm_unload(struct drm_device *dev)
 {
         struct nouveau_drm *drm = nouveau_drm(dev);
 
+        pm_runtime_get_sync(dev->dev);
         nouveau_fbcon_fini(dev);
         nouveau_accel_fini(drm);
 
@@ -424,6 +468,8 @@ nouveau_drm_unload(struct drm_device *dev)
         nouveau_agp_fini(drm);
         nouveau_vga_fini(drm);
 
+        if (drm->hdmi_device)
+                pci_dev_put(drm->hdmi_device);
         nouveau_cli_destroy(&drm->client);
         return 0;
 }
@@ -450,19 +496,16 @@ nouveau_do_suspend(struct drm_device *dev)
         int ret;
 
         if (dev->mode_config.num_crtc) {
-                NV_INFO(drm, "suspending fbcon...\n");
-                nouveau_fbcon_set_suspend(dev, 1);
-
-                NV_INFO(drm, "suspending display...\n");
+                NV_SUSPEND(drm, "suspending display...\n");
                 ret = nouveau_display_suspend(dev);
                 if (ret)
                         return ret;
         }
 
-        NV_INFO(drm, "evicting buffers...\n");
+        NV_SUSPEND(drm, "evicting buffers...\n");
         ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM);
 
-        NV_INFO(drm, "waiting for kernel channels to go idle...\n");
+        NV_SUSPEND(drm, "waiting for kernel channels to go idle...\n");
         if (drm->cechan) {
                 ret = nouveau_channel_idle(drm->cechan);
                 if (ret)
@@ -475,7 +518,7 @@ nouveau_do_suspend(struct drm_device *dev)
                         return ret;
         }
 
-        NV_INFO(drm, "suspending client object trees...\n");
+        NV_SUSPEND(drm, "suspending client object trees...\n");
         if (drm->fence && nouveau_fence(drm)->suspend) {
                 if (!nouveau_fence(drm)->suspend(drm))
                         return -ENOMEM;
@@ -487,7 +530,7 @@ nouveau_do_suspend(struct drm_device *dev)
                         goto fail_client;
         }
 
-        NV_INFO(drm, "suspending kernel object tree...\n");
+        NV_SUSPEND(drm, "suspending kernel object tree...\n");
         ret = nouveau_client_fini(&drm->client.base, true);
         if (ret)
                 goto fail_client;
@@ -501,7 +544,7 @@ fail_client:
         }
 
         if (dev->mode_config.num_crtc) {
-                NV_INFO(drm, "resuming display...\n");
+                NV_SUSPEND(drm, "resuming display...\n");
                 nouveau_display_resume(dev);
         }
         return ret;
@@ -513,9 +556,14 @@ int nouveau_pmops_suspend(struct device *dev)
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
         int ret;
 
-        if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
+        if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
+            drm_dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF)
                 return 0;
 
+        if (drm_dev->mode_config.num_crtc)
+                nouveau_fbcon_set_suspend(drm_dev, 1);
+
+        nv_suspend_set_printk_level(NV_DBG_INFO);
         ret = nouveau_do_suspend(drm_dev);
         if (ret)
                 return ret;
@@ -523,6 +571,7 @@ int nouveau_pmops_suspend(struct device *dev)
         pci_save_state(pdev);
         pci_disable_device(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
+        nv_suspend_set_printk_level(NV_DBG_DEBUG);
 
         return 0;
 }
@@ -533,15 +582,15 @@ nouveau_do_resume(struct drm_device *dev)
         struct nouveau_drm *drm = nouveau_drm(dev);
         struct nouveau_cli *cli;
 
-        NV_INFO(drm, "re-enabling device...\n");
+        NV_SUSPEND(drm, "re-enabling device...\n");
 
         nouveau_agp_reset(drm);
 
-        NV_INFO(drm, "resuming kernel object tree...\n");
+        NV_SUSPEND(drm, "resuming kernel object tree...\n");
         nouveau_client_init(&drm->client.base);
         nouveau_agp_init(drm);
 
-        NV_INFO(drm, "resuming client object trees...\n");
+        NV_SUSPEND(drm, "resuming client object trees...\n");
         if (drm->fence && nouveau_fence(drm)->resume)
                 nouveau_fence(drm)->resume(drm);
 
@@ -553,9 +602,10 @@ nouveau_do_resume(struct drm_device *dev)
         nouveau_pm_resume(dev);
 
         if (dev->mode_config.num_crtc) {
-                NV_INFO(drm, "resuming display...\n");
-                nouveau_display_resume(dev);
+                NV_SUSPEND(drm, "resuming display...\n");
+                nouveau_display_repin(dev);
         }
+
         return 0;
 }
 
@@ -565,7 +615,8 @@ int nouveau_pmops_resume(struct device *dev)
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
         int ret;
 
-        if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
+        if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF ||
+            drm_dev->switch_power_state == DRM_SWITCH_POWER_DYNAMIC_OFF)
                 return 0;
 
         pci_set_power_state(pdev, PCI_D0);
@@ -575,23 +626,54 @@ int nouveau_pmops_resume(struct device *dev)
                 return ret;
         pci_set_master(pdev);
 
-        return nouveau_do_resume(drm_dev);
+        nv_suspend_set_printk_level(NV_DBG_INFO);
+        ret = nouveau_do_resume(drm_dev);
+        if (ret) {
+                nv_suspend_set_printk_level(NV_DBG_DEBUG);
+                return ret;
+        }
+        if (drm_dev->mode_config.num_crtc)
+                nouveau_fbcon_set_suspend(drm_dev, 0);
+
+        nouveau_fbcon_zfill_all(drm_dev);
+        nouveau_display_resume(drm_dev);
+        nv_suspend_set_printk_level(NV_DBG_DEBUG);
+        return 0;
 }
 
 static int nouveau_pmops_freeze(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        int ret;
+
+        nv_suspend_set_printk_level(NV_DBG_INFO);
+        if (drm_dev->mode_config.num_crtc)
+                nouveau_fbcon_set_suspend(drm_dev, 1);
 
-        return nouveau_do_suspend(drm_dev);
+        ret = nouveau_do_suspend(drm_dev);
+        nv_suspend_set_printk_level(NV_DBG_DEBUG);
+        return ret;
 }
 
 static int nouveau_pmops_thaw(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        int ret;
 
-        return nouveau_do_resume(drm_dev);
+        nv_suspend_set_printk_level(NV_DBG_INFO);
+        ret = nouveau_do_resume(drm_dev);
+        if (ret) {
+                nv_suspend_set_printk_level(NV_DBG_DEBUG);
+                return ret;
+        }
+        if (drm_dev->mode_config.num_crtc)
+                nouveau_fbcon_set_suspend(drm_dev, 0);
+        nouveau_fbcon_zfill_all(drm_dev);
+        nouveau_display_resume(drm_dev);
+        nv_suspend_set_printk_level(NV_DBG_DEBUG);
+        return 0;
 }
 
 
@@ -604,19 +686,24 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
         char name[32], tmpname[TASK_COMM_LEN];
         int ret;
 
+        /* need to bring up power immediately if opening device */
+        ret = pm_runtime_get_sync(dev->dev);
+        if (ret < 0)
+                return ret;
+
         get_task_comm(tmpname, current);
         snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid));
 
         ret = nouveau_cli_create(pdev, name, sizeof(*cli), (void **)&cli);
         if (ret)
-                return ret;
+                goto out_suspend;
 
         if (nv_device(drm->device)->card_type >= NV_50) {
                 ret = nouveau_vm_new(nv_device(drm->device), 0, (1ULL << 40),
                                      0x1000, &cli->base.vm);
                 if (ret) {
                         nouveau_cli_destroy(cli);
-                        return ret;
+                        goto out_suspend;
                 }
         }
 
@@ -625,7 +712,12 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv)
         mutex_lock(&drm->client.mutex);
         list_add(&cli->head, &drm->clients);
         mutex_unlock(&drm->client.mutex);
-        return 0;
+
+out_suspend:
+        pm_runtime_mark_last_busy(dev->dev);
+        pm_runtime_put_autosuspend(dev->dev);
+
+        return ret;
 }
 
 static void
@@ -634,12 +726,15 @@ nouveau_drm_preclose(struct drm_device *dev, struct drm_file *fpriv)
         struct nouveau_cli *cli = nouveau_cli(fpriv);
         struct nouveau_drm *drm = nouveau_drm(dev);
 
+        pm_runtime_get_sync(dev->dev);
+
         if (cli->abi16)
                 nouveau_abi16_fini(cli->abi16);
 
         mutex_lock(&drm->client.mutex);
         list_del(&cli->head);
         mutex_unlock(&drm->client.mutex);
+
 }
 
 static void
@@ -647,9 +742,11 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv)
 {
         struct nouveau_cli *cli = nouveau_cli(fpriv);
         nouveau_cli_destroy(cli);
+        pm_runtime_mark_last_busy(dev->dev);
+        pm_runtime_put_autosuspend(dev->dev);
 }
 
-static struct drm_ioctl_desc
+static const struct drm_ioctl_desc
 nouveau_ioctls[] = {
         DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_UNLOCKED|DRM_AUTH),
         DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
@@ -665,15 +762,32 @@ nouveau_ioctls[] = {
         DRM_IOCTL_DEF_DRV(NOUVEAU_GEM_INFO, nouveau_gem_ioctl_info, DRM_UNLOCKED|DRM_AUTH),
 };
 
+long nouveau_drm_ioctl(struct file *filp,
+                       unsigned int cmd, unsigned long arg)
+{
+        struct drm_file *file_priv = filp->private_data;
+        struct drm_device *dev;
+        long ret;
+        dev = file_priv->minor->dev;
+
+        ret = pm_runtime_get_sync(dev->dev);
+        if (ret < 0)
+                return ret;
+
+        ret = drm_ioctl(filp, cmd, arg);
+
+        pm_runtime_mark_last_busy(dev->dev);
+        pm_runtime_put_autosuspend(dev->dev);
+        return ret;
+}
 static const struct file_operations
 nouveau_driver_fops = {
         .owner = THIS_MODULE,
         .open = drm_open,
         .release = drm_release,
-        .unlocked_ioctl = drm_ioctl,
+        .unlocked_ioctl = nouveau_drm_ioctl,
         .mmap = nouveau_ttm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 #if defined(CONFIG_COMPAT)
         .compat_ioctl = nouveau_compat_ioctl,
@@ -684,7 +798,7 @@ nouveau_driver_fops = {
 static struct drm_driver
 driver = {
         .driver_features =
-                DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
+                DRIVER_USE_AGP |
                 DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME,
 
         .load = nouveau_drm_load,
@@ -704,6 +818,7 @@ driver = {
         .disable_vblank = nouveau_drm_vblank_disable,
 
         .ioctls = nouveau_ioctls,
+        .num_ioctls = ARRAY_SIZE(nouveau_ioctls),
         .fops = &nouveau_driver_fops,
 
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
@@ -724,7 +839,7 @@ driver = {
 
         .dumb_create = nouveau_display_dumb_create,
         .dumb_map_offset = nouveau_display_dumb_map_offset,
-        .dumb_destroy = nouveau_display_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
@@ -753,6 +868,90 @@ nouveau_drm_pci_table[] = {
         {}
 };
 
+static int nouveau_pmops_runtime_suspend(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        int ret;
+
+        if (nouveau_runtime_pm == 0)
+                return -EINVAL;
+
+        drm_kms_helper_poll_disable(drm_dev);
+        vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_OFF);
+        nouveau_switcheroo_optimus_dsm();
+        ret = nouveau_do_suspend(drm_dev);
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3cold);
+        drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
+        return ret;
+}
+
+static int nouveau_pmops_runtime_resume(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        struct nouveau_device *device = nouveau_dev(drm_dev);
+        int ret;
+
+        if (nouveau_runtime_pm == 0)
+                return -EINVAL;
+
+        pci_set_power_state(pdev, PCI_D0);
+        pci_restore_state(pdev);
+        ret = pci_enable_device(pdev);
+        if (ret)
+                return ret;
+        pci_set_master(pdev);
+
+        ret = nouveau_do_resume(drm_dev);
+        nouveau_display_resume(drm_dev);
+        drm_kms_helper_poll_enable(drm_dev);
+        /* do magic */
+        nv_mask(device, 0x88488, (1 << 25), (1 << 25));
+        vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_ON);
+        drm_dev->switch_power_state = DRM_SWITCH_POWER_ON;
+        return ret;
+}
+
+static int nouveau_pmops_runtime_idle(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct drm_device *drm_dev = pci_get_drvdata(pdev);
+        struct nouveau_drm *drm = nouveau_drm(drm_dev);
+        struct drm_crtc *crtc;
+
+        if (nouveau_runtime_pm == 0)
+                return -EBUSY;
+
+        /* are we optimus enabled? */
+        if (nouveau_runtime_pm == -1 && !nouveau_is_optimus() && !nouveau_is_v1_dsm()) {
+                DRM_DEBUG_DRIVER("failing to power off - not optimus\n");
+                return -EBUSY;
+        }
+
+        /* if we have a hdmi audio device - make sure it has a driver loaded */
+        if (drm->hdmi_device) {
+                if (!drm->hdmi_device->driver) {
+                        DRM_DEBUG_DRIVER("failing to power off - no HDMI audio driver loaded\n");
+                        pm_runtime_mark_last_busy(dev);
+                        return -EBUSY;
+                }
+        }
+
+        list_for_each_entry(crtc, &drm->dev->mode_config.crtc_list, head) {
+                if (crtc->enabled) {
+                        DRM_DEBUG_DRIVER("failing to power off - crtc active\n");
+                        return -EBUSY;
+                }
+        }
+        pm_runtime_mark_last_busy(dev);
+        pm_runtime_autosuspend(dev);
+        /* we don't want the main rpm_idle to call suspend - we want to autosuspend */
+        return 1;
+}
+
 static const struct dev_pm_ops nouveau_pm_ops = {
         .suspend = nouveau_pmops_suspend,
         .resume = nouveau_pmops_resume,
@@ -760,6 +959,9 @@ static const struct dev_pm_ops nouveau_pm_ops = {
         .thaw = nouveau_pmops_thaw,
         .poweroff = nouveau_pmops_freeze,
         .restore = nouveau_pmops_resume,
+        .runtime_suspend = nouveau_pmops_runtime_suspend,
+        .runtime_resume = nouveau_pmops_runtime_resume,
+        .runtime_idle = nouveau_pmops_runtime_idle,
 };
 
 static struct pci_driver
@@ -774,8 +976,6 @@ nouveau_drm_pci_driver = {
 static int __init
 nouveau_drm_init(void)
 {
-        driver.num_ioctls = ARRAY_SIZE(nouveau_ioctls);
-
         if (nouveau_modeset == -1) {
 #ifdef CONFIG_VGA_CONSOLE
                 if (vgacon_text_force())
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
index 41ff7e0d403a..994fd6ec373b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
@@ -70,6 +70,8 @@ nouveau_cli(struct drm_file *fpriv)
         return fpriv ? fpriv->driver_priv : NULL;
 }
 
+extern int nouveau_runtime_pm;
+
 struct nouveau_drm {
         struct nouveau_cli client;
         struct drm_device *dev;
@@ -129,6 +131,12 @@ struct nouveau_drm {
 
         /* power management */
         struct nouveau_pm *pm;
+
+        /* display power reference */
+        bool have_disp_power_ref;
+
+        struct dev_pm_domain vga_pm_domain;
+        struct pci_dev *hdmi_device;
 };
 
 static inline struct nouveau_drm *
@@ -146,6 +154,7 @@ nouveau_dev(struct drm_device *dev)
 int nouveau_pmops_suspend(struct device *);
 int nouveau_pmops_resume(struct device *);
 
+#define NV_SUSPEND(cli, fmt, args...) nv_suspend((cli), fmt, ##args)
 #define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args)
 #define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args)
 #define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args)
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 830cb7bad922..487242fb3fdc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -220,7 +220,7 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,
         }
 
         rep->size = nvbo->bo.mem.num_pages << PAGE_SHIFT;
-        rep->map_handle = nvbo->bo.addr_space_offset;
+        rep->map_handle = drm_vma_node_offset_addr(&nvbo->bo.vma_node);
         rep->tile_mode = nvbo->tile_mode;
         rep->tile_flags = nvbo->tile_flags;
         return 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
index 25d3495725eb..81638d7f2eff 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -32,6 +32,9 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev,
 {
         struct drm_device *dev = pci_get_drvdata(pdev);
 
+        if ((nouveau_is_optimus() || nouveau_is_v1_dsm()) && state == VGA_SWITCHEROO_OFF)
+                return;
+
         if (state == VGA_SWITCHEROO_ON) {
                 printk(KERN_ERR "VGA switcheroo: switched nouveau on\n");
                 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
@@ -78,8 +81,17 @@ void
 nouveau_vga_init(struct nouveau_drm *drm)
 {
         struct drm_device *dev = drm->dev;
+        bool runtime = false;
         vga_client_register(dev->pdev, dev, NULL, nouveau_vga_set_decode);
-        vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops);
+
+        if (nouveau_runtime_pm == 1)
+                runtime = true;
+        if ((nouveau_runtime_pm == -1) && (nouveau_is_optimus() || nouveau_is_v1_dsm()))
+                runtime = true;
+        vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, runtime);
+
+        if (runtime && nouveau_is_v1_dsm() && !nouveau_is_optimus())
+                vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain);
 }
 
 void
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 8b40a36c1b57..9d2092a5ed38 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1326,7 +1326,7 @@ static const struct drm_crtc_funcs nv50_crtc_func = {
         .cursor_set = nv50_crtc_cursor_set,
         .cursor_move = nv50_crtc_cursor_move,
         .gamma_set = nv50_crtc_gamma_set,
-        .set_config = drm_crtc_helper_set_config,
+        .set_config = nouveau_crtc_set_config,
         .destroy = nv50_crtc_destroy,
         .page_flip = nouveau_crtc_page_flip,
 };
diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index d85e058f2845..778372b062ad 100644
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -18,7 +18,4 @@ omapdrm-y := omap_drv.o \
         omap_dmm_tiler.o \
         tcm-sita.o
 
-# temporary:
-omapdrm-y += omap_gem_helpers.o
-
 obj-$(CONFIG_DRM_OMAP)  += omapdrm.o
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 11a5263a5e9f..0fd2eb139f6e 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -331,7 +331,8 @@ static void page_flip_cb(void *arg)
 
 static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
                  struct drm_framebuffer *fb,
-                 struct drm_pending_vblank_event *event)
+                 struct drm_pending_vblank_event *event,
+                 uint32_t page_flip_flags)
 {
         struct drm_device *dev = crtc->dev;
         struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 9b794c933c81..acf667859cb6 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -871,7 +871,7 @@ int tiler_map_show(struct seq_file *s, void *arg)
                 goto error;
 
         for (lut_idx = 0; lut_idx < omap_dmm->num_lut; lut_idx++) {
-                memset(map, 0, sizeof(h_adj * sizeof(*map)));
+                memset(map, 0, h_adj * sizeof(*map));
                 memset(global_map, ' ', (w_adj + 1) * h_adj);
 
                 for (i = 0; i < omap_dmm->container_height; i++) {
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index a3004f12b9a3..2603d909f49c 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -419,7 +419,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
         return ret;
 }
 
-static struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
+static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
         DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH),
         DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH),
@@ -524,12 +524,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)
         return 0;
 }
 
-static int dev_firstopen(struct drm_device *dev)
-{
-        DBG("firstopen: dev=%p", dev);
-        return 0;
-}
-
 /**
  * lastclose - clean up after all DRM clients have exited
  * @dev: DRM device
@@ -598,7 +592,6 @@ static const struct file_operations omapdriver_fops = {
                 .release = drm_release,
                 .mmap = omap_gem_mmap,
                 .poll = drm_poll,
-                .fasync = drm_fasync,
                 .read = drm_read,
                 .llseek = noop_llseek,
 };
@@ -609,7 +602,6 @@ static struct drm_driver omap_drm_driver = {
                 .load = dev_load,
                 .unload = dev_unload,
                 .open = dev_open,
-                .firstopen = dev_firstopen,
                 .lastclose = dev_lastclose,
                 .preclose = dev_preclose,
                 .postclose = dev_postclose,
@@ -633,7 +625,7 @@ static struct drm_driver omap_drm_driver = {
                 .gem_vm_ops = &omap_gem_vm_ops,
                 .dumb_create = omap_gem_dumb_create,
                 .dumb_map_offset = omap_gem_dumb_map_offset,
-                .dumb_destroy = omap_gem_dumb_destroy,
+                .dumb_destroy = drm_gem_dumb_destroy,
                 .ioctls = ioctls,
                 .num_ioctls = DRM_OMAP_NUM_IOCTLS,
                 .fops = &omapdriver_fops,
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 14f17da2ce25..30b95b736658 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -203,9 +203,8 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
 struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev,
                 struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object **bos);
 struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb, int p);
-int omap_framebuffer_replace(struct drm_framebuffer *a,
-                struct drm_framebuffer *b, void *arg,
-                void (*unpin)(void *arg, struct drm_gem_object *bo));
+int omap_framebuffer_pin(struct drm_framebuffer *fb);
+int omap_framebuffer_unpin(struct drm_framebuffer *fb);
 void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
                 struct omap_drm_window *win, struct omap_overlay_info *info);
 struct drm_connector *omap_framebuffer_get_next_connector(
@@ -225,8 +224,6 @@ int omap_gem_init_object(struct drm_gem_object *obj);
 void *omap_gem_vaddr(struct drm_gem_object *obj);
 int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
                 uint32_t handle, uint64_t *offset);
-int omap_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                uint32_t handle);
 int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
                 struct drm_mode_create_dumb *args);
 int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma);
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 8031402e7951..f2b8f0668c0c 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -237,55 +237,49 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb,
         }
 }
 
-/* Call for unpin 'a' (if not NULL), and pin 'b' (if not NULL).  Although
- * buffers to unpin are just pushed to the unpin fifo so that the
- * caller can defer unpin until vblank.
- *
- * Note if this fails (ie. something went very wrong!), all buffers are
- * unpinned, and the caller disables the overlay.  We could have tried
- * to revert back to the previous set of pinned buffers but if things are
- * hosed there is no guarantee that would succeed.
- */
-int omap_framebuffer_replace(struct drm_framebuffer *a,
-                struct drm_framebuffer *b, void *arg,
-                void (*unpin)(void *arg, struct drm_gem_object *bo))
+/* pin, prepare for scanout: */
+int omap_framebuffer_pin(struct drm_framebuffer *fb)
 {
-        int ret = 0, i, na, nb;
-        struct omap_framebuffer *ofba = to_omap_framebuffer(a);
-        struct omap_framebuffer *ofbb = to_omap_framebuffer(b);
-        uint32_t pinned_mask = 0;
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        int ret, i, n = drm_format_num_planes(fb->pixel_format);
 
-        na = a ? drm_format_num_planes(a->pixel_format) : 0;
-        nb = b ? drm_format_num_planes(b->pixel_format) : 0;
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                ret = omap_gem_get_paddr(plane->bo, &plane->paddr, true);
+                if (ret)
+                        goto fail;
+                omap_gem_dma_sync(plane->bo, DMA_TO_DEVICE);
+        }
 
-        for (i = 0; i < max(na, nb); i++) {
-                struct plane *pa, *pb;
+        return 0;
 
-                pa = (i < na) ? &ofba->planes[i] : NULL;
-                pb = (i < nb) ? &ofbb->planes[i] : NULL;
+fail:
+        for (i--; i >= 0; i--) {
+                struct plane *plane = &omap_fb->planes[i];
+                omap_gem_put_paddr(plane->bo);
+                plane->paddr = 0;
+        }
 
-                if (pa)
-                        unpin(arg, pa->bo);
+        return ret;
+}
 
-                if (pb && !ret) {
-                        ret = omap_gem_get_paddr(pb->bo, &pb->paddr, true);
-                        if (!ret) {
-                                omap_gem_dma_sync(pb->bo, DMA_TO_DEVICE);
-                                pinned_mask |= (1 << i);
-                        }
-                }
-        }
+/* unpin, no longer being scanned out: */
+int omap_framebuffer_unpin(struct drm_framebuffer *fb)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        int ret, i, n = drm_format_num_planes(fb->pixel_format);
 
-        if (ret) {
-                /* something went wrong.. unpin what has been pinned */
-                for (i = 0; i < nb; i++) {
-                        if (pinned_mask & (1 << i)) {
-                                struct plane *pb = &ofba->planes[i];
-                                unpin(arg, pb->bo);
-                        }
-                }
+        for (i = 0; i < n; i++) {
+                struct plane *plane = &omap_fb->planes[i];
+                ret = omap_gem_put_paddr(plane->bo);
+                if (ret)
+                        goto fail;
+                plane->paddr = 0;
         }
 
+        return 0;
+
+fail:
         return ret;
 }
 
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index ebbdf4132e9c..533f6ebec531 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -20,6 +20,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/shmem_fs.h>
+#include <drm/drm_vma_manager.h>
 
 #include "omap_drv.h"
 #include "omap_dmm_tiler.h"
@@ -236,7 +237,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
          * mapping_gfp_mask(mapping) which conflicts w/ GFP_DMA32.. probably
          * we actually want CMA memory for it all anyways..
          */
-        pages = _drm_gem_get_pages(obj, GFP_KERNEL);
+        pages = drm_gem_get_pages(obj, GFP_KERNEL);
         if (IS_ERR(pages)) {
                 dev_err(obj->dev->dev, "could not get pages: %ld\n", PTR_ERR(pages));
                 return PTR_ERR(pages);
@@ -270,7 +271,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
         return 0;
 
 free_pages:
-        _drm_gem_put_pages(obj, pages, true, false);
+        drm_gem_put_pages(obj, pages, true, false);
 
         return ret;
 }
@@ -294,7 +295,7 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj)
         kfree(omap_obj->addrs);
         omap_obj->addrs = NULL;
 
-        _drm_gem_put_pages(obj, omap_obj->pages, true, false);
+        drm_gem_put_pages(obj, omap_obj->pages, true, false);
         omap_obj->pages = NULL;
 }
 
@@ -308,21 +309,20 @@ uint32_t omap_gem_flags(struct drm_gem_object *obj)
 static uint64_t mmap_offset(struct drm_gem_object *obj)
 {
         struct drm_device *dev = obj->dev;
+        int ret;
+        size_t size;
 
         WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
-        if (!obj->map_list.map) {
-                /* Make it mmapable */
-                size_t size = omap_gem_mmap_size(obj);
-                int ret = _drm_gem_create_mmap_offset_size(obj, size);
-
-                if (ret) {
-                        dev_err(dev->dev, "could not allocate mmap offset\n");
-                        return 0;
-                }
+        /* Make it mmapable */
+        size = omap_gem_mmap_size(obj);
+        ret = drm_gem_create_mmap_offset_size(obj, size);
+        if (ret) {
+                dev_err(dev->dev, "could not allocate mmap offset\n");
+                return 0;
         }
 
-        return (uint64_t)obj->map_list.hash.key << PAGE_SHIFT;
+        return drm_vma_node_offset_addr(&obj->vma_node);
 }
 
 uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj)
@@ -629,21 +629,6 @@ int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 }
 
 /**
- * omap_gem_dumb_destroy        -       destroy a dumb buffer
- * @file: client file
- * @dev: our DRM device
- * @handle: the object handle
- *
- * Destroy a handle that was created via omap_gem_dumb_create.
- */
-int omap_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                uint32_t handle)
-{
-        /* No special work needed, drop the reference and see what falls out */
-        return drm_gem_handle_delete(file, handle);
-}
-
-/**
  * omap_gem_dumb_map    -       buffer mapping for dumb interface
  * @file: our drm client file
  * @dev: drm device
@@ -997,12 +982,11 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
 {
         struct drm_device *dev = obj->dev;
         struct omap_gem_object *omap_obj = to_omap_bo(obj);
-        uint64_t off = 0;
+        uint64_t off;
 
         WARN_ON(!mutex_is_locked(&dev->struct_mutex));
 
-        if (obj->map_list.map)
-                off = (uint64_t)obj->map_list.hash.key;
+        off = drm_vma_node_start(&obj->vma_node);
 
         seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d",
                         omap_obj->flags, obj->name, obj->refcount.refcount.counter,
@@ -1309,8 +1293,7 @@ void omap_gem_free_object(struct drm_gem_object *obj)
 
         list_del(&omap_obj->mm_list);
 
-        if (obj->map_list.map)
-                drm_gem_free_mmap_offset(obj);
+        drm_gem_free_mmap_offset(obj);
 
         /* this means the object is still pinned.. which really should
          * not happen.  I think..
@@ -1427,8 +1410,9 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                 omap_obj->height = gsize.tiled.height;
         }
 
+        ret = 0;
         if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM))
-                ret = drm_gem_private_object_init(dev, obj, size);
+                drm_gem_private_object_init(dev, obj, size);
         else
                 ret = drm_gem_object_init(dev, obj, size);
 
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_helpers.c b/drivers/gpu/drm/omapdrm/omap_gem_helpers.c
deleted file mode 100644
index f9eb679eb79b..000000000000
--- a/drivers/gpu/drm/omapdrm/omap_gem_helpers.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * drivers/gpu/drm/omapdrm/omap_gem_helpers.c
- *
- * Copyright (C) 2011 Texas Instruments
- * Author: Rob Clark <rob.clark@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* temporary copy of drm_gem_{get,put}_pages() until the
- * "drm/gem: add functions to get/put pages" patch is merged..
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/shmem_fs.h>
-
-#include <drm/drmP.h>
-
-/**
- * drm_gem_get_pages - helper to allocate backing pages for a GEM object
- * @obj: obj in question
- * @gfpmask: gfp mask of requested pages
- */
-struct page **_drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
-{
-        struct inode *inode;
-        struct address_space *mapping;
-        struct page *p, **pages;
-        int i, npages;
-
-        /* This is the shared memory object that backs the GEM resource */
-        inode = file_inode(obj->filp);
-        mapping = inode->i_mapping;
-
-        npages = obj->size >> PAGE_SHIFT;
-
-        pages = drm_malloc_ab(npages, sizeof(struct page *));
-        if (pages == NULL)
-                return ERR_PTR(-ENOMEM);
-
-        gfpmask |= mapping_gfp_mask(mapping);
-
-        for (i = 0; i < npages; i++) {
-                p = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
-                if (IS_ERR(p))
-                        goto fail;
-                pages[i] = p;
-
-                /* There is a hypothetical issue w/ drivers that require
-                 * buffer memory in the low 4GB.. if the pages are un-
-                 * pinned, and swapped out, they can end up swapped back
-                 * in above 4GB.  If pages are already in memory, then
-                 * shmem_read_mapping_page_gfp will ignore the gfpmask,
-                 * even if the already in-memory page disobeys the mask.
-                 *
-                 * It is only a theoretical issue today, because none of
-                 * the devices with this limitation can be populated with
-                 * enough memory to trigger the issue.  But this BUG_ON()
-                 * is here as a reminder in case the problem with
-                 * shmem_read_mapping_page_gfp() isn't solved by the time
-                 * it does become a real issue.
-                 *
-                 * See this thread: http://lkml.org/lkml/2011/7/11/238
-                 */
-                BUG_ON((gfpmask & __GFP_DMA32) &&
-                                (page_to_pfn(p) >= 0x00100000UL));
-        }
-
-        return pages;
-
-fail:
-        while (i--)
-                page_cache_release(pages[i]);
-
-        drm_free_large(pages);
-        return ERR_CAST(p);
-}
-
-/**
- * drm_gem_put_pages - helper to free backing pages for a GEM object
- * @obj: obj in question
- * @pages: pages to free
- */
-void _drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
-                bool dirty, bool accessed)
-{
-        int i, npages;
-
-        npages = obj->size >> PAGE_SHIFT;
-
-        for (i = 0; i < npages; i++) {
-                if (dirty)
-                        set_page_dirty(pages[i]);
-
-                if (accessed)
-                        mark_page_accessed(pages[i]);
-
-                /* Undo the reference we took when populating the table */
-                page_cache_release(pages[i]);
-        }
-
-        drm_free_large(pages);
-}
-
-int
-_drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
-{
-        struct drm_device *dev = obj->dev;
-        struct drm_gem_mm *mm = dev->mm_private;
-        struct drm_map_list *list;
-        struct drm_local_map *map;
-        int ret = 0;
-
-        /* Set the object up for mmap'ing */
-        list = &obj->map_list;
-        list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
-        if (!list->map)
-                return -ENOMEM;
-
-        map = list->map;
-        map->type = _DRM_GEM;
-        map->size = size;
-        map->handle = obj;
-
-        /* Get a DRM GEM mmap offset allocated... */
-        list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
-                        size / PAGE_SIZE, 0, 0);
-
-        if (!list->file_offset_node) {
-                DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
-                ret = -ENOSPC;
-                goto out_free_list;
-        }
-
-        list->file_offset_node = drm_mm_get_block(list->file_offset_node,
-                        size / PAGE_SIZE, 0);
-        if (!list->file_offset_node) {
-                ret = -ENOMEM;
-                goto out_free_list;
-        }
-
-        list->hash.key = list->file_offset_node->start;
-        ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
-        if (ret) {
-                DRM_ERROR("failed to add to map hash\n");
-                goto out_free_mm;
-        }
-
-        return 0;
-
-out_free_mm:
-        drm_mm_put_block(list->file_offset_node);
-out_free_list:
-        kfree(list->map);
-        list->map = NULL;
-
-        return ret;
-}
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 8d225d7ff4e3..046d5e660c04 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -17,7 +17,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kfifo.h>
+#include "drm_flip_work.h"
 
 #include "omap_drv.h"
 #include "omap_dmm_tiler.h"
@@ -58,26 +58,23 @@ struct omap_plane {
 
         struct omap_drm_irq error_irq;
 
-        /* set of bo's pending unpin until next post_apply() */
-        DECLARE_KFIFO_PTR(unpin_fifo, struct drm_gem_object *);
+        /* for deferring bo unpin's until next post_apply(): */
+        struct drm_flip_work unpin_work;
 
         // XXX maybe get rid of this and handle vblank in crtc too?
         struct callback apply_done_cb;
 };
 
-static void unpin(void *arg, struct drm_gem_object *bo)
+static void unpin_worker(struct drm_flip_work *work, void *val)
 {
-        struct drm_plane *plane = arg;
-        struct omap_plane *omap_plane = to_omap_plane(plane);
+        struct omap_plane *omap_plane =
+                        container_of(work, struct omap_plane, unpin_work);
+        struct drm_device *dev = omap_plane->base.dev;
 
-        if (kfifo_put(&omap_plane->unpin_fifo,
-                        (const struct drm_gem_object **)&bo)) {
-                /* also hold a ref so it isn't free'd while pinned */
-                drm_gem_object_reference(bo);
-        } else {
-                dev_err(plane->dev->dev, "unpin fifo full!\n");
-                omap_gem_put_paddr(bo);
-        }
+        omap_framebuffer_unpin(val);
+        mutex_lock(&dev->mode_config.mutex);
+        drm_framebuffer_unreference(val);
+        mutex_unlock(&dev->mode_config.mutex);
 }
 
 /* update which fb (if any) is pinned for scanout */
@@ -87,23 +84,22 @@ static int update_pin(struct drm_plane *plane, struct drm_framebuffer *fb)
         struct drm_framebuffer *pinned_fb = omap_plane->pinned_fb;
 
         if (pinned_fb != fb) {
-                int ret;
+                int ret = 0;
 
                 DBG("%p -> %p", pinned_fb, fb);
 
-                if (fb)
+                if (fb) {
                         drm_framebuffer_reference(fb);
-
-                ret = omap_framebuffer_replace(pinned_fb, fb, plane, unpin);
+                        ret = omap_framebuffer_pin(fb);
+                }
 
                 if (pinned_fb)
-                        drm_framebuffer_unreference(pinned_fb);
+                        drm_flip_work_queue(&omap_plane->unpin_work, pinned_fb);
 
                 if (ret) {
                         dev_err(plane->dev->dev, "could not swap %p -> %p\n",
                                         omap_plane->pinned_fb, fb);
-                        if (fb)
-                                drm_framebuffer_unreference(fb);
+                        drm_framebuffer_unreference(fb);
                         omap_plane->pinned_fb = NULL;
                         return ret;
                 }
@@ -170,17 +166,14 @@ static void omap_plane_post_apply(struct omap_drm_apply *apply)
         struct omap_plane *omap_plane =
                         container_of(apply, struct omap_plane, apply);
         struct drm_plane *plane = &omap_plane->base;
+        struct omap_drm_private *priv = plane->dev->dev_private;
         struct omap_overlay_info *info = &omap_plane->info;
-        struct drm_gem_object *bo = NULL;
         struct callback cb;
 
         cb = omap_plane->apply_done_cb;
         omap_plane->apply_done_cb.fxn = NULL;
 
-        while (kfifo_get(&omap_plane->unpin_fifo, &bo)) {
-                omap_gem_put_paddr(bo);
-                drm_gem_object_unreference_unlocked(bo);
-        }
+        drm_flip_work_commit(&omap_plane->unpin_work, priv->wq);
 
         if (cb.fxn)
                 cb.fxn(cb.arg);
@@ -277,8 +270,7 @@ static void omap_plane_destroy(struct drm_plane *plane)
         omap_plane_disable(plane);
         drm_plane_cleanup(plane);
 
-        WARN_ON(!kfifo_is_empty(&omap_plane->unpin_fifo));
-        kfifo_free(&omap_plane->unpin_fifo);
+        drm_flip_work_cleanup(&omap_plane->unpin_work);
 
         kfree(omap_plane);
 }
@@ -399,7 +391,8 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         if (!omap_plane)
                 goto fail;
 
-        ret = kfifo_alloc(&omap_plane->unpin_fifo, 16, GFP_KERNEL);
+        ret = drm_flip_work_init(&omap_plane->unpin_work, 16,
+                        "unpin", unpin_worker);
         if (ret) {
                 dev_err(dev->dev, "could not allocate unpin FIFO\n");
                 goto fail;
diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
index 93c2f2cceb51..eb89653a7a17 100644
--- a/drivers/gpu/drm/qxl/qxl_cmd.c
+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
@@ -179,9 +179,10 @@ qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *relea
                               uint32_t type, bool interruptible)
 {
         struct qxl_command cmd;
+        struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
 
         cmd.type = type;
-        cmd.data = qxl_bo_physical_address(qdev, release->bos[0], release->release_offset);
+        cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);
 
         return qxl_ring_push(qdev->command_ring, &cmd, interruptible);
 }
@@ -191,9 +192,10 @@ qxl_push_cursor_ring_release(struct qxl_device *qdev, struct qxl_release *releas
                              uint32_t type, bool interruptible)
 {
         struct qxl_command cmd;
+        struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
 
         cmd.type = type;
-        cmd.data = qxl_bo_physical_address(qdev, release->bos[0], release->release_offset);
+        cmd.data = qxl_bo_physical_address(qdev, to_qxl_bo(entry->tv.bo), release->release_offset);
 
         return qxl_ring_push(qdev->cursor_ring, &cmd, interruptible);
 }
@@ -214,7 +216,6 @@ int qxl_garbage_collect(struct qxl_device *qdev)
         struct qxl_release *release;
         uint64_t id, next_id;
         int i = 0;
-        int ret;
         union qxl_release_info *info;
 
         while (qxl_ring_pop(qdev->release_ring, &id)) {
@@ -224,17 +225,10 @@ int qxl_garbage_collect(struct qxl_device *qdev)
                         if (release == NULL)
                                 break;
 
-                        ret = qxl_release_reserve(qdev, release, false);
-                        if (ret) {
-                                qxl_io_log(qdev, "failed to reserve release on garbage collect %lld\n", id);
-                                DRM_ERROR("failed to reserve release %lld\n", id);
-                        }
-
                         info = qxl_release_map(qdev, release);
                         next_id = info->next;
                         qxl_release_unmap(qdev, release, info);
 
-                        qxl_release_unreserve(qdev, release);
                         QXL_INFO(qdev, "popped %lld, next %lld\n", id,
                                 next_id);
 
@@ -259,27 +253,29 @@ int qxl_garbage_collect(struct qxl_device *qdev)
         return i;
 }
 
-int qxl_alloc_bo_reserved(struct qxl_device *qdev, unsigned long size,
+int qxl_alloc_bo_reserved(struct qxl_device *qdev,
+                          struct qxl_release *release,
+                          unsigned long size,
                           struct qxl_bo **_bo)
 {
         struct qxl_bo *bo;
         int ret;
 
         ret = qxl_bo_create(qdev, size, false /* not kernel - device */,
-                            QXL_GEM_DOMAIN_VRAM, NULL, &bo);
+                            false, QXL_GEM_DOMAIN_VRAM, NULL, &bo);
         if (ret) {
                 DRM_ERROR("failed to allocate VRAM BO\n");
                 return ret;
         }
-        ret = qxl_bo_reserve(bo, false);
-        if (unlikely(ret != 0))
+        ret = qxl_release_list_add(release, bo);
+        if (ret)
                 goto out_unref;
 
         *_bo = bo;
         return 0;
 out_unref:
         qxl_bo_unref(&bo);
-        return 0;
+        return ret;
 }
 
 static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port, bool intr)
@@ -503,6 +499,10 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
         if (ret)
                 return ret;
 
+        ret = qxl_release_reserve_list(release, true);
+        if (ret)
+                return ret;
+
         cmd = (struct qxl_surface_cmd *)qxl_release_map(qdev, release);
         cmd->type = QXL_SURFACE_CMD_CREATE;
         cmd->u.surface_create.format = surf->surf.format;
@@ -524,14 +524,11 @@ int qxl_hw_surface_alloc(struct qxl_device *qdev,
 
         surf->surf_create = release;
 
-        /* no need to add a release to the fence for this bo,
+        /* no need to add a release to the fence for this surface bo,
            since it is only released when we ask to destroy the surface
            and it would never signal otherwise */
-        qxl_fence_releaseable(qdev, release);
-
         qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
-
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
 
         surf->hw_surf_alloc = true;
         spin_lock(&qdev->surf_id_idr_lock);
@@ -573,12 +570,9 @@ int qxl_hw_surface_dealloc(struct qxl_device *qdev,
         cmd->surface_id = id;
         qxl_release_unmap(qdev, release, &cmd->release_info);
 
-        qxl_fence_releaseable(qdev, release);
-
         qxl_push_command_ring_release(qdev, release, QXL_CMD_SURFACE, false);
 
-        qxl_release_unreserve(qdev, release);
-
+        qxl_release_fence_buffer_objects(release);
 
         return 0;
 }
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index f76f5dd7bfc4..835caba026d3 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -179,7 +179,7 @@ static void qxl_crtc_destroy(struct drm_crtc *crtc)
         kfree(qxl_crtc);
 }
 
-static void
+static int
 qxl_hide_cursor(struct qxl_device *qdev)
 {
         struct qxl_release *release;
@@ -188,14 +188,22 @@ qxl_hide_cursor(struct qxl_device *qdev)
 
         ret = qxl_alloc_release_reserved(qdev, sizeof(*cmd), QXL_RELEASE_CURSOR_CMD,
                                          &release, NULL);
+        if (ret)
+                return ret;
+
+        ret = qxl_release_reserve_list(release, true);
+        if (ret) {
+                qxl_release_free(qdev, release);
+                return ret;
+        }
 
         cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);
         cmd->type = QXL_CURSOR_HIDE;
         qxl_release_unmap(qdev, release, &cmd->release_info);
 
-        qxl_fence_releaseable(qdev, release);
         qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+        return 0;
 }
 
 static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
@@ -216,10 +224,8 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
 
         int size = 64*64*4;
         int ret = 0;
-        if (!handle) {
-                qxl_hide_cursor(qdev);
-                return 0;
-        }
+        if (!handle)
+                return qxl_hide_cursor(qdev);
 
         obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
         if (!obj) {
@@ -234,8 +240,9 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
                 goto out_unref;
 
         ret = qxl_bo_pin(user_bo, QXL_GEM_DOMAIN_CPU, NULL);
+        qxl_bo_unreserve(user_bo);
         if (ret)
-                goto out_unreserve;
+                goto out_unref;
 
         ret = qxl_bo_kmap(user_bo, &user_ptr);
         if (ret)
@@ -246,14 +253,20 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
                                          &release, NULL);
         if (ret)
                 goto out_kunmap;
-        ret = qxl_alloc_bo_reserved(qdev, sizeof(struct qxl_cursor) + size,
-                                    &cursor_bo);
+
+        ret = qxl_alloc_bo_reserved(qdev, release, sizeof(struct qxl_cursor) + size,
+                           &cursor_bo);
         if (ret)
                 goto out_free_release;
-        ret = qxl_bo_kmap(cursor_bo, (void **)&cursor);
+
+        ret = qxl_release_reserve_list(release, false);
         if (ret)
                 goto out_free_bo;
 
+        ret = qxl_bo_kmap(cursor_bo, (void **)&cursor);
+        if (ret)
+                goto out_backoff;
+
         cursor->header.unique = 0;
         cursor->header.type = SPICE_CURSOR_TYPE_ALPHA;
         cursor->header.width = 64;
@@ -269,11 +282,7 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
 
         qxl_bo_kunmap(cursor_bo);
 
-        /* finish with the userspace bo */
         qxl_bo_kunmap(user_bo);
-        qxl_bo_unpin(user_bo);
-        qxl_bo_unreserve(user_bo);
-        drm_gem_object_unreference_unlocked(obj);
 
         cmd = (struct qxl_cursor_cmd *)qxl_release_map(qdev, release);
         cmd->type = QXL_CURSOR_SET;
@@ -281,30 +290,35 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
         cmd->u.set.position.y = qcrtc->cur_y;
 
         cmd->u.set.shape = qxl_bo_physical_address(qdev, cursor_bo, 0);
-        qxl_release_add_res(qdev, release, cursor_bo);
 
         cmd->u.set.visible = 1;
         qxl_release_unmap(qdev, release, &cmd->release_info);
 
-        qxl_fence_releaseable(qdev, release);
         qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+
+        /* finish with the userspace bo */
+        ret = qxl_bo_reserve(user_bo, false);
+        if (!ret) {
+                qxl_bo_unpin(user_bo);
+                qxl_bo_unreserve(user_bo);
+        }
+        drm_gem_object_unreference_unlocked(obj);
 
-        qxl_bo_unreserve(cursor_bo);
         qxl_bo_unref(&cursor_bo);
 
         return ret;
+
+out_backoff:
+        qxl_release_backoff_reserve_list(release);
 out_free_bo:
         qxl_bo_unref(&cursor_bo);
 out_free_release:
-        qxl_release_unreserve(qdev, release);
         qxl_release_free(qdev, release);
 out_kunmap:
         qxl_bo_kunmap(user_bo);
 out_unpin:
         qxl_bo_unpin(user_bo);
-out_unreserve:
-        qxl_bo_unreserve(user_bo);
 out_unref:
         drm_gem_object_unreference_unlocked(obj);
         return ret;
@@ -322,6 +336,14 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
 
         ret = qxl_alloc_release_reserved(qdev, sizeof(*cmd), QXL_RELEASE_CURSOR_CMD,
                                    &release, NULL);
+        if (ret)
+                return ret;
+
+        ret = qxl_release_reserve_list(release, true);
+        if (ret) {
+                qxl_release_free(qdev, release);
+                return ret;
+        }
 
         qcrtc->cur_x = x;
         qcrtc->cur_y = y;
@@ -332,9 +354,9 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
         cmd->u.position.y = qcrtc->cur_y;
         qxl_release_unmap(qdev, release, &cmd->release_info);
 
-        qxl_fence_releaseable(qdev, release);
         qxl_push_cursor_ring_release(qdev, release, QXL_CMD_CURSOR, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
index 3c8c3dbf9378..56e1d633875e 100644
--- a/drivers/gpu/drm/qxl/qxl_draw.c
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
@@ -23,25 +23,29 @@
 #include "qxl_drv.h"
 #include "qxl_object.h"
 
+static int alloc_clips(struct qxl_device *qdev,
+                       struct qxl_release *release,
+                       unsigned num_clips,
+                       struct qxl_bo **clips_bo)
+{
+        int size = sizeof(struct qxl_clip_rects) + sizeof(struct qxl_rect) * num_clips;
+
+        return qxl_alloc_bo_reserved(qdev, release, size, clips_bo);
+}
+
 /* returns a pointer to the already allocated qxl_rect array inside
  * the qxl_clip_rects. This is *not* the same as the memory allocated
  * on the device, it is offset to qxl_clip_rects.chunk.data */
 static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
                                               struct qxl_drawable *drawable,
                                               unsigned num_clips,
-                                              struct qxl_bo **clips_bo,
-                                              struct qxl_release *release)
+                                              struct qxl_bo *clips_bo)
 {
         struct qxl_clip_rects *dev_clips;
         int ret;
-        int size = sizeof(*dev_clips) + sizeof(struct qxl_rect) * num_clips;
-        ret = qxl_alloc_bo_reserved(qdev, size, clips_bo);
-        if (ret)
-                return NULL;
 
-        ret = qxl_bo_kmap(*clips_bo, (void **)&dev_clips);
+        ret = qxl_bo_kmap(clips_bo, (void **)&dev_clips);
         if (ret) {
-                qxl_bo_unref(clips_bo);
                 return NULL;
         }
         dev_clips->num_rects = num_clips;
@@ -52,20 +56,34 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
 }
 
 static int
+alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
+{
+        int ret;
+        ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
+                                         QXL_RELEASE_DRAWABLE, release,
+                                         NULL);
+        return ret;
+}
+
+static void
+free_drawable(struct qxl_device *qdev, struct qxl_release *release)
+{
+        qxl_release_free(qdev, release);
+}
+
+/* release needs to be reserved at this point */
+static int
 make_drawable(struct qxl_device *qdev, int surface, uint8_t type,
               const struct qxl_rect *rect,
-              struct qxl_release **release)
+              struct qxl_release *release)
 {
         struct qxl_drawable *drawable;
-        int i, ret;
+        int i;
 
-        ret = qxl_alloc_release_reserved(qdev, sizeof(*drawable),
-                                         QXL_RELEASE_DRAWABLE, release,
-                                         NULL);
-        if (ret)
-                return ret;
+        drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
+        if (!drawable)
+                return -ENOMEM;
 
-        drawable = (struct qxl_drawable *)qxl_release_map(qdev, *release);
         drawable->type = type;
 
         drawable->surface_id = surface;         /* Only primary for now */
@@ -91,14 +109,23 @@ make_drawable(struct qxl_device *qdev, int surface, uint8_t type,
                 drawable->bbox = *rect;
 
         drawable->mm_time = qdev->rom->mm_clock;
-        qxl_release_unmap(qdev, *release, &drawable->release_info);
+        qxl_release_unmap(qdev, release, &drawable->release_info);
         return 0;
 }
 
-static int qxl_palette_create_1bit(struct qxl_bo **palette_bo,
+static int alloc_palette_object(struct qxl_device *qdev,
+                                struct qxl_release *release,
+                                struct qxl_bo **palette_bo)
+{
+        return qxl_alloc_bo_reserved(qdev, release,
+                                     sizeof(struct qxl_palette) + sizeof(uint32_t) * 2,
+                                     palette_bo);
+}
+
+static int qxl_palette_create_1bit(struct qxl_bo *palette_bo,
+                                   struct qxl_release *release,
                                    const struct qxl_fb_image *qxl_fb_image)
 {
-        struct qxl_device *qdev = qxl_fb_image->qdev;
         const struct fb_image *fb_image = &qxl_fb_image->fb_image;
         uint32_t visual = qxl_fb_image->visual;
         const uint32_t *pseudo_palette = qxl_fb_image->pseudo_palette;
@@ -108,12 +135,7 @@ static int qxl_palette_create_1bit(struct qxl_bo **palette_bo,
         static uint64_t unique; /* we make no attempt to actually set this
                                  * correctly globaly, since that would require
                                  * tracking all of our palettes. */
-
-        ret = qxl_alloc_bo_reserved(qdev,
-                                    sizeof(struct qxl_palette) + sizeof(uint32_t) * 2,
-                                    palette_bo);
-
-        ret = qxl_bo_kmap(*palette_bo, (void **)&pal);
+        ret = qxl_bo_kmap(palette_bo, (void **)&pal);
         pal->num_ents = 2;
         pal->unique = unique++;
         if (visual == FB_VISUAL_TRUECOLOR || visual == FB_VISUAL_DIRECTCOLOR) {
@@ -126,7 +148,7 @@ static int qxl_palette_create_1bit(struct qxl_bo **palette_bo,
         }
         pal->ents[0] = bgcolor;
         pal->ents[1] = fgcolor;
-        qxl_bo_kunmap(*palette_bo);
+        qxl_bo_kunmap(palette_bo);
         return 0;
 }
 
@@ -144,44 +166,63 @@ void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image,
         const char *src = fb_image->data;
         int depth = fb_image->depth;
         struct qxl_release *release;
-        struct qxl_bo *image_bo;
         struct qxl_image *image;
         int ret;
-
+        struct qxl_drm_image *dimage;
+        struct qxl_bo *palette_bo = NULL;
         if (stride == 0)
                 stride = depth * width / 8;
 
+        ret = alloc_drawable(qdev, &release);
+        if (ret)
+                return;
+
+        ret = qxl_image_alloc_objects(qdev, release,
+                                      &dimage,
+                                      height, stride);
+        if (ret)
+                goto out_free_drawable;
+
+        if (depth == 1) {
+                ret = alloc_palette_object(qdev, release, &palette_bo);
+                if (ret)
+                        goto out_free_image;
+        }
+
+        /* do a reservation run over all the objects we just allocated */
+        ret = qxl_release_reserve_list(release, true);
+        if (ret)
+                goto out_free_palette;
+
         rect.left = x;
         rect.right = x + width;
         rect.top = y;
         rect.bottom = y + height;
 
-        ret = make_drawable(qdev, 0, QXL_DRAW_COPY, &rect, &release);
-        if (ret)
-                return;
+        ret = make_drawable(qdev, 0, QXL_DRAW_COPY, &rect, release);
+        if (ret) {
+                qxl_release_backoff_reserve_list(release);
+                goto out_free_palette;
+        }
 
-        ret = qxl_image_create(qdev, release, &image_bo,
-                               (const uint8_t *)src, 0, 0,
-                               width, height, depth, stride);
+        ret = qxl_image_init(qdev, release, dimage,
+                             (const uint8_t *)src, 0, 0,
+                             width, height, depth, stride);
         if (ret) {
-                qxl_release_unreserve(qdev, release);
+                qxl_release_backoff_reserve_list(release);
                 qxl_release_free(qdev, release);
                 return;
         }
 
         if (depth == 1) {
-                struct qxl_bo *palette_bo;
                 void *ptr;
-                ret = qxl_palette_create_1bit(&palette_bo, qxl_fb_image);
-                qxl_release_add_res(qdev, release, palette_bo);
+                ret = qxl_palette_create_1bit(palette_bo, release, qxl_fb_image);
 
-                ptr = qxl_bo_kmap_atomic_page(qdev, image_bo, 0);
+                ptr = qxl_bo_kmap_atomic_page(qdev, dimage->bo, 0);
                 image = ptr;
                 image->u.bitmap.palette =
                         qxl_bo_physical_address(qdev, palette_bo, 0);
-                qxl_bo_kunmap_atomic_page(qdev, image_bo, ptr);
-                qxl_bo_unreserve(palette_bo);
-                qxl_bo_unref(&palette_bo);
+                qxl_bo_kunmap_atomic_page(qdev, dimage->bo, ptr);
         }
 
         drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
@@ -199,16 +240,20 @@ void qxl_draw_opaque_fb(const struct qxl_fb_image *qxl_fb_image,
         drawable->u.copy.mask.bitmap = 0;
 
         drawable->u.copy.src_bitmap =
-                qxl_bo_physical_address(qdev, image_bo, 0);
+                qxl_bo_physical_address(qdev, dimage->bo, 0);
         qxl_release_unmap(qdev, release, &drawable->release_info);
 
-        qxl_release_add_res(qdev, release, image_bo);
-        qxl_bo_unreserve(image_bo);
-        qxl_bo_unref(&image_bo);
-
-        qxl_fence_releaseable(qdev, release);
         qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+
+out_free_palette:
+        if (palette_bo)
+                qxl_bo_unref(&palette_bo);
+out_free_image:
+        qxl_image_free_objects(qdev, dimage);
+out_free_drawable:
+        if (ret)
+                free_drawable(qdev, release);
 }
 
 /* push a draw command using the given clipping rectangles as
@@ -243,10 +288,14 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
         int depth = qxl_fb->base.bits_per_pixel;
         uint8_t *surface_base;
         struct qxl_release *release;
-        struct qxl_bo *image_bo;
         struct qxl_bo *clips_bo;
+        struct qxl_drm_image *dimage;
         int ret;
 
+        ret = alloc_drawable(qdev, &release);
+        if (ret)
+                return;
+
         left = clips->x1;
         right = clips->x2;
         top = clips->y1;
@@ -263,36 +312,52 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
 
         width = right - left;
         height = bottom - top;
+
+        ret = alloc_clips(qdev, release, num_clips, &clips_bo);
+        if (ret)
+                goto out_free_drawable;
+
+        ret = qxl_image_alloc_objects(qdev, release,
+                                      &dimage,
+                                      height, stride);
+        if (ret)
+                goto out_free_clips;
+
+        /* do a reservation run over all the objects we just allocated */
+        ret = qxl_release_reserve_list(release, true);
+        if (ret)
+                goto out_free_image;
+
         drawable_rect.left = left;
         drawable_rect.right = right;
         drawable_rect.top = top;
         drawable_rect.bottom = bottom;
+
         ret = make_drawable(qdev, 0, QXL_DRAW_COPY, &drawable_rect,
-                            &release);
+                            release);
         if (ret)
-                return;
+                goto out_release_backoff;
 
         ret = qxl_bo_kmap(bo, (void **)&surface_base);
         if (ret)
-                goto out_unref;
+                goto out_release_backoff;
 
-        ret = qxl_image_create(qdev, release, &image_bo, surface_base,
-                               left, top, width, height, depth, stride);
+
+        ret = qxl_image_init(qdev, release, dimage, surface_base,
+                             left, top, width, height, depth, stride);
         qxl_bo_kunmap(bo);
         if (ret)
-                goto out_unref;
+                goto out_release_backoff;
+
+        rects = drawable_set_clipping(qdev, drawable, num_clips, clips_bo);
+        if (!rects)
+                goto out_release_backoff;
 
-        rects = drawable_set_clipping(qdev, drawable, num_clips, &clips_bo, release);
-        if (!rects) {
-                qxl_bo_unref(&image_bo);
-                goto out_unref;
-        }
         drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
 
         drawable->clip.type = SPICE_CLIP_TYPE_RECTS;
         drawable->clip.data = qxl_bo_physical_address(qdev,
                                                       clips_bo, 0);
-        qxl_release_add_res(qdev, release, clips_bo);
 
         drawable->u.copy.src_area.top = 0;
         drawable->u.copy.src_area.bottom = height;
@@ -306,11 +371,9 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
         drawable->u.copy.mask.pos.y = 0;
         drawable->u.copy.mask.bitmap = 0;
 
-        drawable->u.copy.src_bitmap = qxl_bo_physical_address(qdev, image_bo, 0);
+        drawable->u.copy.src_bitmap = qxl_bo_physical_address(qdev, dimage->bo, 0);
         qxl_release_unmap(qdev, release, &drawable->release_info);
-        qxl_release_add_res(qdev, release, image_bo);
-        qxl_bo_unreserve(image_bo);
-        qxl_bo_unref(&image_bo);
+
         clips_ptr = clips;
         for (i = 0; i < num_clips; i++, clips_ptr += inc) {
                 rects[i].left   = clips_ptr->x1;
@@ -319,17 +382,22 @@ void qxl_draw_dirty_fb(struct qxl_device *qdev,
                 rects[i].bottom = clips_ptr->y2;
         }
         qxl_bo_kunmap(clips_bo);
-        qxl_bo_unreserve(clips_bo);
-        qxl_bo_unref(&clips_bo);
 
-        qxl_fence_releaseable(qdev, release);
         qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
-        qxl_release_unreserve(qdev, release);
-        return;
+        qxl_release_fence_buffer_objects(release);
+
+out_release_backoff:
+        if (ret)
+                qxl_release_backoff_reserve_list(release);
+out_free_image:
+        qxl_image_free_objects(qdev, dimage);
+out_free_clips:
+        qxl_bo_unref(&clips_bo);
+out_free_drawable:
+        /* only free drawable on error */
+        if (ret)
+                free_drawable(qdev, release);
 
-out_unref:
-        qxl_release_unreserve(qdev, release);
-        qxl_release_free(qdev, release);
 }
 
 void qxl_draw_copyarea(struct qxl_device *qdev,
@@ -342,22 +410,36 @@ void qxl_draw_copyarea(struct qxl_device *qdev,
         struct qxl_release *release;
         int ret;
 
+        ret = alloc_drawable(qdev, &release);
+        if (ret)
+                return;
+
+        /* do a reservation run over all the objects we just allocated */
+        ret = qxl_release_reserve_list(release, true);
+        if (ret)
+                goto out_free_release;
+
         rect.left = dx;
         rect.top = dy;
         rect.right = dx + width;
         rect.bottom = dy + height;
-        ret = make_drawable(qdev, 0, QXL_COPY_BITS, &rect, &release);
-        if (ret)
-                return;
+        ret = make_drawable(qdev, 0, QXL_COPY_BITS, &rect, release);
+        if (ret) {
+                qxl_release_backoff_reserve_list(release);
+                goto out_free_release;
+        }
 
         drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
         drawable->u.copy_bits.src_pos.x = sx;
         drawable->u.copy_bits.src_pos.y = sy;
-
         qxl_release_unmap(qdev, release, &drawable->release_info);
-        qxl_fence_releaseable(qdev, release);
+
         qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+
+out_free_release:
+        if (ret)
+                free_drawable(qdev, release);
 }
 
 void qxl_draw_fill(struct qxl_draw_fill *qxl_draw_fill_rec)
@@ -370,10 +452,21 @@ void qxl_draw_fill(struct qxl_draw_fill *qxl_draw_fill_rec)
         struct qxl_release *release;
         int ret;
 
-        ret = make_drawable(qdev, 0, QXL_DRAW_FILL, &rect, &release);
+        ret = alloc_drawable(qdev, &release);
         if (ret)
                 return;
 
+        /* do a reservation run over all the objects we just allocated */
+        ret = qxl_release_reserve_list(release, true);
+        if (ret)
+                goto out_free_release;
+
+        ret = make_drawable(qdev, 0, QXL_DRAW_FILL, &rect, release);
+        if (ret) {
+                qxl_release_backoff_reserve_list(release);
+                goto out_free_release;
+        }
+
         drawable = (struct qxl_drawable *)qxl_release_map(qdev, release);
         drawable->u.fill.brush.type = SPICE_BRUSH_TYPE_SOLID;
         drawable->u.fill.brush.u.color = color;
@@ -384,7 +477,11 @@ void qxl_draw_fill(struct qxl_draw_fill *qxl_draw_fill_rec)
         drawable->u.fill.mask.bitmap = 0;
 
         qxl_release_unmap(qdev, release, &drawable->release_info);
-        qxl_fence_releaseable(qdev, release);
+
         qxl_push_command_ring_release(qdev, release, QXL_CMD_DRAW, false);
-        qxl_release_unreserve(qdev, release);
+        qxl_release_fence_buffer_objects(release);
+
+out_free_release:
+        if (ret)
+                free_drawable(qdev, release);
 }
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c
index df0b577a6608..514118ae72d4 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@ -84,7 +84,6 @@ static const struct file_operations qxl_fops = {
         .release = drm_release,
         .unlocked_ioctl = drm_ioctl,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .mmap = qxl_mmap,
 };
 
@@ -221,7 +220,7 @@ static struct drm_driver qxl_driver = {
 
         .dumb_create = qxl_mode_dumb_create,
         .dumb_map_offset = qxl_mode_dumb_mmap,
-        .dumb_destroy = qxl_mode_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 #if defined(CONFIG_DEBUG_FS)
         .debugfs_init = qxl_debugfs_init,
         .debugfs_cleanup = qxl_debugfs_takedown,
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index aacb791464a3..f7c9adde46a0 100644
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -42,6 +42,9 @@
 #include <ttm/ttm_placement.h>
 #include <ttm/ttm_module.h>
 
+/* just for ttm_validate_buffer */
+#include <ttm/ttm_execbuf_util.h>
+
 #include <drm/qxl_drm.h>
 #include "qxl_dev.h"
 
@@ -118,9 +121,9 @@ struct qxl_bo {
         uint32_t surface_id;
         struct qxl_fence fence; /* per bo fence  - list of releases */
         struct qxl_release *surf_create;
-        atomic_t reserve_count;
 };
 #define gem_to_qxl_bo(gobj) container_of((gobj), struct qxl_bo, gem_base)
+#define to_qxl_bo(tobj) container_of((tobj), struct qxl_bo, tbo)
 
 struct qxl_gem {
         struct mutex            mutex;
@@ -128,12 +131,7 @@ struct qxl_gem {
 };
 
 struct qxl_bo_list {
-        struct list_head lhead;
-        struct qxl_bo *bo;
-};
-
-struct qxl_reloc_list {
-        struct list_head bos;
+        struct ttm_validate_buffer tv;
 };
 
 struct qxl_crtc {
@@ -195,10 +193,20 @@ enum {
 struct qxl_release {
         int id;
         int type;
-        int bo_count;
         uint32_t release_offset;
         uint32_t surface_release_id;
-        struct qxl_bo *bos[QXL_MAX_RES];
+        struct ww_acquire_ctx ticket;
+        struct list_head bos;
+};
+
+struct qxl_drm_chunk {
+        struct list_head head;
+        struct qxl_bo *bo;
+};
+
+struct qxl_drm_image {
+        struct qxl_bo *bo;
+        struct list_head chunk_list;
 };
 
 struct qxl_fb_image {
@@ -314,12 +322,13 @@ struct qxl_device {
         struct workqueue_struct *gc_queue;
         struct work_struct gc_work;
 
+        struct work_struct fb_work;
 };
 
 /* forward declaration for QXL_INFO_IO */
 void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...);
 
-extern struct drm_ioctl_desc qxl_ioctls[];
+extern const struct drm_ioctl_desc qxl_ioctls[];
 extern int qxl_max_ioctl;
 
 int qxl_driver_load(struct drm_device *dev, unsigned long flags);
@@ -396,9 +405,6 @@ int qxl_gem_object_create(struct qxl_device *qdev, int size,
                           bool discardable, bool kernel,
                           struct qxl_surface *surf,
                           struct drm_gem_object **obj);
-int qxl_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
-                          uint64_t *gpu_addr);
-void qxl_gem_object_unpin(struct drm_gem_object *obj);
 int qxl_gem_object_create_with_handle(struct qxl_device *qdev,
                                       struct drm_file *file_priv,
                                       u32 domain,
@@ -418,9 +424,6 @@ int qxl_bo_kmap(struct qxl_bo *bo, void **ptr);
 int qxl_mode_dumb_create(struct drm_file *file_priv,
                          struct drm_device *dev,
                          struct drm_mode_create_dumb *args);
-int qxl_mode_dumb_destroy(struct drm_file *file_priv,
-                          struct drm_device *dev,
-                          uint32_t handle);
 int qxl_mode_dumb_mmap(struct drm_file *filp,
                        struct drm_device *dev,
                        uint32_t handle, uint64_t *offset_p);
@@ -433,12 +436,19 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma);
 
 /* qxl image */
 
-int qxl_image_create(struct qxl_device *qdev,
-                     struct qxl_release *release,
-                     struct qxl_bo **image_bo,
-                     const uint8_t *data,
-                     int x, int y, int width, int height,
-                     int depth, int stride);
+int qxl_image_init(struct qxl_device *qdev,
+                   struct qxl_release *release,
+                   struct qxl_drm_image *dimage,
+                   const uint8_t *data,
+                   int x, int y, int width, int height,
+                   int depth, int stride);
+int
+qxl_image_alloc_objects(struct qxl_device *qdev,
+                        struct qxl_release *release,
+                        struct qxl_drm_image **image_ptr,
+                        int height, int stride);
+void qxl_image_free_objects(struct qxl_device *qdev, struct qxl_drm_image *dimage);
+
 void qxl_update_screen(struct qxl_device *qxl);
 
 /* qxl io operations (qxl_cmd.c) */
@@ -459,20 +469,15 @@ int qxl_ring_push(struct qxl_ring *ring, const void *new_elt, bool interruptible
 void qxl_io_flush_release(struct qxl_device *qdev);
 void qxl_io_flush_surfaces(struct qxl_device *qdev);
 
-int qxl_release_reserve(struct qxl_device *qdev,
-                        struct qxl_release *release, bool no_wait);
-void qxl_release_unreserve(struct qxl_device *qdev,
-                           struct qxl_release *release);
 union qxl_release_info *qxl_release_map(struct qxl_device *qdev,
                                         struct qxl_release *release);
 void qxl_release_unmap(struct qxl_device *qdev,
                        struct qxl_release *release,
                        union qxl_release_info *info);
-/*
- * qxl_bo_add_resource.
- *
- */
-void qxl_bo_add_resource(struct qxl_bo *main_bo, struct qxl_bo *resource);
+int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo);
+int qxl_release_reserve_list(struct qxl_release *release, bool no_intr);
+void qxl_release_backoff_reserve_list(struct qxl_release *release);
+void qxl_release_fence_buffer_objects(struct qxl_release *release);
 
 int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
                                        enum qxl_surface_cmd_type surface_cmd_type,
@@ -481,15 +486,16 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
 int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
                                int type, struct qxl_release **release,
                                struct qxl_bo **rbo);
-int qxl_fence_releaseable(struct qxl_device *qdev,
-                          struct qxl_release *release);
+
 int
 qxl_push_command_ring_release(struct qxl_device *qdev, struct qxl_release *release,
                               uint32_t type, bool interruptible);
 int
 qxl_push_cursor_ring_release(struct qxl_device *qdev, struct qxl_release *release,
                              uint32_t type, bool interruptible);
-int qxl_alloc_bo_reserved(struct qxl_device *qdev, unsigned long size,
+int qxl_alloc_bo_reserved(struct qxl_device *qdev,
+                          struct qxl_release *release,
+                          unsigned long size,
                           struct qxl_bo **_bo);
 /* qxl drawing commands */
 
@@ -510,15 +516,9 @@ void qxl_draw_copyarea(struct qxl_device *qdev,
                        u32 sx, u32 sy,
                        u32 dx, u32 dy);
 
-uint64_t
-qxl_release_alloc(struct qxl_device *qdev, int type,
-                  struct qxl_release **ret);
-
 void qxl_release_free(struct qxl_device *qdev,
                       struct qxl_release *release);
-void qxl_release_add_res(struct qxl_device *qdev,
-                         struct qxl_release *release,
-                         struct qxl_bo *bo);
+
 /* used by qxl_debugfs_release */
 struct qxl_release *qxl_release_from_id_locked(struct qxl_device *qdev,
                                                    uint64_t id);
@@ -561,7 +561,7 @@ void qxl_surface_evict(struct qxl_device *qdev, struct qxl_bo *surf, bool freein
 int qxl_update_surface(struct qxl_device *qdev, struct qxl_bo *surf);
 
 /* qxl_fence.c */
-int qxl_fence_add_release(struct qxl_fence *qfence, uint32_t rel_id);
+void qxl_fence_add_release_locked(struct qxl_fence *qfence, uint32_t rel_id);
 int qxl_fence_remove_release(struct qxl_fence *qfence, uint32_t rel_id);
 int qxl_fence_init(struct qxl_device *qdev, struct qxl_fence *qfence);
 void qxl_fence_fini(struct qxl_fence *qfence);
diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c
index 847c4ee798f7..d34bb4130ff0 100644
--- a/drivers/gpu/drm/qxl/qxl_dumb.c
+++ b/drivers/gpu/drm/qxl/qxl_dumb.c
@@ -68,13 +68,6 @@ int qxl_mode_dumb_create(struct drm_file *file_priv,
         return 0;
 }
 
-int qxl_mode_dumb_destroy(struct drm_file *file_priv,
-                             struct drm_device *dev,
-                             uint32_t handle)
-{
-        return drm_gem_handle_delete(file_priv, handle);
-}
-
 int qxl_mode_dumb_mmap(struct drm_file *file_priv,
                        struct drm_device *dev,
                        uint32_t handle, uint64_t *offset_p)
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 76f39d88d684..88722f233430 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -37,12 +37,29 @@
 
 #define QXL_DIRTY_DELAY (HZ / 30)
 
+#define QXL_FB_OP_FILLRECT 1
+#define QXL_FB_OP_COPYAREA 2
+#define QXL_FB_OP_IMAGEBLIT 3
+
+struct qxl_fb_op {
+        struct list_head head;
+        int op_type;
+        union {
+                struct fb_fillrect fr;
+                struct fb_copyarea ca;
+                struct fb_image ib;
+        } op;
+        void *img_data;
+};
+
 struct qxl_fbdev {
         struct drm_fb_helper helper;
         struct qxl_framebuffer  qfb;
         struct list_head        fbdev_list;
         struct qxl_device       *qdev;
 
+        spinlock_t delayed_ops_lock;
+        struct list_head delayed_ops;
         void *shadow;
         int size;
 
@@ -164,8 +181,69 @@ static struct fb_deferred_io qxl_defio = {
         .deferred_io    = qxl_deferred_io,
 };
 
-static void qxl_fb_fillrect(struct fb_info *info,
-                            const struct fb_fillrect *fb_rect)
+static void qxl_fb_delayed_fillrect(struct qxl_fbdev *qfbdev,
+                                    const struct fb_fillrect *fb_rect)
+{
+        struct qxl_fb_op *op;
+        unsigned long flags;
+
+        op = kmalloc(sizeof(struct qxl_fb_op), GFP_ATOMIC | __GFP_NOWARN);
+        if (!op)
+                return;
+
+        op->op.fr = *fb_rect;
+        op->img_data = NULL;
+        op->op_type = QXL_FB_OP_FILLRECT;
+
+        spin_lock_irqsave(&qfbdev->delayed_ops_lock, flags);
+        list_add_tail(&op->head, &qfbdev->delayed_ops);
+        spin_unlock_irqrestore(&qfbdev->delayed_ops_lock, flags);
+}
+
+static void qxl_fb_delayed_copyarea(struct qxl_fbdev *qfbdev,
+                                    const struct fb_copyarea *fb_copy)
+{
+        struct qxl_fb_op *op;
+        unsigned long flags;
+
+        op = kmalloc(sizeof(struct qxl_fb_op), GFP_ATOMIC | __GFP_NOWARN);
+        if (!op)
+                return;
+
+        op->op.ca = *fb_copy;
+        op->img_data = NULL;
+        op->op_type = QXL_FB_OP_COPYAREA;
+
+        spin_lock_irqsave(&qfbdev->delayed_ops_lock, flags);
+        list_add_tail(&op->head, &qfbdev->delayed_ops);
+        spin_unlock_irqrestore(&qfbdev->delayed_ops_lock, flags);
+}
+
+static void qxl_fb_delayed_imageblit(struct qxl_fbdev *qfbdev,
+                                     const struct fb_image *fb_image)
+{
+        struct qxl_fb_op *op;
+        unsigned long flags;
+        uint32_t size = fb_image->width * fb_image->height * (fb_image->depth >= 8 ? fb_image->depth / 8 : 1);
+
+        op = kmalloc(sizeof(struct qxl_fb_op) + size, GFP_ATOMIC | __GFP_NOWARN);
+        if (!op)
+                return;
+
+        op->op.ib = *fb_image;
+        op->img_data = (void *)(op + 1);
+        op->op_type = QXL_FB_OP_IMAGEBLIT;
+
+        memcpy(op->img_data, fb_image->data, size);
+
+        op->op.ib.data = op->img_data;
+        spin_lock_irqsave(&qfbdev->delayed_ops_lock, flags);
+        list_add_tail(&op->head, &qfbdev->delayed_ops);
+        spin_unlock_irqrestore(&qfbdev->delayed_ops_lock, flags);
+}
+
+static void qxl_fb_fillrect_internal(struct fb_info *info,
+                                     const struct fb_fillrect *fb_rect)
 {
         struct qxl_fbdev *qfbdev = info->par;
         struct qxl_device *qdev = qfbdev->qdev;
@@ -203,17 +281,28 @@ static void qxl_fb_fillrect(struct fb_info *info,
         qxl_draw_fill_rec.rect = rect;
         qxl_draw_fill_rec.color = color;
         qxl_draw_fill_rec.rop = rop;
+
+        qxl_draw_fill(&qxl_draw_fill_rec);
+}
+
+static void qxl_fb_fillrect(struct fb_info *info,
+                            const struct fb_fillrect *fb_rect)
+{
+        struct qxl_fbdev *qfbdev = info->par;
+        struct qxl_device *qdev = qfbdev->qdev;
+
         if (!drm_can_sleep()) {
-                qxl_io_log(qdev,
-                        "%s: TODO use RCU, mysterious locks with spin_lock\n",
-                        __func__);
+                qxl_fb_delayed_fillrect(qfbdev, fb_rect);
+                schedule_work(&qdev->fb_work);
                 return;
         }
-        qxl_draw_fill(&qxl_draw_fill_rec);
+        /* make sure any previous work is done */
+        flush_work(&qdev->fb_work);
+        qxl_fb_fillrect_internal(info, fb_rect);
 }
 
-static void qxl_fb_copyarea(struct fb_info *info,
-                            const struct fb_copyarea *region)
+static void qxl_fb_copyarea_internal(struct fb_info *info,
+                                     const struct fb_copyarea *region)
 {
         struct qxl_fbdev *qfbdev = info->par;
 
@@ -223,37 +312,89 @@ static void qxl_fb_copyarea(struct fb_info *info,
                           region->dx, region->dy);
 }
 
+static void qxl_fb_copyarea(struct fb_info *info,
+                            const struct fb_copyarea *region)
+{
+        struct qxl_fbdev *qfbdev = info->par;
+        struct qxl_device *qdev = qfbdev->qdev;
+
+        if (!drm_can_sleep()) {
+                qxl_fb_delayed_copyarea(qfbdev, region);
+                schedule_work(&qdev->fb_work);
+                return;
+        }
+        /* make sure any previous work is done */
+        flush_work(&qdev->fb_work);
+        qxl_fb_copyarea_internal(info, region);
+}
+
 static void qxl_fb_imageblit_safe(struct qxl_fb_image *qxl_fb_image)
 {
         qxl_draw_opaque_fb(qxl_fb_image, 0);
 }
 
+static void qxl_fb_imageblit_internal(struct fb_info *info,
+                                      const struct fb_image *image)
+{
+        struct qxl_fbdev *qfbdev = info->par;
+        struct qxl_fb_image qxl_fb_image;
+
+        /* ensure proper order  rendering operations - TODO: must do this
+         * for everything. */
+        qxl_fb_image_init(&qxl_fb_image, qfbdev->qdev, info, image);
+        qxl_fb_imageblit_safe(&qxl_fb_image);
+}
+
 static void qxl_fb_imageblit(struct fb_info *info,
                              const struct fb_image *image)
 {
         struct qxl_fbdev *qfbdev = info->par;
         struct qxl_device *qdev = qfbdev->qdev;
-        struct qxl_fb_image qxl_fb_image;
 
         if (!drm_can_sleep()) {
-                /* we cannot do any ttm_bo allocation since that will fail on
-                 * ioremap_wc..__get_vm_area_node, so queue the work item
-                 * instead This can happen from printk inside an interrupt
-                 * context, i.e.: smp_apic_timer_interrupt..check_cpu_stall */
-                qxl_io_log(qdev,
-                        "%s: TODO use RCU, mysterious locks with spin_lock\n",
-                           __func__);
+                qxl_fb_delayed_imageblit(qfbdev, image);
+                schedule_work(&qdev->fb_work);
                 return;
         }
+        /* make sure any previous work is done */
+        flush_work(&qdev->fb_work);
+        qxl_fb_imageblit_internal(info, image);
+}
 
-        /* ensure proper order of rendering operations - TODO: must do this
-         * for everything. */
-        qxl_fb_image_init(&qxl_fb_image, qfbdev->qdev, info, image);
-        qxl_fb_imageblit_safe(&qxl_fb_image);
+static void qxl_fb_work(struct work_struct *work)
+{
+        struct qxl_device *qdev = container_of(work, struct qxl_device, fb_work);
+        unsigned long flags;
+        struct qxl_fb_op *entry, *tmp;
+        struct qxl_fbdev *qfbdev = qdev->mode_info.qfbdev;
+
+        /* since the irq context just adds entries to the end of the
+           list dropping the lock should be fine, as entry isn't modified
+           in the operation code */
+        spin_lock_irqsave(&qfbdev->delayed_ops_lock, flags);
+        list_for_each_entry_safe(entry, tmp, &qfbdev->delayed_ops, head) {
+                spin_unlock_irqrestore(&qfbdev->delayed_ops_lock, flags);
+                switch (entry->op_type) {
+                case QXL_FB_OP_FILLRECT:
+                        qxl_fb_fillrect_internal(qfbdev->helper.fbdev, &entry->op.fr);
+                        break;
+                case QXL_FB_OP_COPYAREA:
+                        qxl_fb_copyarea_internal(qfbdev->helper.fbdev, &entry->op.ca);
+                        break;
+                case QXL_FB_OP_IMAGEBLIT:
+                        qxl_fb_imageblit_internal(qfbdev->helper.fbdev, &entry->op.ib);
+                        break;
+                }
+                spin_lock_irqsave(&qfbdev->delayed_ops_lock, flags);
+                list_del(&entry->head);
+                kfree(entry);
+        }
+        spin_unlock_irqrestore(&qfbdev->delayed_ops_lock, flags);
 }
 
 int qxl_fb_init(struct qxl_device *qdev)
 {
+        INIT_WORK(&qdev->fb_work, qxl_fb_work);
         return 0;
 }
 
@@ -536,7 +677,8 @@ int qxl_fbdev_init(struct qxl_device *qdev)
         qfbdev->qdev = qdev;
         qdev->mode_info.qfbdev = qfbdev;
         qfbdev->helper.funcs = &qxl_fb_helper_funcs;
-
+        spin_lock_init(&qfbdev->delayed_ops_lock);
+        INIT_LIST_HEAD(&qfbdev->delayed_ops);
         ret = drm_fb_helper_init(qdev->ddev, &qfbdev->helper,
                                  qxl_num_crtc /* num_crtc - QXL supports just 1 */,
                                  QXLFB_CONN_LIMIT);
diff --git a/drivers/gpu/drm/qxl/qxl_fence.c b/drivers/gpu/drm/qxl/qxl_fence.c
index 63c6715ad385..ae59e91cfb9a 100644
--- a/drivers/gpu/drm/qxl/qxl_fence.c
+++ b/drivers/gpu/drm/qxl/qxl_fence.c
@@ -49,17 +49,11 @@
 
    For some reason every so often qxl hw fails to release, things go wrong.
 */
-
-
-int qxl_fence_add_release(struct qxl_fence *qfence, uint32_t rel_id)
+/* must be called with the fence lock held */
+void qxl_fence_add_release_locked(struct qxl_fence *qfence, uint32_t rel_id)
 {
-        struct qxl_bo *bo = container_of(qfence, struct qxl_bo, fence);
-
-        spin_lock(&bo->tbo.bdev->fence_lock);
         radix_tree_insert(&qfence->tree, rel_id, qfence);
         qfence->num_active_releases++;
-        spin_unlock(&bo->tbo.bdev->fence_lock);
-        return 0;
 }
 
 int qxl_fence_remove_release(struct qxl_fence *qfence, uint32_t rel_id)
diff --git a/drivers/gpu/drm/qxl/qxl_gem.c b/drivers/gpu/drm/qxl/qxl_gem.c
index a235693aabba..1648e4125af7 100644
--- a/drivers/gpu/drm/qxl/qxl_gem.c
+++ b/drivers/gpu/drm/qxl/qxl_gem.c
@@ -55,7 +55,7 @@ int qxl_gem_object_create(struct qxl_device *qdev, int size,
         /* At least align on page size */
         if (alignment < PAGE_SIZE)
                 alignment = PAGE_SIZE;
-        r = qxl_bo_create(qdev, size, kernel, initial_domain, surf, &qbo);
+        r = qxl_bo_create(qdev, size, kernel, false, initial_domain, surf, &qbo);
         if (r) {
                 if (r != -ERESTARTSYS)
                         DRM_ERROR(
@@ -101,32 +101,6 @@ int qxl_gem_object_create_with_handle(struct qxl_device *qdev,
         return 0;
 }
 
-int qxl_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
-                          uint64_t *gpu_addr)
-{
-        struct qxl_bo *qobj = obj->driver_private;
-        int r;
-
-        r = qxl_bo_reserve(qobj, false);
-        if (unlikely(r != 0))
-                return r;
-        r = qxl_bo_pin(qobj, pin_domain, gpu_addr);
-        qxl_bo_unreserve(qobj);
-        return r;
-}
-
-void qxl_gem_object_unpin(struct drm_gem_object *obj)
-{
-        struct qxl_bo *qobj = obj->driver_private;
-        int r;
-
-        r = qxl_bo_reserve(qobj, false);
-        if (likely(r == 0)) {
-                qxl_bo_unpin(qobj);
-                qxl_bo_unreserve(qobj);
-        }
-}
-
 int qxl_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv)
 {
         return 0;
diff --git a/drivers/gpu/drm/qxl/qxl_image.c b/drivers/gpu/drm/qxl/qxl_image.c
index cf856206996b..7fbcc35e8ad3 100644
--- a/drivers/gpu/drm/qxl/qxl_image.c
+++ b/drivers/gpu/drm/qxl/qxl_image.c
@@ -30,31 +30,100 @@
 #include "qxl_object.h"
 
 static int
-qxl_image_create_helper(struct qxl_device *qdev,
+qxl_allocate_chunk(struct qxl_device *qdev,
+                   struct qxl_release *release,
+                   struct qxl_drm_image *image,
+                   unsigned int chunk_size)
+{
+        struct qxl_drm_chunk *chunk;
+        int ret;
+
+        chunk = kmalloc(sizeof(struct qxl_drm_chunk), GFP_KERNEL);
+        if (!chunk)
+                return -ENOMEM;
+
+        ret = qxl_alloc_bo_reserved(qdev, release, chunk_size, &chunk->bo);
+        if (ret) {
+                kfree(chunk);
+                return ret;
+        }
+
+        list_add_tail(&chunk->head, &image->chunk_list);
+        return 0;
+}
+
+int
+qxl_image_alloc_objects(struct qxl_device *qdev,
                         struct qxl_release *release,
-                        struct qxl_bo **image_bo,
-                        const uint8_t *data,
-                        int width, int height,
-                        int depth, unsigned int hash,
-                        int stride)
+                        struct qxl_drm_image **image_ptr,
+                        int height, int stride)
+{
+        struct qxl_drm_image *image;
+        int ret;
+
+        image = kmalloc(sizeof(struct qxl_drm_image), GFP_KERNEL);
+        if (!image)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&image->chunk_list);
+
+        ret = qxl_alloc_bo_reserved(qdev, release, sizeof(struct qxl_image), &image->bo);
+        if (ret) {
+                kfree(image);
+                return ret;
+        }
+
+        ret = qxl_allocate_chunk(qdev, release, image, sizeof(struct qxl_data_chunk) + stride * height);
+        if (ret) {
+                qxl_bo_unref(&image->bo);
+                kfree(image);
+                return ret;
+        }
+        *image_ptr = image;
+        return 0;
+}
+
+void qxl_image_free_objects(struct qxl_device *qdev, struct qxl_drm_image *dimage)
 {
+        struct qxl_drm_chunk *chunk, *tmp;
+
+        list_for_each_entry_safe(chunk, tmp, &dimage->chunk_list, head) {
+                qxl_bo_unref(&chunk->bo);
+                kfree(chunk);
+        }
+
+        qxl_bo_unref(&dimage->bo);
+        kfree(dimage);
+}
+
+static int
+qxl_image_init_helper(struct qxl_device *qdev,
+                      struct qxl_release *release,
+                      struct qxl_drm_image *dimage,
+                      const uint8_t *data,
+                      int width, int height,
+                      int depth, unsigned int hash,
+                      int stride)
+{
+        struct qxl_drm_chunk *drv_chunk;
         struct qxl_image *image;
         struct qxl_data_chunk *chunk;
         int i;
         int chunk_stride;
         int linesize = width * depth / 8;
-        struct qxl_bo *chunk_bo;
-        int ret;
+        struct qxl_bo *chunk_bo, *image_bo;
         void *ptr;
         /* Chunk */
         /* FIXME: Check integer overflow */
         /* TODO: variable number of chunks */
+
+        drv_chunk = list_first_entry(&dimage->chunk_list, struct qxl_drm_chunk, head);
+
+        chunk_bo = drv_chunk->bo;
         chunk_stride = stride; /* TODO: should use linesize, but it renders
                                   wrong (check the bitmaps are sent correctly
                                   first) */
-        ret = qxl_alloc_bo_reserved(qdev, sizeof(*chunk) + height * chunk_stride,
-                                    &chunk_bo);
-        
+
         ptr = qxl_bo_kmap_atomic_page(qdev, chunk_bo, 0);
         chunk = ptr;
         chunk->data_size = height * chunk_stride;
@@ -102,7 +171,6 @@ qxl_image_create_helper(struct qxl_device *qdev,
                                 while (remain > 0) {
                                         page_base = out_offset & PAGE_MASK;
                                         page_offset = offset_in_page(out_offset);
-                                        
                                         size = min((int)(PAGE_SIZE - page_offset), remain);
 
                                         ptr = qxl_bo_kmap_atomic_page(qdev, chunk_bo, page_base);
@@ -116,14 +184,10 @@ qxl_image_create_helper(struct qxl_device *qdev,
                         }
                 }
         }
-
-
         qxl_bo_kunmap(chunk_bo);
 
-        /* Image */
-        ret = qxl_alloc_bo_reserved(qdev, sizeof(*image), image_bo);
-
-        ptr = qxl_bo_kmap_atomic_page(qdev, *image_bo, 0);
+        image_bo = dimage->bo;
+        ptr = qxl_bo_kmap_atomic_page(qdev, image_bo, 0);
         image = ptr;
 
         image->descriptor.id = 0;
@@ -154,23 +218,20 @@ qxl_image_create_helper(struct qxl_device *qdev,
         image->u.bitmap.stride = chunk_stride;
         image->u.bitmap.palette = 0;
         image->u.bitmap.data = qxl_bo_physical_address(qdev, chunk_bo, 0);
-        qxl_release_add_res(qdev, release, chunk_bo);
-        qxl_bo_unreserve(chunk_bo);
-        qxl_bo_unref(&chunk_bo);
 
-        qxl_bo_kunmap_atomic_page(qdev, *image_bo, ptr);
+        qxl_bo_kunmap_atomic_page(qdev, image_bo, ptr);
 
         return 0;
 }
 
-int qxl_image_create(struct qxl_device *qdev,
+int qxl_image_init(struct qxl_device *qdev,
                      struct qxl_release *release,
-                     struct qxl_bo **image_bo,
+                     struct qxl_drm_image *dimage,
                      const uint8_t *data,
                      int x, int y, int width, int height,
                      int depth, int stride)
 {
         data += y * stride + x * (depth / 8);
-        return qxl_image_create_helper(qdev, release, image_bo, data,
+        return qxl_image_init_helper(qdev, release, dimage, data,
                                        width, height, depth, 0, stride);
 }
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 27f45e49250d..7b95c75e9626 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -68,55 +68,60 @@ static int qxl_map_ioctl(struct drm_device *dev, void *data,
                                   &qxl_map->offset);
 }
 
+struct qxl_reloc_info {
+        int type;
+        struct qxl_bo *dst_bo;
+        uint32_t dst_offset;
+        struct qxl_bo *src_bo;
+        int src_offset;
+};
+
 /*
  * dst must be validated, i.e. whole bo on vram/surfacesram (right now all bo's
  * are on vram).
  * *(dst + dst_off) = qxl_bo_physical_address(src, src_off)
  */
 static void
-apply_reloc(struct qxl_device *qdev, struct qxl_bo *dst, uint64_t dst_off,
-            struct qxl_bo *src, uint64_t src_off)
+apply_reloc(struct qxl_device *qdev, struct qxl_reloc_info *info)
 {
         void *reloc_page;
-
-        reloc_page = qxl_bo_kmap_atomic_page(qdev, dst, dst_off & PAGE_MASK);
-        *(uint64_t *)(reloc_page + (dst_off & ~PAGE_MASK)) = qxl_bo_physical_address(qdev,
-                                                                     src, src_off);
-        qxl_bo_kunmap_atomic_page(qdev, dst, reloc_page);
+        reloc_page = qxl_bo_kmap_atomic_page(qdev, info->dst_bo, info->dst_offset & PAGE_MASK);
+        *(uint64_t *)(reloc_page + (info->dst_offset & ~PAGE_MASK)) = qxl_bo_physical_address(qdev,
+                                                                                              info->src_bo,
+                                                                                              info->src_offset);
+        qxl_bo_kunmap_atomic_page(qdev, info->dst_bo, reloc_page);
 }
 
 static void
-apply_surf_reloc(struct qxl_device *qdev, struct qxl_bo *dst, uint64_t dst_off,
-                 struct qxl_bo *src)
+apply_surf_reloc(struct qxl_device *qdev, struct qxl_reloc_info *info)
 {
         uint32_t id = 0;
         void *reloc_page;
 
-        if (src && !src->is_primary)
-                id = src->surface_id;
+        if (info->src_bo && !info->src_bo->is_primary)
+                id = info->src_bo->surface_id;
 
-        reloc_page = qxl_bo_kmap_atomic_page(qdev, dst, dst_off & PAGE_MASK);
-        *(uint32_t *)(reloc_page + (dst_off & ~PAGE_MASK)) = id;
-        qxl_bo_kunmap_atomic_page(qdev, dst, reloc_page);
+        reloc_page = qxl_bo_kmap_atomic_page(qdev, info->dst_bo, info->dst_offset & PAGE_MASK);
+        *(uint32_t *)(reloc_page + (info->dst_offset & ~PAGE_MASK)) = id;
+        qxl_bo_kunmap_atomic_page(qdev, info->dst_bo, reloc_page);
 }
 
 /* return holding the reference to this object */
 static struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev,
                                          struct drm_file *file_priv, uint64_t handle,
-                                         struct qxl_reloc_list *reloc_list)
+                                         struct qxl_release *release)
 {
         struct drm_gem_object *gobj;
         struct qxl_bo *qobj;
         int ret;
 
         gobj = drm_gem_object_lookup(qdev->ddev, file_priv, handle);
-        if (!gobj) {
-                DRM_ERROR("bad bo handle %lld\n", handle);
+        if (!gobj)
                 return NULL;
-        }
+
         qobj = gem_to_qxl_bo(gobj);
 
-        ret = qxl_bo_list_add(reloc_list, qobj);
+        ret = qxl_release_list_add(release, qobj);
         if (ret)
                 return NULL;
 
@@ -129,151 +134,177 @@ static struct qxl_bo *qxlhw_handle_to_bo(struct qxl_device *qdev,
  * However, the command as passed from user space must *not* contain the initial
  * QXLReleaseInfo struct (first XXX bytes)
  */
-static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
-                                struct drm_file *file_priv)
+static int qxl_process_single_command(struct qxl_device *qdev,
+                                      struct drm_qxl_command *cmd,
+                                      struct drm_file *file_priv)
 {
-        struct qxl_device *qdev = dev->dev_private;
-        struct drm_qxl_execbuffer *execbuffer = data;
-        struct drm_qxl_command user_cmd;
-        int cmd_num;
-        struct qxl_bo *reloc_src_bo;
-        struct qxl_bo *reloc_dst_bo;
-        struct drm_qxl_reloc reloc;
+        struct qxl_reloc_info *reloc_info;
+        int release_type;
+        struct qxl_release *release;
+        struct qxl_bo *cmd_bo;
         void *fb_cmd;
-        int i, ret;
-        struct qxl_reloc_list reloc_list;
+        int i, j, ret, num_relocs;
         int unwritten;
-        uint32_t reloc_dst_offset;
-        INIT_LIST_HEAD(&reloc_list.bos);
 
-        for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
-                struct qxl_release *release;
-                struct qxl_bo *cmd_bo;
-                int release_type;
-                struct drm_qxl_command *commands =
-                        (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
+        switch (cmd->type) {
+        case QXL_CMD_DRAW:
+                release_type = QXL_RELEASE_DRAWABLE;
+                break;
+        case QXL_CMD_SURFACE:
+        case QXL_CMD_CURSOR:
+        default:
+                DRM_DEBUG("Only draw commands in execbuffers\n");
+                return -EINVAL;
+                break;
+        }
 
-                if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num],
-                                       sizeof(user_cmd)))
-                        return -EFAULT;
-                switch (user_cmd.type) {
-                case QXL_CMD_DRAW:
-                        release_type = QXL_RELEASE_DRAWABLE;
-                        break;
-                case QXL_CMD_SURFACE:
-                case QXL_CMD_CURSOR:
-                default:
-                        DRM_DEBUG("Only draw commands in execbuffers\n");
-                        return -EINVAL;
-                        break;
-                }
+        if (cmd->command_size > PAGE_SIZE - sizeof(union qxl_release_info))
+                return -EINVAL;
 
-                if (user_cmd.command_size > PAGE_SIZE - sizeof(union qxl_release_info))
-                        return -EINVAL;
+        if (!access_ok(VERIFY_READ,
+                       (void *)(unsigned long)cmd->command,
+                       cmd->command_size))
+                return -EFAULT;
 
-                if (!access_ok(VERIFY_READ,
-                               (void *)(unsigned long)user_cmd.command,
-                               user_cmd.command_size))
-                        return -EFAULT;
+        reloc_info = kmalloc(sizeof(struct qxl_reloc_info) * cmd->relocs_num, GFP_KERNEL);
+        if (!reloc_info)
+                return -ENOMEM;
 
-                ret = qxl_alloc_release_reserved(qdev,
-                                                 sizeof(union qxl_release_info) +
-                                                 user_cmd.command_size,
-                                                 release_type,
-                                                 &release,
-                                                 &cmd_bo);
-                if (ret)
-                        return ret;
+        ret = qxl_alloc_release_reserved(qdev,
+                                         sizeof(union qxl_release_info) +
+                                         cmd->command_size,
+                                         release_type,
+                                         &release,
+                                         &cmd_bo);
+        if (ret)
+                goto out_free_reloc;
 
-                /* TODO copy slow path code from i915 */
-                fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
-                unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)user_cmd.command, user_cmd.command_size);
+        /* TODO copy slow path code from i915 */
+        fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
+        unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size);
 
-                {
-                        struct qxl_drawable *draw = fb_cmd;
+        {
+                struct qxl_drawable *draw = fb_cmd;
+                draw->mm_time = qdev->rom->mm_clock;
+        }
 
-                        draw->mm_time = qdev->rom->mm_clock;
-                }
-                qxl_bo_kunmap_atomic_page(qdev, cmd_bo, fb_cmd);
-                if (unwritten) {
-                        DRM_ERROR("got unwritten %d\n", unwritten);
-                        qxl_release_unreserve(qdev, release);
-                        qxl_release_free(qdev, release);
-                        return -EFAULT;
+        qxl_bo_kunmap_atomic_page(qdev, cmd_bo, fb_cmd);
+        if (unwritten) {
+                DRM_ERROR("got unwritten %d\n", unwritten);
+                ret = -EFAULT;
+                goto out_free_release;
+        }
+
+        /* fill out reloc info structs */
+        num_relocs = 0;
+        for (i = 0; i < cmd->relocs_num; ++i) {
+                struct drm_qxl_reloc reloc;
+
+                if (DRM_COPY_FROM_USER(&reloc,
+                                       &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
+                                       sizeof(reloc))) {
+                        ret = -EFAULT;
+                        goto out_free_bos;
                 }
 
-                for (i = 0 ; i < user_cmd.relocs_num; ++i) {
-                        if (DRM_COPY_FROM_USER(&reloc,
-                                               &((struct drm_qxl_reloc *)(uintptr_t)user_cmd.relocs)[i],
-                                               sizeof(reloc))) {
-                                qxl_bo_list_unreserve(&reloc_list, true);
-                                qxl_release_unreserve(qdev, release);
-                                qxl_release_free(qdev, release);
-                                return -EFAULT;
-                        }
+                /* add the bos to the list of bos to validate -
+                   need to validate first then process relocs? */
+                if (reloc.reloc_type != QXL_RELOC_TYPE_BO && reloc.reloc_type != QXL_RELOC_TYPE_SURF) {
+                        DRM_DEBUG("unknown reloc type %d\n", reloc_info[i].type);
 
-                        /* add the bos to the list of bos to validate -
-                           need to validate first then process relocs? */
-                        if (reloc.dst_handle) {
-                                reloc_dst_bo = qxlhw_handle_to_bo(qdev, file_priv,
-                                                                  reloc.dst_handle, &reloc_list);
-                                if (!reloc_dst_bo) {
-                                        qxl_bo_list_unreserve(&reloc_list, true);
-                                        qxl_release_unreserve(qdev, release);
-                                        qxl_release_free(qdev, release);
-                                        return -EINVAL;
-                                }
-                                reloc_dst_offset = 0;
-                        } else {
-                                reloc_dst_bo = cmd_bo;
-                                reloc_dst_offset = release->release_offset;
+                        ret = -EINVAL;
+                        goto out_free_bos;
+                }
+                reloc_info[i].type = reloc.reloc_type;
+
+                if (reloc.dst_handle) {
+                        reloc_info[i].dst_bo = qxlhw_handle_to_bo(qdev, file_priv,
+                                                                  reloc.dst_handle, release);
+                        if (!reloc_info[i].dst_bo) {
+                                ret = -EINVAL;
+                                reloc_info[i].src_bo = NULL;
+                                goto out_free_bos;
                         }
-
-                        /* reserve and validate the reloc dst bo */
-                        if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle > 0) {
-                                reloc_src_bo =
-                                        qxlhw_handle_to_bo(qdev, file_priv,
-                                                           reloc.src_handle, &reloc_list);
-                                if (!reloc_src_bo) {
-                                        if (reloc_dst_bo != cmd_bo)
-                                                drm_gem_object_unreference_unlocked(&reloc_dst_bo->gem_base);
-                                        qxl_bo_list_unreserve(&reloc_list, true);
-                                        qxl_release_unreserve(qdev, release);
-                                        qxl_release_free(qdev, release);
-                                        return -EINVAL;
-                                }
-                        } else
-                                reloc_src_bo = NULL;
-                        if (reloc.reloc_type == QXL_RELOC_TYPE_BO) {
-                                apply_reloc(qdev, reloc_dst_bo, reloc_dst_offset + reloc.dst_offset,
-                                            reloc_src_bo, reloc.src_offset);
-                        } else if (reloc.reloc_type == QXL_RELOC_TYPE_SURF) {
-                                apply_surf_reloc(qdev, reloc_dst_bo, reloc_dst_offset + reloc.dst_offset, reloc_src_bo);
-                        } else {
-                                DRM_ERROR("unknown reloc type %d\n", reloc.reloc_type);
-                                return -EINVAL;
+                        reloc_info[i].dst_offset = reloc.dst_offset;
+                } else {
+                        reloc_info[i].dst_bo = cmd_bo;
+                        reloc_info[i].dst_offset = reloc.dst_offset + release->release_offset;
+                }
+                num_relocs++;
+
+                /* reserve and validate the reloc dst bo */
+                if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle > 0) {
+                        reloc_info[i].src_bo =
+                                qxlhw_handle_to_bo(qdev, file_priv,
+                                                   reloc.src_handle, release);
+                        if (!reloc_info[i].src_bo) {
+                                if (reloc_info[i].dst_bo != cmd_bo)
+                                        drm_gem_object_unreference_unlocked(&reloc_info[i].dst_bo->gem_base);
+                                ret = -EINVAL;
+                                goto out_free_bos;
                         }
+                        reloc_info[i].src_offset = reloc.src_offset;
+                } else {
+                        reloc_info[i].src_bo = NULL;
+                        reloc_info[i].src_offset = 0;
+                }
+        }
 
-                        if (reloc_src_bo && reloc_src_bo != cmd_bo) {
-                                qxl_release_add_res(qdev, release, reloc_src_bo);
-                                drm_gem_object_unreference_unlocked(&reloc_src_bo->gem_base);
-                        }
+        /* validate all buffers */
+        ret = qxl_release_reserve_list(release, false);
+        if (ret)
+                goto out_free_bos;
 
-                        if (reloc_dst_bo != cmd_bo)
-                                drm_gem_object_unreference_unlocked(&reloc_dst_bo->gem_base);
-                }
-                qxl_fence_releaseable(qdev, release);
+        for (i = 0; i < cmd->relocs_num; ++i) {
+                if (reloc_info[i].type == QXL_RELOC_TYPE_BO)
+                        apply_reloc(qdev, &reloc_info[i]);
+                else if (reloc_info[i].type == QXL_RELOC_TYPE_SURF)
+                        apply_surf_reloc(qdev, &reloc_info[i]);
+        }
 
-                ret = qxl_push_command_ring_release(qdev, release, user_cmd.type, true);
-                if (ret == -ERESTARTSYS) {
-                        qxl_release_unreserve(qdev, release);
-                        qxl_release_free(qdev, release);
-                        qxl_bo_list_unreserve(&reloc_list, true);
+        ret = qxl_push_command_ring_release(qdev, release, cmd->type, true);
+        if (ret)
+                qxl_release_backoff_reserve_list(release);
+        else
+                qxl_release_fence_buffer_objects(release);
+
+out_free_bos:
+        for (j = 0; j < num_relocs; j++) {
+                if (reloc_info[j].dst_bo != cmd_bo)
+                        drm_gem_object_unreference_unlocked(&reloc_info[j].dst_bo->gem_base);
+                if (reloc_info[j].src_bo && reloc_info[j].src_bo != cmd_bo)
+                        drm_gem_object_unreference_unlocked(&reloc_info[j].src_bo->gem_base);
+        }
+out_free_release:
+        if (ret)
+                qxl_release_free(qdev, release);
+out_free_reloc:
+        kfree(reloc_info);
+        return ret;
+}
+
+static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
+                                struct drm_file *file_priv)
+{
+        struct qxl_device *qdev = dev->dev_private;
+        struct drm_qxl_execbuffer *execbuffer = data;
+        struct drm_qxl_command user_cmd;
+        int cmd_num;
+        int ret;
+
+        for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
+
+                struct drm_qxl_command *commands =
+                        (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
+
+                if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num],
+                                       sizeof(user_cmd)))
+                        return -EFAULT;
+
+                ret = qxl_process_single_command(qdev, &user_cmd, file_priv);
+                if (ret)
                         return ret;
-                }
-                qxl_release_unreserve(qdev, release);
         }
-        qxl_bo_list_unreserve(&reloc_list, 0);
         return 0;
 }
 
@@ -305,7 +336,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,
                 goto out;
 
         if (!qobj->pin_count) {
-                qxl_ttm_placement_from_domain(qobj, qobj->type);
+                qxl_ttm_placement_from_domain(qobj, qobj->type, false);
                 ret = ttm_bo_validate(&qobj->tbo, &qobj->placement,
                                       true, false);
                 if (unlikely(ret))
@@ -402,7 +433,7 @@ static int qxl_alloc_surf_ioctl(struct drm_device *dev, void *data,
         return ret;
 }
 
-struct drm_ioctl_desc qxl_ioctls[] = {
+const struct drm_ioctl_desc qxl_ioctls[] = {
         DRM_IOCTL_DEF_DRV(QXL_ALLOC, qxl_alloc_ioctl, DRM_AUTH|DRM_UNLOCKED),
 
         DRM_IOCTL_DEF_DRV(QXL_MAP, qxl_map_ioctl, DRM_AUTH|DRM_UNLOCKED),
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 1191fe7788c9..8691c76c5ef0 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -51,20 +51,21 @@ bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo)
         return false;
 }
 
-void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain)
+void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned)
 {
         u32 c = 0;
+        u32 pflag = pinned ? TTM_PL_FLAG_NO_EVICT : 0;
 
         qbo->placement.fpfn = 0;
         qbo->placement.lpfn = 0;
         qbo->placement.placement = qbo->placements;
         qbo->placement.busy_placement = qbo->placements;
         if (domain == QXL_GEM_DOMAIN_VRAM)
-                qbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_VRAM;
+                qbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_VRAM | pflag;
         if (domain == QXL_GEM_DOMAIN_SURFACE)
-                qbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_PRIV0;
+                qbo->placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_PRIV0 | pflag;
         if (domain == QXL_GEM_DOMAIN_CPU)
-                qbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+                qbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM | pflag;
         if (!c)
                 qbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
         qbo->placement.num_placement = c;
@@ -73,7 +74,7 @@ void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain)
 
 
 int qxl_bo_create(struct qxl_device *qdev,
-                  unsigned long size, bool kernel, u32 domain,
+                  unsigned long size, bool kernel, bool pinned, u32 domain,
                   struct qxl_surface *surf,
                   struct qxl_bo **bo_ptr)
 {
@@ -97,17 +98,16 @@ int qxl_bo_create(struct qxl_device *qdev,
                 kfree(bo);
                 return r;
         }
-        bo->gem_base.driver_private = NULL;
         bo->type = domain;
-        bo->pin_count = 0;
+        bo->pin_count = pinned ? 1 : 0;
         bo->surface_id = 0;
         qxl_fence_init(qdev, &bo->fence);
         INIT_LIST_HEAD(&bo->list);
-        atomic_set(&bo->reserve_count, 0);
+
         if (surf)
                 bo->surf = *surf;
 
-        qxl_ttm_placement_from_domain(bo, domain);
+        qxl_ttm_placement_from_domain(bo, domain, pinned);
 
         r = ttm_bo_init(&qdev->mman.bdev, &bo->tbo, size, type,
                         &bo->placement, 0, !kernel, NULL, size,
@@ -228,7 +228,7 @@ struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo)
 int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr)
 {
         struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private;
-        int r, i;
+        int r;
 
         if (bo->pin_count) {
                 bo->pin_count++;
@@ -236,9 +236,7 @@ int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr)
                         *gpu_addr = qxl_bo_gpu_offset(bo);
                 return 0;
         }
-        qxl_ttm_placement_from_domain(bo, domain);
-        for (i = 0; i < bo->placement.num_placement; i++)
-                bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+        qxl_ttm_placement_from_domain(bo, domain, true);
         r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
         if (likely(r == 0)) {
                 bo->pin_count = 1;
@@ -317,53 +315,6 @@ int qxl_bo_check_id(struct qxl_device *qdev, struct qxl_bo *bo)
         return 0;
 }
 
-void qxl_bo_list_unreserve(struct qxl_reloc_list *reloc_list, bool failed)
-{
-        struct qxl_bo_list *entry, *sf;
-
-        list_for_each_entry_safe(entry, sf, &reloc_list->bos, lhead) {
-                qxl_bo_unreserve(entry->bo);
-                list_del(&entry->lhead);
-                kfree(entry);
-        }
-}
-
-int qxl_bo_list_add(struct qxl_reloc_list *reloc_list, struct qxl_bo *bo)
-{
-        struct qxl_bo_list *entry;
-        int ret;
-
-        list_for_each_entry(entry, &reloc_list->bos, lhead) {
-                if (entry->bo == bo)
-                        return 0;
-        }
-
-        entry = kmalloc(sizeof(struct qxl_bo_list), GFP_KERNEL);
-        if (!entry)
-                return -ENOMEM;
-
-        entry->bo = bo;
-        list_add(&entry->lhead, &reloc_list->bos);
-
-        ret = qxl_bo_reserve(bo, false);
-        if (ret)
-                return ret;
-
-        if (!bo->pin_count) {
-                qxl_ttm_placement_from_domain(bo, bo->type);
-                ret = ttm_bo_validate(&bo->tbo, &bo->placement,
-                                      true, false);
-                if (ret)
-                        return ret;
-        }
-
-        /* allocate a surface for reserved + validated buffers */
-        ret = qxl_bo_check_id(bo->gem_base.dev->dev_private, bo);
-        if (ret)
-                return ret;
-        return 0;
-}
-
 int qxl_surf_evict(struct qxl_device *qdev)
 {
         return ttm_bo_evict_mm(&qdev->mman.bdev, TTM_PL_PRIV0);
diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h
index ee7ad79ce781..d458a140c024 100644
--- a/drivers/gpu/drm/qxl/qxl_object.h
+++ b/drivers/gpu/drm/qxl/qxl_object.h
@@ -59,7 +59,7 @@ static inline unsigned long qxl_bo_size(struct qxl_bo *bo)
 
 static inline u64 qxl_bo_mmap_offset(struct qxl_bo *bo)
 {
-        return bo->tbo.addr_space_offset;
+        return drm_vma_node_offset_addr(&bo->tbo.vma_node);
 }
 
 static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type,
@@ -88,7 +88,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type,
 
 extern int qxl_bo_create(struct qxl_device *qdev,
                          unsigned long size,
-                         bool kernel, u32 domain,
+                         bool kernel, bool pinned, u32 domain,
                          struct qxl_surface *surf,
                          struct qxl_bo **bo_ptr);
 extern int qxl_bo_kmap(struct qxl_bo *bo, void **ptr);
@@ -99,9 +99,7 @@ extern struct qxl_bo *qxl_bo_ref(struct qxl_bo *bo);
 extern void qxl_bo_unref(struct qxl_bo **bo);
 extern int qxl_bo_pin(struct qxl_bo *bo, u32 domain, u64 *gpu_addr);
 extern int qxl_bo_unpin(struct qxl_bo *bo);
-extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain);
+extern void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned);
 extern bool qxl_ttm_bo_is_qxl_bo(struct ttm_buffer_object *bo);
 
-extern int qxl_bo_list_add(struct qxl_reloc_list *reloc_list, struct qxl_bo *bo);
-extern void qxl_bo_list_unreserve(struct qxl_reloc_list *reloc_list, bool failed);
 #endif
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index b443d6751d5f..0109a9644cb2 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -38,7 +38,8 @@
 
 static const int release_size_per_bo[] = { RELEASE_SIZE, SURFACE_RELEASE_SIZE, RELEASE_SIZE };
 static const int releases_per_bo[] = { RELEASES_PER_BO, SURFACE_RELEASES_PER_BO, RELEASES_PER_BO };
-uint64_t
+
+static uint64_t
 qxl_release_alloc(struct qxl_device *qdev, int type,
                   struct qxl_release **ret)
 {
@@ -53,9 +54,9 @@ qxl_release_alloc(struct qxl_device *qdev, int type,
                 return 0;
         }
         release->type = type;
-        release->bo_count = 0;
         release->release_offset = 0;
         release->surface_release_id = 0;
+        INIT_LIST_HEAD(&release->bos);
 
         idr_preload(GFP_KERNEL);
         spin_lock(&qdev->release_idr_lock);
@@ -77,20 +78,20 @@ void
 qxl_release_free(struct qxl_device *qdev,
                  struct qxl_release *release)
 {
-        int i;
-
-        QXL_INFO(qdev, "release %d, type %d, %d bos\n", release->id,
-                 release->type, release->bo_count);
+        struct qxl_bo_list *entry, *tmp;
+        QXL_INFO(qdev, "release %d, type %d\n", release->id,
+                 release->type);
 
         if (release->surface_release_id)
                 qxl_surface_id_dealloc(qdev, release->surface_release_id);
 
-        for (i = 0 ; i < release->bo_count; ++i) {
+        list_for_each_entry_safe(entry, tmp, &release->bos, tv.head) {
+                struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
                 QXL_INFO(qdev, "release %llx\n",
-                        release->bos[i]->tbo.addr_space_offset
+                        drm_vma_node_offset_addr(&entry->tv.bo->vma_node)
                                                 - DRM_FILE_OFFSET);
-                qxl_fence_remove_release(&release->bos[i]->fence, release->id);
-                qxl_bo_unref(&release->bos[i]);
+                qxl_fence_remove_release(&bo->fence, release->id);
+                qxl_bo_unref(&bo);
         }
         spin_lock(&qdev->release_idr_lock);
         idr_remove(&qdev->release_idr, release->id);
@@ -98,83 +99,117 @@ qxl_release_free(struct qxl_device *qdev,
         kfree(release);
 }
 
-void
-qxl_release_add_res(struct qxl_device *qdev, struct qxl_release *release,
-                    struct qxl_bo *bo)
-{
-        int i;
-        for (i = 0; i < release->bo_count; i++)
-                if (release->bos[i] == bo)
-                        return;
-
-        if (release->bo_count >= QXL_MAX_RES) {
-                DRM_ERROR("exceeded max resource on a qxl_release item\n");
-                return;
-        }
-        release->bos[release->bo_count++] = qxl_bo_ref(bo);
-}
-
 static int qxl_release_bo_alloc(struct qxl_device *qdev,
                                 struct qxl_bo **bo)
 {
         int ret;
-        ret = qxl_bo_create(qdev, PAGE_SIZE, false, QXL_GEM_DOMAIN_VRAM, NULL,
+        /* pin releases bo's they are too messy to evict */
+        ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
+                            QXL_GEM_DOMAIN_VRAM, NULL,
                             bo);
         return ret;
 }
 
-int qxl_release_reserve(struct qxl_device *qdev,
-                        struct qxl_release *release, bool no_wait)
+int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
+{
+        struct qxl_bo_list *entry;
+
+        list_for_each_entry(entry, &release->bos, tv.head) {
+                if (entry->tv.bo == &bo->tbo)
+                        return 0;
+        }
+
+        entry = kmalloc(sizeof(struct qxl_bo_list), GFP_KERNEL);
+        if (!entry)
+                return -ENOMEM;
+
+        qxl_bo_ref(bo);
+        entry->tv.bo = &bo->tbo;
+        list_add_tail(&entry->tv.head, &release->bos);
+        return 0;
+}
+
+static int qxl_release_validate_bo(struct qxl_bo *bo)
 {
         int ret;
-        if (atomic_inc_return(&release->bos[0]->reserve_count) == 1) {
-                ret = qxl_bo_reserve(release->bos[0], no_wait);
+
+        if (!bo->pin_count) {
+                qxl_ttm_placement_from_domain(bo, bo->type, false);
+                ret = ttm_bo_validate(&bo->tbo, &bo->placement,
+                                      true, false);
                 if (ret)
                         return ret;
         }
+
+        /* allocate a surface for reserved + validated buffers */
+        ret = qxl_bo_check_id(bo->gem_base.dev->dev_private, bo);
+        if (ret)
+                return ret;
+        return 0;
+}
+
+int qxl_release_reserve_list(struct qxl_release *release, bool no_intr)
+{
+        int ret;
+        struct qxl_bo_list *entry;
+
+        /* if only one object on the release its the release itself
+           since these objects are pinned no need to reserve */
+        if (list_is_singular(&release->bos))
+                return 0;
+
+        ret = ttm_eu_reserve_buffers(&release->ticket, &release->bos);
+        if (ret)
+                return ret;
+
+        list_for_each_entry(entry, &release->bos, tv.head) {
+                struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
+
+                ret = qxl_release_validate_bo(bo);
+                if (ret) {
+                        ttm_eu_backoff_reservation(&release->ticket, &release->bos);
+                        return ret;
+                }
+        }
         return 0;
 }
 
-void qxl_release_unreserve(struct qxl_device *qdev,
-                          struct qxl_release *release)
+void qxl_release_backoff_reserve_list(struct qxl_release *release)
 {
-        if (atomic_dec_and_test(&release->bos[0]->reserve_count))
-                qxl_bo_unreserve(release->bos[0]);
+        /* if only one object on the release its the release itself
+           since these objects are pinned no need to reserve */
+        if (list_is_singular(&release->bos))
+                return;
+
+        ttm_eu_backoff_reservation(&release->ticket, &release->bos);
 }
 
+
 int qxl_alloc_surface_release_reserved(struct qxl_device *qdev,
                                        enum qxl_surface_cmd_type surface_cmd_type,
                                        struct qxl_release *create_rel,
                                        struct qxl_release **release)
 {
-        int ret;
-
         if (surface_cmd_type == QXL_SURFACE_CMD_DESTROY && create_rel) {
                 int idr_ret;
+                struct qxl_bo_list *entry = list_first_entry(&create_rel->bos, struct qxl_bo_list, tv.head);
                 struct qxl_bo *bo;
                 union qxl_release_info *info;
 
                 /* stash the release after the create command */
                 idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release);
-                bo = qxl_bo_ref(create_rel->bos[0]);
+                bo = qxl_bo_ref(to_qxl_bo(entry->tv.bo));
 
                 (*release)->release_offset = create_rel->release_offset + 64;
 
-                qxl_release_add_res(qdev, *release, bo);
+                qxl_release_list_add(*release, bo);
 
-                ret = qxl_release_reserve(qdev, *release, false);
-                if (ret) {
-                        DRM_ERROR("release reserve failed\n");
-                        goto out_unref;
-                }
                 info = qxl_release_map(qdev, *release);
                 info->id = idr_ret;
                 qxl_release_unmap(qdev, *release, info);
 
-
-out_unref:
                 qxl_bo_unref(&bo);
-                return ret;
+                return 0;
         }
 
         return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_surface_cmd),
@@ -187,7 +222,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
 {
         struct qxl_bo *bo;
         int idr_ret;
-        int ret;
+        int ret = 0;
         union qxl_release_info *info;
         int cur_idx;
 
@@ -216,11 +251,6 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
                         mutex_unlock(&qdev->release_mutex);
                         return ret;
                 }
-
-                /* pin releases bo's they are too messy to evict */
-                ret = qxl_bo_reserve(qdev->current_release_bo[cur_idx], false);
-                qxl_bo_pin(qdev->current_release_bo[cur_idx], QXL_GEM_DOMAIN_VRAM, NULL);
-                qxl_bo_unreserve(qdev->current_release_bo[cur_idx]);
         }
 
         bo = qxl_bo_ref(qdev->current_release_bo[cur_idx]);
@@ -231,36 +261,18 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size,
         if (rbo)
                 *rbo = bo;
 
-        qxl_release_add_res(qdev, *release, bo);
-
-        ret = qxl_release_reserve(qdev, *release, false);
         mutex_unlock(&qdev->release_mutex);
-        if (ret)
-                goto out_unref;
+
+        qxl_release_list_add(*release, bo);
 
         info = qxl_release_map(qdev, *release);
         info->id = idr_ret;
         qxl_release_unmap(qdev, *release, info);
 
-out_unref:
         qxl_bo_unref(&bo);
         return ret;
 }
 
-int qxl_fence_releaseable(struct qxl_device *qdev,
-                          struct qxl_release *release)
-{
-        int i, ret;
-        for (i = 0; i < release->bo_count; i++) {
-                if (!release->bos[i]->tbo.sync_obj)
-                        release->bos[i]->tbo.sync_obj = &release->bos[i]->fence;
-                ret = qxl_fence_add_release(&release->bos[i]->fence, release->id);
-                if (ret)
-                        return ret;
-        }
-        return 0;
-}
-
 struct qxl_release *qxl_release_from_id_locked(struct qxl_device *qdev,
                                                    uint64_t id)
 {
@@ -273,10 +285,7 @@ struct qxl_release *qxl_release_from_id_locked(struct qxl_device *qdev,
                 DRM_ERROR("failed to find id in release_idr\n");
                 return NULL;
         }
-        if (release->bo_count < 1) {
-                DRM_ERROR("read a released resource with 0 bos\n");
-                return NULL;
-        }
+
         return release;
 }
 
@@ -285,9 +294,12 @@ union qxl_release_info *qxl_release_map(struct qxl_device *qdev,
 {
         void *ptr;
         union qxl_release_info *info;
-        struct qxl_bo *bo = release->bos[0];
+        struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+        struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
 
         ptr = qxl_bo_kmap_atomic_page(qdev, bo, release->release_offset & PAGE_SIZE);
+        if (!ptr)
+                return NULL;
         info = ptr + (release->release_offset & ~PAGE_SIZE);
         return info;
 }
@@ -296,9 +308,51 @@ void qxl_release_unmap(struct qxl_device *qdev,
                        struct qxl_release *release,
                        union qxl_release_info *info)
 {
-        struct qxl_bo *bo = release->bos[0];
+        struct qxl_bo_list *entry = list_first_entry(&release->bos, struct qxl_bo_list, tv.head);
+        struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
         void *ptr;
 
         ptr = ((void *)info) - (release->release_offset & ~PAGE_SIZE);
         qxl_bo_kunmap_atomic_page(qdev, bo, ptr);
 }
+
+void qxl_release_fence_buffer_objects(struct qxl_release *release)
+{
+        struct ttm_validate_buffer *entry;
+        struct ttm_buffer_object *bo;
+        struct ttm_bo_global *glob;
+        struct ttm_bo_device *bdev;
+        struct ttm_bo_driver *driver;
+        struct qxl_bo *qbo;
+
+        /* if only one object on the release its the release itself
+           since these objects are pinned no need to reserve */
+        if (list_is_singular(&release->bos))
+                return;
+
+        bo = list_first_entry(&release->bos, struct ttm_validate_buffer, head)->bo;
+        bdev = bo->bdev;
+        driver = bdev->driver;
+        glob = bo->glob;
+
+        spin_lock(&glob->lru_lock);
+        spin_lock(&bdev->fence_lock);
+
+        list_for_each_entry(entry, &release->bos, head) {
+                bo = entry->bo;
+                qbo = to_qxl_bo(bo);
+
+                if (!entry->bo->sync_obj)
+                        entry->bo->sync_obj = &qbo->fence;
+
+                qxl_fence_add_release_locked(&qbo->fence, release->id);
+
+                ttm_bo_add_to_lru(bo);
+                ww_mutex_unlock(&bo->resv->lock);
+                entry->reserved = false;
+        }
+        spin_unlock(&bdev->fence_lock);
+        spin_unlock(&glob->lru_lock);
+        ww_acquire_fini(&release->ticket);
+}
+
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 489cb8cece4d..037786d7c1dc 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -206,13 +206,15 @@ static void qxl_evict_flags(struct ttm_buffer_object *bo,
                 return;
         }
         qbo = container_of(bo, struct qxl_bo, tbo);
-        qxl_ttm_placement_from_domain(qbo, QXL_GEM_DOMAIN_CPU);
+        qxl_ttm_placement_from_domain(qbo, QXL_GEM_DOMAIN_CPU, false);
         *placement = qbo->placement;
 }
 
 static int qxl_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct qxl_bo *qbo = to_qxl_bo(bo);
+
+        return drm_vma_node_verify_access(&qbo->gem_base.vma_node, filp);
 }
 
 static int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index d4660cf942a5..c451257f08fb 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -540,7 +540,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
         dev_priv->ring.end = ((u32 *) dev_priv->cce_ring->handle
                               + init->ring_size / sizeof(u32));
         dev_priv->ring.size = init->ring_size;
-        dev_priv->ring.size_l2qw = drm_order(init->ring_size / 8);
+        dev_priv->ring.size_l2qw = order_base_2(init->ring_size / 8);
 
         dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
 
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 472c38fe123f..5bd307cd8da1 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -48,7 +48,6 @@ static const struct file_operations r128_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = r128_compat_ioctl,
 #endif
@@ -57,7 +56,7 @@ static const struct file_operations r128_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
+            DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
             DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
         .dev_priv_size = sizeof(drm_r128_buf_priv_t),
         .load = r128_driver_load,
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 930c71b2fb5e..56eb5e3f5439 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -131,7 +131,7 @@ typedef struct drm_r128_buf_priv {
         drm_r128_freelist_t *list_entry;
 } drm_r128_buf_priv_t;
 
-extern struct drm_ioctl_desc r128_ioctls[];
+extern const struct drm_ioctl_desc r128_ioctls[];
 extern int r128_max_ioctl;
 
                                 /* r128_cce.c */
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
index 19bb7e6f3d9a..01dd9aef9f0e 100644
--- a/drivers/gpu/drm/r128/r128_state.c
+++ b/drivers/gpu/drm/r128/r128_state.c
@@ -1643,7 +1643,7 @@ void r128_driver_lastclose(struct drm_device *dev)
         r128_do_cleanup_cce(dev);
 }
 
-struct drm_ioctl_desc r128_ioctls[] = {
+const struct drm_ioctl_desc r128_ioctls[] = {
         DRM_IOCTL_DEF_DRV(R128_INIT, r128_cce_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(R128_CCE_START, r128_cce_start, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(R128_CCE_STOP, r128_cce_stop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 064023bed480..3569d89b9e41 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -44,6 +44,41 @@ static char *pre_emph_names[] = {
 };
 
 /***** radeon AUX functions *****/
+
+/* Atom needs data in little endian format
+ * so swap as appropriate when copying data to
+ * or from atom. Note that atom operates on
+ * dw units.
+ */
+static void radeon_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le)
+{
+#ifdef __BIG_ENDIAN
+        u8 src_tmp[20], dst_tmp[20]; /* used for byteswapping */
+        u32 *dst32, *src32;
+        int i;
+
+        memcpy(src_tmp, src, num_bytes);
+        src32 = (u32 *)src_tmp;
+        dst32 = (u32 *)dst_tmp;
+        if (to_le) {
+                for (i = 0; i < ((num_bytes + 3) / 4); i++)
+                        dst32[i] = cpu_to_le32(src32[i]);
+                memcpy(dst, dst_tmp, num_bytes);
+        } else {
+                u8 dws = num_bytes & ~3;
+                for (i = 0; i < ((num_bytes + 3) / 4); i++)
+                        dst32[i] = le32_to_cpu(src32[i]);
+                memcpy(dst, dst_tmp, dws);
+                if (num_bytes % 4) {
+                        for (i = 0; i < (num_bytes % 4); i++)
+                                dst[dws+i] = dst_tmp[dws+i];
+                }
+        }
+#else
+        memcpy(dst, src, num_bytes);
+#endif
+}
+
 union aux_channel_transaction {
         PROCESS_AUX_CHANNEL_TRANSACTION_PS_ALLOCATION v1;
         PROCESS_AUX_CHANNEL_TRANSACTION_PARAMETERS_V2 v2;
@@ -65,10 +100,10 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan,
 
         base = (unsigned char *)(rdev->mode_info.atom_context->scratch + 1);
 
-        memcpy(base, send, send_bytes);
+        radeon_copy_swap(base, send, send_bytes, true);
 
-        args.v1.lpAuxRequest = 0 + 4;
-        args.v1.lpDataOut = 16 + 4;
+        args.v1.lpAuxRequest = cpu_to_le16((u16)(0 + 4));
+        args.v1.lpDataOut = cpu_to_le16((u16)(16 + 4));
         args.v1.ucDataOutLen = 0;
         args.v1.ucChannelID = chan->rec.i2c_id;
         args.v1.ucDelay = delay / 10;
@@ -102,7 +137,7 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan,
                 recv_bytes = recv_size;
 
         if (recv && recv_size)
-                memcpy(recv, base + 16, recv_bytes);
+                radeon_copy_swap(recv, base + 16, recv_bytes, false);
 
         return recv_bytes;
 }
@@ -550,7 +585,7 @@ static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector,
                 return false;
         }
 
-        DRM_DEBUG_KMS("link status %*ph\n", 6, link_status);
+        DRM_DEBUG_KMS("link status %6ph\n", link_status);
         return true;
 }
 
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 6dacec4e2090..6adbc998349e 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -2535,8 +2535,8 @@ static int cik_cp_gfx_resume(struct radeon_device *rdev)
         /* ring 0 - compute and gfx */
         /* Set ring buffer size */
         ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
@@ -2915,7 +2915,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev)
                 /* set the EOP size, register value is 2^(EOP_SIZE+1) dwords */
                 tmp = RREG32(CP_HPD_EOP_CONTROL);
                 tmp &= ~EOP_SIZE_MASK;
-                tmp |= drm_order(MEC_HPD_SIZE / 8);
+                tmp |= order_base_2(MEC_HPD_SIZE / 8);
                 WREG32(CP_HPD_EOP_CONTROL, tmp);
         }
         cik_srbm_select(rdev, 0, 0, 0, 0);
@@ -3030,9 +3030,9 @@ static int cik_cp_compute_resume(struct radeon_device *rdev)
                         ~(QUEUE_SIZE_MASK | RPTR_BLOCK_SIZE_MASK);
 
                 mqd->queue_state.cp_hqd_pq_control |=
-                        drm_order(rdev->ring[idx].ring_size / 8);
+                        order_base_2(rdev->ring[idx].ring_size / 8);
                 mqd->queue_state.cp_hqd_pq_control |=
-                        (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8);
+                        (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8);
 #ifdef __BIG_ENDIAN
                 mqd->queue_state.cp_hqd_pq_control |= BUF_SWAP_32BIT;
 #endif
@@ -3375,7 +3375,7 @@ static int cik_sdma_gfx_resume(struct radeon_device *rdev)
                 WREG32(SDMA0_SEM_WAIT_FAIL_TIMER_CNTL + reg_offset, 0);
 
                 /* Set ring buffer size in dwords */
-                rb_bufsz = drm_order(ring->ring_size / 4);
+                rb_bufsz = order_base_2(ring->ring_size / 4);
                 rb_cntl = rb_bufsz << 1;
 #ifdef __BIG_ENDIAN
                 rb_cntl |= SDMA_RB_SWAP_ENABLE | SDMA_RPTR_WRITEBACK_SWAP_ENABLE;
@@ -5030,7 +5030,7 @@ static int cik_irq_init(struct radeon_device *rdev)
         WREG32(INTERRUPT_CNTL, interrupt_cntl);
 
         WREG32(IH_RB_BASE, rdev->ih.gpu_addr >> 8);
-        rb_bufsz = drm_order(rdev->ih.ring_size / 4);
+        rb_bufsz = order_base_2(rdev->ih.ring_size / 4);
 
         ih_rb_cntl = (IH_WPTR_OVERFLOW_ENABLE |
                       IH_WPTR_OVERFLOW_CLEAR |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 038dcac7670c..b67c9ec7f690 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2881,8 +2881,8 @@ static int evergreen_cp_resume(struct radeon_device *rdev)
         RREG32(GRBM_SOFT_RESET);
 
         /* Set ring buffer size */
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 56bd4f3be4fe..5b6e47765656 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -1560,8 +1560,8 @@ static int cayman_cp_resume(struct radeon_device *rdev)
 
                 /* Set ring buffer size */
                 ring = &rdev->ring[ridx[i]];
-                rb_cntl = drm_order(ring->ring_size / 8);
-                rb_cntl |= drm_order(RADEON_GPU_PAGE_SIZE/8) << 8;
+                rb_cntl = order_base_2(ring->ring_size / 8);
+                rb_cntl |= order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8;
 #ifdef __BIG_ENDIAN
                 rb_cntl |= BUF_SWAP_32BIT;
 #endif
@@ -1720,7 +1720,7 @@ int cayman_dma_resume(struct radeon_device *rdev)
                 WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL + reg_offset, 0);
 
                 /* Set ring buffer size in dwords */
-                rb_bufsz = drm_order(ring->ring_size / 4);
+                rb_bufsz = order_base_2(ring->ring_size / 4);
                 rb_cntl = rb_bufsz << 1;
 #ifdef __BIG_ENDIAN
                 rb_cntl |= DMA_RB_SWAP_ENABLE | DMA_RPTR_WRITEBACK_SWAP_ENABLE;
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 75349cdaa84b..5625cf706f0c 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1097,7 +1097,7 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size)
         }
 
         /* Align ring size */
-        rb_bufsz = drm_order(ring_size / 8);
+        rb_bufsz = order_base_2(ring_size / 8);
         ring_size = (1 << (rb_bufsz + 1)) * 4;
         r100_cp_load_microcode(rdev);
         r = radeon_ring_init(rdev, ring, ring_size, RADEON_WB_CP_RPTR_OFFSET,
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 393880a09412..cfc1d28ade39 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2413,8 +2413,8 @@ int r600_cp_resume(struct radeon_device *rdev)
         WREG32(GRBM_SOFT_RESET, 0);
 
         /* Set ring buffer size */
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
@@ -2467,7 +2467,7 @@ void r600_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsign
         int r;
 
         /* Align ring size */
-        rb_bufsz = drm_order(ring_size / 8);
+        rb_bufsz = order_base_2(ring_size / 8);
         ring_size = (1 << (rb_bufsz + 1)) * 4;
         ring->ring_size = ring_size;
         ring->align_mask = 16 - 1;
@@ -2547,7 +2547,7 @@ int r600_dma_resume(struct radeon_device *rdev)
         WREG32(DMA_SEM_WAIT_FAIL_TIMER_CNTL, 0);
 
         /* Set ring buffer size in dwords */
-        rb_bufsz = drm_order(ring->ring_size / 4);
+        rb_bufsz = order_base_2(ring->ring_size / 4);
         rb_cntl = rb_bufsz << 1;
 #ifdef __BIG_ENDIAN
         rb_cntl |= DMA_RB_SWAP_ENABLE | DMA_RPTR_WRITEBACK_SWAP_ENABLE;
@@ -2656,7 +2656,7 @@ int r600_uvd_rbc_start(struct radeon_device *rdev)
         WREG32(UVD_RBC_RB_BASE, ring->gpu_addr);
 
         /* Set ring buffer size */
-        rb_bufsz = drm_order(ring->ring_size);
+        rb_bufsz = order_base_2(ring->ring_size);
         rb_bufsz = (0x1 << 8) | rb_bufsz;
         WREG32(UVD_RBC_RB_CNTL, rb_bufsz);
 
@@ -3166,7 +3166,7 @@ int r600_copy_cpdma(struct radeon_device *rdev,
 
         size_in_bytes = (num_gpu_pages << RADEON_GPU_PAGE_SHIFT);
         num_loops = DIV_ROUND_UP(size_in_bytes, 0x1fffff);
-        r = radeon_ring_lock(rdev, ring, num_loops * 6 + 21);
+        r = radeon_ring_lock(rdev, ring, num_loops * 6 + 24);
         if (r) {
                 DRM_ERROR("radeon: moving bo (%d).\n", r);
                 radeon_semaphore_free(rdev, &sem, NULL);
@@ -3181,6 +3181,9 @@ int r600_copy_cpdma(struct radeon_device *rdev,
                 radeon_semaphore_free(rdev, &sem, NULL);
         }
 
+        radeon_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));
+        radeon_ring_write(ring, (WAIT_UNTIL - PACKET3_SET_CONFIG_REG_OFFSET) >> 2);
+        radeon_ring_write(ring, WAIT_3D_IDLE_bit);
         for (i = 0; i < num_loops; i++) {
                 cur_size_in_bytes = size_in_bytes;
                 if (cur_size_in_bytes > 0x1fffff)
@@ -3812,7 +3815,7 @@ void r600_ih_ring_init(struct radeon_device *rdev, unsigned ring_size)
         u32 rb_bufsz;
 
         /* Align ring size */
-        rb_bufsz = drm_order(ring_size / 4);
+        rb_bufsz = order_base_2(ring_size / 4);
         ring_size = (1 << rb_bufsz) * 4;
         rdev->ih.ring_size = ring_size;
         rdev->ih.ptr_mask = rdev->ih.ring_size - 1;
@@ -4049,7 +4052,7 @@ int r600_irq_init(struct radeon_device *rdev)
         WREG32(INTERRUPT_CNTL, interrupt_cntl);
 
         WREG32(IH_RB_BASE, rdev->ih.gpu_addr >> 8);
-        rb_bufsz = drm_order(rdev->ih.ring_size / 4);
+        rb_bufsz = order_base_2(rdev->ih.ring_size / 4);
 
         ih_rb_cntl = (IH_WPTR_OVERFLOW_ENABLE |
                       IH_WPTR_OVERFLOW_CLEAR |
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 1c51c08b1fde..d8eb48bff0ed 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -2200,13 +2200,13 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
         dev_priv->ring.end = ((u32 *) dev_priv->cp_ring->handle
                               + init->ring_size / sizeof(u32));
         dev_priv->ring.size = init->ring_size;
-        dev_priv->ring.size_l2qw = drm_order(init->ring_size / 8);
+        dev_priv->ring.size_l2qw = order_base_2(init->ring_size / 8);
 
         dev_priv->ring.rptr_update = /* init->rptr_update */ 4096;
-        dev_priv->ring.rptr_update_l2qw = drm_order(/* init->rptr_update */ 4096 / 8);
+        dev_priv->ring.rptr_update_l2qw = order_base_2(/* init->rptr_update */ 4096 / 8);
 
         dev_priv->ring.fetch_size = /* init->fetch_size */ 32;
-        dev_priv->ring.fetch_size_l2ow = drm_order(/* init->fetch_size */ 32 / 16);
+        dev_priv->ring.fetch_size_l2ow = order_base_2(/* init->fetch_size */ 32 / 16);
 
         dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
 
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c
index b88f54b134ab..e5c860f4ccbe 100644
--- a/drivers/gpu/drm/radeon/r600_dpm.c
+++ b/drivers/gpu/drm/radeon/r600_dpm.c
@@ -278,9 +278,9 @@ bool r600_dynamicpm_enabled(struct radeon_device *rdev)
 void r600_enable_sclk_control(struct radeon_device *rdev, bool enable)
 {
         if (enable)
-                WREG32_P(GENERAL_PWRMGT, 0, ~SCLK_PWRMGT_OFF);
+                WREG32_P(SCLK_PWRMGT_CNTL, 0, ~SCLK_PWRMGT_OFF);
         else
-                WREG32_P(GENERAL_PWRMGT, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);
+                WREG32_P(SCLK_PWRMGT_CNTL, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF);
 }
 
 void r600_enable_mclk_control(struct radeon_device *rdev, bool enable)
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 2f08219c39b6..19066d1dcb7d 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -492,9 +492,6 @@ int radeon_mode_dumb_create(struct drm_file *file_priv,
 int radeon_mode_dumb_mmap(struct drm_file *filp,
                           struct drm_device *dev,
                           uint32_t handle, uint64_t *offset_p);
-int radeon_mode_dumb_destroy(struct drm_file *file_priv,
-                             struct drm_device *dev,
-                             uint32_t handle);
 
 /*
  * Semaphores.
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 78bec1a58ed1..f8f8b3113ddd 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -1161,6 +1161,7 @@ static struct radeon_asic rv6xx_asic = {
                 .get_mclk = &rv6xx_dpm_get_mclk,
                 .print_power_state = &rv6xx_dpm_print_power_state,
                 .debugfs_print_current_performance_level = &rv6xx_dpm_debugfs_print_current_performance_level,
+                .force_performance_level = &rv6xx_dpm_force_performance_level,
         },
         .pflip = {
                 .pre_page_flip = &rs600_pre_page_flip,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index ca1895709908..902479fa737f 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -421,6 +421,8 @@ void rv6xx_dpm_print_power_state(struct radeon_device *rdev,
                                  struct radeon_ps *ps);
 void rv6xx_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,
                                                        struct seq_file *m);
+int rv6xx_dpm_force_performance_level(struct radeon_device *rdev,
+                                      enum radeon_dpm_forced_level level);
 /* rs780 dpm */
 int rs780_dpm_init(struct radeon_device *rdev);
 int rs780_dpm_enable(struct radeon_device *rdev);
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index 78edadc9e86b..68ce36056019 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -147,7 +147,7 @@ static uint16_t combios_get_table_offset(struct drm_device *dev,
                                          enum radeon_combios_table_offset table)
 {
         struct radeon_device *rdev = dev->dev_private;
-        int rev;
+        int rev, size;
         uint16_t offset = 0, check_offset;
 
         if (!rdev->bios)
@@ -156,174 +156,106 @@ static uint16_t combios_get_table_offset(struct drm_device *dev,
         switch (table) {
                 /* absolute offset tables */
         case COMBIOS_ASIC_INIT_1_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0xc);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0xc;
                 break;
         case COMBIOS_BIOS_SUPPORT_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x14);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x14;
                 break;
         case COMBIOS_DAC_PROGRAMMING_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x2a);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x2a;
                 break;
         case COMBIOS_MAX_COLOR_DEPTH_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x2c);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x2c;
                 break;
         case COMBIOS_CRTC_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x2e);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x2e;
                 break;
         case COMBIOS_PLL_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x30);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x30;
                 break;
         case COMBIOS_TV_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x32);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x32;
                 break;
         case COMBIOS_DFP_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x34);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x34;
                 break;
         case COMBIOS_HW_CONFIG_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x36);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x36;
                 break;
         case COMBIOS_MULTIMEDIA_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x38);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x38;
                 break;
         case COMBIOS_TV_STD_PATCH_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x3e);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x3e;
                 break;
         case COMBIOS_LCD_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x40);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x40;
                 break;
         case COMBIOS_MOBILE_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x42);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x42;
                 break;
         case COMBIOS_PLL_INIT_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x46);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x46;
                 break;
         case COMBIOS_MEM_CONFIG_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x48);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x48;
                 break;
         case COMBIOS_SAVE_MASK_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x4a);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x4a;
                 break;
         case COMBIOS_HARDCODED_EDID_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x4c);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x4c;
                 break;
         case COMBIOS_ASIC_INIT_2_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x4e);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x4e;
                 break;
         case COMBIOS_CONNECTOR_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x50);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x50;
                 break;
         case COMBIOS_DYN_CLK_1_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x52);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x52;
                 break;
         case COMBIOS_RESERVED_MEM_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x54);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x54;
                 break;
         case COMBIOS_EXT_TMDS_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x58);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x58;
                 break;
         case COMBIOS_MEM_CLK_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x5a);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x5a;
                 break;
         case COMBIOS_EXT_DAC_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x5c);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x5c;
                 break;
         case COMBIOS_MISC_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x5e);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x5e;
                 break;
         case COMBIOS_CRT_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x60);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x60;
                 break;
         case COMBIOS_INTEGRATED_SYSTEM_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x62);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x62;
                 break;
         case COMBIOS_COMPONENT_VIDEO_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x64);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x64;
                 break;
         case COMBIOS_FAN_SPEED_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x66);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x66;
                 break;
         case COMBIOS_OVERDRIVE_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x68);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x68;
                 break;
         case COMBIOS_OEM_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x6a);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x6a;
                 break;
         case COMBIOS_DYN_CLK_2_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x6c);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x6c;
                 break;
         case COMBIOS_POWER_CONNECTOR_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x6e);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x6e;
                 break;
         case COMBIOS_I2C_INFO_TABLE:
-                check_offset = RBIOS16(rdev->bios_header_start + 0x70);
-                if (check_offset)
-                        offset = check_offset;
+                check_offset = 0x70;
                 break;
                 /* relative offset tables */
         case COMBIOS_ASIC_INIT_3_TABLE: /* offset from misc info */
@@ -439,11 +371,16 @@ static uint16_t combios_get_table_offset(struct drm_device *dev,
                 }
                 break;
         default:
+                check_offset = 0;
                 break;
         }
 
-        return offset;
+        size = RBIOS8(rdev->bios_header_start + 0x6);
+        /* check absolute offset tables */
+        if (table < COMBIOS_ASIC_INIT_3_TABLE && check_offset && check_offset < size)
+                offset = RBIOS16(rdev->bios_header_start + check_offset);
 
+        return offset;
 }
 
 bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)
@@ -965,16 +902,22 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(struct
                         dac = RBIOS8(dac_info + 0x3) & 0xf;
                         p_dac->ps2_pdac_adj = (bg << 8) | (dac);
                 }
-                /* if the values are all zeros, use the table */
-                if (p_dac->ps2_pdac_adj)
+                /* if the values are zeros, use the table */
+                if ((dac == 0) || (bg == 0))
+                        found = 0;
+                else
                         found = 1;
         }
 
         /* quirks */
+        /* Radeon 7000 (RV100) */
+        if (((dev->pdev->device == 0x5159) &&
+            (dev->pdev->subsystem_vendor == 0x174B) &&
+            (dev->pdev->subsystem_device == 0x7c28)) ||
         /* Radeon 9100 (R200) */
-        if ((dev->pdev->device == 0x514D) &&
+           ((dev->pdev->device == 0x514D) &&
             (dev->pdev->subsystem_vendor == 0x174B) &&
-            (dev->pdev->subsystem_device == 0x7149)) {
+            (dev->pdev->subsystem_device == 0x7149))) {
                 /* vbios value is bad, use the default */
                 found = 0;
         }
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index efc4f6441ef4..3cae2bbc1854 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1444,13 +1444,13 @@ static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
         dev_priv->ring.end = ((u32 *) dev_priv->cp_ring->handle
                               + init->ring_size / sizeof(u32));
         dev_priv->ring.size = init->ring_size;
-        dev_priv->ring.size_l2qw = drm_order(init->ring_size / 8);
+        dev_priv->ring.size_l2qw = order_base_2(init->ring_size / 8);
 
         dev_priv->ring.rptr_update = /* init->rptr_update */ 4096;
-        dev_priv->ring.rptr_update_l2qw = drm_order( /* init->rptr_update */ 4096 / 8);
+        dev_priv->ring.rptr_update_l2qw = order_base_2( /* init->rptr_update */ 4096 / 8);
 
         dev_priv->ring.fetch_size = /* init->fetch_size */ 32;
-        dev_priv->ring.fetch_size_l2ow = drm_order( /* init->fetch_size */ 32 / 16);
+        dev_priv->ring.fetch_size_l2ow = order_base_2( /* init->fetch_size */ 32 / 16);
         dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
 
         dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 82335e38ec4f..0610ca4fb6a3 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1269,7 +1269,7 @@ int radeon_device_init(struct radeon_device *rdev,
         /* this will fail for cards that aren't VGA class devices, just
          * ignore it */
         vga_client_register(rdev->pdev, rdev, NULL, radeon_vga_set_decode);
-        vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops);
+        vga_switcheroo_register_client(rdev->pdev, &radeon_switcheroo_ops, false);
 
         r = radeon_init(rdev);
         if (r)
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index c2b67b4e1ac2..358bd96c06c5 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -345,7 +345,8 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 
 static int radeon_crtc_page_flip(struct drm_crtc *crtc,
                                  struct drm_framebuffer *fb,
-                                 struct drm_pending_vblank_event *event)
+                                 struct drm_pending_vblank_event *event,
+                                 uint32_t page_flip_flags)
 {
         struct drm_device *dev = crtc->dev;
         struct radeon_device *rdev = dev->dev_private;
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 29876b1be8ec..1f93dd503646 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -81,7 +81,6 @@
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);
-int radeon_driver_firstopen_kms(struct drm_device *dev);
 void radeon_driver_lastclose_kms(struct drm_device *dev);
 int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
 void radeon_driver_postclose_kms(struct drm_device *dev,
@@ -101,8 +100,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);
 int radeon_driver_irq_postinstall_kms(struct drm_device *dev);
 void radeon_driver_irq_uninstall_kms(struct drm_device *dev);
 irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);
-int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv);
 int radeon_gem_object_init(struct drm_gem_object *obj);
 void radeon_gem_object_free(struct drm_gem_object *obj);
 int radeon_gem_object_open(struct drm_gem_object *obj,
@@ -111,7 +108,7 @@ void radeon_gem_object_close(struct drm_gem_object *obj,
                                 struct drm_file *file_priv);
 extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,
                                       int *vpos, int *hpos);
-extern struct drm_ioctl_desc radeon_ioctls_kms[];
+extern const struct drm_ioctl_desc radeon_ioctls_kms[];
 extern int radeon_max_kms_ioctl;
 int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
 int radeon_mode_dumb_mmap(struct drm_file *filp,
@@ -120,9 +117,6 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,
 int radeon_mode_dumb_create(struct drm_file *file_priv,
                             struct drm_device *dev,
                             struct drm_mode_create_dumb *args);
-int radeon_mode_dumb_destroy(struct drm_file *file_priv,
-                             struct drm_device *dev,
-                             uint32_t handle);
 struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj);
 struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,
                                                         size_t size,
@@ -272,7 +266,6 @@ static const struct file_operations radeon_driver_old_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = radeon_compat_ioctl,
@@ -282,7 +275,7 @@ static const struct file_operations radeon_driver_old_fops = {
 
 static struct drm_driver driver_old = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
+            DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
             DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED,
         .dev_priv_size = sizeof(drm_radeon_buf_priv_t),
         .load = radeon_driver_load,
@@ -381,7 +374,6 @@ static const struct file_operations radeon_driver_kms_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = radeon_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = radeon_kms_compat_ioctl,
@@ -390,12 +382,11 @@ static const struct file_operations radeon_driver_kms_fops = {
 
 static struct drm_driver kms_driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
-            DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM |
+            DRIVER_USE_AGP |
+            DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
             DRIVER_PRIME,
         .dev_priv_size = 0,
         .load = radeon_driver_load_kms,
-        .firstopen = radeon_driver_firstopen_kms,
         .open = radeon_driver_open_kms,
         .preclose = radeon_driver_preclose_kms,
         .postclose = radeon_driver_postclose_kms,
@@ -421,10 +412,9 @@ static struct drm_driver kms_driver = {
         .gem_free_object = radeon_gem_object_free,
         .gem_open_object = radeon_gem_object_open,
         .gem_close_object = radeon_gem_object_close,
-        .dma_ioctl = radeon_dma_ioctl_kms,
         .dumb_create = radeon_mode_dumb_create,
         .dumb_map_offset = radeon_mode_dumb_mmap,
-        .dumb_destroy = radeon_mode_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
         .fops = &radeon_driver_kms_fops,
 
         .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c
index d9d31a383276..6a51d943ccf4 100644
--- a/drivers/gpu/drm/radeon/radeon_gart.c
+++ b/drivers/gpu/drm/radeon/radeon_gart.c
@@ -466,7 +466,7 @@ int radeon_vm_manager_init(struct radeon_device *rdev)
                 size += rdev->vm_manager.max_pfn * 8;
                 size *= 2;
                 r = radeon_sa_bo_manager_init(rdev, &rdev->vm_manager.sa_manager,
-                                              RADEON_VM_PTB_ALIGN(size),
+                                              RADEON_GPU_PAGE_ALIGN(size),
                                               RADEON_VM_PTB_ALIGN_SIZE,
                                               RADEON_GEM_DOMAIN_VRAM);
                 if (r) {
@@ -621,7 +621,7 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm)
         }
 
 retry:
-        pd_size = RADEON_VM_PTB_ALIGN(radeon_vm_directory_size(rdev));
+        pd_size = radeon_vm_directory_size(rdev);
         r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager,
                              &vm->page_directory, pd_size,
                              RADEON_VM_PTB_ALIGN_SIZE, false);
@@ -953,8 +953,8 @@ static int radeon_vm_update_pdes(struct radeon_device *rdev,
 retry:
                 r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager,
                                      &vm->page_tables[pt_idx],
-                                     RADEON_VM_PTB_ALIGN(RADEON_VM_PTE_COUNT * 8),
-                                     RADEON_VM_PTB_ALIGN_SIZE, false);
+                                     RADEON_VM_PTE_COUNT * 8,
+                                     RADEON_GPU_PAGE_SIZE, false);
 
                 if (r == -ENOMEM) {
                         r = radeon_vm_evict(rdev, vm);
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index aa796031ab65..dce99c8a5835 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -570,13 +570,6 @@ int radeon_mode_dumb_create(struct drm_file *file_priv,
         return 0;
 }
 
-int radeon_mode_dumb_destroy(struct drm_file *file_priv,
-                             struct drm_device *dev,
-                             uint32_t handle)
-{
-        return drm_gem_handle_delete(file_priv, handle);
-}
-
 #if defined(CONFIG_DEBUG_FS)
 static int radeon_debugfs_gem_info(struct seq_file *m, void *data)
 {
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 49ff3d1a6102..b46a5616664a 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -449,19 +449,6 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
  * Outdated mess for old drm with Xorg being in charge (void function now).
  */
 /**
- * radeon_driver_firstopen_kms - drm callback for first open
- *
- * @dev: drm dev pointer
- *
- * Nothing to be done for KMS (all asics).
- * Returns 0 on success.
- */
-int radeon_driver_firstopen_kms(struct drm_device *dev)
-{
-        return 0;
-}
-
-/**
  * radeon_driver_firstopen_kms - drm callback for last close
  *
  * @dev: drm dev pointer
@@ -683,16 +670,6 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc,
                                                      drmcrtc);
 }
 
-/*
- * IOCTL.
- */
-int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,
-                         struct drm_file *file_priv)
-{
-        /* Not valid in KMS. */
-        return -EINVAL;
-}
-
 #define KMS_INVALID_IOCTL(name)                                         \
 int name(struct drm_device *dev, void *data, struct drm_file *file_priv)\
 {                                                                       \
@@ -732,7 +709,7 @@ KMS_INVALID_IOCTL(radeon_surface_alloc_kms)
 KMS_INVALID_IOCTL(radeon_surface_free_kms)
 
 
-struct drm_ioctl_desc radeon_ioctls_kms[] = {
+const struct drm_ioctl_desc radeon_ioctls_kms[] = {
         DRM_IOCTL_DEF_DRV(RADEON_CP_INIT, radeon_cp_init_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(RADEON_CP_START, radeon_cp_start_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(RADEON_CP_STOP, radeon_cp_stop_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index 2020bf4a3830..c0fa4aa9ceea 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -142,7 +142,6 @@ int radeon_bo_create(struct radeon_device *rdev,
                 return r;
         }
         bo->rdev = rdev;
-        bo->gem_base.driver_private = NULL;
         bo->surface_reg = -1;
         INIT_LIST_HEAD(&bo->list);
         INIT_LIST_HEAD(&bo->va);
diff --git a/drivers/gpu/drm/radeon/radeon_object.h b/drivers/gpu/drm/radeon/radeon_object.h
index 49c82c480013..209b11150263 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -113,13 +113,10 @@ static inline unsigned radeon_bo_gpu_page_alignment(struct radeon_bo *bo)
  * @bo: radeon object for which we query the offset
  *
  * Returns mmap offset of the object.
- *
- * Note: addr_space_offset is constant after ttm bo init thus isn't protected
- * by any lock.
  */
 static inline u64 radeon_bo_mmap_offset(struct radeon_bo *bo)
 {
-        return bo->tbo.addr_space_offset;
+        return drm_vma_node_offset_addr(&bo->tbo.vma_node);
 }
 
 extern int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type,
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 65b9eabd5a2f..20074560fc25 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -68,7 +68,6 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev,
                                RADEON_GEM_DOMAIN_GTT, sg, &bo);
         if (ret)
                 return ERR_PTR(ret);
-        bo->gem_base.driver_private = bo;
 
         mutex_lock(&rdev->gem.mutex);
         list_add_tail(&bo->list, &rdev->gem.objects);
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 6c0ce8915fac..71245d6f34a2 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -203,7 +203,9 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
 
 static int radeon_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-        return 0;
+        struct radeon_bo *rbo = container_of(bo, struct radeon_bo, tbo);
+
+        return drm_vma_node_verify_access(&rbo->gem_base.vma_node, filp);
 }
 
 static void radeon_move_null(struct ttm_buffer_object *bo,
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
index 65e33f387341..363018c60412 100644
--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
@@ -819,7 +819,7 @@ static void rv6xx_program_memory_timing_parameters(struct radeon_device *rdev)
                  POWERMODE1(calculate_memory_refresh_rate(rdev,
                                                           pi->hw.sclks[R600_POWER_LEVEL_MEDIUM])) |
                  POWERMODE2(calculate_memory_refresh_rate(rdev,
-                                                          pi->hw.sclks[R600_POWER_LEVEL_MEDIUM])) |
+                                                          pi->hw.sclks[R600_POWER_LEVEL_HIGH])) |
                  POWERMODE3(calculate_memory_refresh_rate(rdev,
                                                           pi->hw.sclks[R600_POWER_LEVEL_HIGH])));
         WREG32(ARB_RFSH_RATE, arb_refresh_rate);
@@ -1182,10 +1182,10 @@ static void rv6xx_program_display_gap(struct radeon_device *rdev)
         u32 tmp = RREG32(CG_DISPLAY_GAP_CNTL);
 
         tmp &= ~(DISP1_GAP_MCHG_MASK | DISP2_GAP_MCHG_MASK);
-        if (RREG32(AVIVO_D1CRTC_CONTROL) & AVIVO_CRTC_EN) {
+        if (rdev->pm.dpm.new_active_crtcs & 1) {
                 tmp |= DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_VBLANK);
                 tmp |= DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
-        } else if (RREG32(AVIVO_D2CRTC_CONTROL) & AVIVO_CRTC_EN) {
+        } else if (rdev->pm.dpm.new_active_crtcs & 2) {
                 tmp |= DISP1_GAP_MCHG(R600_PM_DISPLAY_GAP_IGNORE);
                 tmp |= DISP2_GAP_MCHG(R600_PM_DISPLAY_GAP_VBLANK);
         } else {
@@ -1670,6 +1670,8 @@ int rv6xx_dpm_set_power_state(struct radeon_device *rdev)
         struct radeon_ps *old_ps = rdev->pm.dpm.current_ps;
         int ret;
 
+        pi->restricted_levels = 0;
+
         rv6xx_set_uvd_clock_before_set_eng_clock(rdev, new_ps, old_ps);
 
         rv6xx_clear_vc(rdev);
@@ -1756,6 +1758,8 @@ int rv6xx_dpm_set_power_state(struct radeon_device *rdev)
 
         rv6xx_set_uvd_clock_after_set_eng_clock(rdev, new_ps, old_ps);
 
+        rdev->pm.dpm.forced_level = RADEON_DPM_FORCED_LEVEL_AUTO;
+
         return 0;
 }
 
@@ -2085,3 +2089,34 @@ u32 rv6xx_dpm_get_mclk(struct radeon_device *rdev, bool low)
         else
                 return requested_state->high.mclk;
 }
+
+int rv6xx_dpm_force_performance_level(struct radeon_device *rdev,
+                                      enum radeon_dpm_forced_level level)
+{
+        struct rv6xx_power_info *pi = rv6xx_get_pi(rdev);
+
+        if (level == RADEON_DPM_FORCED_LEVEL_HIGH) {
+                pi->restricted_levels = 3;
+        } else if (level == RADEON_DPM_FORCED_LEVEL_LOW) {
+                pi->restricted_levels = 2;
+        } else {
+                pi->restricted_levels = 0;
+        }
+
+        rv6xx_clear_vc(rdev);
+        r600_power_level_enable(rdev, R600_POWER_LEVEL_LOW, true);
+        r600_set_at(rdev, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF);
+        r600_wait_for_power_level(rdev, R600_POWER_LEVEL_LOW);
+        r600_power_level_enable(rdev, R600_POWER_LEVEL_HIGH, false);
+        r600_power_level_enable(rdev, R600_POWER_LEVEL_MEDIUM, false);
+        rv6xx_enable_medium(rdev);
+        rv6xx_enable_high(rdev);
+        if (pi->restricted_levels == 3)
+                r600_power_level_enable(rdev, R600_POWER_LEVEL_LOW, false);
+        rv6xx_program_vc(rdev);
+        rv6xx_program_at(rdev);
+
+        rdev->pm.dpm.forced_level = level;
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index d325280e2f9f..d71037f4f68f 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -3383,8 +3383,8 @@ static int si_cp_resume(struct radeon_device *rdev)
         /* ring 0 - compute and gfx */
         /* Set ring buffer size */
         ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
@@ -3416,8 +3416,8 @@ static int si_cp_resume(struct radeon_device *rdev)
         /* ring1  - compute only */
         /* Set ring buffer size */
         ring = &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX];
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
@@ -3442,8 +3442,8 @@ static int si_cp_resume(struct radeon_device *rdev)
         /* ring2 - compute only */
         /* Set ring buffer size */
         ring = &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX];
-        rb_bufsz = drm_order(ring->ring_size / 8);
-        tmp = (drm_order(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
+        rb_bufsz = order_base_2(ring->ring_size / 8);
+        tmp = (order_base_2(RADEON_GPU_PAGE_SIZE/8) << 8) | rb_bufsz;
 #ifdef __BIG_ENDIAN
         tmp |= BUF_SWAP_32BIT;
 #endif
@@ -5651,7 +5651,7 @@ static int si_irq_init(struct radeon_device *rdev)
         WREG32(INTERRUPT_CNTL, interrupt_cntl);
 
         WREG32(IH_RB_BASE, rdev->ih.gpu_addr >> 8);
-        rb_bufsz = drm_order(rdev->ih.ring_size / 4);
+        rb_bufsz = order_base_2(rdev->ih.ring_size / 4);
 
         ih_rb_cntl = (IH_WPTR_OVERFLOW_ENABLE |
                       IH_WPTR_OVERFLOW_CLEAR |
diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index 72887df8dd76..c590cd9dca0b 100644
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -7,3 +7,10 @@ config DRM_RCAR_DU
         help
           Choose this option if you have an R-Car chipset.
           If M is selected the module will be called rcar-du-drm.
+
+config DRM_RCAR_LVDS
+        bool "R-Car DU LVDS Encoder Support"
+        depends on DRM_RCAR_DU
+        help
+          Enable support the R-Car Display Unit embedded LVDS encoders
+          (currently only on R8A7790).
diff --git a/drivers/gpu/drm/rcar-du/Makefile b/drivers/gpu/drm/rcar-du/Makefile
index 7333c0094015..12b8d4477835 100644
--- a/drivers/gpu/drm/rcar-du/Makefile
+++ b/drivers/gpu/drm/rcar-du/Makefile
@@ -1,8 +1,12 @@
 rcar-du-drm-y := rcar_du_crtc.o \
                  rcar_du_drv.o \
+                 rcar_du_encoder.o \
+                 rcar_du_group.o \
                  rcar_du_kms.o \
-                 rcar_du_lvds.o \
+                 rcar_du_lvdscon.o \
                  rcar_du_plane.o \
-                 rcar_du_vga.o
+                 rcar_du_vgacon.o
 
-obj-$(CONFIG_DRM_RCAR_DU)       += rcar-du-drm.o
+rcar-du-drm-$(CONFIG_DRM_RCAR_LVDS)     += rcar_du_lvdsenc.o
+
+obj-$(CONFIG_DRM_RCAR_DU)               += rcar-du-drm.o
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 24183fb93592..a9d24e4bf792 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -23,30 +23,26 @@
 #include "rcar_du_crtc.h"
 #include "rcar_du_drv.h"
 #include "rcar_du_kms.h"
-#include "rcar_du_lvds.h"
 #include "rcar_du_plane.h"
 #include "rcar_du_regs.h"
-#include "rcar_du_vga.h"
-
-#define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc)
 
 static u32 rcar_du_crtc_read(struct rcar_du_crtc *rcrtc, u32 reg)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
 
         return rcar_du_read(rcdu, rcrtc->mmio_offset + reg);
 }
 
 static void rcar_du_crtc_write(struct rcar_du_crtc *rcrtc, u32 reg, u32 data)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
 
         rcar_du_write(rcdu, rcrtc->mmio_offset + reg, data);
 }
 
 static void rcar_du_crtc_clr(struct rcar_du_crtc *rcrtc, u32 reg, u32 clr)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
 
         rcar_du_write(rcdu, rcrtc->mmio_offset + reg,
                       rcar_du_read(rcdu, rcrtc->mmio_offset + reg) & ~clr);
@@ -54,7 +50,7 @@ static void rcar_du_crtc_clr(struct rcar_du_crtc *rcrtc, u32 reg, u32 clr)
 
 static void rcar_du_crtc_set(struct rcar_du_crtc *rcrtc, u32 reg, u32 set)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
 
         rcar_du_write(rcdu, rcrtc->mmio_offset + reg,
                       rcar_du_read(rcdu, rcrtc->mmio_offset + reg) | set);
@@ -63,29 +59,48 @@ static void rcar_du_crtc_set(struct rcar_du_crtc *rcrtc, u32 reg, u32 set)
 static void rcar_du_crtc_clr_set(struct rcar_du_crtc *rcrtc, u32 reg,
                                  u32 clr, u32 set)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
         u32 value = rcar_du_read(rcdu, rcrtc->mmio_offset + reg);
 
         rcar_du_write(rcdu, rcrtc->mmio_offset + reg, (value & ~clr) | set);
 }
 
+static int rcar_du_crtc_get(struct rcar_du_crtc *rcrtc)
+{
+        int ret;
+
+        ret = clk_prepare_enable(rcrtc->clock);
+        if (ret < 0)
+                return ret;
+
+        ret = rcar_du_group_get(rcrtc->group);
+        if (ret < 0)
+                clk_disable_unprepare(rcrtc->clock);
+
+        return ret;
+}
+
+static void rcar_du_crtc_put(struct rcar_du_crtc *rcrtc)
+{
+        rcar_du_group_put(rcrtc->group);
+        clk_disable_unprepare(rcrtc->clock);
+}
+
 static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
 {
-        struct drm_crtc *crtc = &rcrtc->crtc;
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
-        const struct drm_display_mode *mode = &crtc->mode;
+        const struct drm_display_mode *mode = &rcrtc->crtc.mode;
         unsigned long clk;
         u32 value;
         u32 div;
 
         /* Dot clock */
-        clk = clk_get_rate(rcdu->clock);
+        clk = clk_get_rate(rcrtc->clock);
         div = DIV_ROUND_CLOSEST(clk, mode->clock * 1000);
         div = clamp(div, 1U, 64U) - 1;
 
-        rcar_du_write(rcdu, rcrtc->index ? ESCR2 : ESCR,
-                      ESCR_DCLKSEL_CLKS | div);
-        rcar_du_write(rcdu, rcrtc->index ? OTAR2 : OTAR, 0);
+        rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? ESCR2 : ESCR,
+                            ESCR_DCLKSEL_CLKS | div);
+        rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? OTAR2 : OTAR, 0);
 
         /* Signal polarities */
         value = ((mode->flags & DRM_MODE_FLAG_PVSYNC) ? 0 : DSMR_VSL)
@@ -112,68 +127,25 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
         rcar_du_crtc_write(rcrtc, DEWR,  mode->hdisplay);
 }
 
-static void rcar_du_crtc_set_routing(struct rcar_du_crtc *rcrtc)
-{
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
-        u32 dorcr = rcar_du_read(rcdu, DORCR);
-
-        dorcr &= ~(DORCR_PG2T | DORCR_DK2S | DORCR_PG2D_MASK);
-
-        /* Set the DU1 pins sources. Select CRTC 0 if explicitly requested and
-         * CRTC 1 in all other cases to avoid cloning CRTC 0 to DU0 and DU1 by
-         * default.
-         */
-        if (rcrtc->outputs & (1 << 1) && rcrtc->index == 0)
-                dorcr |= DORCR_PG2D_DS1;
-        else
-                dorcr |= DORCR_PG2T | DORCR_DK2S | DORCR_PG2D_DS2;
-
-        rcar_du_write(rcdu, DORCR, dorcr);
-}
-
-static void __rcar_du_start_stop(struct rcar_du_device *rcdu, bool start)
-{
-        rcar_du_write(rcdu, DSYSR,
-                      (rcar_du_read(rcdu, DSYSR) & ~(DSYSR_DRES | DSYSR_DEN)) |
-                      (start ? DSYSR_DEN : DSYSR_DRES));
-}
-
-static void rcar_du_start_stop(struct rcar_du_device *rcdu, bool start)
-{
-        /* Many of the configuration bits are only updated when the display
-         * reset (DRES) bit in DSYSR is set to 1, disabling *both* CRTCs. Some
-         * of those bits could be pre-configured, but others (especially the
-         * bits related to plane assignment to display timing controllers) need
-         * to be modified at runtime.
-         *
-         * Restart the display controller if a start is requested. Sorry for the
-         * flicker. It should be possible to move most of the "DRES-update" bits
-         * setup to driver initialization time and minimize the number of cases
-         * when the display controller will have to be restarted.
-         */
-        if (start) {
-                if (rcdu->used_crtcs++ != 0)
-                        __rcar_du_start_stop(rcdu, false);
-                __rcar_du_start_stop(rcdu, true);
-        } else {
-                if (--rcdu->used_crtcs == 0)
-                        __rcar_du_start_stop(rcdu, false);
-        }
-}
-
-void rcar_du_crtc_route_output(struct drm_crtc *crtc, unsigned int output)
+void rcar_du_crtc_route_output(struct drm_crtc *crtc,
+                               enum rcar_du_output output)
 {
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
 
         /* Store the route from the CRTC output to the DU output. The DU will be
          * configured when starting the CRTC.
          */
-        rcrtc->outputs |= 1 << output;
+        rcrtc->outputs |= BIT(output);
+
+        /* Store RGB routing to DPAD0 for R8A7790. */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_DEFR8) &&
+            output == RCAR_DU_OUTPUT_DPAD0)
+                rcdu->dpad0_source = rcrtc->index;
 }
 
 void rcar_du_crtc_update_planes(struct drm_crtc *crtc)
 {
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
         struct rcar_du_plane *planes[RCAR_DU_NUM_HW_PLANES];
         unsigned int num_planes = 0;
@@ -182,8 +154,8 @@ void rcar_du_crtc_update_planes(struct drm_crtc *crtc)
         u32 dptsr = 0;
         u32 dspr = 0;
 
-        for (i = 0; i < ARRAY_SIZE(rcdu->planes.planes); ++i) {
-                struct rcar_du_plane *plane = &rcdu->planes.planes[i];
+        for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes.planes); ++i) {
+                struct rcar_du_plane *plane = &rcrtc->group->planes.planes[i];
                 unsigned int j;
 
                 if (plane->crtc != &rcrtc->crtc || !plane->enabled)
@@ -220,8 +192,8 @@ void rcar_du_crtc_update_planes(struct drm_crtc *crtc)
         /* Select display timing and dot clock generator 2 for planes associated
          * with superposition controller 2.
          */
-        if (rcrtc->index) {
-                u32 value = rcar_du_read(rcdu, DPTSR);
+        if (rcrtc->index % 2) {
+                u32 value = rcar_du_group_read(rcrtc->group, DPTSR);
 
                 /* The DPTSR register is updated when the display controller is
                  * stopped. We thus need to restart the DU. Once again, sorry
@@ -231,21 +203,19 @@ void rcar_du_crtc_update_planes(struct drm_crtc *crtc)
                  * occur only if we need to break the pre-association.
                  */
                 if (value != dptsr) {
-                        rcar_du_write(rcdu, DPTSR, dptsr);
-                        if (rcdu->used_crtcs) {
-                                __rcar_du_start_stop(rcdu, false);
-                                __rcar_du_start_stop(rcdu, true);
-                        }
+                        rcar_du_group_write(rcrtc->group, DPTSR, dptsr);
+                        if (rcrtc->group->used_crtcs)
+                                rcar_du_group_restart(rcrtc->group);
                 }
         }
 
-        rcar_du_write(rcdu, rcrtc->index ? DS2PR : DS1PR, dspr);
+        rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? DS2PR : DS1PR,
+                            dspr);
 }
 
 static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
 {
         struct drm_crtc *crtc = &rcrtc->crtc;
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
         unsigned int i;
 
         if (rcrtc->started)
@@ -260,16 +230,16 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
 
         /* Configure display timings and output routing */
         rcar_du_crtc_set_display_timing(rcrtc);
-        rcar_du_crtc_set_routing(rcrtc);
+        rcar_du_group_set_routing(rcrtc->group);
 
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&rcrtc->group->planes.lock);
         rcrtc->plane->enabled = true;
         rcar_du_crtc_update_planes(crtc);
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&rcrtc->group->planes.lock);
 
         /* Setup planes. */
-        for (i = 0; i < ARRAY_SIZE(rcdu->planes.planes); ++i) {
-                struct rcar_du_plane *plane = &rcdu->planes.planes[i];
+        for (i = 0; i < ARRAY_SIZE(rcrtc->group->planes.planes); ++i) {
+                struct rcar_du_plane *plane = &rcrtc->group->planes.planes[i];
 
                 if (plane->crtc != crtc || !plane->enabled)
                         continue;
@@ -283,7 +253,7 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
          */
         rcar_du_crtc_clr_set(rcrtc, DSYSR, DSYSR_TVM_MASK, DSYSR_TVM_MASTER);
 
-        rcar_du_start_stop(rcdu, true);
+        rcar_du_group_start_stop(rcrtc->group, true);
 
         rcrtc->started = true;
 }
@@ -291,42 +261,37 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
 static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
 {
         struct drm_crtc *crtc = &rcrtc->crtc;
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
 
         if (!rcrtc->started)
                 return;
 
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&rcrtc->group->planes.lock);
         rcrtc->plane->enabled = false;
         rcar_du_crtc_update_planes(crtc);
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&rcrtc->group->planes.lock);
 
         /* Select switch sync mode. This stops display operation and configures
          * the HSYNC and VSYNC signals as inputs.
          */
         rcar_du_crtc_clr_set(rcrtc, DSYSR, DSYSR_TVM_MASK, DSYSR_TVM_SWITCH);
 
-        rcar_du_start_stop(rcdu, false);
+        rcar_du_group_start_stop(rcrtc->group, false);
 
         rcrtc->started = false;
 }
 
 void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
-
         rcar_du_crtc_stop(rcrtc);
-        rcar_du_put(rcdu);
+        rcar_du_crtc_put(rcrtc);
 }
 
 void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc)
 {
-        struct rcar_du_device *rcdu = rcrtc->crtc.dev->dev_private;
-
         if (rcrtc->dpms != DRM_MODE_DPMS_ON)
                 return;
 
-        rcar_du_get(rcdu);
+        rcar_du_crtc_get(rcrtc);
         rcar_du_crtc_start(rcrtc);
 }
 
@@ -340,18 +305,17 @@ static void rcar_du_crtc_update_base(struct rcar_du_crtc *rcrtc)
 
 static void rcar_du_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 
         if (rcrtc->dpms == mode)
                 return;
 
         if (mode == DRM_MODE_DPMS_ON) {
-                rcar_du_get(rcdu);
+                rcar_du_crtc_get(rcrtc);
                 rcar_du_crtc_start(rcrtc);
         } else {
                 rcar_du_crtc_stop(rcrtc);
-                rcar_du_put(rcdu);
+                rcar_du_crtc_put(rcrtc);
         }
 
         rcrtc->dpms = mode;
@@ -367,13 +331,12 @@ static bool rcar_du_crtc_mode_fixup(struct drm_crtc *crtc,
 
 static void rcar_du_crtc_mode_prepare(struct drm_crtc *crtc)
 {
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 
         /* We need to access the hardware during mode set, acquire a reference
-         * to the DU.
+         * to the CRTC.
          */
-        rcar_du_get(rcdu);
+        rcar_du_crtc_get(rcrtc);
 
         /* Stop the CRTC and release the plane. Force the DPMS mode to off as a
          * result.
@@ -390,8 +353,8 @@ static int rcar_du_crtc_mode_set(struct drm_crtc *crtc,
                                  int x, int y,
                                  struct drm_framebuffer *old_fb)
 {
-        struct rcar_du_device *rcdu = crtc->dev->dev_private;
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+        struct rcar_du_device *rcdu = rcrtc->group->dev;
         const struct rcar_du_format_info *format;
         int ret;
 
@@ -423,10 +386,10 @@ static int rcar_du_crtc_mode_set(struct drm_crtc *crtc,
 
 error:
         /* There's no rollback/abort operation to clean up in case of error. We
-         * thus need to release the reference to the DU acquired in prepare()
+         * thus need to release the reference to the CRTC acquired in prepare()
          * here.
          */
-        rcar_du_put(rcdu);
+        rcar_du_crtc_put(rcrtc);
         return ret;
 }
 
@@ -514,9 +477,28 @@ static void rcar_du_crtc_finish_page_flip(struct rcar_du_crtc *rcrtc)
         drm_vblank_put(dev, rcrtc->index);
 }
 
+static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
+{
+        struct rcar_du_crtc *rcrtc = arg;
+        irqreturn_t ret = IRQ_NONE;
+        u32 status;
+
+        status = rcar_du_crtc_read(rcrtc, DSSR);
+        rcar_du_crtc_write(rcrtc, DSRCR, status & DSRCR_MASK);
+
+        if (status & DSSR_VBK) {
+                drm_handle_vblank(rcrtc->crtc.dev, rcrtc->index);
+                rcar_du_crtc_finish_page_flip(rcrtc);
+                ret = IRQ_HANDLED;
+        }
+
+        return ret;
+}
+
 static int rcar_du_crtc_page_flip(struct drm_crtc *crtc,
                                   struct drm_framebuffer *fb,
-                                  struct drm_pending_vblank_event *event)
+                                  struct drm_pending_vblank_event *event,
+                                  uint32_t page_flip_flags)
 {
         struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
         struct drm_device *dev = rcrtc->crtc.dev;
@@ -549,16 +531,41 @@ static const struct drm_crtc_funcs crtc_funcs = {
         .page_flip = rcar_du_crtc_page_flip,
 };
 
-int rcar_du_crtc_create(struct rcar_du_device *rcdu, unsigned int index)
+int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
 {
+        static const unsigned int mmio_offsets[] = {
+                DU0_REG_OFFSET, DU1_REG_OFFSET, DU2_REG_OFFSET
+        };
+
+        struct rcar_du_device *rcdu = rgrp->dev;
+        struct platform_device *pdev = to_platform_device(rcdu->dev);
         struct rcar_du_crtc *rcrtc = &rcdu->crtcs[index];
         struct drm_crtc *crtc = &rcrtc->crtc;
+        unsigned int irqflags;
+        char clk_name[5];
+        char *name;
+        int irq;
         int ret;
 
-        rcrtc->mmio_offset = index ? DISP2_REG_OFFSET : 0;
+        /* Get the CRTC clock. */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) {
+                sprintf(clk_name, "du.%u", index);
+                name = clk_name;
+        } else {
+                name = NULL;
+        }
+
+        rcrtc->clock = devm_clk_get(rcdu->dev, name);
+        if (IS_ERR(rcrtc->clock)) {
+                dev_err(rcdu->dev, "no clock for CRTC %u\n", index);
+                return PTR_ERR(rcrtc->clock);
+        }
+
+        rcrtc->group = rgrp;
+        rcrtc->mmio_offset = mmio_offsets[index];
         rcrtc->index = index;
         rcrtc->dpms = DRM_MODE_DPMS_OFF;
-        rcrtc->plane = &rcdu->planes.planes[index];
+        rcrtc->plane = &rgrp->planes.planes[index % 2];
 
         rcrtc->plane->crtc = crtc;
 
@@ -568,6 +575,28 @@ int rcar_du_crtc_create(struct rcar_du_device *rcdu, unsigned int index)
 
         drm_crtc_helper_add(crtc, &crtc_helper_funcs);
 
+        /* Register the interrupt handler. */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CRTC_IRQ_CLOCK)) {
+                irq = platform_get_irq(pdev, index);
+                irqflags = 0;
+        } else {
+                irq = platform_get_irq(pdev, 0);
+                irqflags = IRQF_SHARED;
+        }
+
+        if (irq < 0) {
+                dev_err(rcdu->dev, "no IRQ for CRTC %u\n", index);
+                return ret;
+        }
+
+        ret = devm_request_irq(rcdu->dev, irq, rcar_du_crtc_irq, irqflags,
+                               dev_name(rcdu->dev), rcrtc);
+        if (ret < 0) {
+                dev_err(rcdu->dev,
+                        "failed to register IRQ for CRTC %u\n", index);
+                return ret;
+        }
+
         return 0;
 }
 
@@ -580,16 +609,3 @@ void rcar_du_crtc_enable_vblank(struct rcar_du_crtc *rcrtc, bool enable)
                 rcar_du_crtc_clr(rcrtc, DIER, DIER_VBE);
         }
 }
-
-void rcar_du_crtc_irq(struct rcar_du_crtc *rcrtc)
-{
-        u32 status;
-
-        status = rcar_du_crtc_read(rcrtc, DSSR);
-        rcar_du_crtc_write(rcrtc, DSRCR, status & DSRCR_MASK);
-
-        if (status & DSSR_VBK) {
-                drm_handle_vblank(rcrtc->crtc.dev, rcrtc->index);
-                rcar_du_crtc_finish_page_flip(rcrtc);
-        }
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
index 2a0365bcbd14..43e7575c700c 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
@@ -15,16 +15,18 @@
 #define __RCAR_DU_CRTC_H__
 
 #include <linux/mutex.h>
+#include <linux/platform_data/rcar-du.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 
-struct rcar_du_device;
+struct rcar_du_group;
 struct rcar_du_plane;
 
 struct rcar_du_crtc {
         struct drm_crtc crtc;
 
+        struct clk *clock;
         unsigned int mmio_offset;
         unsigned int index;
         bool started;
@@ -33,18 +35,21 @@ struct rcar_du_crtc {
         unsigned int outputs;
         int dpms;
 
+        struct rcar_du_group *group;
         struct rcar_du_plane *plane;
 };
 
-int rcar_du_crtc_create(struct rcar_du_device *rcdu, unsigned int index);
+#define to_rcar_crtc(c) container_of(c, struct rcar_du_crtc, crtc)
+
+int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index);
 void rcar_du_crtc_enable_vblank(struct rcar_du_crtc *rcrtc, bool enable);
-void rcar_du_crtc_irq(struct rcar_du_crtc *rcrtc);
 void rcar_du_crtc_cancel_page_flip(struct rcar_du_crtc *rcrtc,
                                    struct drm_file *file);
 void rcar_du_crtc_suspend(struct rcar_du_crtc *rcrtc);
 void rcar_du_crtc_resume(struct rcar_du_crtc *rcrtc);
 
-void rcar_du_crtc_route_output(struct drm_crtc *crtc, unsigned int output);
+void rcar_du_crtc_route_output(struct drm_crtc *crtc,
+                               enum rcar_du_output output);
 void rcar_du_crtc_update_planes(struct drm_crtc *crtc);
 
 #endif /* __RCAR_DU_CRTC_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index dc0fe09b2ba1..0023f9719cf1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -21,6 +21,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_gem_cma_helper.h>
 
 #include "rcar_du_crtc.h"
@@ -29,74 +30,21 @@
 #include "rcar_du_regs.h"
 
 /* -----------------------------------------------------------------------------
- * Core device operations
- */
-
-/*
- * rcar_du_get - Acquire a reference to the DU
- *
- * Acquiring a reference enables the device clock and setup core registers. A
- * reference must be held before accessing any hardware registers.
- *
- * This function must be called with the DRM mode_config lock held.
- *
- * Return 0 in case of success or a negative error code otherwise.
- */
-int rcar_du_get(struct rcar_du_device *rcdu)
-{
-        int ret;
-
-        if (rcdu->use_count)
-                goto done;
-
-        /* Enable clocks before accessing the hardware. */
-        ret = clk_prepare_enable(rcdu->clock);
-        if (ret < 0)
-                return ret;
-
-        /* Enable extended features */
-        rcar_du_write(rcdu, DEFR, DEFR_CODE | DEFR_DEFE);
-        rcar_du_write(rcdu, DEFR2, DEFR2_CODE | DEFR2_DEFE2G);
-        rcar_du_write(rcdu, DEFR3, DEFR3_CODE | DEFR3_DEFE3);
-        rcar_du_write(rcdu, DEFR4, DEFR4_CODE);
-        rcar_du_write(rcdu, DEFR5, DEFR5_CODE | DEFR5_DEFE5);
-
-        /* Use DS1PR and DS2PR to configure planes priorities and connects the
-         * superposition 0 to DU0 pins. DU1 pins will be configured dynamically.
-         */
-        rcar_du_write(rcdu, DORCR, DORCR_PG1D_DS1 | DORCR_DPRS);
-
-done:
-        rcdu->use_count++;
-        return 0;
-}
-
-/*
- * rcar_du_put - Release a reference to the DU
- *
- * Releasing the last reference disables the device clock.
- *
- * This function must be called with the DRM mode_config lock held.
- */
-void rcar_du_put(struct rcar_du_device *rcdu)
-{
-        if (--rcdu->use_count)
-                return;
-
-        clk_disable_unprepare(rcdu->clock);
-}
-
-/* -----------------------------------------------------------------------------
  * DRM operations
  */
 
 static int rcar_du_unload(struct drm_device *dev)
 {
+        struct rcar_du_device *rcdu = dev->dev_private;
+
+        if (rcdu->fbdev)
+                drm_fbdev_cma_fini(rcdu->fbdev);
+
         drm_kms_helper_poll_fini(dev);
         drm_mode_config_cleanup(dev);
         drm_vblank_cleanup(dev);
-        drm_irq_uninstall(dev);
 
+        dev->irq_enabled = 0;
         dev->dev_private = NULL;
 
         return 0;
@@ -107,7 +55,6 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
         struct platform_device *pdev = dev->platformdev;
         struct rcar_du_platform_data *pdata = pdev->dev.platform_data;
         struct rcar_du_device *rcdu;
-        struct resource *ioarea;
         struct resource *mem;
         int ret;
 
@@ -124,35 +71,15 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
 
         rcdu->dev = &pdev->dev;
         rcdu->pdata = pdata;
+        rcdu->info = (struct rcar_du_device_info *)pdev->id_entry->driver_data;
         rcdu->ddev = dev;
         dev->dev_private = rcdu;
 
-        /* I/O resources and clocks */
+        /* I/O resources */
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (mem == NULL) {
-                dev_err(&pdev->dev, "failed to get memory resource\n");
-                return -EINVAL;
-        }
-
-        ioarea = devm_request_mem_region(&pdev->dev, mem->start,
-                                         resource_size(mem), pdev->name);
-        if (ioarea == NULL) {
-                dev_err(&pdev->dev, "failed to request memory region\n");
-                return -EBUSY;
-        }
-
-        rcdu->mmio = devm_ioremap_nocache(&pdev->dev, ioarea->start,
-                                          resource_size(ioarea));
-        if (rcdu->mmio == NULL) {
-                dev_err(&pdev->dev, "failed to remap memory resource\n");
-                return -ENOMEM;
-        }
-
-        rcdu->clock = devm_clk_get(&pdev->dev, NULL);
-        if (IS_ERR(rcdu->clock)) {
-                dev_err(&pdev->dev, "failed to get clock\n");
-                return -ENOENT;
-        }
+        rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(rcdu->mmio))
+                return PTR_ERR(rcdu->mmio);
 
         /* DRM/KMS objects */
         ret = rcar_du_modeset_init(rcdu);
@@ -161,18 +88,14 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags)
                 goto done;
         }
 
-        /* IRQ and vblank handling */
+        /* vblank handling */
         ret = drm_vblank_init(dev, (1 << rcdu->num_crtcs) - 1);
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to initialize vblank\n");
                 goto done;
         }
 
-        ret = drm_irq_install(dev);
-        if (ret < 0) {
-                dev_err(&pdev->dev, "failed to install IRQ handler\n");
-                goto done;
-        }
+        dev->irq_enabled = 1;
 
         platform_set_drvdata(pdev, rcdu);
 
@@ -188,20 +111,15 @@ static void rcar_du_preclose(struct drm_device *dev, struct drm_file *file)
         struct rcar_du_device *rcdu = dev->dev_private;
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(rcdu->crtcs); ++i)
+        for (i = 0; i < rcdu->num_crtcs; ++i)
                 rcar_du_crtc_cancel_page_flip(&rcdu->crtcs[i], file);
 }
 
-static irqreturn_t rcar_du_irq(int irq, void *arg)
+static void rcar_du_lastclose(struct drm_device *dev)
 {
-        struct drm_device *dev = arg;
         struct rcar_du_device *rcdu = dev->dev_private;
-        unsigned int i;
-
-        for (i = 0; i < ARRAY_SIZE(rcdu->crtcs); ++i)
-                rcar_du_crtc_irq(&rcdu->crtcs[i]);
 
-        return IRQ_HANDLED;
+        drm_fbdev_cma_restore_mode(rcdu->fbdev);
 }
 
 static int rcar_du_enable_vblank(struct drm_device *dev, int crtc)
@@ -230,18 +148,16 @@ static const struct file_operations rcar_du_fops = {
 #endif
         .poll           = drm_poll,
         .read           = drm_read,
-        .fasync         = drm_fasync,
         .llseek         = no_llseek,
         .mmap           = drm_gem_cma_mmap,
 };
 
 static struct drm_driver rcar_du_driver = {
-        .driver_features        = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET
-                                | DRIVER_PRIME,
+        .driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME,
         .load                   = rcar_du_load,
         .unload                 = rcar_du_unload,
         .preclose               = rcar_du_preclose,
-        .irq_handler            = rcar_du_irq,
+        .lastclose              = rcar_du_lastclose,
         .get_vblank_counter     = drm_vblank_count,
         .enable_vblank          = rcar_du_enable_vblank,
         .disable_vblank         = rcar_du_disable_vblank,
@@ -258,7 +174,7 @@ static struct drm_driver rcar_du_driver = {
         .gem_prime_mmap         = drm_gem_cma_prime_mmap,
         .dumb_create            = rcar_du_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
-        .dumb_destroy           = drm_gem_cma_dumb_destroy,
+        .dumb_destroy           = drm_gem_dumb_destroy,
         .fops                   = &rcar_du_fops,
         .name                   = "rcar-du",
         .desc                   = "Renesas R-Car Display Unit",
@@ -313,6 +229,57 @@ static int rcar_du_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct rcar_du_device_info rcar_du_r8a7779_info = {
+        .features = 0,
+        .num_crtcs = 2,
+        .routes = {
+                /* R8A7779 has two RGB outputs and one (currently unsupported)
+                 * TCON output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                },
+                [RCAR_DU_OUTPUT_DPAD1] = {
+                        .possible_crtcs = BIT(1) | BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                },
+        },
+        .num_lvds = 0,
+};
+
+static const struct rcar_du_device_info rcar_du_r8a7790_info = {
+        .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_ALIGN_128B
+                  | RCAR_DU_FEATURE_DEFR8,
+        .num_crtcs = 3,
+        .routes = {
+                /* R8A7790 has one RGB output, two LVDS outputs and one
+                 * (currently unsupported) TCON output.
+                 */
+                [RCAR_DU_OUTPUT_DPAD0] = {
+                        .possible_crtcs = BIT(2) | BIT(1) | BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_NONE,
+                },
+                [RCAR_DU_OUTPUT_LVDS0] = {
+                        .possible_crtcs = BIT(0),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                },
+                [RCAR_DU_OUTPUT_LVDS1] = {
+                        .possible_crtcs = BIT(2) | BIT(1),
+                        .encoder_type = DRM_MODE_ENCODER_LVDS,
+                },
+        },
+        .num_lvds = 2,
+};
+
+static const struct platform_device_id rcar_du_id_table[] = {
+        { "rcar-du-r8a7779", (kernel_ulong_t)&rcar_du_r8a7779_info },
+        { "rcar-du-r8a7790", (kernel_ulong_t)&rcar_du_r8a7790_info },
+        { }
+};
+
+MODULE_DEVICE_TABLE(platform, rcar_du_id_table);
+
 static struct platform_driver rcar_du_platform_driver = {
         .probe          = rcar_du_probe,
         .remove         = rcar_du_remove,
@@ -321,6 +288,7 @@ static struct platform_driver rcar_du_platform_driver = {
                 .name   = "rcar-du",
                 .pm     = &rcar_du_pm_ops,
         },
+        .id_table       = rcar_du_id_table,
 };
 
 module_platform_driver(rcar_du_platform_driver);
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index 193cc59d495c..65d2d636b002 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -15,43 +15,74 @@
 #define __RCAR_DU_DRV_H__
 
 #include <linux/kernel.h>
-#include <linux/mutex.h>
 #include <linux/platform_data/rcar-du.h>
 
 #include "rcar_du_crtc.h"
-#include "rcar_du_plane.h"
+#include "rcar_du_group.h"
 
 struct clk;
 struct device;
 struct drm_device;
+struct drm_fbdev_cma;
+struct rcar_du_device;
+struct rcar_du_lvdsenc;
+
+#define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK  (1 << 0)        /* Per-CRTC IRQ and clock */
+#define RCAR_DU_FEATURE_ALIGN_128B      (1 << 1)        /* Align pitches to 128 bytes */
+#define RCAR_DU_FEATURE_DEFR8           (1 << 2)        /* Has DEFR8 register */
+
+/*
+ * struct rcar_du_output_routing - Output routing specification
+ * @possible_crtcs: bitmask of possible CRTCs for the output
+ * @encoder_type: DRM type of the internal encoder associated with the output
+ *
+ * The DU has 5 possible outputs (DPAD0/1, LVDS0/1, TCON). Output routing data
+ * specify the valid SoC outputs, which CRTCs can drive the output, and the type
+ * of in-SoC encoder for the output.
+ */
+struct rcar_du_output_routing {
+        unsigned int possible_crtcs;
+        unsigned int encoder_type;
+};
+
+/*
+ * struct rcar_du_device_info - DU model-specific information
+ * @features: device features (RCAR_DU_FEATURE_*)
+ * @num_crtcs: total number of CRTCs
+ * @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*)
+ * @num_lvds: number of internal LVDS encoders
+ */
+struct rcar_du_device_info {
+        unsigned int features;
+        unsigned int num_crtcs;
+        struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX];
+        unsigned int num_lvds;
+};
 
 struct rcar_du_device {
         struct device *dev;
         const struct rcar_du_platform_data *pdata;
+        const struct rcar_du_device_info *info;
 
         void __iomem *mmio;
-        struct clk *clock;
-        unsigned int use_count;
 
         struct drm_device *ddev;
+        struct drm_fbdev_cma *fbdev;
 
-        struct rcar_du_crtc crtcs[2];
-        unsigned int used_crtcs;
+        struct rcar_du_crtc crtcs[3];
         unsigned int num_crtcs;
 
-        struct {
-                struct rcar_du_plane planes[RCAR_DU_NUM_SW_PLANES];
-                unsigned int free;
-                struct mutex lock;
+        struct rcar_du_group groups[2];
 
-                struct drm_property *alpha;
-                struct drm_property *colorkey;
-                struct drm_property *zpos;
-        } planes;
+        unsigned int dpad0_source;
+        struct rcar_du_lvdsenc *lvds[2];
 };
 
-int rcar_du_get(struct rcar_du_device *rcdu);
-void rcar_du_put(struct rcar_du_device *rcdu);
+static inline bool rcar_du_has(struct rcar_du_device *rcdu,
+                               unsigned int feature)
+{
+        return rcdu->info->features & feature;
+}
 
 static inline u32 rcar_du_read(struct rcar_du_device *rcdu, u32 reg)
 {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
new file mode 100644
index 000000000000..3daa7a168dc6
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -0,0 +1,202 @@
+/*
+ * rcar_du_encoder.c  --  R-Car Display Unit Encoder
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/export.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+
+#include "rcar_du_drv.h"
+#include "rcar_du_encoder.h"
+#include "rcar_du_kms.h"
+#include "rcar_du_lvdscon.h"
+#include "rcar_du_lvdsenc.h"
+#include "rcar_du_vgacon.h"
+
+/* -----------------------------------------------------------------------------
+ * Common connector functions
+ */
+
+struct drm_encoder *
+rcar_du_connector_best_encoder(struct drm_connector *connector)
+{
+        struct rcar_du_connector *rcon = to_rcar_connector(connector);
+
+        return &rcon->encoder->encoder;
+}
+
+/* -----------------------------------------------------------------------------
+ * Encoder
+ */
+
+static void rcar_du_encoder_dpms(struct drm_encoder *encoder, int mode)
+{
+        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+
+        if (renc->lvds)
+                rcar_du_lvdsenc_dpms(renc->lvds, encoder->crtc, mode);
+}
+
+static bool rcar_du_encoder_mode_fixup(struct drm_encoder *encoder,
+                                       const struct drm_display_mode *mode,
+                                       struct drm_display_mode *adjusted_mode)
+{
+        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+        const struct drm_display_mode *panel_mode;
+        struct drm_device *dev = encoder->dev;
+        struct drm_connector *connector;
+        bool found = false;
+
+        /* DAC encoders have currently no restriction on the mode. */
+        if (encoder->encoder_type == DRM_MODE_ENCODER_DAC)
+                return true;
+
+        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+                if (connector->encoder == encoder) {
+                        found = true;
+                        break;
+                }
+        }
+
+        if (!found) {
+                dev_dbg(dev->dev, "mode_fixup: no connector found\n");
+                return false;
+        }
+
+        if (list_empty(&connector->modes)) {
+                dev_dbg(dev->dev, "mode_fixup: empty modes list\n");
+                return false;
+        }
+
+        panel_mode = list_first_entry(&connector->modes,
+                                      struct drm_display_mode, head);
+
+        /* We're not allowed to modify the resolution. */
+        if (mode->hdisplay != panel_mode->hdisplay ||
+            mode->vdisplay != panel_mode->vdisplay)
+                return false;
+
+        /* The flat panel mode is fixed, just copy it to the adjusted mode. */
+        drm_mode_copy(adjusted_mode, panel_mode);
+
+        /* The internal LVDS encoder has a clock frequency operating range of
+         * 30MHz to 150MHz. Clamp the clock accordingly.
+         */
+        if (renc->lvds)
+                adjusted_mode->clock = clamp(adjusted_mode->clock,
+                                             30000, 150000);
+
+        return true;
+}
+
+static void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder)
+{
+        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+
+        if (renc->lvds)
+                rcar_du_lvdsenc_dpms(renc->lvds, encoder->crtc,
+                                     DRM_MODE_DPMS_OFF);
+}
+
+static void rcar_du_encoder_mode_commit(struct drm_encoder *encoder)
+{
+        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+
+        if (renc->lvds)
+                rcar_du_lvdsenc_dpms(renc->lvds, encoder->crtc,
+                                     DRM_MODE_DPMS_ON);
+}
+
+static void rcar_du_encoder_mode_set(struct drm_encoder *encoder,
+                                     struct drm_display_mode *mode,
+                                     struct drm_display_mode *adjusted_mode)
+{
+        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+
+        rcar_du_crtc_route_output(encoder->crtc, renc->output);
+}
+
+static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
+        .dpms = rcar_du_encoder_dpms,
+        .mode_fixup = rcar_du_encoder_mode_fixup,
+        .prepare = rcar_du_encoder_mode_prepare,
+        .commit = rcar_du_encoder_mode_commit,
+        .mode_set = rcar_du_encoder_mode_set,
+};
+
+static const struct drm_encoder_funcs encoder_funcs = {
+        .destroy = drm_encoder_cleanup,
+};
+
+int rcar_du_encoder_init(struct rcar_du_device *rcdu,
+                         enum rcar_du_encoder_type type,
+                         enum rcar_du_output output,
+                         const struct rcar_du_encoder_data *data)
+{
+        struct rcar_du_encoder *renc;
+        unsigned int encoder_type;
+        int ret;
+
+        renc = devm_kzalloc(rcdu->dev, sizeof(*renc), GFP_KERNEL);
+        if (renc == NULL)
+                return -ENOMEM;
+
+        renc->output = output;
+
+        switch (output) {
+        case RCAR_DU_OUTPUT_LVDS0:
+                renc->lvds = rcdu->lvds[0];
+                break;
+
+        case RCAR_DU_OUTPUT_LVDS1:
+                renc->lvds = rcdu->lvds[1];
+                break;
+
+        default:
+                break;
+        }
+
+        switch (type) {
+        case RCAR_DU_ENCODER_VGA:
+                encoder_type = DRM_MODE_ENCODER_DAC;
+                break;
+        case RCAR_DU_ENCODER_LVDS:
+                encoder_type = DRM_MODE_ENCODER_LVDS;
+                break;
+        case RCAR_DU_ENCODER_NONE:
+        default:
+                /* No external encoder, use the internal encoder type. */
+                encoder_type = rcdu->info->routes[output].encoder_type;
+                break;
+        }
+
+        ret = drm_encoder_init(rcdu->ddev, &renc->encoder, &encoder_funcs,
+                               encoder_type);
+        if (ret < 0)
+                return ret;
+
+        drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);
+
+        switch (encoder_type) {
+        case DRM_MODE_ENCODER_LVDS:
+                return rcar_du_lvds_connector_init(rcdu, renc,
+                                                   &data->connector.lvds.panel);
+
+        case DRM_MODE_ENCODER_DAC:
+                return rcar_du_vga_connector_init(rcdu, renc);
+
+        default:
+                return -EINVAL;
+        }
+}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.h b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
new file mode 100644
index 000000000000..0e5a65e45d0e
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h
@@ -0,0 +1,49 @@
+/*
+ * rcar_du_encoder.h  --  R-Car Display Unit Encoder
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __RCAR_DU_ENCODER_H__
+#define __RCAR_DU_ENCODER_H__
+
+#include <linux/platform_data/rcar-du.h>
+
+#include <drm/drm_crtc.h>
+
+struct rcar_du_device;
+struct rcar_du_lvdsenc;
+
+struct rcar_du_encoder {
+        struct drm_encoder encoder;
+        enum rcar_du_output output;
+        struct rcar_du_lvdsenc *lvds;
+};
+
+#define to_rcar_encoder(e) \
+        container_of(e, struct rcar_du_encoder, encoder)
+
+struct rcar_du_connector {
+        struct drm_connector connector;
+        struct rcar_du_encoder *encoder;
+};
+
+#define to_rcar_connector(c) \
+        container_of(c, struct rcar_du_connector, connector)
+
+struct drm_encoder *
+rcar_du_connector_best_encoder(struct drm_connector *connector);
+
+int rcar_du_encoder_init(struct rcar_du_device *rcdu,
+                         enum rcar_du_encoder_type type,
+                         enum rcar_du_output output,
+                         const struct rcar_du_encoder_data *data);
+
+#endif /* __RCAR_DU_ENCODER_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c
new file mode 100644
index 000000000000..eb53cd97e8c6
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c
@@ -0,0 +1,187 @@
+/*
+ * rcar_du_group.c  --  R-Car Display Unit Channels Pair
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+/*
+ * The R8A7779 DU is split in per-CRTC resources (scan-out engine, blending
+ * unit, timings generator, ...) and device-global resources (start/stop
+ * control, planes, ...) shared between the two CRTCs.
+ *
+ * The R8A7790 introduced a third CRTC with its own set of global resources.
+ * This would be modeled as two separate DU device instances if it wasn't for
+ * a handful or resources that are shared between the three CRTCs (mostly
+ * related to input and output routing). For this reason the R8A7790 DU must be
+ * modeled as a single device with three CRTCs, two sets of "semi-global"
+ * resources, and a few device-global resources.
+ *
+ * The rcar_du_group object is a driver specific object, without any real
+ * counterpart in the DU documentation, that models those semi-global resources.
+ */
+
+#include <linux/clk.h>
+#include <linux/io.h>
+
+#include "rcar_du_drv.h"
+#include "rcar_du_group.h"
+#include "rcar_du_regs.h"
+
+u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg)
+{
+        return rcar_du_read(rgrp->dev, rgrp->mmio_offset + reg);
+}
+
+void rcar_du_group_write(struct rcar_du_group *rgrp, u32 reg, u32 data)
+{
+        rcar_du_write(rgrp->dev, rgrp->mmio_offset + reg, data);
+}
+
+static void rcar_du_group_setup_defr8(struct rcar_du_group *rgrp)
+{
+        u32 defr8 = DEFR8_CODE | DEFR8_DEFE8;
+
+        if (!rcar_du_has(rgrp->dev, RCAR_DU_FEATURE_DEFR8))
+                return;
+
+        /* The DEFR8 register for the first group also controls RGB output
+         * routing to DPAD0
+         */
+        if (rgrp->index == 0)
+                defr8 |= DEFR8_DRGBS_DU(rgrp->dev->dpad0_source);
+
+        rcar_du_group_write(rgrp, DEFR8, defr8);
+}
+
+static void rcar_du_group_setup(struct rcar_du_group *rgrp)
+{
+        /* Enable extended features */
+        rcar_du_group_write(rgrp, DEFR, DEFR_CODE | DEFR_DEFE);
+        rcar_du_group_write(rgrp, DEFR2, DEFR2_CODE | DEFR2_DEFE2G);
+        rcar_du_group_write(rgrp, DEFR3, DEFR3_CODE | DEFR3_DEFE3);
+        rcar_du_group_write(rgrp, DEFR4, DEFR4_CODE);
+        rcar_du_group_write(rgrp, DEFR5, DEFR5_CODE | DEFR5_DEFE5);
+
+        rcar_du_group_setup_defr8(rgrp);
+
+        /* Use DS1PR and DS2PR to configure planes priorities and connects the
+         * superposition 0 to DU0 pins. DU1 pins will be configured dynamically.
+         */
+        rcar_du_group_write(rgrp, DORCR, DORCR_PG1D_DS1 | DORCR_DPRS);
+}
+
+/*
+ * rcar_du_group_get - Acquire a reference to the DU channels group
+ *
+ * Acquiring the first reference setups core registers. A reference must be held
+ * before accessing any hardware registers.
+ *
+ * This function must be called with the DRM mode_config lock held.
+ *
+ * Return 0 in case of success or a negative error code otherwise.
+ */
+int rcar_du_group_get(struct rcar_du_group *rgrp)
+{
+        if (rgrp->use_count)
+                goto done;
+
+        rcar_du_group_setup(rgrp);
+
+done:
+        rgrp->use_count++;
+        return 0;
+}
+
+/*
+ * rcar_du_group_put - Release a reference to the DU
+ *
+ * This function must be called with the DRM mode_config lock held.
+ */
+void rcar_du_group_put(struct rcar_du_group *rgrp)
+{
+        --rgrp->use_count;
+}
+
+static void __rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start)
+{
+        rcar_du_group_write(rgrp, DSYSR,
+                (rcar_du_group_read(rgrp, DSYSR) & ~(DSYSR_DRES | DSYSR_DEN)) |
+                (start ? DSYSR_DEN : DSYSR_DRES));
+}
+
+void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start)
+{
+        /* Many of the configuration bits are only updated when the display
+         * reset (DRES) bit in DSYSR is set to 1, disabling *both* CRTCs. Some
+         * of those bits could be pre-configured, but others (especially the
+         * bits related to plane assignment to display timing controllers) need
+         * to be modified at runtime.
+         *
+         * Restart the display controller if a start is requested. Sorry for the
+         * flicker. It should be possible to move most of the "DRES-update" bits
+         * setup to driver initialization time and minimize the number of cases
+         * when the display controller will have to be restarted.
+         */
+        if (start) {
+                if (rgrp->used_crtcs++ != 0)
+                        __rcar_du_group_start_stop(rgrp, false);
+                __rcar_du_group_start_stop(rgrp, true);
+        } else {
+                if (--rgrp->used_crtcs == 0)
+                        __rcar_du_group_start_stop(rgrp, false);
+        }
+}
+
+void rcar_du_group_restart(struct rcar_du_group *rgrp)
+{
+        __rcar_du_group_start_stop(rgrp, false);
+        __rcar_du_group_start_stop(rgrp, true);
+}
+
+static int rcar_du_set_dpad0_routing(struct rcar_du_device *rcdu)
+{
+        int ret;
+
+        /* RGB output routing to DPAD0 is configured in the DEFR8 register of
+         * the first group. As this function can be called with the DU0 and DU1
+         * CRTCs disabled, we need to enable the first group clock before
+         * accessing the register.
+         */
+        ret = clk_prepare_enable(rcdu->crtcs[0].clock);
+        if (ret < 0)
+                return ret;
+
+        rcar_du_group_setup_defr8(&rcdu->groups[0]);
+
+        clk_disable_unprepare(rcdu->crtcs[0].clock);
+
+        return 0;
+}
+
+int rcar_du_group_set_routing(struct rcar_du_group *rgrp)
+{
+        struct rcar_du_crtc *crtc0 = &rgrp->dev->crtcs[rgrp->index * 2];
+        u32 dorcr = rcar_du_group_read(rgrp, DORCR);
+
+        dorcr &= ~(DORCR_PG2T | DORCR_DK2S | DORCR_PG2D_MASK);
+
+        /* Set the DPAD1 pins sources. Select CRTC 0 if explicitly requested and
+         * CRTC 1 in all other cases to avoid cloning CRTC 0 to DPAD0 and DPAD1
+         * by default.
+         */
+        if (crtc0->outputs & BIT(RCAR_DU_OUTPUT_DPAD1))
+                dorcr |= DORCR_PG2D_DS1;
+        else
+                dorcr |= DORCR_PG2T | DORCR_DK2S | DORCR_PG2D_DS2;
+
+        rcar_du_group_write(rgrp, DORCR, dorcr);
+
+        return rcar_du_set_dpad0_routing(rgrp->dev);
+}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h
new file mode 100644
index 000000000000..5025930972ec
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h
@@ -0,0 +1,50 @@
+/*
+ * rcar_du_group.c  --  R-Car Display Unit Planes and CRTCs Group
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __RCAR_DU_GROUP_H__
+#define __RCAR_DU_GROUP_H__
+
+#include "rcar_du_plane.h"
+
+struct rcar_du_device;
+
+/*
+ * struct rcar_du_group - CRTCs and planes group
+ * @dev: the DU device
+ * @mmio_offset: registers offset in the device memory map
+ * @index: group index
+ * @use_count: number of users of the group (rcar_du_group_(get|put))
+ * @used_crtcs: number of CRTCs currently in use
+ * @planes: planes handled by the group
+ */
+struct rcar_du_group {
+        struct rcar_du_device *dev;
+        unsigned int mmio_offset;
+        unsigned int index;
+
+        unsigned int use_count;
+        unsigned int used_crtcs;
+
+        struct rcar_du_planes planes;
+};
+
+u32 rcar_du_group_read(struct rcar_du_group *rgrp, u32 reg);
+void rcar_du_group_write(struct rcar_du_group *rgrp, u32 reg, u32 data);
+
+int rcar_du_group_get(struct rcar_du_group *rgrp);
+void rcar_du_group_put(struct rcar_du_group *rgrp);
+void rcar_du_group_start_stop(struct rcar_du_group *rgrp, bool start);
+void rcar_du_group_restart(struct rcar_du_group *rgrp);
+int rcar_du_group_set_routing(struct rcar_du_group *rgrp);
+
+#endif /* __RCAR_DU_GROUP_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index d30c2e29bee2..b31ac080c4a7 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -19,10 +19,10 @@
 
 #include "rcar_du_crtc.h"
 #include "rcar_du_drv.h"
+#include "rcar_du_encoder.h"
 #include "rcar_du_kms.h"
-#include "rcar_du_lvds.h"
+#include "rcar_du_lvdsenc.h"
 #include "rcar_du_regs.h"
-#include "rcar_du_vga.h"
 
 /* -----------------------------------------------------------------------------
  * Format helpers
@@ -106,46 +106,24 @@ const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc)
 }
 
 /* -----------------------------------------------------------------------------
- * Common connector and encoder functions
- */
-
-struct drm_encoder *
-rcar_du_connector_best_encoder(struct drm_connector *connector)
-{
-        struct rcar_du_connector *rcon = to_rcar_connector(connector);
-
-        return &rcon->encoder->encoder;
-}
-
-void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder)
-{
-}
-
-void rcar_du_encoder_mode_set(struct drm_encoder *encoder,
-                              struct drm_display_mode *mode,
-                              struct drm_display_mode *adjusted_mode)
-{
-        struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
-
-        rcar_du_crtc_route_output(encoder->crtc, renc->output);
-}
-
-void rcar_du_encoder_mode_commit(struct drm_encoder *encoder)
-{
-}
-
-/* -----------------------------------------------------------------------------
  * Frame buffer
  */
 
 int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev,
                         struct drm_mode_create_dumb *args)
 {
+        struct rcar_du_device *rcdu = dev->dev_private;
         unsigned int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
         unsigned int align;
 
-        /* The pitch must be aligned to a 16 pixels boundary. */
-        align = 16 * args->bpp / 8;
+        /* The R8A7779 DU requires a 16 pixels pitch alignment as documented,
+         * but the R8A7790 DU seems to require a 128 bytes pitch alignment.
+         */
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_ALIGN_128B))
+                align = 128;
+        else
+                align = 16 * args->bpp / 8;
+
         args->pitch = roundup(max(args->pitch, min_pitch), align);
 
         return drm_gem_cma_dumb_create(file, dev, args);
@@ -155,6 +133,7 @@ static struct drm_framebuffer *
 rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                   struct drm_mode_fb_cmd2 *mode_cmd)
 {
+        struct rcar_du_device *rcdu = dev->dev_private;
         const struct rcar_du_format_info *format;
         unsigned int align;
 
@@ -165,7 +144,10 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                 return ERR_PTR(-EINVAL);
         }
 
-        align = 16 * format->bpp / 8;
+        if (rcar_du_has(rcdu, RCAR_DU_FEATURE_ALIGN_128B))
+                align = 128;
+        else
+                align = 16 * format->bpp / 8;
 
         if (mode_cmd->pitches[0] & (align - 1) ||
             mode_cmd->pitches[0] >= 8192) {
@@ -185,81 +167,124 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv,
         return drm_fb_cma_create(dev, file_priv, mode_cmd);
 }
 
+static void rcar_du_output_poll_changed(struct drm_device *dev)
+{
+        struct rcar_du_device *rcdu = dev->dev_private;
+
+        drm_fbdev_cma_hotplug_event(rcdu->fbdev);
+}
+
 static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = {
         .fb_create = rcar_du_fb_create,
+        .output_poll_changed = rcar_du_output_poll_changed,
 };
 
 int rcar_du_modeset_init(struct rcar_du_device *rcdu)
 {
+        static const unsigned int mmio_offsets[] = {
+                DU0_REG_OFFSET, DU2_REG_OFFSET
+        };
+
         struct drm_device *dev = rcdu->ddev;
         struct drm_encoder *encoder;
+        struct drm_fbdev_cma *fbdev;
+        unsigned int num_groups;
         unsigned int i;
         int ret;
 
-        drm_mode_config_init(rcdu->ddev);
+        drm_mode_config_init(dev);
 
-        rcdu->ddev->mode_config.min_width = 0;
-        rcdu->ddev->mode_config.min_height = 0;
-        rcdu->ddev->mode_config.max_width = 4095;
-        rcdu->ddev->mode_config.max_height = 2047;
-        rcdu->ddev->mode_config.funcs = &rcar_du_mode_config_funcs;
+        dev->mode_config.min_width = 0;
+        dev->mode_config.min_height = 0;
+        dev->mode_config.max_width = 4095;
+        dev->mode_config.max_height = 2047;
+        dev->mode_config.funcs = &rcar_du_mode_config_funcs;
 
-        ret = rcar_du_plane_init(rcdu);
-        if (ret < 0)
-                return ret;
+        rcdu->num_crtcs = rcdu->info->num_crtcs;
+
+        /* Initialize the groups. */
+        num_groups = DIV_ROUND_UP(rcdu->num_crtcs, 2);
+
+        for (i = 0; i < num_groups; ++i) {
+                struct rcar_du_group *rgrp = &rcdu->groups[i];
+
+                rgrp->dev = rcdu;
+                rgrp->mmio_offset = mmio_offsets[i];
+                rgrp->index = i;
+
+                ret = rcar_du_planes_init(rgrp);
+                if (ret < 0)
+                        return ret;
+        }
+
+        /* Create the CRTCs. */
+        for (i = 0; i < rcdu->num_crtcs; ++i) {
+                struct rcar_du_group *rgrp = &rcdu->groups[i / 2];
 
-        for (i = 0; i < ARRAY_SIZE(rcdu->crtcs); ++i) {
-                ret = rcar_du_crtc_create(rcdu, i);
+                ret = rcar_du_crtc_create(rgrp, i);
                 if (ret < 0)
                         return ret;
         }
 
-        rcdu->used_crtcs = 0;
-        rcdu->num_crtcs = i;
+        /* Initialize the encoders. */
+        ret = rcar_du_lvdsenc_init(rcdu);
+        if (ret < 0)
+                return ret;
 
         for (i = 0; i < rcdu->pdata->num_encoders; ++i) {
                 const struct rcar_du_encoder_data *pdata =
                         &rcdu->pdata->encoders[i];
+                const struct rcar_du_output_routing *route =
+                        &rcdu->info->routes[pdata->output];
+
+                if (pdata->type == RCAR_DU_ENCODER_UNUSED)
+                        continue;
 
-                if (pdata->output >= ARRAY_SIZE(rcdu->crtcs)) {
+                if (pdata->output >= RCAR_DU_OUTPUT_MAX ||
+                    route->possible_crtcs == 0) {
                         dev_warn(rcdu->dev,
                                  "encoder %u references unexisting output %u, skipping\n",
                                  i, pdata->output);
                         continue;
                 }
 
-                switch (pdata->encoder) {
-                case RCAR_DU_ENCODER_VGA:
-                        rcar_du_vga_init(rcdu, &pdata->u.vga, pdata->output);
-                        break;
-
-                case RCAR_DU_ENCODER_LVDS:
-                        rcar_du_lvds_init(rcdu, &pdata->u.lvds, pdata->output);
-                        break;
-
-                default:
-                        break;
-                }
+                rcar_du_encoder_init(rcdu, pdata->type, pdata->output, pdata);
         }
 
-        /* Set the possible CRTCs and possible clones. All encoders can be
-         * driven by the CRTC associated with the output they're connected to,
-         * as well as by CRTC 0.
+        /* Set the possible CRTCs and possible clones. There's always at least
+         * one way for all encoders to clone each other, set all bits in the
+         * possible clones field.
          */
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                 struct rcar_du_encoder *renc = to_rcar_encoder(encoder);
+                const struct rcar_du_output_routing *route =
+                        &rcdu->info->routes[renc->output];
 
-                encoder->possible_crtcs = (1 << 0) | (1 << renc->output);
-                encoder->possible_clones = 1 << 0;
+                encoder->possible_crtcs = route->possible_crtcs;
+                encoder->possible_clones = (1 << rcdu->pdata->num_encoders) - 1;
         }
 
-        ret = rcar_du_plane_register(rcdu);
-        if (ret < 0)
-                return ret;
+        /* Now that the CRTCs have been initialized register the planes. */
+        for (i = 0; i < num_groups; ++i) {
+                ret = rcar_du_planes_register(&rcdu->groups[i]);
+                if (ret < 0)
+                        return ret;
+        }
+
+        drm_kms_helper_poll_init(dev);
+
+        drm_helper_disable_unused_functions(dev);
+
+        fbdev = drm_fbdev_cma_init(dev, 32, dev->mode_config.num_crtc,
+                                   dev->mode_config.num_connector);
+        if (IS_ERR(fbdev))
+                return PTR_ERR(fbdev);
 
-        drm_kms_helper_poll_init(rcdu->ddev);
+#ifndef CONFIG_FRAMEBUFFER_CONSOLE
+        drm_fbdev_cma_restore_mode(fbdev);
+#endif
 
-        drm_helper_disable_unused_functions(rcdu->ddev);
+        rcdu->fbdev = fbdev;
 
         return 0;
 }
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.h b/drivers/gpu/drm/rcar-du/rcar_du_kms.h
index dba472263486..5750e6af5655 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.h
@@ -16,8 +16,9 @@
 
 #include <linux/types.h>
 
-#include <drm/drm_crtc.h>
-
+struct drm_file;
+struct drm_device;
+struct drm_mode_create_dumb;
 struct rcar_du_device;
 
 struct rcar_du_format_info {
@@ -28,32 +29,8 @@ struct rcar_du_format_info {
         unsigned int edf;
 };
 
-struct rcar_du_encoder {
-        struct drm_encoder encoder;
-        unsigned int output;
-};
-
-#define to_rcar_encoder(e) \
-        container_of(e, struct rcar_du_encoder, encoder)
-
-struct rcar_du_connector {
-        struct drm_connector connector;
-        struct rcar_du_encoder *encoder;
-};
-
-#define to_rcar_connector(c) \
-        container_of(c, struct rcar_du_connector, connector)
-
 const struct rcar_du_format_info *rcar_du_format_info(u32 fourcc);
 
-struct drm_encoder *
-rcar_du_connector_best_encoder(struct drm_connector *connector);
-void rcar_du_encoder_mode_prepare(struct drm_encoder *encoder);
-void rcar_du_encoder_mode_set(struct drm_encoder *encoder,
-                              struct drm_display_mode *mode,
-                              struct drm_display_mode *adjusted_mode);
-void rcar_du_encoder_mode_commit(struct drm_encoder *encoder);
-
 int rcar_du_modeset_init(struct rcar_du_device *rcdu);
 
 int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvds.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
index 7aefe7267e1d..4f3ba93cd91d 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c
@@ -1,5 +1,5 @@
 /*
- * rcar_du_lvds.c  --  R-Car Display Unit LVDS Encoder and Connector
+ * rcar_du_lvdscon.c  --  R-Car Display Unit LVDS Connector
  *
  * Copyright (C) 2013 Renesas Corporation
  *
@@ -16,8 +16,9 @@
 #include <drm/drm_crtc_helper.h>
 
 #include "rcar_du_drv.h"
+#include "rcar_du_encoder.h"
 #include "rcar_du_kms.h"
-#include "rcar_du_lvds.h"
+#include "rcar_du_lvdscon.h"
 
 struct rcar_du_lvds_connector {
         struct rcar_du_connector connector;
@@ -28,13 +29,10 @@ struct rcar_du_lvds_connector {
 #define to_rcar_lvds_connector(c) \
         container_of(c, struct rcar_du_lvds_connector, connector.connector)
 
-/* -----------------------------------------------------------------------------
- * Connector
- */
-
 static int rcar_du_lvds_connector_get_modes(struct drm_connector *connector)
 {
-        struct rcar_du_lvds_connector *lvdscon = to_rcar_lvds_connector(connector);
+        struct rcar_du_lvds_connector *lvdscon =
+                to_rcar_lvds_connector(connector);
         struct drm_display_mode *mode;
 
         mode = drm_mode_create(connector->dev);
@@ -90,9 +88,9 @@ static const struct drm_connector_funcs connector_funcs = {
         .destroy = rcar_du_lvds_connector_destroy,
 };
 
-static int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
-                                       struct rcar_du_encoder *renc,
-                                       const struct rcar_du_panel_data *panel)
+int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
+                                struct rcar_du_encoder *renc,
+                                const struct rcar_du_panel_data *panel)
 {
         struct rcar_du_lvds_connector *lvdscon;
         struct drm_connector *connector;
@@ -131,86 +129,3 @@ static int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
 
         return 0;
 }
-
-/* -----------------------------------------------------------------------------
- * Encoder
- */
-
-static void rcar_du_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
-{
-}
-
-static bool rcar_du_lvds_encoder_mode_fixup(struct drm_encoder *encoder,
-                                           const struct drm_display_mode *mode,
-                                           struct drm_display_mode *adjusted_mode)
-{
-        const struct drm_display_mode *panel_mode;
-        struct drm_device *dev = encoder->dev;
-        struct drm_connector *connector;
-        bool found = false;
-
-        list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
-                if (connector->encoder == encoder) {
-                        found = true;
-                        break;
-                }
-        }
-
-        if (!found) {
-                dev_dbg(dev->dev, "mode_fixup: no connector found\n");
-                return false;
-        }
-
-        if (list_empty(&connector->modes)) {
-                dev_dbg(dev->dev, "mode_fixup: empty modes list\n");
-                return false;
-        }
-
-        panel_mode = list_first_entry(&connector->modes,
-                                      struct drm_display_mode, head);
-
-        /* We're not allowed to modify the resolution. */
-        if (mode->hdisplay != panel_mode->hdisplay ||
-            mode->vdisplay != panel_mode->vdisplay)
-                return false;
-
-        /* The flat panel mode is fixed, just copy it to the adjusted mode. */
-        drm_mode_copy(adjusted_mode, panel_mode);
-
-        return true;
-}
-
-static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
-        .dpms = rcar_du_lvds_encoder_dpms,
-        .mode_fixup = rcar_du_lvds_encoder_mode_fixup,
-        .prepare = rcar_du_encoder_mode_prepare,
-        .commit = rcar_du_encoder_mode_commit,
-        .mode_set = rcar_du_encoder_mode_set,
-};
-
-static const struct drm_encoder_funcs encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-int rcar_du_lvds_init(struct rcar_du_device *rcdu,
-                      const struct rcar_du_encoder_lvds_data *data,
-                      unsigned int output)
-{
-        struct rcar_du_encoder *renc;
-        int ret;
-
-        renc = devm_kzalloc(rcdu->dev, sizeof(*renc), GFP_KERNEL);
-        if (renc == NULL)
-                return -ENOMEM;
-
-        renc->output = output;
-
-        ret = drm_encoder_init(rcdu->ddev, &renc->encoder, &encoder_funcs,
-                               DRM_MODE_ENCODER_LVDS);
-        if (ret < 0)
-                return ret;
-
-        drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);
-
-        return rcar_du_lvds_connector_init(rcdu, renc, &data->panel);
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvds.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
index b47f8328e103..bff8683699ca 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvds.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h
@@ -1,5 +1,5 @@
 /*
- * rcar_du_lvds.h  --  R-Car Display Unit LVDS Encoder and Connector
+ * rcar_du_lvdscon.h  --  R-Car Display Unit LVDS Connector
  *
  * Copyright (C) 2013 Renesas Corporation
  *
@@ -11,14 +11,15 @@
  * (at your option) any later version.
  */
 
-#ifndef __RCAR_DU_LVDS_H__
-#define __RCAR_DU_LVDS_H__
+#ifndef __RCAR_DU_LVDSCON_H__
+#define __RCAR_DU_LVDSCON_H__
 
 struct rcar_du_device;
-struct rcar_du_encoder_lvds_data;
+struct rcar_du_encoder;
+struct rcar_du_panel_data;
 
-int rcar_du_lvds_init(struct rcar_du_device *rcdu,
-                      const struct rcar_du_encoder_lvds_data *data,
-                      unsigned int output);
+int rcar_du_lvds_connector_init(struct rcar_du_device *rcdu,
+                                struct rcar_du_encoder *renc,
+                                const struct rcar_du_panel_data *panel);
 
-#endif /* __RCAR_DU_LVDS_H__ */
+#endif /* __RCAR_DU_LVDSCON_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
new file mode 100644
index 000000000000..a0f6a1781925
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
@@ -0,0 +1,196 @@
+/*
+ * rcar_du_lvdsenc.c  --  R-Car Display Unit LVDS Encoder
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "rcar_du_drv.h"
+#include "rcar_du_encoder.h"
+#include "rcar_du_lvdsenc.h"
+#include "rcar_lvds_regs.h"
+
+struct rcar_du_lvdsenc {
+        struct rcar_du_device *dev;
+
+        unsigned int index;
+        void __iomem *mmio;
+        struct clk *clock;
+        int dpms;
+
+        enum rcar_lvds_input input;
+};
+
+static void rcar_lvds_write(struct rcar_du_lvdsenc *lvds, u32 reg, u32 data)
+{
+        iowrite32(data, lvds->mmio + reg);
+}
+
+static int rcar_du_lvdsenc_start(struct rcar_du_lvdsenc *lvds,
+                                 struct rcar_du_crtc *rcrtc)
+{
+        const struct drm_display_mode *mode = &rcrtc->crtc.mode;
+        unsigned int freq = mode->clock;
+        u32 lvdcr0;
+        u32 pllcr;
+        int ret;
+
+        if (lvds->dpms == DRM_MODE_DPMS_ON)
+                return 0;
+
+        ret = clk_prepare_enable(lvds->clock);
+        if (ret < 0)
+                return ret;
+
+        /* PLL clock configuration */
+        if (freq <= 38000)
+                pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_38M;
+        else if (freq <= 60000)
+                pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_60M;
+        else if (freq <= 121000)
+                pllcr = LVDPLLCR_CEEN | LVDPLLCR_COSEL | LVDPLLCR_PLLDLYCNT_121M;
+        else
+                pllcr = LVDPLLCR_PLLDLYCNT_150M;
+
+        rcar_lvds_write(lvds, LVDPLLCR, pllcr);
+
+        /* Hardcode the channels and control signals routing for now.
+         *
+         * HSYNC -> CTRL0
+         * VSYNC -> CTRL1
+         * DISP  -> CTRL2
+         * 0     -> CTRL3
+         *
+         * Channels 1 and 3 are switched on ES1.
+         */
+        rcar_lvds_write(lvds, LVDCTRCR, LVDCTRCR_CTR3SEL_ZERO |
+                        LVDCTRCR_CTR2SEL_DISP | LVDCTRCR_CTR1SEL_VSYNC |
+                        LVDCTRCR_CTR0SEL_HSYNC);
+        rcar_lvds_write(lvds, LVDCHCR,
+                        LVDCHCR_CHSEL_CH(0, 0) | LVDCHCR_CHSEL_CH(1, 3) |
+                        LVDCHCR_CHSEL_CH(2, 2) | LVDCHCR_CHSEL_CH(3, 1));
+
+        /* Select the input, hardcode mode 0, enable LVDS operation and turn
+         * bias circuitry on.
+         */
+        lvdcr0 = LVDCR0_BEN | LVDCR0_LVEN;
+        if (rcrtc->index == 2)
+                lvdcr0 |= LVDCR0_DUSEL;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        /* Turn all the channels on. */
+        rcar_lvds_write(lvds, LVDCR1, LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) |
+                        LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY);
+
+        /* Turn the PLL on, wait for the startup delay, and turn the output
+         * on.
+         */
+        lvdcr0 |= LVDCR0_PLLEN;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        usleep_range(100, 150);
+
+        lvdcr0 |= LVDCR0_LVRES;
+        rcar_lvds_write(lvds, LVDCR0, lvdcr0);
+
+        lvds->dpms = DRM_MODE_DPMS_ON;
+        return 0;
+}
+
+static void rcar_du_lvdsenc_stop(struct rcar_du_lvdsenc *lvds)
+{
+        if (lvds->dpms == DRM_MODE_DPMS_OFF)
+                return;
+
+        rcar_lvds_write(lvds, LVDCR0, 0);
+        rcar_lvds_write(lvds, LVDCR1, 0);
+
+        clk_disable_unprepare(lvds->clock);
+
+        lvds->dpms = DRM_MODE_DPMS_OFF;
+}
+
+int rcar_du_lvdsenc_dpms(struct rcar_du_lvdsenc *lvds,
+                         struct drm_crtc *crtc, int mode)
+{
+        if (mode == DRM_MODE_DPMS_OFF) {
+                rcar_du_lvdsenc_stop(lvds);
+                return 0;
+        } else if (crtc) {
+                struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
+                return rcar_du_lvdsenc_start(lvds, rcrtc);
+        } else
+                return -EINVAL;
+}
+
+static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds,
+                                         struct platform_device *pdev)
+{
+        struct resource *mem;
+        char name[7];
+
+        sprintf(name, "lvds.%u", lvds->index);
+
+        mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
+        if (mem == NULL) {
+                dev_err(&pdev->dev, "failed to get memory resource for %s\n",
+                        name);
+                return -EINVAL;
+        }
+
+        lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
+        if (lvds->mmio == NULL) {
+                dev_err(&pdev->dev, "failed to remap memory resource for %s\n",
+                        name);
+                return -ENOMEM;
+        }
+
+        lvds->clock = devm_clk_get(&pdev->dev, name);
+        if (IS_ERR(lvds->clock)) {
+                dev_err(&pdev->dev, "failed to get clock for %s\n", name);
+                return PTR_ERR(lvds->clock);
+        }
+
+        return 0;
+}
+
+int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu)
+{
+        struct platform_device *pdev = to_platform_device(rcdu->dev);
+        struct rcar_du_lvdsenc *lvds;
+        unsigned int i;
+        int ret;
+
+        for (i = 0; i < rcdu->info->num_lvds; ++i) {
+                lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
+                if (lvds == NULL) {
+                        dev_err(&pdev->dev, "failed to allocate private data\n");
+                        return -ENOMEM;
+                }
+
+                lvds->dev = rcdu;
+                lvds->index = i;
+                lvds->input = i ? RCAR_LVDS_INPUT_DU1 : RCAR_LVDS_INPUT_DU0;
+                lvds->dpms = DRM_MODE_DPMS_OFF;
+
+                ret = rcar_du_lvdsenc_get_resources(lvds, pdev);
+                if (ret < 0)
+                        return ret;
+
+                rcdu->lvds[i] = lvds;
+        }
+
+        return 0;
+}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
new file mode 100644
index 000000000000..7051c6de19ae
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h
@@ -0,0 +1,46 @@
+/*
+ * rcar_du_lvdsenc.h  --  R-Car Display Unit LVDS Encoder
+ *
+ * Copyright (C) 2013 Renesas Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __RCAR_DU_LVDSENC_H__
+#define __RCAR_DU_LVDSENC_H__
+
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_data/rcar-du.h>
+
+struct rcar_drm_crtc;
+struct rcar_du_lvdsenc;
+
+enum rcar_lvds_input {
+        RCAR_LVDS_INPUT_DU0,
+        RCAR_LVDS_INPUT_DU1,
+        RCAR_LVDS_INPUT_DU2,
+};
+
+#if IS_ENABLED(CONFIG_DRM_RCAR_LVDS)
+int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu);
+int rcar_du_lvdsenc_dpms(struct rcar_du_lvdsenc *lvds,
+                         struct drm_crtc *crtc, int mode);
+#else
+static inline int rcar_du_lvdsenc_init(struct rcar_du_device *rcdu)
+{
+        return 0;
+}
+static inline int rcar_du_lvdsenc_dpms(struct rcar_du_lvdsenc *lvds,
+                                       struct drm_crtc *crtc, int mode)
+{
+        return 0;
+}
+#endif
+
+#endif /* __RCAR_DU_LVDSENC_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index a65f81ddf51d..53000644733f 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -36,90 +36,95 @@ static inline struct rcar_du_plane *to_rcar_plane(struct drm_plane *plane)
         return container_of(plane, struct rcar_du_kms_plane, plane)->hwplane;
 }
 
-static u32 rcar_du_plane_read(struct rcar_du_device *rcdu,
+static u32 rcar_du_plane_read(struct rcar_du_group *rgrp,
                               unsigned int index, u32 reg)
 {
-        return rcar_du_read(rcdu, index * PLANE_OFF + reg);
+        return rcar_du_read(rgrp->dev,
+                            rgrp->mmio_offset + index * PLANE_OFF + reg);
 }
 
-static void rcar_du_plane_write(struct rcar_du_device *rcdu,
+static void rcar_du_plane_write(struct rcar_du_group *rgrp,
                                 unsigned int index, u32 reg, u32 data)
 {
-        rcar_du_write(rcdu, index * PLANE_OFF + reg, data);
+        rcar_du_write(rgrp->dev, rgrp->mmio_offset + index * PLANE_OFF + reg,
+                      data);
 }
 
 int rcar_du_plane_reserve(struct rcar_du_plane *plane,
                           const struct rcar_du_format_info *format)
 {
-        struct rcar_du_device *rcdu = plane->dev;
+        struct rcar_du_group *rgrp = plane->group;
         unsigned int i;
         int ret = -EBUSY;
 
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&rgrp->planes.lock);
 
-        for (i = 0; i < ARRAY_SIZE(rcdu->planes.planes); ++i) {
-                if (!(rcdu->planes.free & (1 << i)))
+        for (i = 0; i < ARRAY_SIZE(rgrp->planes.planes); ++i) {
+                if (!(rgrp->planes.free & (1 << i)))
                         continue;
 
                 if (format->planes == 1 ||
-                    rcdu->planes.free & (1 << ((i + 1) % 8)))
+                    rgrp->planes.free & (1 << ((i + 1) % 8)))
                         break;
         }
 
-        if (i == ARRAY_SIZE(rcdu->planes.planes))
+        if (i == ARRAY_SIZE(rgrp->planes.planes))
                 goto done;
 
-        rcdu->planes.free &= ~(1 << i);
+        rgrp->planes.free &= ~(1 << i);
         if (format->planes == 2)
-                rcdu->planes.free &= ~(1 << ((i + 1) % 8));
+                rgrp->planes.free &= ~(1 << ((i + 1) % 8));
 
         plane->hwindex = i;
 
         ret = 0;
 
 done:
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&rgrp->planes.lock);
         return ret;
 }
 
 void rcar_du_plane_release(struct rcar_du_plane *plane)
 {
-        struct rcar_du_device *rcdu = plane->dev;
+        struct rcar_du_group *rgrp = plane->group;
 
         if (plane->hwindex == -1)
                 return;
 
-        mutex_lock(&rcdu->planes.lock);
-        rcdu->planes.free |= 1 << plane->hwindex;
+        mutex_lock(&rgrp->planes.lock);
+        rgrp->planes.free |= 1 << plane->hwindex;
         if (plane->format->planes == 2)
-                rcdu->planes.free |= 1 << ((plane->hwindex + 1) % 8);
-        mutex_unlock(&rcdu->planes.lock);
+                rgrp->planes.free |= 1 << ((plane->hwindex + 1) % 8);
+        mutex_unlock(&rgrp->planes.lock);
 
         plane->hwindex = -1;
 }
 
 void rcar_du_plane_update_base(struct rcar_du_plane *plane)
 {
-        struct rcar_du_device *rcdu = plane->dev;
+        struct rcar_du_group *rgrp = plane->group;
         unsigned int index = plane->hwindex;
 
-        /* According to the datasheet the Y position is expressed in raster line
-         * units. However, 32bpp formats seem to require a doubled Y position
-         * value. Similarly, for the second plane, NV12 and NV21 formats seem to
+        /* The Y position is expressed in raster line units and must be doubled
+         * for 32bpp formats, according to the R8A7790 datasheet. No mention of
+         * doubling the Y position is found in the R8A7779 datasheet, but the
+         * rule seems to apply there as well.
+         *
+         * Similarly, for the second plane, NV12 and NV21 formats seem to
          * require a halved Y position value.
          */
-        rcar_du_plane_write(rcdu, index, PnSPXR, plane->src_x);
-        rcar_du_plane_write(rcdu, index, PnSPYR, plane->src_y *
+        rcar_du_plane_write(rgrp, index, PnSPXR, plane->src_x);
+        rcar_du_plane_write(rgrp, index, PnSPYR, plane->src_y *
                             (plane->format->bpp == 32 ? 2 : 1));
-        rcar_du_plane_write(rcdu, index, PnDSA0R, plane->dma[0]);
+        rcar_du_plane_write(rgrp, index, PnDSA0R, plane->dma[0]);
 
         if (plane->format->planes == 2) {
                 index = (index + 1) % 8;
 
-                rcar_du_plane_write(rcdu, index, PnSPXR, plane->src_x);
-                rcar_du_plane_write(rcdu, index, PnSPYR, plane->src_y *
+                rcar_du_plane_write(rgrp, index, PnSPXR, plane->src_x);
+                rcar_du_plane_write(rgrp, index, PnSPYR, plane->src_y *
                                     (plane->format->bpp == 16 ? 2 : 1) / 2);
-                rcar_du_plane_write(rcdu, index, PnDSA0R, plane->dma[1]);
+                rcar_du_plane_write(rgrp, index, PnDSA0R, plane->dma[1]);
         }
 }
 
@@ -140,7 +145,7 @@ void rcar_du_plane_compute_base(struct rcar_du_plane *plane,
 static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
                                      unsigned int index)
 {
-        struct rcar_du_device *rcdu = plane->dev;
+        struct rcar_du_group *rgrp = plane->group;
         u32 colorkey;
         u32 pnmr;
 
@@ -154,9 +159,9 @@ static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
          * enable alpha-blending regardless of the X bit value.
          */
         if (plane->format->fourcc != DRM_FORMAT_XRGB1555)
-                rcar_du_plane_write(rcdu, index, PnALPHAR, PnALPHAR_ABIT_0);
+                rcar_du_plane_write(rgrp, index, PnALPHAR, PnALPHAR_ABIT_0);
         else
-                rcar_du_plane_write(rcdu, index, PnALPHAR,
+                rcar_du_plane_write(rgrp, index, PnALPHAR,
                                     PnALPHAR_ABIT_X | plane->alpha);
 
         pnmr = PnMR_BM_MD | plane->format->pnmr;
@@ -172,14 +177,14 @@ static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
         if (plane->format->fourcc == DRM_FORMAT_YUYV)
                 pnmr |= PnMR_YCDF_YUYV;
 
-        rcar_du_plane_write(rcdu, index, PnMR, pnmr);
+        rcar_du_plane_write(rgrp, index, PnMR, pnmr);
 
         switch (plane->format->fourcc) {
         case DRM_FORMAT_RGB565:
                 colorkey = ((plane->colorkey & 0xf80000) >> 8)
                          | ((plane->colorkey & 0x00fc00) >> 5)
                          | ((plane->colorkey & 0x0000f8) >> 3);
-                rcar_du_plane_write(rcdu, index, PnTC2R, colorkey);
+                rcar_du_plane_write(rgrp, index, PnTC2R, colorkey);
                 break;
 
         case DRM_FORMAT_ARGB1555:
@@ -187,12 +192,12 @@ static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
                 colorkey = ((plane->colorkey & 0xf80000) >> 9)
                          | ((plane->colorkey & 0x00f800) >> 6)
                          | ((plane->colorkey & 0x0000f8) >> 3);
-                rcar_du_plane_write(rcdu, index, PnTC2R, colorkey);
+                rcar_du_plane_write(rgrp, index, PnTC2R, colorkey);
                 break;
 
         case DRM_FORMAT_XRGB8888:
         case DRM_FORMAT_ARGB8888:
-                rcar_du_plane_write(rcdu, index, PnTC3R,
+                rcar_du_plane_write(rgrp, index, PnTC3R,
                                     PnTC3R_CODE | (plane->colorkey & 0xffffff));
                 break;
         }
@@ -201,7 +206,7 @@ static void rcar_du_plane_setup_mode(struct rcar_du_plane *plane,
 static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
                                   unsigned int index)
 {
-        struct rcar_du_device *rcdu = plane->dev;
+        struct rcar_du_group *rgrp = plane->group;
         u32 ddcr2 = PnDDCR2_CODE;
         u32 ddcr4;
         u32 mwr;
@@ -211,7 +216,7 @@ static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
          * The data format is selected by the DDDF field in PnMR and the EDF
          * field in DDCR4.
          */
-        ddcr4 = rcar_du_plane_read(rcdu, index, PnDDCR4);
+        ddcr4 = rcar_du_plane_read(rgrp, index, PnDDCR4);
         ddcr4 &= ~PnDDCR4_EDF_MASK;
         ddcr4 |= plane->format->edf | PnDDCR4_CODE;
 
@@ -232,8 +237,8 @@ static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
                 }
         }
 
-        rcar_du_plane_write(rcdu, index, PnDDCR2, ddcr2);
-        rcar_du_plane_write(rcdu, index, PnDDCR4, ddcr4);
+        rcar_du_plane_write(rgrp, index, PnDDCR2, ddcr2);
+        rcar_du_plane_write(rgrp, index, PnDDCR4, ddcr4);
 
         /* Memory pitch (expressed in pixels) */
         if (plane->format->planes == 2)
@@ -241,19 +246,19 @@ static void __rcar_du_plane_setup(struct rcar_du_plane *plane,
         else
                 mwr = plane->pitch * 8 / plane->format->bpp;
 
-        rcar_du_plane_write(rcdu, index, PnMWR, mwr);
+        rcar_du_plane_write(rgrp, index, PnMWR, mwr);
 
         /* Destination position and size */
-        rcar_du_plane_write(rcdu, index, PnDSXR, plane->width);
-        rcar_du_plane_write(rcdu, index, PnDSYR, plane->height);
-        rcar_du_plane_write(rcdu, index, PnDPXR, plane->dst_x);
-        rcar_du_plane_write(rcdu, index, PnDPYR, plane->dst_y);
+        rcar_du_plane_write(rgrp, index, PnDSXR, plane->width);
+        rcar_du_plane_write(rgrp, index, PnDSYR, plane->height);
+        rcar_du_plane_write(rgrp, index, PnDPXR, plane->dst_x);
+        rcar_du_plane_write(rgrp, index, PnDPYR, plane->dst_y);
 
         /* Wrap-around and blinking, disabled */
-        rcar_du_plane_write(rcdu, index, PnWASPR, 0);
-        rcar_du_plane_write(rcdu, index, PnWAMWR, 4095);
-        rcar_du_plane_write(rcdu, index, PnBTR, 0);
-        rcar_du_plane_write(rcdu, index, PnMLR, 0);
+        rcar_du_plane_write(rgrp, index, PnWASPR, 0);
+        rcar_du_plane_write(rgrp, index, PnWAMWR, 4095);
+        rcar_du_plane_write(rgrp, index, PnBTR, 0);
+        rcar_du_plane_write(rgrp, index, PnMLR, 0);
 }
 
 void rcar_du_plane_setup(struct rcar_du_plane *plane)
@@ -273,7 +278,7 @@ rcar_du_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
                        uint32_t src_w, uint32_t src_h)
 {
         struct rcar_du_plane *rplane = to_rcar_plane(plane);
-        struct rcar_du_device *rcdu = plane->dev->dev_private;
+        struct rcar_du_device *rcdu = rplane->group->dev;
         const struct rcar_du_format_info *format;
         unsigned int nplanes;
         int ret;
@@ -316,26 +321,25 @@ rcar_du_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
         rcar_du_plane_compute_base(rplane, fb);
         rcar_du_plane_setup(rplane);
 
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&rplane->group->planes.lock);
         rplane->enabled = true;
         rcar_du_crtc_update_planes(rplane->crtc);
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&rplane->group->planes.lock);
 
         return 0;
 }
 
 static int rcar_du_plane_disable(struct drm_plane *plane)
 {
-        struct rcar_du_device *rcdu = plane->dev->dev_private;
         struct rcar_du_plane *rplane = to_rcar_plane(plane);
 
         if (!rplane->enabled)
                 return 0;
 
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&rplane->group->planes.lock);
         rplane->enabled = false;
         rcar_du_crtc_update_planes(rplane->crtc);
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&rplane->group->planes.lock);
 
         rcar_du_plane_release(rplane);
 
@@ -377,9 +381,7 @@ static void rcar_du_plane_set_colorkey(struct rcar_du_plane *plane,
 static void rcar_du_plane_set_zpos(struct rcar_du_plane *plane,
                                    unsigned int zpos)
 {
-        struct rcar_du_device *rcdu = plane->dev;
-
-        mutex_lock(&rcdu->planes.lock);
+        mutex_lock(&plane->group->planes.lock);
         if (plane->zpos == zpos)
                 goto done;
 
@@ -390,21 +392,21 @@ static void rcar_du_plane_set_zpos(struct rcar_du_plane *plane,
         rcar_du_crtc_update_planes(plane->crtc);
 
 done:
-        mutex_unlock(&rcdu->planes.lock);
+        mutex_unlock(&plane->group->planes.lock);
 }
 
 static int rcar_du_plane_set_property(struct drm_plane *plane,
                                       struct drm_property *property,
                                       uint64_t value)
 {
-        struct rcar_du_device *rcdu = plane->dev->dev_private;
         struct rcar_du_plane *rplane = to_rcar_plane(plane);
+        struct rcar_du_group *rgrp = rplane->group;
 
-        if (property == rcdu->planes.alpha)
+        if (property == rgrp->planes.alpha)
                 rcar_du_plane_set_alpha(rplane, value);
-        else if (property == rcdu->planes.colorkey)
+        else if (property == rgrp->planes.colorkey)
                 rcar_du_plane_set_colorkey(rplane, value);
-        else if (property == rcdu->planes.zpos)
+        else if (property == rgrp->planes.zpos)
                 rcar_du_plane_set_zpos(rplane, value);
         else
                 return -EINVAL;
@@ -432,37 +434,39 @@ static const uint32_t formats[] = {
         DRM_FORMAT_NV16,
 };
 
-int rcar_du_plane_init(struct rcar_du_device *rcdu)
+int rcar_du_planes_init(struct rcar_du_group *rgrp)
 {
+        struct rcar_du_planes *planes = &rgrp->planes;
+        struct rcar_du_device *rcdu = rgrp->dev;
         unsigned int i;
 
-        mutex_init(&rcdu->planes.lock);
-        rcdu->planes.free = 0xff;
+        mutex_init(&planes->lock);
+        planes->free = 0xff;
 
-        rcdu->planes.alpha =
+        planes->alpha =
                 drm_property_create_range(rcdu->ddev, 0, "alpha", 0, 255);
-        if (rcdu->planes.alpha == NULL)
+        if (planes->alpha == NULL)
                 return -ENOMEM;
 
         /* The color key is expressed as an RGB888 triplet stored in a 32-bit
          * integer in XRGB8888 format. Bit 24 is used as a flag to disable (0)
          * or enable source color keying (1).
          */
-        rcdu->planes.colorkey =
+        planes->colorkey =
                 drm_property_create_range(rcdu->ddev, 0, "colorkey",
                                           0, 0x01ffffff);
-        if (rcdu->planes.colorkey == NULL)
+        if (planes->colorkey == NULL)
                 return -ENOMEM;
 
-        rcdu->planes.zpos =
+        planes->zpos =
                 drm_property_create_range(rcdu->ddev, 0, "zpos", 1, 7);
-        if (rcdu->planes.zpos == NULL)
+        if (planes->zpos == NULL)
                 return -ENOMEM;
 
-        for (i = 0; i < ARRAY_SIZE(rcdu->planes.planes); ++i) {
-                struct rcar_du_plane *plane = &rcdu->planes.planes[i];
+        for (i = 0; i < ARRAY_SIZE(planes->planes); ++i) {
+                struct rcar_du_plane *plane = &planes->planes[i];
 
-                plane->dev = rcdu;
+                plane->group = rgrp;
                 plane->hwindex = -1;
                 plane->alpha = 255;
                 plane->colorkey = RCAR_DU_COLORKEY_NONE;
@@ -472,11 +476,16 @@ int rcar_du_plane_init(struct rcar_du_device *rcdu)
         return 0;
 }
 
-int rcar_du_plane_register(struct rcar_du_device *rcdu)
+int rcar_du_planes_register(struct rcar_du_group *rgrp)
 {
+        struct rcar_du_planes *planes = &rgrp->planes;
+        struct rcar_du_device *rcdu = rgrp->dev;
+        unsigned int crtcs;
         unsigned int i;
         int ret;
 
+        crtcs = ((1 << rcdu->num_crtcs) - 1) & (3 << (2 * rgrp->index));
+
         for (i = 0; i < RCAR_DU_NUM_KMS_PLANES; ++i) {
                 struct rcar_du_kms_plane *plane;
 
@@ -484,23 +493,22 @@ int rcar_du_plane_register(struct rcar_du_device *rcdu)
                 if (plane == NULL)
                         return -ENOMEM;
 
-                plane->hwplane = &rcdu->planes.planes[i + 2];
+                plane->hwplane = &planes->planes[i + 2];
                 plane->hwplane->zpos = 1;
 
-                ret = drm_plane_init(rcdu->ddev, &plane->plane,
-                                     (1 << rcdu->num_crtcs) - 1,
+                ret = drm_plane_init(rcdu->ddev, &plane->plane, crtcs,
                                      &rcar_du_plane_funcs, formats,
                                      ARRAY_SIZE(formats), false);
                 if (ret < 0)
                         return ret;
 
                 drm_object_attach_property(&plane->plane.base,
-                                           rcdu->planes.alpha, 255);
+                                           planes->alpha, 255);
                 drm_object_attach_property(&plane->plane.base,
-                                           rcdu->planes.colorkey,
+                                           planes->colorkey,
                                            RCAR_DU_COLORKEY_NONE);
                 drm_object_attach_property(&plane->plane.base,
-                                           rcdu->planes.zpos, 1);
+                                           planes->zpos, 1);
         }
 
         return 0;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.h b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
index 5397dba2fe57..f94f9ce84998 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.h
@@ -14,10 +14,13 @@
 #ifndef __RCAR_DU_PLANE_H__
 #define __RCAR_DU_PLANE_H__
 
-struct drm_crtc;
-struct drm_framebuffer;
-struct rcar_du_device;
+#include <linux/mutex.h>
+
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+
 struct rcar_du_format_info;
+struct rcar_du_group;
 
 /* The RCAR DU has 8 hardware planes, shared between KMS planes and CRTCs. As
  * using KMS planes requires at least one of the CRTCs being enabled, no more
@@ -30,7 +33,7 @@ struct rcar_du_format_info;
 #define RCAR_DU_NUM_SW_PLANES           9
 
 struct rcar_du_plane {
-        struct rcar_du_device *dev;
+        struct rcar_du_group *group;
         struct drm_crtc *crtc;
 
         bool enabled;
@@ -54,8 +57,19 @@ struct rcar_du_plane {
         unsigned int dst_y;
 };
 
-int rcar_du_plane_init(struct rcar_du_device *rcdu);
-int rcar_du_plane_register(struct rcar_du_device *rcdu);
+struct rcar_du_planes {
+        struct rcar_du_plane planes[RCAR_DU_NUM_SW_PLANES];
+        unsigned int free;
+        struct mutex lock;
+
+        struct drm_property *alpha;
+        struct drm_property *colorkey;
+        struct drm_property *zpos;
+};
+
+int rcar_du_planes_init(struct rcar_du_group *rgrp);
+int rcar_du_planes_register(struct rcar_du_group *rgrp);
+
 void rcar_du_plane_setup(struct rcar_du_plane *plane);
 void rcar_du_plane_update_base(struct rcar_du_plane *plane);
 void rcar_du_plane_compute_base(struct rcar_du_plane *plane,
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
index 69f21f19b51c..73f7347f740b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
@@ -13,14 +13,15 @@
 #ifndef __RCAR_DU_REGS_H__
 #define __RCAR_DU_REGS_H__
 
-#define DISP2_REG_OFFSET         0x30000
+#define DU0_REG_OFFSET          0x00000
+#define DU1_REG_OFFSET          0x30000
+#define DU2_REG_OFFSET          0x40000
 
 /* -----------------------------------------------------------------------------
  * Display Control Registers
  */
 
 #define DSYSR                   0x00000 /* display 1 */
-#define D2SYSR                  0x30000 /* display 2 */
 #define DSYSR_ILTS              (1 << 29)
 #define DSYSR_DSEC              (1 << 20)
 #define DSYSR_IUPD              (1 << 16)
@@ -35,7 +36,6 @@
 #define DSYSR_SCM_INT_VIDEO     (3 << 4)
 
 #define DSMR                    0x00004
-#define D2SMR                   0x30004
 #define DSMR_VSPM               (1 << 28)
 #define DSMR_ODPM               (1 << 27)
 #define DSMR_DIPM_DISP          (0 << 25)
@@ -60,7 +60,6 @@
 #define DSMR_CSY_MASK           (3 << 6)
 
 #define DSSR                    0x00008
-#define D2SSR                   0x30008
 #define DSSR_VC1FB_DSA0         (0 << 30)
 #define DSSR_VC1FB_DSA1         (1 << 30)
 #define DSSR_VC1FB_DSA2         (2 << 30)
@@ -80,7 +79,6 @@
 #define DSSR_ADC(n)             (1 << ((n)-1))
 
 #define DSRCR                   0x0000c
-#define D2SRCR                  0x3000c
 #define DSRCR_TVCL              (1 << 15)
 #define DSRCR_FRCL              (1 << 14)
 #define DSRCR_VBCL              (1 << 11)
@@ -90,7 +88,6 @@
 #define DSRCR_MASK              0x0000cbff
 
 #define DIER                    0x00010
-#define D2IER                   0x30010
 #define DIER_TVE                (1 << 15)
 #define DIER_FRE                (1 << 14)
 #define DIER_VBE                (1 << 11)
@@ -114,7 +111,6 @@
 #define DPPR_BPP32              (DPPR_BPP32_P1 | DPPR_BPP32_P2) /* plane1 & 2 */
 
 #define DEFR                    0x00020
-#define D2EFR                   0x30020
 #define DEFR_CODE               (0x7773 << 16)
 #define DEFR_EXSL               (1 << 12)
 #define DEFR_EXVL               (1 << 11)
@@ -137,12 +133,10 @@
 #define DCPCR_DCE               (1 << 0)
 
 #define DEFR2                   0x00034
-#define D2EFR2                  0x30034
 #define DEFR2_CODE              (0x7775 << 16)
 #define DEFR2_DEFE2G            (1 << 0)
 
 #define DEFR3                   0x00038
-#define D2EFR3                  0x30038
 #define DEFR3_CODE              (0x7776 << 16)
 #define DEFR3_EVDA              (1 << 14)
 #define DEFR3_EVDM_1            (1 << 12)
@@ -153,7 +147,6 @@
 #define DEFR3_DEFE3             (1 << 0)
 
 #define DEFR4                   0x0003c
-#define D2EFR4                  0x3003c
 #define DEFR4_CODE              (0x7777 << 16)
 #define DEFR4_LRUO              (1 << 5)
 #define DEFR4_SPCE              (1 << 4)
@@ -205,6 +198,68 @@
 #define DEFR6_DEFAULT           (DEFR6_CODE | DEFR6_TCNE2)
 
 /* -----------------------------------------------------------------------------
+ * R8A7790-only Control Registers
+ */
+
+#define DD1SSR                  0x20008
+#define DD1SSR_TVR              (1 << 15)
+#define DD1SSR_FRM              (1 << 14)
+#define DD1SSR_BUF              (1 << 12)
+#define DD1SSR_VBK              (1 << 11)
+#define DD1SSR_RINT             (1 << 9)
+#define DD1SSR_HBK              (1 << 8)
+#define DD1SSR_ADC(n)           (1 << ((n)-1))
+
+#define DD1SRCR                 0x2000c
+#define DD1SRCR_TVR             (1 << 15)
+#define DD1SRCR_FRM             (1 << 14)
+#define DD1SRCR_BUF             (1 << 12)
+#define DD1SRCR_VBK             (1 << 11)
+#define DD1SRCR_RINT            (1 << 9)
+#define DD1SRCR_HBK             (1 << 8)
+#define DD1SRCR_ADC(n)          (1 << ((n)-1))
+
+#define DD1IER                  0x20010
+#define DD1IER_TVR              (1 << 15)
+#define DD1IER_FRM              (1 << 14)
+#define DD1IER_BUF              (1 << 12)
+#define DD1IER_VBK              (1 << 11)
+#define DD1IER_RINT             (1 << 9)
+#define DD1IER_HBK              (1 << 8)
+#define DD1IER_ADC(n)           (1 << ((n)-1))
+
+#define DEFR8                   0x20020
+#define DEFR8_CODE              (0x7790 << 16)
+#define DEFR8_VSCS              (1 << 6)
+#define DEFR8_DRGBS_DU(n)       ((n) << 4)
+#define DEFR8_DRGBS_MASK        (3 << 4)
+#define DEFR8_DEFE8             (1 << 0)
+
+#define DOFLR                   0x20024
+#define DOFLR_CODE              (0x7790 << 16)
+#define DOFLR_HSYCFL1           (1 << 13)
+#define DOFLR_VSYCFL1           (1 << 12)
+#define DOFLR_ODDFL1            (1 << 11)
+#define DOFLR_DISPFL1           (1 << 10)
+#define DOFLR_CDEFL1            (1 << 9)
+#define DOFLR_RGBFL1            (1 << 8)
+#define DOFLR_HSYCFL0           (1 << 5)
+#define DOFLR_VSYCFL0           (1 << 4)
+#define DOFLR_ODDFL0            (1 << 3)
+#define DOFLR_DISPFL0           (1 << 2)
+#define DOFLR_CDEFL0            (1 << 1)
+#define DOFLR_RGBFL0            (1 << 0)
+
+#define DIDSR                   0x20028
+#define DIDSR_CODE              (0x7790 << 16)
+#define DIDSR_LCDS_DCLKIN(n)    (0 << (8 + (n) * 2))
+#define DIDSR_LCDS_LVDS0(n)     (2 << (8 + (n) * 2))
+#define DIDSR_LCDS_LVDS1(n)     (3 << (8 + (n) * 2))
+#define DIDSR_LCDS_MASK(n)      (3 << (8 + (n) * 2))
+#define DIDSR_PCDS_CLK(n, clk)  (clk << ((n) * 2))
+#define DIDSR_PCDS_MASK(n)      (3 << ((n) * 2))
+
+/* -----------------------------------------------------------------------------
  * Display Timing Generation Registers
  */
 
@@ -349,21 +404,34 @@
 #define APnMR_BM_AD             (2 << 4)        /* Auto Display Change Mode */
 
 #define APnMWR                  0x0a104
+
+#define APnDSXR                 0x0a110
+#define APnDSYR                 0x0a114
+#define APnDPXR                 0x0a118
+#define APnDPYR                 0x0a11c
+
 #define APnDSA0R                0x0a120
 #define APnDSA1R                0x0a124
 #define APnDSA2R                0x0a128
+
+#define APnSPXR                 0x0a130
+#define APnSPYR                 0x0a134
+#define APnWASPR                0x0a138
+#define APnWAMWR                0x0a13c
+
+#define APnBTR                  0x0a140
+
 #define APnMLR                  0x0a150
+#define APnSWAPR                0x0a180
 
 /* -----------------------------------------------------------------------------
  * Display Capture Registers
  */
 
+#define DCMR                    0x0c100
 #define DCMWR                   0x0c104
-#define DC2MWR                  0x0c204
 #define DCSAR                   0x0c120
-#define DC2SAR                  0x0c220
 #define DCMLR                   0x0c150
-#define DC2MLR                  0x0c250
 
 /* -----------------------------------------------------------------------------
  * Color Palette Registers
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vga.c b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
index 327289ec380d..41d563adfeaa 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vga.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
@@ -1,5 +1,5 @@
 /*
- * rcar_du_vga.c  --  R-Car Display Unit VGA DAC and Connector
+ * rcar_du_vgacon.c  --  R-Car Display Unit VGA Connector
  *
  * Copyright (C) 2013 Renesas Corporation
  *
@@ -16,12 +16,9 @@
 #include <drm/drm_crtc_helper.h>
 
 #include "rcar_du_drv.h"
+#include "rcar_du_encoder.h"
 #include "rcar_du_kms.h"
-#include "rcar_du_vga.h"
-
-/* -----------------------------------------------------------------------------
- * Connector
- */
+#include "rcar_du_vgacon.h"
 
 static int rcar_du_vga_connector_get_modes(struct drm_connector *connector)
 {
@@ -49,7 +46,7 @@ static void rcar_du_vga_connector_destroy(struct drm_connector *connector)
 static enum drm_connector_status
 rcar_du_vga_connector_detect(struct drm_connector *connector, bool force)
 {
-        return connector_status_unknown;
+        return connector_status_connected;
 }
 
 static const struct drm_connector_funcs connector_funcs = {
@@ -59,8 +56,8 @@ static const struct drm_connector_funcs connector_funcs = {
         .destroy = rcar_du_vga_connector_destroy,
 };
 
-static int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
-                                      struct rcar_du_encoder *renc)
+int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
+                               struct rcar_du_encoder *renc)
 {
         struct rcar_du_connector *rcon;
         struct drm_connector *connector;
@@ -97,53 +94,3 @@ static int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
 
         return 0;
 }
-
-/* -----------------------------------------------------------------------------
- * Encoder
- */
-
-static void rcar_du_vga_encoder_dpms(struct drm_encoder *encoder, int mode)
-{
-}
-
-static bool rcar_du_vga_encoder_mode_fixup(struct drm_encoder *encoder,
-                                           const struct drm_display_mode *mode,
-                                           struct drm_display_mode *adjusted_mode)
-{
-        return true;
-}
-
-static const struct drm_encoder_helper_funcs encoder_helper_funcs = {
-        .dpms = rcar_du_vga_encoder_dpms,
-        .mode_fixup = rcar_du_vga_encoder_mode_fixup,
-        .prepare = rcar_du_encoder_mode_prepare,
-        .commit = rcar_du_encoder_mode_commit,
-        .mode_set = rcar_du_encoder_mode_set,
-};
-
-static const struct drm_encoder_funcs encoder_funcs = {
-        .destroy = drm_encoder_cleanup,
-};
-
-int rcar_du_vga_init(struct rcar_du_device *rcdu,
-                     const struct rcar_du_encoder_vga_data *data,
-                     unsigned int output)
-{
-        struct rcar_du_encoder *renc;
-        int ret;
-
-        renc = devm_kzalloc(rcdu->dev, sizeof(*renc), GFP_KERNEL);
-        if (renc == NULL)
-                return -ENOMEM;
-
-        renc->output = output;
-
-        ret = drm_encoder_init(rcdu->ddev, &renc->encoder, &encoder_funcs,
-                               DRM_MODE_ENCODER_DAC);
-        if (ret < 0)
-                return ret;
-
-        drm_encoder_helper_add(&renc->encoder, &encoder_helper_funcs);
-
-        return rcar_du_vga_connector_init(rcdu, renc);
-}
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vga.h b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h
index 66b4d2d7190d..b12b0cf7f117 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_vga.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h
@@ -1,5 +1,5 @@
 /*
- * rcar_du_vga.h  --  R-Car Display Unit VGA DAC and Connector
+ * rcar_du_vgacon.h  --  R-Car Display Unit VGA Connector
  *
  * Copyright (C) 2013 Renesas Corporation
  *
@@ -11,14 +11,13 @@
  * (at your option) any later version.
  */
 
-#ifndef __RCAR_DU_VGA_H__
-#define __RCAR_DU_VGA_H__
+#ifndef __RCAR_DU_VGACON_H__
+#define __RCAR_DU_VGACON_H__
 
 struct rcar_du_device;
-struct rcar_du_encoder_vga_data;
+struct rcar_du_encoder;
 
-int rcar_du_vga_init(struct rcar_du_device *rcdu,
-                     const struct rcar_du_encoder_vga_data *data,
-                     unsigned int output);
+int rcar_du_vga_connector_init(struct rcar_du_device *rcdu,
+                               struct rcar_du_encoder *renc);
 
-#endif /* __RCAR_DU_VGA_H__ */
+#endif /* __RCAR_DU_VGACON_H__ */
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h b/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
new file mode 100644
index 000000000000..77cf9289ab65
--- /dev/null
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
@@ -0,0 +1,69 @@
+/*
+ * rcar_lvds_regs.h  --  R-Car LVDS Interface Registers Definitions
+ *
+ * Copyright (C) 2013 Renesas Electronics Corporation
+ *
+ * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ */
+
+#ifndef __RCAR_LVDS_REGS_H__
+#define __RCAR_LVDS_REGS_H__
+
+#define LVDCR0                          0x0000
+#define LVDCR0_DUSEL                    (1 << 15)
+#define LVDCR0_DMD                      (1 << 12)
+#define LVDCR0_LVMD_MASK                (0xf << 8)
+#define LVDCR0_LVMD_SHIFT               8
+#define LVDCR0_PLLEN                    (1 << 4)
+#define LVDCR0_BEN                      (1 << 2)
+#define LVDCR0_LVEN                     (1 << 1)
+#define LVDCR0_LVRES                    (1 << 0)
+
+#define LVDCR1                          0x0004
+#define LVDCR1_CKSEL                    (1 << 15)
+#define LVDCR1_CHSTBY(n)                (3 << (2 + (n) * 2))
+#define LVDCR1_CLKSTBY                  (3 << 0)
+
+#define LVDPLLCR                        0x0008
+#define LVDPLLCR_CEEN                   (1 << 14)
+#define LVDPLLCR_FBEN                   (1 << 13)
+#define LVDPLLCR_COSEL                  (1 << 12)
+#define LVDPLLCR_PLLDLYCNT_150M         (0x1bf << 0)
+#define LVDPLLCR_PLLDLYCNT_121M         (0x22c << 0)
+#define LVDPLLCR_PLLDLYCNT_60M          (0x77b << 0)
+#define LVDPLLCR_PLLDLYCNT_38M          (0x69a << 0)
+#define LVDPLLCR_PLLDLYCNT_MASK         (0x7ff << 0)
+
+#define LVDCTRCR                        0x000c
+#define LVDCTRCR_CTR3SEL_ZERO           (0 << 12)
+#define LVDCTRCR_CTR3SEL_ODD            (1 << 12)
+#define LVDCTRCR_CTR3SEL_CDE            (2 << 12)
+#define LVDCTRCR_CTR3SEL_MASK           (7 << 12)
+#define LVDCTRCR_CTR2SEL_DISP           (0 << 8)
+#define LVDCTRCR_CTR2SEL_ODD            (1 << 8)
+#define LVDCTRCR_CTR2SEL_CDE            (2 << 8)
+#define LVDCTRCR_CTR2SEL_HSYNC          (3 << 8)
+#define LVDCTRCR_CTR2SEL_VSYNC          (4 << 8)
+#define LVDCTRCR_CTR2SEL_MASK           (7 << 8)
+#define LVDCTRCR_CTR1SEL_VSYNC          (0 << 4)
+#define LVDCTRCR_CTR1SEL_DISP           (1 << 4)
+#define LVDCTRCR_CTR1SEL_ODD            (2 << 4)
+#define LVDCTRCR_CTR1SEL_CDE            (3 << 4)
+#define LVDCTRCR_CTR1SEL_HSYNC          (4 << 4)
+#define LVDCTRCR_CTR1SEL_MASK           (7 << 4)
+#define LVDCTRCR_CTR0SEL_HSYNC          (0 << 0)
+#define LVDCTRCR_CTR0SEL_VSYNC          (1 << 0)
+#define LVDCTRCR_CTR0SEL_DISP           (2 << 0)
+#define LVDCTRCR_CTR0SEL_ODD            (3 << 0)
+#define LVDCTRCR_CTR0SEL_CDE            (4 << 0)
+#define LVDCTRCR_CTR0SEL_MASK           (7 << 0)
+
+#define LVDCHCR                         0x0010
+#define LVDCHCR_CHSEL_CH(n, c)          ((((c) - (n)) & 3) << ((n) * 4))
+#define LVDCHCR_CHSEL_MASK(n)           (3 << ((n) * 4))
+
+#endif /* __RCAR_LVDS_REGS_H__ */
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
index bd6b2cf508d5..b17d0710871a 100644
--- a/drivers/gpu/drm/savage/savage_bci.c
+++ b/drivers/gpu/drm/savage/savage_bci.c
@@ -1072,7 +1072,7 @@ void savage_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv)
                 drm_idlelock_release(&file_priv->master->lock);
 }
 
-struct drm_ioctl_desc savage_ioctls[] = {
+const struct drm_ioctl_desc savage_ioctls[] = {
         DRM_IOCTL_DEF_DRV(SAVAGE_BCI_INIT, savage_bci_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
         DRM_IOCTL_DEF_DRV(SAVAGE_BCI_CMDBUF, savage_bci_cmdbuf, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(SAVAGE_BCI_EVENT_EMIT, savage_bci_event_emit, DRM_AUTH),
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index 71b2081e7835..3c030216e888 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -42,7 +42,6 @@ static const struct file_operations savage_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -51,7 +50,7 @@ static const struct file_operations savage_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_PCI_DMA,
+            DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_PCI_DMA,
         .dev_priv_size = sizeof(drm_savage_buf_priv_t),
         .load = savage_driver_load,
         .firstopen = savage_driver_firstopen,
diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
index c05082a59f6f..335f8fcf1041 100644
--- a/drivers/gpu/drm/savage/savage_drv.h
+++ b/drivers/gpu/drm/savage/savage_drv.h
@@ -104,7 +104,7 @@ enum savage_family {
         S3_LAST
 };
 
-extern struct drm_ioctl_desc savage_ioctls[];
+extern const struct drm_ioctl_desc savage_ioctls[];
 extern int savage_max_ioctl;
 
 #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 99e2034e49cc..54bad98e9477 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -465,7 +465,8 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc)
 
 static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
                                     struct drm_framebuffer *fb,
-                                    struct drm_pending_vblank_event *event)
+                                    struct drm_pending_vblank_event *event,
+                                    uint32_t page_flip_flags)
 {
         struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
         struct drm_device *dev = scrtc->crtc.dev;
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
index 5f83f9a3ef59..015551866b4a 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c
@@ -257,7 +257,6 @@ static const struct file_operations shmob_drm_fops = {
 #endif
         .poll           = drm_poll,
         .read           = drm_read,
-        .fasync         = drm_fasync,
         .llseek         = no_llseek,
         .mmap           = drm_gem_cma_mmap,
 };
@@ -285,7 +284,7 @@ static struct drm_driver shmob_drm_driver = {
         .gem_prime_mmap         = drm_gem_cma_prime_mmap,
         .dumb_create            = drm_gem_cma_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
-        .dumb_destroy           = drm_gem_cma_dumb_destroy,
+        .dumb_destroy           = drm_gem_dumb_destroy,
         .fops                   = &shmob_drm_fops,
         .name                   = "shmob-drm",
         .desc                   = "Renesas SH Mobile DRM",
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 5a5325e6b759..4383b74a3aa4 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -72,7 +72,6 @@ static const struct file_operations sis_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -103,7 +102,7 @@ void sis_driver_postclose(struct drm_device *dev, struct drm_file *file)
 }
 
 static struct drm_driver driver = {
-        .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
+        .driver_features = DRIVER_USE_AGP,
         .load = sis_driver_load,
         .unload = sis_driver_unload,
         .open = sis_driver_open,
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index 13b527bb83be..c31c0253054d 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -70,7 +70,7 @@ extern void sis_reclaim_buffers_locked(struct drm_device *dev,
                                        struct drm_file *file_priv);
 extern void sis_lastclose(struct drm_device *dev);
 
-extern struct drm_ioctl_desc sis_ioctls[];
+extern const struct drm_ioctl_desc sis_ioctls[];
 extern int sis_max_ioctl;
 
 #endif
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 9a43d98e5003..01857d836350 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -109,7 +109,8 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
         if (pool == AGP_TYPE) {
                 retval = drm_mm_insert_node(&dev_priv->agp_mm,
                                             &item->mm_node,
-                                            mem->size, 0);
+                                            mem->size, 0,
+                                            DRM_MM_SEARCH_DEFAULT);
                 offset = item->mm_node.start;
         } else {
 #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
@@ -121,7 +122,8 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
 #else
                 retval = drm_mm_insert_node(&dev_priv->vram_mm,
                                             &item->mm_node,
-                                            mem->size, 0);
+                                            mem->size, 0,
+                                            DRM_MM_SEARCH_DEFAULT);
                 offset = item->mm_node.start;
 #endif
         }
@@ -348,7 +350,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
         return;
 }
 
-struct drm_ioctl_desc sis_ioctls[] = {
+const struct drm_ioctl_desc sis_ioctls[] = {
         DRM_IOCTL_DEF_DRV(SIS_FB_ALLOC, sis_fb_alloc, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(SIS_FB_FREE, sis_drm_free, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(SIS_AGP_INIT, sis_ioctl_agp_init, DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index ddfa743459d0..3492ca5c46d3 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -48,7 +48,6 @@ static const struct file_operations tdfx_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -56,7 +55,6 @@ static const struct file_operations tdfx_driver_fops = {
 };
 
 static struct drm_driver driver = {
-        .driver_features = DRIVER_USE_MTRR,
         .fops = &tdfx_driver_fops,
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 7418dcd986d3..d36efc13b16f 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -15,7 +15,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kfifo.h>
+#include "drm_flip_work.h"
 
 #include "tilcdc_drv.h"
 #include "tilcdc_regs.h"
@@ -35,21 +35,18 @@ struct tilcdc_crtc {
         struct drm_framebuffer *scanout[2];
 
         /* for deferred fb unref's: */
-        DECLARE_KFIFO_PTR(unref_fifo, struct drm_framebuffer *);
-        struct work_struct work;
+        struct drm_flip_work unref_work;
 };
 #define to_tilcdc_crtc(x) container_of(x, struct tilcdc_crtc, base)
 
-static void unref_worker(struct work_struct *work)
+static void unref_worker(struct drm_flip_work *work, void *val)
 {
         struct tilcdc_crtc *tilcdc_crtc =
-                container_of(work, struct tilcdc_crtc, work);
+                container_of(work, struct tilcdc_crtc, unref_work);
         struct drm_device *dev = tilcdc_crtc->base.dev;
-        struct drm_framebuffer *fb;
 
         mutex_lock(&dev->mode_config.mutex);
-        while (kfifo_get(&tilcdc_crtc->unref_fifo, &fb))
-                drm_framebuffer_unreference(fb);
+        drm_framebuffer_unreference(val);
         mutex_unlock(&dev->mode_config.mutex);
 }
 
@@ -68,19 +65,14 @@ static void set_scanout(struct drm_crtc *crtc, int n)
         };
         struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
         struct drm_device *dev = crtc->dev;
+        struct tilcdc_drm_private *priv = dev->dev_private;
 
         pm_runtime_get_sync(dev->dev);
         tilcdc_write(dev, base_reg[n], tilcdc_crtc->start);
         tilcdc_write(dev, ceil_reg[n], tilcdc_crtc->end);
         if (tilcdc_crtc->scanout[n]) {
-                if (kfifo_put(&tilcdc_crtc->unref_fifo,
-                                (const struct drm_framebuffer **)&tilcdc_crtc->scanout[n])) {
-                        struct tilcdc_drm_private *priv = dev->dev_private;
-                        queue_work(priv->wq, &tilcdc_crtc->work);
-                } else {
-                        dev_err(dev->dev, "unref fifo full!\n");
-                        drm_framebuffer_unreference(tilcdc_crtc->scanout[n]);
-                }
+                drm_flip_work_queue(&tilcdc_crtc->unref_work, tilcdc_crtc->scanout[n]);
+                drm_flip_work_commit(&tilcdc_crtc->unref_work, priv->wq);
         }
         tilcdc_crtc->scanout[n] = crtc->fb;
         drm_framebuffer_reference(tilcdc_crtc->scanout[n]);
@@ -149,14 +141,15 @@ static void tilcdc_crtc_destroy(struct drm_crtc *crtc)
         WARN_ON(tilcdc_crtc->dpms == DRM_MODE_DPMS_ON);
 
         drm_crtc_cleanup(crtc);
-        WARN_ON(!kfifo_is_empty(&tilcdc_crtc->unref_fifo));
-        kfifo_free(&tilcdc_crtc->unref_fifo);
+        drm_flip_work_cleanup(&tilcdc_crtc->unref_work);
+
         kfree(tilcdc_crtc);
 }
 
 static int tilcdc_crtc_page_flip(struct drm_crtc *crtc,
                 struct drm_framebuffer *fb,
-                struct drm_pending_vblank_event *event)
+                struct drm_pending_vblank_event *event,
+                uint32_t page_flip_flags)
 {
         struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
         struct drm_device *dev = crtc->dev;
@@ -379,7 +372,12 @@ static int tilcdc_crtc_mode_set(struct drm_crtc *crtc,
         else
                 tilcdc_clear(dev, LCDC_RASTER_TIMING_2_REG, LCDC_SYNC_EDGE);
 
-        if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+        /*
+         * use value from adjusted_mode here as this might have been
+         * changed as part of the fixup for slave encoders to solve the
+         * issue where tilcdc timings are not VESA compliant
+         */
+        if (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC)
                 tilcdc_set(dev, LCDC_RASTER_TIMING_2_REG, LCDC_INVERT_HSYNC);
         else
                 tilcdc_clear(dev, LCDC_RASTER_TIMING_2_REG, LCDC_INVERT_HSYNC);
@@ -666,14 +664,13 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
         tilcdc_crtc->dpms = DRM_MODE_DPMS_OFF;
         init_waitqueue_head(&tilcdc_crtc->frame_done_wq);
 
-        ret = kfifo_alloc(&tilcdc_crtc->unref_fifo, 16, GFP_KERNEL);
+        ret = drm_flip_work_init(&tilcdc_crtc->unref_work, 16,
+                        "unref", unref_worker);
         if (ret) {
                 dev_err(dev->dev, "could not allocate unref FIFO\n");
                 goto fail;
         }
 
-        INIT_WORK(&tilcdc_crtc->work, unref_worker);
-
         ret = drm_crtc_init(dev, crtc, &tilcdc_crtc_funcs);
         if (ret < 0)
                 goto fail;
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
index 40b71da5a214..116da199b942 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c
@@ -497,7 +497,6 @@ static const struct file_operations fops = {
 #endif
         .poll               = drm_poll,
         .read               = drm_read,
-        .fasync             = drm_fasync,
         .llseek             = no_llseek,
         .mmap               = drm_gem_cma_mmap,
 };
@@ -519,7 +518,7 @@ static struct drm_driver tilcdc_driver = {
         .gem_vm_ops         = &drm_gem_cma_vm_ops,
         .dumb_create        = drm_gem_cma_dumb_create,
         .dumb_map_offset    = drm_gem_cma_dumb_map_offset,
-        .dumb_destroy       = drm_gem_cma_dumb_destroy,
+        .dumb_destroy       = drm_gem_dumb_destroy,
 #ifdef CONFIG_DEBUG_FS
         .debugfs_init       = tilcdc_debugfs_init,
         .debugfs_cleanup    = tilcdc_debugfs_cleanup,
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
index dfffaf014022..23b3203d8241 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
@@ -73,13 +73,38 @@ static void slave_encoder_prepare(struct drm_encoder *encoder)
         tilcdc_crtc_set_panel_info(encoder->crtc, &slave_info);
 }
 
+static bool slave_encoder_fixup(struct drm_encoder *encoder,
+                const struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
+{
+        /*
+         * tilcdc does not generate VESA-complient sync but aligns
+         * VS on the second edge of HS instead of first edge.
+         * We use adjusted_mode, to fixup sync by aligning both rising
+         * edges and add HSKEW offset to let the slave encoder fix it up.
+         */
+        adjusted_mode->hskew = mode->hsync_end - mode->hsync_start;
+        adjusted_mode->flags |= DRM_MODE_FLAG_HSKEW;
+
+        if (mode->flags & DRM_MODE_FLAG_NHSYNC) {
+                adjusted_mode->flags |= DRM_MODE_FLAG_PHSYNC;
+                adjusted_mode->flags &= ~DRM_MODE_FLAG_NHSYNC;
+        } else {
+                adjusted_mode->flags |= DRM_MODE_FLAG_NHSYNC;
+                adjusted_mode->flags &= ~DRM_MODE_FLAG_PHSYNC;
+        }
+
+        return drm_i2c_encoder_mode_fixup(encoder, mode, adjusted_mode);
+}
+
+
 static const struct drm_encoder_funcs slave_encoder_funcs = {
                 .destroy        = slave_encoder_destroy,
 };
 
 static const struct drm_encoder_helper_funcs slave_encoder_helper_funcs = {
                 .dpms           = drm_i2c_encoder_dpms,
-                .mode_fixup     = drm_i2c_encoder_mode_fixup,
+                .mode_fixup     = slave_encoder_fixup,
                 .prepare        = slave_encoder_prepare,
                 .commit         = drm_i2c_encoder_commit,
                 .mode_set       = drm_i2c_encoder_mode_set,
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index cb9dd674670c..f1a857ec1021 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -45,7 +45,6 @@
 #define TTM_DEBUG(fmt, arg...)
 #define TTM_BO_HASH_ORDER 13
 
-static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
 static int ttm_bo_swapout(struct ttm_mem_shrink *shrink);
 static void ttm_bo_global_kobj_release(struct kobject *kobj);
 
@@ -615,13 +614,7 @@ static void ttm_bo_release(struct kref *kref)
         struct ttm_bo_device *bdev = bo->bdev;
         struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
 
-        write_lock(&bdev->vm_lock);
-        if (likely(bo->vm_node != NULL)) {
-                rb_erase(&bo->vm_rb, &bdev->addr_space_rb);
-                drm_mm_put_block(bo->vm_node);
-                bo->vm_node = NULL;
-        }
-        write_unlock(&bdev->vm_lock);
+        drm_vma_offset_remove(&bdev->vma_manager, &bo->vma_node);
         ttm_mem_io_lock(man, false);
         ttm_mem_io_free_vm(bo);
         ttm_mem_io_unlock(man);
@@ -1129,6 +1122,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
         bo->resv = &bo->ttm_resv;
         reservation_object_init(bo->resv);
         atomic_inc(&bo->glob->bo_count);
+        drm_vma_node_reset(&bo->vma_node);
 
         ret = ttm_bo_check_placement(bo, placement);
 
@@ -1139,7 +1133,8 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
         if (likely(!ret) &&
             (bo->type == ttm_bo_type_device ||
              bo->type == ttm_bo_type_sg))
-                ret = ttm_bo_setup_vm(bo);
+                ret = drm_vma_offset_add(&bdev->vma_manager, &bo->vma_node,
+                                         bo->mem.num_pages);
 
         locked = ww_mutex_trylock(&bo->resv->lock);
         WARN_ON(!locked);
@@ -1424,10 +1419,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
                 TTM_DEBUG("Swap list was clean\n");
         spin_unlock(&glob->lru_lock);
 
-        BUG_ON(!drm_mm_clean(&bdev->addr_space_mm));
-        write_lock(&bdev->vm_lock);
-        drm_mm_takedown(&bdev->addr_space_mm);
-        write_unlock(&bdev->vm_lock);
+        drm_vma_offset_manager_destroy(&bdev->vma_manager);
 
         return ret;
 }
@@ -1441,7 +1433,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
 {
         int ret = -EINVAL;
 
-        rwlock_init(&bdev->vm_lock);
         bdev->driver = driver;
 
         memset(bdev->man, 0, sizeof(bdev->man));
@@ -1454,9 +1445,8 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
         if (unlikely(ret != 0))
                 goto out_no_sys;
 
-        bdev->addr_space_rb = RB_ROOT;
-        drm_mm_init(&bdev->addr_space_mm, file_page_offset, 0x10000000);
-
+        drm_vma_offset_manager_init(&bdev->vma_manager, file_page_offset,
+                                    0x10000000);
         INIT_DELAYED_WORK(&bdev->wq, ttm_bo_delayed_workqueue);
         INIT_LIST_HEAD(&bdev->ddestroy);
         bdev->dev_mapping = NULL;
@@ -1498,12 +1488,8 @@ bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo)
 {
         struct ttm_bo_device *bdev = bo->bdev;
-        loff_t offset = (loff_t) bo->addr_space_offset;
-        loff_t holelen = ((loff_t) bo->mem.num_pages) << PAGE_SHIFT;
 
-        if (!bdev->dev_mapping)
-                return;
-        unmap_mapping_range(bdev->dev_mapping, offset, holelen, 1);
+        drm_vma_node_unmap(&bo->vma_node, bdev->dev_mapping);
         ttm_mem_io_free_vm(bo);
 }
 
@@ -1520,78 +1506,6 @@ void ttm_bo_unmap_virtual(struct ttm_buffer_object *bo)
 
 EXPORT_SYMBOL(ttm_bo_unmap_virtual);
 
-static void ttm_bo_vm_insert_rb(struct ttm_buffer_object *bo)
-{
-        struct ttm_bo_device *bdev = bo->bdev;
-        struct rb_node **cur = &bdev->addr_space_rb.rb_node;
-        struct rb_node *parent = NULL;
-        struct ttm_buffer_object *cur_bo;
-        unsigned long offset = bo->vm_node->start;
-        unsigned long cur_offset;
-
-        while (*cur) {
-                parent = *cur;
-                cur_bo = rb_entry(parent, struct ttm_buffer_object, vm_rb);
-                cur_offset = cur_bo->vm_node->start;
-                if (offset < cur_offset)
-                        cur = &parent->rb_left;
-                else if (offset > cur_offset)
-                        cur = &parent->rb_right;
-                else
-                        BUG();
-        }
-
-        rb_link_node(&bo->vm_rb, parent, cur);
-        rb_insert_color(&bo->vm_rb, &bdev->addr_space_rb);
-}
-
-/**
- * ttm_bo_setup_vm:
- *
- * @bo: the buffer to allocate address space for
- *
- * Allocate address space in the drm device so that applications
- * can mmap the buffer and access the contents. This only
- * applies to ttm_bo_type_device objects as others are not
- * placed in the drm device address space.
- */
-
-static int ttm_bo_setup_vm(struct ttm_buffer_object *bo)
-{
-        struct ttm_bo_device *bdev = bo->bdev;
-        int ret;
-
-retry_pre_get:
-        ret = drm_mm_pre_get(&bdev->addr_space_mm);
-        if (unlikely(ret != 0))
-                return ret;
-
-        write_lock(&bdev->vm_lock);
-        bo->vm_node = drm_mm_search_free(&bdev->addr_space_mm,
-                                         bo->mem.num_pages, 0, 0);
-
-        if (unlikely(bo->vm_node == NULL)) {
-                ret = -ENOMEM;
-                goto out_unlock;
-        }
-
-        bo->vm_node = drm_mm_get_block_atomic(bo->vm_node,
-                                              bo->mem.num_pages, 0);
-
-        if (unlikely(bo->vm_node == NULL)) {
-                write_unlock(&bdev->vm_lock);
-                goto retry_pre_get;
-        }
-
-        ttm_bo_vm_insert_rb(bo);
-        write_unlock(&bdev->vm_lock);
-        bo->addr_space_offset = ((uint64_t) bo->vm_node->start) << PAGE_SHIFT;
-
-        return 0;
-out_unlock:
-        write_unlock(&bdev->vm_lock);
-        return ret;
-}
 
 int ttm_bo_wait(struct ttm_buffer_object *bo,
                 bool lazy, bool interruptible, bool no_wait)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
index e4367f91472a..c58eba33bd5f 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
@@ -61,28 +61,25 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
         lpfn = placement->lpfn;
         if (!lpfn)
                 lpfn = man->size;
-        do {
-                ret = drm_mm_pre_get(mm);
-                if (unlikely(ret))
-                        return ret;
 
-                spin_lock(&rman->lock);
-                node = drm_mm_search_free_in_range(mm,
-                                        mem->num_pages, mem->page_alignment,
-                                        placement->fpfn, lpfn, 1);
-                if (unlikely(node == NULL)) {
-                        spin_unlock(&rman->lock);
-                        return 0;
-                }
-                node = drm_mm_get_block_atomic_range(node, mem->num_pages,
-                                                     mem->page_alignment,
-                                                     placement->fpfn,
-                                                     lpfn);
-                spin_unlock(&rman->lock);
-        } while (node == NULL);
+        node = kzalloc(sizeof(*node), GFP_KERNEL);
+        if (!node)
+                return -ENOMEM;
+
+        spin_lock(&rman->lock);
+        ret = drm_mm_insert_node_in_range(mm, node, mem->num_pages,
+                                          mem->page_alignment,
+                                          placement->fpfn, lpfn,
+                                          DRM_MM_SEARCH_BEST);
+        spin_unlock(&rman->lock);
+
+        if (unlikely(ret)) {
+                kfree(node);
+        } else {
+                mem->mm_node = node;
+                mem->start = node->start;
+        }
 
-        mem->mm_node = node;
-        mem->start = node->start;
         return 0;
 }
 
@@ -93,8 +90,10 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
 
         if (mem->mm_node) {
                 spin_lock(&rman->lock);
-                drm_mm_put_block(mem->mm_node);
+                drm_mm_remove_node(mem->mm_node);
                 spin_unlock(&rman->lock);
+
+                kfree(mem->mm_node);
                 mem->mm_node = NULL;
         }
 }
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 319cf4127c5b..7cc904d3a4d1 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -30,6 +30,7 @@
 
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
+#include <drm/drm_vma_manager.h>
 #include <linux/io.h>
 #include <linux/highmem.h>
 #include <linux/wait.h>
@@ -450,7 +451,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
         INIT_LIST_HEAD(&fbo->lru);
         INIT_LIST_HEAD(&fbo->swap);
         INIT_LIST_HEAD(&fbo->io_reserve_lru);
-        fbo->vm_node = NULL;
+        drm_vma_node_reset(&fbo->vma_node);
         atomic_set(&fbo->cpu_writers, 0);
 
         spin_lock(&bdev->fence_lock);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 3df9f16b041c..1006c15445e9 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -33,6 +33,7 @@
 #include <ttm/ttm_module.h>
 #include <ttm/ttm_bo_driver.h>
 #include <ttm/ttm_placement.h>
+#include <drm/drm_vma_manager.h>
 #include <linux/mm.h>
 #include <linux/rbtree.h>
 #include <linux/module.h>
@@ -40,37 +41,6 @@
 
 #define TTM_BO_VM_NUM_PREFAULT 16
 
-static struct ttm_buffer_object *ttm_bo_vm_lookup_rb(struct ttm_bo_device *bdev,
-                                                     unsigned long page_start,
-                                                     unsigned long num_pages)
-{
-        struct rb_node *cur = bdev->addr_space_rb.rb_node;
-        unsigned long cur_offset;
-        struct ttm_buffer_object *bo;
-        struct ttm_buffer_object *best_bo = NULL;
-
-        while (likely(cur != NULL)) {
-                bo = rb_entry(cur, struct ttm_buffer_object, vm_rb);
-                cur_offset = bo->vm_node->start;
-                if (page_start >= cur_offset) {
-                        cur = cur->rb_right;
-                        best_bo = bo;
-                        if (page_start == cur_offset)
-                                break;
-                } else
-                        cur = cur->rb_left;
-        }
-
-        if (unlikely(best_bo == NULL))
-                return NULL;
-
-        if (unlikely((best_bo->vm_node->start + best_bo->num_pages) <
-                     (page_start + num_pages)))
-                return NULL;
-
-        return best_bo;
-}
-
 static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -146,9 +116,9 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
         }
 
         page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) +
-            bo->vm_node->start - vma->vm_pgoff;
+            drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;
         page_last = vma_pages(vma) +
-            bo->vm_node->start - vma->vm_pgoff;
+            drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;
 
         if (unlikely(page_offset >= bo->num_pages)) {
                 retval = VM_FAULT_SIGBUS;
@@ -249,6 +219,30 @@ static const struct vm_operations_struct ttm_bo_vm_ops = {
         .close = ttm_bo_vm_close
 };
 
+static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,
+                                                  unsigned long offset,
+                                                  unsigned long pages)
+{
+        struct drm_vma_offset_node *node;
+        struct ttm_buffer_object *bo = NULL;
+
+        drm_vma_offset_lock_lookup(&bdev->vma_manager);
+
+        node = drm_vma_offset_lookup_locked(&bdev->vma_manager, offset, pages);
+        if (likely(node)) {
+                bo = container_of(node, struct ttm_buffer_object, vma_node);
+                if (!kref_get_unless_zero(&bo->kref))
+                        bo = NULL;
+        }
+
+        drm_vma_offset_unlock_lookup(&bdev->vma_manager);
+
+        if (!bo)
+                pr_err("Could not find buffer object to map\n");
+
+        return bo;
+}
+
 int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
                 struct ttm_bo_device *bdev)
 {
@@ -256,17 +250,9 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
         struct ttm_buffer_object *bo;
         int ret;
 
-        read_lock(&bdev->vm_lock);
-        bo = ttm_bo_vm_lookup_rb(bdev, vma->vm_pgoff,
-                                 vma_pages(vma));
-        if (likely(bo != NULL) && !kref_get_unless_zero(&bo->kref))
-                bo = NULL;
-        read_unlock(&bdev->vm_lock);
-
-        if (unlikely(bo == NULL)) {
-                pr_err("Could not find buffer object to map\n");
+        bo = ttm_bo_vm_lookup(bdev, vma->vm_pgoff, vma_pages(vma));
+        if (unlikely(!bo))
                 return -EINVAL;
-        }
 
         driver = bo->bdev->driver;
         if (unlikely(!driver->verify_access)) {
@@ -304,162 +290,3 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)
         return 0;
 }
 EXPORT_SYMBOL(ttm_fbdev_mmap);
-
-
-ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp,
-                  const char __user *wbuf, char __user *rbuf, size_t count,
-                  loff_t *f_pos, bool write)
-{
-        struct ttm_buffer_object *bo;
-        struct ttm_bo_driver *driver;
-        struct ttm_bo_kmap_obj map;
-        unsigned long dev_offset = (*f_pos >> PAGE_SHIFT);
-        unsigned long kmap_offset;
-        unsigned long kmap_end;
-        unsigned long kmap_num;
-        size_t io_size;
-        unsigned int page_offset;
-        char *virtual;
-        int ret;
-        bool no_wait = false;
-        bool dummy;
-
-        read_lock(&bdev->vm_lock);
-        bo = ttm_bo_vm_lookup_rb(bdev, dev_offset, 1);
-        if (likely(bo != NULL))
-                ttm_bo_reference(bo);
-        read_unlock(&bdev->vm_lock);
-
-        if (unlikely(bo == NULL))
-                return -EFAULT;
-
-        driver = bo->bdev->driver;
-        if (unlikely(!driver->verify_access)) {
-                ret = -EPERM;
-                goto out_unref;
-        }
-
-        ret = driver->verify_access(bo, filp);
-        if (unlikely(ret != 0))
-                goto out_unref;
-
-        kmap_offset = dev_offset - bo->vm_node->start;
-        if (unlikely(kmap_offset >= bo->num_pages)) {
-                ret = -EFBIG;
-                goto out_unref;
-        }
-
-        page_offset = *f_pos & ~PAGE_MASK;
-        io_size = bo->num_pages - kmap_offset;
-        io_size = (io_size << PAGE_SHIFT) - page_offset;
-        if (count < io_size)
-                io_size = count;
-
-        kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
-        kmap_num = kmap_end - kmap_offset + 1;
-
-        ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
-
-        switch (ret) {
-        case 0:
-                break;
-        case -EBUSY:
-                ret = -EAGAIN;
-                goto out_unref;
-        default:
-                goto out_unref;
-        }
-
-        ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
-        if (unlikely(ret != 0)) {
-                ttm_bo_unreserve(bo);
-                goto out_unref;
-        }
-
-        virtual = ttm_kmap_obj_virtual(&map, &dummy);
-        virtual += page_offset;
-
-        if (write)
-                ret = copy_from_user(virtual, wbuf, io_size);
-        else
-                ret = copy_to_user(rbuf, virtual, io_size);
-
-        ttm_bo_kunmap(&map);
-        ttm_bo_unreserve(bo);
-        ttm_bo_unref(&bo);
-
-        if (unlikely(ret != 0))
-                return -EFBIG;
-
-        *f_pos += io_size;
-
-        return io_size;
-out_unref:
-        ttm_bo_unref(&bo);
-        return ret;
-}
-
-ssize_t ttm_bo_fbdev_io(struct ttm_buffer_object *bo, const char __user *wbuf,
-                        char __user *rbuf, size_t count, loff_t *f_pos,
-                        bool write)
-{
-        struct ttm_bo_kmap_obj map;
-        unsigned long kmap_offset;
-        unsigned long kmap_end;
-        unsigned long kmap_num;
-        size_t io_size;
-        unsigned int page_offset;
-        char *virtual;
-        int ret;
-        bool no_wait = false;
-        bool dummy;
-
-        kmap_offset = (*f_pos >> PAGE_SHIFT);
-        if (unlikely(kmap_offset >= bo->num_pages))
-                return -EFBIG;
-
-        page_offset = *f_pos & ~PAGE_MASK;
-        io_size = bo->num_pages - kmap_offset;
-        io_size = (io_size << PAGE_SHIFT) - page_offset;
-        if (count < io_size)
-                io_size = count;
-
-        kmap_end = (*f_pos + count - 1) >> PAGE_SHIFT;
-        kmap_num = kmap_end - kmap_offset + 1;
-
-        ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
-
-        switch (ret) {
-        case 0:
-                break;
-        case -EBUSY:
-                return -EAGAIN;
-        default:
-                return ret;
-        }
-
-        ret = ttm_bo_kmap(bo, kmap_offset, kmap_num, &map);
-        if (unlikely(ret != 0)) {
-                ttm_bo_unreserve(bo);
-                return ret;
-        }
-
-        virtual = ttm_kmap_obj_virtual(&map, &dummy);
-        virtual += page_offset;
-
-        if (write)
-                ret = copy_from_user(virtual, wbuf, io_size);
-        else
-                ret = copy_to_user(rbuf, virtual, io_size);
-
-        ttm_bo_kunmap(&map);
-        ttm_bo_unreserve(bo);
-        ttm_bo_unref(&bo);
-
-        if (unlikely(ret != 0))
-                return ret;
-
-        *f_pos += io_size;
-
-        return io_size;
-}
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index c0770dbba74a..7650dc0d78ce 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -65,7 +65,6 @@ static const struct file_operations udl_driver_fops = {
         .read = drm_read,
         .unlocked_ioctl = drm_ioctl,
         .release = drm_release,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -84,7 +83,7 @@ static struct drm_driver driver = {
 
         .dumb_create = udl_dumb_create,
         .dumb_map_offset = udl_gem_mmap,
-        .dumb_destroy = udl_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
         .fops = &udl_driver_fops,
 
         .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index cc6d90f28c71..56aec9409fa3 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -114,8 +114,6 @@ int udl_dumb_create(struct drm_file *file_priv,
                     struct drm_mode_create_dumb *args);
 int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev,
                  uint32_t handle, uint64_t *offset);
-int udl_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,
-                     uint32_t handle);
 
 int udl_gem_init_object(struct drm_gem_object *obj);
 void udl_gem_free_object(struct drm_gem_object *gem_obj);
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index ef034fa3e6f5..8dbe9d0ae9a7 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -66,12 +66,6 @@ int udl_dumb_create(struct drm_file *file,
                               args->size, &args->handle);
 }
 
-int udl_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-                     uint32_t handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
-
 int udl_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 {
         int ret;
@@ -123,55 +117,23 @@ int udl_gem_init_object(struct drm_gem_object *obj)
 
 static int udl_gem_get_pages(struct udl_gem_object *obj, gfp_t gfpmask)
 {
-        int page_count, i;
-        struct page *page;
-        struct inode *inode;
-        struct address_space *mapping;
+        struct page **pages;
 
         if (obj->pages)
                 return 0;
 
-        page_count = obj->base.size / PAGE_SIZE;
-        BUG_ON(obj->pages != NULL);
-        obj->pages = drm_malloc_ab(page_count, sizeof(struct page *));
-        if (obj->pages == NULL)
-                return -ENOMEM;
+        pages = drm_gem_get_pages(&obj->base, gfpmask);
+        if (IS_ERR(pages))
+                return PTR_ERR(pages);
 
-        inode = file_inode(obj->base.filp);
-        mapping = inode->i_mapping;
-        gfpmask |= mapping_gfp_mask(mapping);
-
-        for (i = 0; i < page_count; i++) {
-                page = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
-                if (IS_ERR(page))
-                        goto err_pages;
-                obj->pages[i] = page;
-        }
+        obj->pages = pages;
 
         return 0;
-err_pages:
-        while (i--)
-                page_cache_release(obj->pages[i]);
-        drm_free_large(obj->pages);
-        obj->pages = NULL;
-        return PTR_ERR(page);
 }
 
 static void udl_gem_put_pages(struct udl_gem_object *obj)
 {
-        int page_count = obj->base.size / PAGE_SIZE;
-        int i;
-
-        if (obj->base.import_attach) {
-                drm_free_large(obj->pages);
-                obj->pages = NULL;
-                return;
-        }
-
-        for (i = 0; i < page_count; i++)
-                page_cache_release(obj->pages[i]);
-
-        drm_free_large(obj->pages);
+        drm_gem_put_pages(&obj->base, obj->pages, false, false);
         obj->pages = NULL;
 }
 
@@ -223,8 +185,7 @@ void udl_gem_free_object(struct drm_gem_object *gem_obj)
         if (obj->pages)
                 udl_gem_put_pages(obj);
 
-        if (gem_obj->map_list.map)
-                drm_gem_free_mmap_offset(gem_obj);
+        drm_gem_free_mmap_offset(gem_obj);
 }
 
 /* the dumb interface doesn't work with the GEM straight MMAP
@@ -247,13 +208,11 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
         ret = udl_gem_get_pages(gobj, GFP_KERNEL);
         if (ret)
                 goto out;
-        if (!gobj->base.map_list.map) {
-                ret = drm_gem_create_mmap_offset(obj);
-                if (ret)
-                        goto out;
-        }
+        ret = drm_gem_create_mmap_offset(obj);
+        if (ret)
+                goto out;
 
-        *offset = (u64)gobj->base.map_list.hash.key << PAGE_SHIFT;
+        *offset = drm_vma_node_offset_addr(&gobj->base.vma_node);
 
 out:
         drm_gem_object_unreference(&gobj->base);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 0ce2d7195256..f5ae57406f34 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -41,8 +41,8 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev,
         total_len = usb_get_descriptor(usbdev, 0x5f, /* vendor specific */
                                     0, desc, MAX_VENDOR_DESCRIPTOR_SIZE);
         if (total_len > 5) {
-                DRM_INFO("vendor descriptor length:%x data:%*ph\n",
-                        total_len, 11, desc);
+                DRM_INFO("vendor descriptor length:%x data:%11ph\n",
+                        total_len, desc);
 
                 if ((desc[0] != total_len) || /* descriptor length */
                     (desc[1] != 0x5f) ||   /* vendor descriptor type */
diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c
index 13558f5a2422..652f9b43ec9d 100644
--- a/drivers/gpu/drm/via/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c
@@ -720,7 +720,7 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
         return ret;
 }
 
-struct drm_ioctl_desc via_ioctls[] = {
+const struct drm_ioctl_desc via_ioctls[] = {
         DRM_IOCTL_DEF_DRV(VIA_ALLOCMEM, via_mem_alloc, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(VIA_FREEMEM, via_mem_free, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(VIA_AGP_INIT, via_agp_init, DRM_AUTH|DRM_MASTER),
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index f4ae20327941..92684a9b7e34 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -64,7 +64,6 @@ static const struct file_operations via_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -73,7 +72,7 @@ static const struct file_operations via_driver_fops = {
 
 static struct drm_driver driver = {
         .driver_features =
-            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |
+            DRIVER_USE_AGP | DRIVER_HAVE_IRQ |
             DRIVER_IRQ_SHARED,
         .load = via_driver_load,
         .unload = via_driver_unload,
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 893a65090c36..a811ef2b505f 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -114,7 +114,7 @@ enum via_family {
 #define VIA_READ8(reg)          DRM_READ8(VIA_BASE, reg)
 #define VIA_WRITE8(reg, val)    DRM_WRITE8(VIA_BASE, reg, val)
 
-extern struct drm_ioctl_desc via_ioctls[];
+extern const struct drm_ioctl_desc via_ioctls[];
 extern int via_max_ioctl;
 
 extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index 0ab93ff09873..7e3ad87c366c 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -140,11 +140,11 @@ int via_mem_alloc(struct drm_device *dev, void *data,
         if (mem->type == VIA_MEM_AGP)
                 retval = drm_mm_insert_node(&dev_priv->agp_mm,
                                             &item->mm_node,
-                                            tmpSize, 0);
+                                            tmpSize, 0, DRM_MM_SEARCH_DEFAULT);
         else
                 retval = drm_mm_insert_node(&dev_priv->vram_mm,
                                             &item->mm_node,
-                                            tmpSize, 0);
+                                            tmpSize, 0, DRM_MM_SEARCH_DEFAULT);
         if (retval)
                 goto fail_alloc;
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 78e21649d48a..1a90f0a2f7e5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -124,7 +124,7 @@
  * Ioctl definitions.
  */
 
-static struct drm_ioctl_desc vmw_ioctls[] = {
+static const struct drm_ioctl_desc vmw_ioctls[] = {
         VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl,
                       DRM_AUTH | DRM_UNLOCKED),
         VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_dmabuf_alloc_ioctl,
@@ -622,8 +622,10 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         }
 
         dev_priv->fman = vmw_fence_manager_init(dev_priv);
-        if (unlikely(dev_priv->fman == NULL))
+        if (unlikely(dev_priv->fman == NULL)) {
+                ret = -ENOMEM;
                 goto out_no_fman;
+        }
 
         vmw_kms_save_vga(dev_priv);
 
@@ -782,7 +784,7 @@ static long vmw_unlocked_ioctl(struct file *filp, unsigned int cmd,
 
         if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
             && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
-                struct drm_ioctl_desc *ioctl =
+                const struct drm_ioctl_desc *ioctl =
                     &vmw_ioctls[nr - DRM_COMMAND_BASE];
 
                 if (unlikely(ioctl->cmd_drv != cmd)) {
@@ -795,29 +797,12 @@ static long vmw_unlocked_ioctl(struct file *filp, unsigned int cmd,
         return drm_ioctl(filp, cmd, arg);
 }
 
-static int vmw_firstopen(struct drm_device *dev)
-{
-        struct vmw_private *dev_priv = vmw_priv(dev);
-        dev_priv->is_opened = true;
-
-        return 0;
-}
-
 static void vmw_lastclose(struct drm_device *dev)
 {
-        struct vmw_private *dev_priv = vmw_priv(dev);
         struct drm_crtc *crtc;
         struct drm_mode_set set;
         int ret;
 
-        /**
-         * Do nothing on the lastclose call from drm_unload.
-         */
-
-        if (!dev_priv->is_opened)
-                return;
-
-        dev_priv->is_opened = false;
         set.x = 0;
         set.y = 0;
         set.fb = NULL;
@@ -1120,7 +1105,6 @@ static const struct file_operations vmwgfx_driver_fops = {
         .mmap = vmw_mmap,
         .poll = vmw_fops_poll,
         .read = vmw_fops_read,
-        .fasync = drm_fasync,
 #if defined(CONFIG_COMPAT)
         .compat_ioctl = drm_compat_ioctl,
 #endif
@@ -1132,7 +1116,6 @@ static struct drm_driver driver = {
         DRIVER_MODESET,
         .load = vmw_driver_load,
         .unload = vmw_driver_unload,
-        .firstopen = vmw_firstopen,
         .lastclose = vmw_lastclose,
         .irq_preinstall = vmw_irq_preinstall,
         .irq_postinstall = vmw_irq_postinstall,
@@ -1143,7 +1126,6 @@ static struct drm_driver driver = {
         .disable_vblank = vmw_disable_vblank,
         .ioctls = vmw_ioctls,
         .num_ioctls = DRM_ARRAY_SIZE(vmw_ioctls),
-        .dma_quiescent = NULL,  /*vmw_dma_quiescent, */
         .master_create = vmw_master_create,
         .master_destroy = vmw_master_destroy,
         .master_set = vmw_master_set,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 13aeda71280e..150ec64af617 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -324,7 +324,6 @@ struct vmw_private {
          */
 
         bool stealth;
-        bool is_opened;
         bool enable_fb;
 
         /**
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index d4607b2530d6..fc43c0601236 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1706,7 +1706,8 @@ int vmw_du_update_layout(struct vmw_private *dev_priv, unsigned num,
 
 int vmw_du_page_flip(struct drm_crtc *crtc,
                      struct drm_framebuffer *fb,
-                     struct drm_pending_vblank_event *event)
+                     struct drm_pending_vblank_event *event,
+                     uint32_t page_flip_flags)
 {
         struct vmw_private *dev_priv = vmw_priv(crtc->dev);
         struct drm_framebuffer *old_fb = crtc->fb;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
index 6fa89c9d6214..8d038c36bd57 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
@@ -123,7 +123,8 @@ struct vmw_display_unit {
 void vmw_display_unit_cleanup(struct vmw_display_unit *du);
 int vmw_du_page_flip(struct drm_crtc *crtc,
                      struct drm_framebuffer *fb,
-                     struct drm_pending_vblank_event *event);
+                     struct drm_pending_vblank_event *event,
+                     uint32_t page_flip_flags);
 void vmw_du_crtc_save(struct drm_crtc *crtc);
 void vmw_du_crtc_restore(struct drm_crtc *crtc);
 void vmw_du_crtc_gamma_set(struct drm_crtc *crtc,
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 7953d1f90b63..0e67cf41065d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -500,7 +500,7 @@ int vmw_dmabuf_alloc_ioctl(struct drm_device *dev, void *data,
                 goto out_no_dmabuf;
 
         rep->handle = handle;
-        rep->map_handle = dma_buf->base.addr_space_offset;
+        rep->map_handle = drm_vma_node_offset_addr(&dma_buf->base.vma_node);
         rep->cur_gmr_id = handle;
         rep->cur_gmr_offset = 0;
 
@@ -834,7 +834,7 @@ int vmw_dumb_map_offset(struct drm_file *file_priv,
         if (ret != 0)
                 return -EINVAL;
 
-        *offset = out_buf->base.addr_space_offset;
+        *offset = drm_vma_node_offset_addr(&out_buf->base.vma_node);
         vmw_dmabuf_unreference(&out_buf);
         return 0;
 }
diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
index e184b00faacd..8c61ceeaa12d 100644
--- a/drivers/gpu/host1x/drm/drm.c
+++ b/drivers/gpu/host1x/drm/drm.c
@@ -356,7 +356,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
 
         bo = to_tegra_bo(gem);
 
-        args->offset = tegra_bo_get_mmap_offset(bo);
+        args->offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
         drm_gem_object_unreference(gem);
 
@@ -487,7 +487,7 @@ static int tegra_submit(struct drm_device *drm, void *data,
 }
 #endif
 
-static struct drm_ioctl_desc tegra_drm_ioctls[] = {
+static const struct drm_ioctl_desc tegra_drm_ioctls[] = {
 #ifdef CONFIG_DRM_TEGRA_STAGING
         DRM_IOCTL_DEF_DRV(TEGRA_GEM_CREATE, tegra_gem_create, DRM_UNLOCKED | DRM_AUTH),
         DRM_IOCTL_DEF_DRV(TEGRA_GEM_MMAP, tegra_gem_mmap, DRM_UNLOCKED),
@@ -508,7 +508,6 @@ static const struct file_operations tegra_drm_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = tegra_drm_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = drm_compat_ioctl,
@@ -633,7 +632,7 @@ struct drm_driver tegra_drm_driver = {
         .gem_vm_ops = &tegra_bo_vm_ops,
         .dumb_create = tegra_bo_dumb_create,
         .dumb_map_offset = tegra_bo_dumb_map_offset,
-        .dumb_destroy = tegra_bo_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
 
         .ioctls = tegra_drm_ioctls,
         .num_ioctls = ARRAY_SIZE(tegra_drm_ioctls),
diff --git a/drivers/gpu/host1x/drm/gem.c b/drivers/gpu/host1x/drm/gem.c
index c5e9a9b494c2..59623de4ee15 100644
--- a/drivers/gpu/host1x/drm/gem.c
+++ b/drivers/gpu/host1x/drm/gem.c
@@ -106,11 +106,6 @@ static void tegra_bo_destroy(struct drm_device *drm, struct tegra_bo *bo)
         dma_free_writecombine(drm->dev, bo->gem.size, bo->vaddr, bo->paddr);
 }
 
-unsigned int tegra_bo_get_mmap_offset(struct tegra_bo *bo)
-{
-        return (unsigned int)bo->gem.map_list.hash.key << PAGE_SHIFT;
-}
-
 struct tegra_bo *tegra_bo_create(struct drm_device *drm, unsigned int size)
 {
         struct tegra_bo *bo;
@@ -182,8 +177,7 @@ void tegra_bo_free_object(struct drm_gem_object *gem)
 {
         struct tegra_bo *bo = to_tegra_bo(gem);
 
-        if (gem->map_list.map)
-                drm_gem_free_mmap_offset(gem);
+        drm_gem_free_mmap_offset(gem);
 
         drm_gem_object_release(gem);
         tegra_bo_destroy(gem->dev, bo);
@@ -228,7 +222,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 
         bo = to_tegra_bo(gem);
 
-        *offset = tegra_bo_get_mmap_offset(bo);
+        *offset = drm_vma_node_offset_addr(&bo->gem.vma_node);
 
         drm_gem_object_unreference(gem);
 
@@ -262,9 +256,3 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma)
 
         return ret;
 }
-
-int tegra_bo_dumb_destroy(struct drm_file *file, struct drm_device *drm,
-                          unsigned int handle)
-{
-        return drm_gem_handle_delete(file, handle);
-}
diff --git a/drivers/gpu/host1x/drm/gem.h b/drivers/gpu/host1x/drm/gem.h
index 34de2b486eb7..492533a2dacb 100644
--- a/drivers/gpu/host1x/drm/gem.h
+++ b/drivers/gpu/host1x/drm/gem.h
@@ -44,13 +44,10 @@ struct tegra_bo *tegra_bo_create_with_handle(struct drm_file *file,
                                             unsigned int size,
                                             unsigned int *handle);
 void tegra_bo_free_object(struct drm_gem_object *gem);
-unsigned int tegra_bo_get_mmap_offset(struct tegra_bo *bo);
 int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
                          struct drm_mode_create_dumb *args);
 int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
                              uint32_t handle, uint64_t *offset);
-int tegra_bo_dumb_destroy(struct drm_file *file, struct drm_device *drm,
-                          unsigned int handle);
 
 int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma);
 
diff --git a/drivers/gpu/host1x/drm/hdmi.c b/drivers/gpu/host1x/drm/hdmi.c
index 01097da09f7f..52e3c9641a0f 100644
--- a/drivers/gpu/host1x/drm/hdmi.c
+++ b/drivers/gpu/host1x/drm/hdmi.c
@@ -551,24 +551,8 @@ static void tegra_hdmi_setup_stereo_infoframe(struct tegra_hdmi *hdmi)
                 return;
         }
 
-        memset(&frame, 0, sizeof(frame));
-
-        frame.type = HDMI_INFOFRAME_TYPE_VENDOR;
-        frame.version = 0x01;
-        frame.length = 6;
-
-        frame.data[0] = 0x03; /* regid0 */
-        frame.data[1] = 0x0c; /* regid1 */
-        frame.data[2] = 0x00; /* regid2 */
-        frame.data[3] = 0x02 << 5; /* video format */
-
-        /* TODO: 74 MHz limit? */
-        if (1) {
-                frame.data[4] = 0x00 << 4; /* 3D structure */
-        } else {
-                frame.data[4] = 0x08 << 4; /* 3D structure */
-                frame.data[5] = 0x00 << 4; /* 3D ext. data */
-        }
+        hdmi_vendor_infoframe_init(&frame);
+        frame.s3d_struct = HDMI_3D_STRUCTURE_FRAME_PACKING;
 
         err = hdmi_vendor_infoframe_pack(&frame, buffer, sizeof(buffer));
         if (err < 0) {
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index cf787e1d9322..ec0ae2d1686a 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -27,6 +27,7 @@
 #include <linux/pci.h>
 #include <linux/console.h>
 #include <linux/vga_switcheroo.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/vgaarb.h>
 
@@ -37,6 +38,7 @@ struct vga_switcheroo_client {
         const struct vga_switcheroo_client_ops *ops;
         int id;
         bool active;
+        bool driver_power_control;
         struct list_head list;
 };
 
@@ -132,7 +134,7 @@ EXPORT_SYMBOL(vga_switcheroo_unregister_handler);
 
 static int register_client(struct pci_dev *pdev,
                            const struct vga_switcheroo_client_ops *ops,
-                           int id, bool active)
+                           int id, bool active, bool driver_power_control)
 {
         struct vga_switcheroo_client *client;
 
@@ -145,6 +147,7 @@ static int register_client(struct pci_dev *pdev,
         client->ops = ops;
         client->id = id;
         client->active = active;
+        client->driver_power_control = driver_power_control;
 
         mutex_lock(&vgasr_mutex);
         list_add_tail(&client->list, &vgasr_priv.clients);
@@ -160,10 +163,11 @@ static int register_client(struct pci_dev *pdev,
 }
 
 int vga_switcheroo_register_client(struct pci_dev *pdev,
-                                   const struct vga_switcheroo_client_ops *ops)
+                                   const struct vga_switcheroo_client_ops *ops,
+                                   bool driver_power_control)
 {
         return register_client(pdev, ops, -1,
-                               pdev == vga_default_device());
+                               pdev == vga_default_device(), driver_power_control);
 }
 EXPORT_SYMBOL(vga_switcheroo_register_client);
 
@@ -171,7 +175,7 @@ int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
                                          const struct vga_switcheroo_client_ops *ops,
                                          int id, bool active)
 {
-        return register_client(pdev, ops, id | ID_BIT_AUDIO, active);
+        return register_client(pdev, ops, id | ID_BIT_AUDIO, active, false);
 }
 EXPORT_SYMBOL(vga_switcheroo_register_audio_client);
 
@@ -258,10 +262,11 @@ static int vga_switcheroo_show(struct seq_file *m, void *v)
         int i = 0;
         mutex_lock(&vgasr_mutex);
         list_for_each_entry(client, &vgasr_priv.clients, list) {
-                seq_printf(m, "%d:%s%s:%c:%s:%s\n", i,
+                seq_printf(m, "%d:%s%s:%c:%s%s:%s\n", i,
                            client_id(client) == VGA_SWITCHEROO_DIS ? "DIS" : "IGD",
                            client_is_vga(client) ? "" : "-Audio",
                            client->active ? '+' : ' ',
+                           client->driver_power_control ? "Dyn" : "",
                            client->pwr_state ? "Pwr" : "Off",
                            pci_name(client->pdev));
                 i++;
@@ -277,6 +282,8 @@ static int vga_switcheroo_debugfs_open(struct inode *inode, struct file *file)
 
 static int vga_switchon(struct vga_switcheroo_client *client)
 {
+        if (client->driver_power_control)
+                return 0;
         if (vgasr_priv.handler->power_state)
                 vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_ON);
         /* call the driver callback to turn on device */
@@ -287,6 +294,8 @@ static int vga_switchon(struct vga_switcheroo_client *client)
 
 static int vga_switchoff(struct vga_switcheroo_client *client)
 {
+        if (client->driver_power_control)
+                return 0;
         /* call the driver callback to turn off device */
         client->ops->set_gpu_state(client->pdev, VGA_SWITCHEROO_OFF);
         if (vgasr_priv.handler->power_state)
@@ -402,6 +411,8 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
                         if (client->active || client_is_audio(client))
                                 continue;
+                        if (client->driver_power_control)
+                                continue;
                         set_audio_state(client->id, VGA_SWITCHEROO_OFF);
                         if (client->pwr_state == VGA_SWITCHEROO_ON)
                                 vga_switchoff(client);
@@ -413,6 +424,8 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                 list_for_each_entry(client, &vgasr_priv.clients, list) {
                         if (client->active || client_is_audio(client))
                                 continue;
+                        if (client->driver_power_control)
+                                continue;
                         if (client->pwr_state == VGA_SWITCHEROO_OFF)
                                 vga_switchon(client);
                         set_audio_state(client->id, VGA_SWITCHEROO_ON);
@@ -565,3 +578,127 @@ err:
         return err;
 }
 EXPORT_SYMBOL(vga_switcheroo_process_delayed_switch);
+
+static void vga_switcheroo_power_switch(struct pci_dev *pdev, enum vga_switcheroo_state state)
+{
+        struct vga_switcheroo_client *client;
+
+        if (!vgasr_priv.handler->power_state)
+                return;
+
+        client = find_client_from_pci(&vgasr_priv.clients, pdev);
+        if (!client)
+                return;
+
+        if (!client->driver_power_control)
+                return;
+
+        vgasr_priv.handler->power_state(client->id, state);
+}
+
+/* force a PCI device to a certain state - mainly to turn off audio clients */
+
+void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic)
+{
+        struct vga_switcheroo_client *client;
+
+        client = find_client_from_pci(&vgasr_priv.clients, pdev);
+        if (!client)
+                return;
+
+        if (!client->driver_power_control)
+                return;
+
+        client->pwr_state = dynamic;
+        set_audio_state(client->id, dynamic);
+}
+EXPORT_SYMBOL(vga_switcheroo_set_dynamic_switch);
+
+/* switcheroo power domain */
+static int vga_switcheroo_runtime_suspend(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int ret;
+
+        ret = dev->bus->pm->runtime_suspend(dev);
+        if (ret)
+                return ret;
+
+        vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_OFF);
+        return 0;
+}
+
+static int vga_switcheroo_runtime_resume(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int ret;
+
+        vga_switcheroo_power_switch(pdev, VGA_SWITCHEROO_ON);
+        ret = dev->bus->pm->runtime_resume(dev);
+        if (ret)
+                return ret;
+
+        return 0;
+}
+
+/* this version is for the case where the power switch is separate
+   to the device being powered down. */
+int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
+{
+        /* copy over all the bus versions */
+        if (dev->bus && dev->bus->pm) {
+                domain->ops = *dev->bus->pm;
+                domain->ops.runtime_suspend = vga_switcheroo_runtime_suspend;
+                domain->ops.runtime_resume = vga_switcheroo_runtime_resume;
+
+                dev->pm_domain = domain;
+                return 0;
+        }
+        dev->pm_domain = NULL;
+        return -EINVAL;
+}
+EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_ops);
+
+static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int ret;
+        struct vga_switcheroo_client *client, *found = NULL;
+
+        /* we need to check if we have to switch back on the video
+           device so the audio device can come back */
+        list_for_each_entry(client, &vgasr_priv.clients, list) {
+                if (PCI_SLOT(client->pdev->devfn) == PCI_SLOT(pdev->devfn) && client_is_vga(client)) {
+                        found = client;
+                        ret = pm_runtime_get_sync(&client->pdev->dev);
+                        if (ret) {
+                                if (ret != 1)
+                                        return ret;
+                        }
+                        break;
+                }
+        }
+        ret = dev->bus->pm->runtime_resume(dev);
+
+        /* put the reference for the gpu */
+        if (found) {
+                pm_runtime_mark_last_busy(&found->pdev->dev);
+                pm_runtime_put_autosuspend(&found->pdev->dev);
+        }
+        return ret;
+}
+
+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
+{
+        /* copy over all the bus versions */
+        if (dev->bus && dev->bus->pm) {
+                domain->ops = *dev->bus->pm;
+                domain->ops.runtime_resume = vga_switcheroo_runtime_resume_hdmi_audio;
+
+                dev->pm_domain = domain;
+                return 0;
+        }
+        dev->pm_domain = NULL;
+        return -EINVAL;
+}
+EXPORT_SYMBOL(vga_switcheroo_init_domain_pm_optimus_hdmi_audio);
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index 4c605c70ebf9..deb5c25305af 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -562,7 +562,7 @@ static void hv_mem_hot_add(unsigned long start, unsigned long size,
                                 struct hv_hotadd_state *has)
 {
         int ret = 0;
-        int i, nid, t;
+        int i, nid;
         unsigned long start_pfn;
         unsigned long processed_pfn;
         unsigned long total_pfn = pfn_count;
@@ -607,14 +607,11 @@ static void hv_mem_hot_add(unsigned long start, unsigned long size,
 
                 /*
                  * Wait for the memory block to be onlined.
+                 * Since the hot add has succeeded, it is ok to
+                 * proceed even if the pages in the hot added region
+                 * have not been "onlined" within the allowed time.
                  */
-                t = wait_for_completion_timeout(&dm_device.ol_waitevent, 5*HZ);
-                if (t == 0) {
-                        pr_info("hot_add memory timedout\n");
-                        has->ha_end_pfn -= HA_CHUNK;
-                        has->covered_end_pfn -=  processed_pfn;
-                        break;
-                }
+                wait_for_completion_timeout(&dm_device.ol_waitevent, 5*HZ);
 
         }
 
@@ -978,6 +975,14 @@ static void post_status(struct hv_dynmem_device *dm)
                                 dm->num_pages_ballooned +
                                 compute_balloon_floor();
 
+        /*
+         * If our transaction ID is no longer current, just don't
+         * send the status. This can happen if we were interrupted
+         * after we picked our transaction ID.
+         */
+        if (status.hdr.trans_id != atomic_read(&trans_id))
+                return;
+
         vmbus_sendpacket(dm->dev->channel, &status,
                                 sizeof(struct dm_status),
                                 (unsigned long)NULL,
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index a2464bf07c49..e8e071fc1d6d 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -690,7 +690,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
         if (ret)
                 pr_err("Unable to register child device\n");
         else
-                pr_info("child device %s registered\n",
+                pr_debug("child device %s registered\n",
                         dev_name(&child_device_obj->device));
 
         return ret;
@@ -702,14 +702,14 @@ int vmbus_device_register(struct hv_device *child_device_obj)
  */
 void vmbus_device_unregister(struct hv_device *device_obj)
 {
+        pr_debug("child device %s unregistered\n",
+                dev_name(&device_obj->device));
+
         /*
          * Kick off the process of unregistering the device.
          * This will call vmbus_remove() and eventually vmbus_device_release()
          */
         device_unregister(&device_obj->device);
-
-        pr_info("child device %s unregistered\n",
-                dev_name(&device_obj->device));
 }
 
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 957a719e8c2f..df7b0a06b0ea 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2290,12 +2290,18 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)
         d = r10_bio->devs[1].devnum;
         wbio = r10_bio->devs[1].bio;
         wbio2 = r10_bio->devs[1].repl_bio;
+        /* Need to test wbio2->bi_end_io before we call
+         * generic_make_request as if the former is NULL,
+         * the latter is free to free wbio2.
+         */
+        if (wbio2 && !wbio2->bi_end_io)
+                wbio2 = NULL;
         if (wbio->bi_end_io) {
                 atomic_inc(&conf->mirrors[d].rdev->nr_pending);
                 md_sync_acct(conf->mirrors[d].rdev->bdev, bio_sectors(wbio));
                 generic_make_request(wbio);
         }
-        if (wbio2 && wbio2->bi_end_io) {
+        if (wbio2) {
                 atomic_inc(&conf->mirrors[d].replacement->nr_pending);
                 md_sync_acct(conf->mirrors[d].replacement->bdev,
                              bio_sectors(wbio2));
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2bf094a587cb..78ea44336e75 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3462,6 +3462,7 @@ static void handle_stripe(struct stripe_head *sh)
                     test_and_clear_bit(STRIPE_SYNC_REQUESTED, &sh->state)) {
                         set_bit(STRIPE_SYNCING, &sh->state);
                         clear_bit(STRIPE_INSYNC, &sh->state);
+                        clear_bit(STRIPE_REPLACED, &sh->state);
                 }
                 spin_unlock(&sh->stripe_lock);
         }
@@ -3607,19 +3608,23 @@ static void handle_stripe(struct stripe_head *sh)
                         handle_parity_checks5(conf, sh, &s, disks);
         }
 
-        if (s.replacing && s.locked == 0
-            && !test_bit(STRIPE_INSYNC, &sh->state)) {
+        if ((s.replacing || s.syncing) && s.locked == 0
+            && !test_bit(STRIPE_COMPUTE_RUN, &sh->state)
+            && !test_bit(STRIPE_REPLACED, &sh->state)) {
                 /* Write out to replacement devices where possible */
                 for (i = 0; i < conf->raid_disks; i++)
-                        if (test_bit(R5_UPTODATE, &sh->dev[i].flags) &&
-                            test_bit(R5_NeedReplace, &sh->dev[i].flags)) {
+                        if (test_bit(R5_NeedReplace, &sh->dev[i].flags)) {
+                                WARN_ON(!test_bit(R5_UPTODATE, &sh->dev[i].flags));
                                 set_bit(R5_WantReplace, &sh->dev[i].flags);
                                 set_bit(R5_LOCKED, &sh->dev[i].flags);
                                 s.locked++;
                         }
-                set_bit(STRIPE_INSYNC, &sh->state);
+                if (s.replacing)
+                        set_bit(STRIPE_INSYNC, &sh->state);
+                set_bit(STRIPE_REPLACED, &sh->state);
         }
         if ((s.syncing || s.replacing) && s.locked == 0 &&
+            !test_bit(STRIPE_COMPUTE_RUN, &sh->state) &&
             test_bit(STRIPE_INSYNC, &sh->state)) {
                 md_done_sync(conf->mddev, STRIPE_SECTORS, 1);
                 clear_bit(STRIPE_SYNCING, &sh->state);
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index b0b663b119a8..70c49329ca9a 100644
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -306,6 +306,7 @@ enum {
         STRIPE_SYNC_REQUESTED,
         STRIPE_SYNCING,
         STRIPE_INSYNC,
+        STRIPE_REPLACED,
         STRIPE_PREREAD_ACTIVE,
         STRIPE_DELAYED,
         STRIPE_DEGRADED,
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index f7b90661e321..e068a76a5f6f 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -66,14 +66,19 @@ EXPORT_SYMBOL(ssc_request);
 
 void ssc_free(struct ssc_device *ssc)
 {
+        bool disable_clk = true;
+
         spin_lock(&user_lock);
-        if (ssc->user) {
+        if (ssc->user)
                 ssc->user--;
-                clk_disable_unprepare(ssc->clk);
-        } else {
+        else {
+                disable_clk = false;
                 dev_dbg(&ssc->pdev->dev, "device already free\n");
         }
         spin_unlock(&user_lock);
+
+        if (disable_clk)
+                clk_disable_unprepare(ssc->clk);
 }
 EXPORT_SYMBOL(ssc_free);
 
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index f9296abcf02a..6127ab64bb39 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -167,7 +167,7 @@ int mei_hbm_start_req(struct mei_device *dev)
 
         dev->hbm_state = MEI_HBM_IDLE;
         if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
-                dev_err(&dev->pdev->dev, "version message writet failed\n");
+                dev_err(&dev->pdev->dev, "version message write failed\n");
                 dev->dev_state = MEI_DEV_RESETTING;
                 mei_reset(dev, 1);
                 return -ENODEV;
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index e4f8dec4dc3c..b22c7e247225 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -239,14 +239,18 @@ static int mei_me_hw_ready_wait(struct mei_device *dev)
         if (mei_me_hw_is_ready(dev))
                 return 0;
 
+        dev->recvd_hw_ready = false;
         mutex_unlock(&dev->device_lock);
         err = wait_event_interruptible_timeout(dev->wait_hw_ready,
-                        dev->recvd_hw_ready, MEI_INTEROP_TIMEOUT);
+                        dev->recvd_hw_ready,
+                        mei_secs_to_jiffies(MEI_INTEROP_TIMEOUT));
         mutex_lock(&dev->device_lock);
         if (!err && !dev->recvd_hw_ready) {
+                if (!err)
+                        err = -ETIMEDOUT;
                 dev_err(&dev->pdev->dev,
-                        "wait hw ready failed. status = 0x%x\n", err);
-                return -ETIMEDOUT;
+                        "wait hw ready failed. status = %d\n", err);
+                return err;
         }
 
         dev->recvd_hw_ready = false;
@@ -483,7 +487,9 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
         /* check if ME wants a reset */
         if (!mei_hw_is_ready(dev) &&
             dev->dev_state != MEI_DEV_RESETTING &&
-            dev->dev_state != MEI_DEV_INITIALIZING) {
+            dev->dev_state != MEI_DEV_INITIALIZING &&
+            dev->dev_state != MEI_DEV_POWER_DOWN &&
+            dev->dev_state != MEI_DEV_POWER_UP) {
                 dev_dbg(&dev->pdev->dev, "FW not ready.\n");
                 mei_reset(dev, 1);
                 mutex_unlock(&dev->device_lock);
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index ed1d75203af6..e6f16f83ecde 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -148,7 +148,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
 
         dev->hbm_state = MEI_HBM_IDLE;
 
-        if (dev->dev_state != MEI_DEV_INITIALIZING) {
+        if (dev->dev_state != MEI_DEV_INITIALIZING &&
+            dev->dev_state != MEI_DEV_POWER_UP) {
                 if (dev->dev_state != MEI_DEV_DISABLED &&
                     dev->dev_state != MEI_DEV_POWER_DOWN)
                         dev->dev_state = MEI_DEV_RESETTING;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 847b1996ce8e..2c5a91bb8ec3 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -128,7 +128,7 @@ static inline int pxamci_set_power(struct pxamci_host *host,
                                !!on ^ host->pdata->gpio_power_invert);
         }
         if (!host->vcc && host->pdata && host->pdata->setpower)
-                host->pdata->setpower(mmc_dev(host->mmc), vdd);
+                return host->pdata->setpower(mmc_dev(host->mmc), vdd);
 
         return 0;
 }
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index a3c1c5aae6a9..1264923ade0f 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -345,6 +345,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
         if (r && irq) {
                 const char *name = NULL;
 
+                memset(r, 0, sizeof(*r));
                 /*
                  * Get optional "interrupts-names" property to add a name
                  * to the resource.
@@ -482,8 +483,9 @@ void __init of_irq_init(const struct of_device_id *matches)
                 }
 
                 /* Get the next pending parent that might have children */
-                desc = list_first_entry(&intc_parent_list, typeof(*desc), list);
-                if (list_empty(&intc_parent_list) || !desc) {
+                desc = list_first_entry_or_null(&intc_parent_list,
+                                                typeof(*desc), list);
+                if (!desc) {
                         pr_err("of_irq_init: children remain, but no parents\n");
                         break;
                 }
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index b29e20b7862f..bb7af78e4eed 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -388,7 +388,6 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         /* Remove the EADS bridge device itself */
         BUG_ON(!bus->self);
         pr_debug("PCI: Now removing bridge device %s\n", pci_name(bus->self));
-        eeh_remove_bus_device(bus->self, true);
         pci_stop_and_remove_bus_device(bus->self);
 
         return 0;
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 5b272bfd261d..2a00239661b3 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -1193,6 +1193,7 @@ void pinctrl_unregister_map(struct pinctrl_map const *map)
         list_for_each_entry(maps_node, &pinctrl_maps, node) {
                 if (maps_node->maps == map) {
                         list_del(&maps_node->node);
+                        kfree(maps_node);
                         mutex_unlock(&pinctrl_maps_mutex);
                         return;
                 }
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 6866548fab31..7323cca440b5 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1483,6 +1483,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
         return ret;
 }
 
+#ifdef CONFIG_PM
 static int pinctrl_single_suspend(struct platform_device *pdev,
                                         pm_message_t state)
 {
@@ -1505,6 +1506,7 @@ static int pinctrl_single_resume(struct platform_device *pdev)
 
         return pinctrl_force_default(pcs->pctl);
 }
+#endif
 
 static int pcs_probe(struct platform_device *pdev)
 {
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
index 7956df58d751..31f7d0e04aaa 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
@@ -3785,6 +3785,7 @@ static const struct regulator_desc sh73a0_vccq_mc0_desc = {
 
 static struct regulator_consumer_supply sh73a0_vccq_mc0_consumers[] = {
         REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "ee100000.sdhi"),
 };
 
 static const struct regulator_init_data sh73a0_vccq_mc0_init_data = {
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas6.c b/drivers/pinctrl/sirf/pinctrl-atlas6.c
index 1fa39a444171..867c9681763c 100644
--- a/drivers/pinctrl/sirf/pinctrl-atlas6.c
+++ b/drivers/pinctrl/sirf/pinctrl-atlas6.c
@@ -496,7 +496,7 @@ static const unsigned sdmmc5_pins[] = { 24, 25, 26 };
 static const struct sirfsoc_muxmask usp0_muxmask[] = {
         {
                 .group = 1,
-                .mask = BIT(19) | BIT(20) | BIT(21) | BIT(22),
+                .mask = BIT(19) | BIT(20) | BIT(21) | BIT(22) | BIT(23),
         },
 };
 
@@ -507,8 +507,21 @@ static const struct sirfsoc_padmux usp0_padmux = {
         .funcval = 0,
 };
 
-static const unsigned usp0_pins[] = { 51, 52, 53, 54 };
+static const unsigned usp0_pins[] = { 51, 52, 53, 54, 55 };
 
+static const struct sirfsoc_muxmask usp0_uart_nostreamctrl_muxmask[] = {
+        {
+                .group = 1,
+                .mask = BIT(20) | BIT(21),
+        },
+};
+
+static const struct sirfsoc_padmux usp0_uart_nostreamctrl_padmux = {
+        .muxmask_counts = ARRAY_SIZE(usp0_uart_nostreamctrl_muxmask),
+        .muxmask = usp0_uart_nostreamctrl_muxmask,
+};
+
+static const unsigned usp0_uart_nostreamctrl_pins[] = { 52, 53 };
 static const struct sirfsoc_muxmask usp1_muxmask[] = {
         {
                 .group = 0,
@@ -822,6 +835,8 @@ static const struct sirfsoc_pin_group sirfsoc_pin_groups[] = {
         SIRFSOC_PIN_GROUP("uart2grp", uart2_pins),
         SIRFSOC_PIN_GROUP("uart2_nostreamctrlgrp", uart2_nostreamctrl_pins),
         SIRFSOC_PIN_GROUP("usp0grp", usp0_pins),
+        SIRFSOC_PIN_GROUP("usp0_uart_nostreamctrl_grp",
+                                        usp0_uart_nostreamctrl_pins),
         SIRFSOC_PIN_GROUP("usp1grp", usp1_pins),
         SIRFSOC_PIN_GROUP("i2c0grp", i2c0_pins),
         SIRFSOC_PIN_GROUP("i2c1grp", i2c1_pins),
@@ -862,6 +877,8 @@ static const char * const uart0grp[] = { "uart0grp" };
 static const char * const uart1grp[] = { "uart1grp" };
 static const char * const uart2grp[] = { "uart2grp" };
 static const char * const uart2_nostreamctrlgrp[] = { "uart2_nostreamctrlgrp" };
+static const char * const usp0_uart_nostreamctrl_grp[] = {
+                                        "usp0_uart_nostreamctrl_grp" };
 static const char * const usp0grp[] = { "usp0grp" };
 static const char * const usp1grp[] = { "usp1grp" };
 static const char * const i2c0grp[] = { "i2c0grp" };
@@ -904,6 +921,9 @@ static const struct sirfsoc_pmx_func sirfsoc_pmx_functions[] = {
         SIRFSOC_PMX_FUNCTION("uart2", uart2grp, uart2_padmux),
         SIRFSOC_PMX_FUNCTION("uart2_nostreamctrl", uart2_nostreamctrlgrp, uart2_nostreamctrl_padmux),
         SIRFSOC_PMX_FUNCTION("usp0", usp0grp, usp0_padmux),
+        SIRFSOC_PMX_FUNCTION("usp0_uart_nostreamctrl",
+                                                usp0_uart_nostreamctrl_grp,
+                                                usp0_uart_nostreamctrl_padmux),
         SIRFSOC_PMX_FUNCTION("usp1", usp1grp, usp1_padmux),
         SIRFSOC_PMX_FUNCTION("i2c0", i2c0grp, i2c0_padmux),
         SIRFSOC_PMX_FUNCTION("i2c1", i2c1grp, i2c1_padmux),
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 7b082157eb79..99d2930b18c8 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -185,7 +185,7 @@ static void sci_io_request_build_ssp_command_iu(struct isci_request *ireq)
         cmd_iu->_r_c = 0;
 
         sci_swab32_cpy(&cmd_iu->cdb, task->ssp_task.cmd->cmnd,
-                       task->ssp_task.cmd->cmd_len / sizeof(u32));
+                       (task->ssp_task.cmd->cmd_len+3) / sizeof(u32));
 }
 
 static void sci_task_request_build_ssp_task_iu(struct isci_request *ireq)
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 9bb020ac089c..0d30ca849e8f 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -491,6 +491,7 @@ int isci_task_abort_task(struct sas_task *task)
         struct isci_tmf           tmf;
         int                       ret = TMF_RESP_FUNC_FAILED;
         unsigned long             flags;
+        int                       target_done_already = 0;
 
         /* Get the isci_request reference from the task.  Note that
          * this check does not depend on the pending request list
@@ -505,9 +506,11 @@ int isci_task_abort_task(struct sas_task *task)
         /* If task is already done, the request isn't valid */
         if (!(task->task_state_flags & SAS_TASK_STATE_DONE) &&
             (task->task_state_flags & SAS_TASK_AT_INITIATOR) &&
-            old_request)
+            old_request) {
                 idev = isci_get_device(task->dev->lldd_dev);
-
+                target_done_already = test_bit(IREQ_COMPLETE_IN_TARGET,
+                                               &old_request->flags);
+        }
         spin_unlock(&task->task_state_lock);
         spin_unlock_irqrestore(&ihost->scic_lock, flags);
 
@@ -561,7 +564,7 @@ int isci_task_abort_task(struct sas_task *task)
 
         if (task->task_proto == SAS_PROTOCOL_SMP ||
             sas_protocol_ata(task->task_proto) ||
-            test_bit(IREQ_COMPLETE_IN_TARGET, &old_request->flags) ||
+            target_done_already ||
             test_bit(IDEV_GONE, &idev->flags)) {
 
                 spin_unlock_irqrestore(&ihost->scic_lock, flags);
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index f14665a6293d..6b1b4e91e53f 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -1857,11 +1857,16 @@ int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
                 goto out;
         }
 
-        /* error info record present */
-        if (unlikely((rx_desc & RXQ_ERR) && (*(u64 *) slot->response))) {
+        /*
+         * error info record present; slot->response is 32 bit aligned but may
+         * not be 64 bit aligned, so check for zero in two 32 bit reads
+         */
+        if (unlikely((rx_desc & RXQ_ERR)
+                     && (*((u32 *)slot->response)
+                         || *(((u32 *)slot->response) + 1)))) {
                 mv_dprintk("port %d slot %d rx_desc %X has error info"
                         "%016llX.\n", slot->port->sas_port.id, slot_idx,
-                         rx_desc, (u64)(*(u64 *)slot->response));
+                         rx_desc, get_unaligned_le64(slot->response));
                 tstat->stat = mvs_slot_err(mvi, task, slot_idx);
                 tstat->resp = SAS_TASK_COMPLETE;
                 goto out;
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h
index 60e2fb7f2dca..d6b19dc80bee 100644
--- a/drivers/scsi/mvsas/mv_sas.h
+++ b/drivers/scsi/mvsas/mv_sas.h
@@ -39,6 +39,7 @@
 #include <linux/irq.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <asm/unaligned.h>
 #include <scsi/libsas.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_tcq.h>
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 42ef481db942..ef0a5481b9dd 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -419,6 +419,8 @@ qla2x00_start_scsi(srb_t *sp)
                             __constant_cpu_to_le16(CF_SIMPLE_TAG);
                         break;
                 }
+        } else {
+                cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
         }
 
         /* Load SCSI command packet. */
@@ -1307,11 +1309,11 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
                     fcp_cmnd->task_attribute = TSK_ORDERED;
                     break;
                 default:
-                    fcp_cmnd->task_attribute = 0;
+                    fcp_cmnd->task_attribute = TSK_SIMPLE;
                     break;
                 }
         } else {
-                fcp_cmnd->task_attribute = 0;
+                fcp_cmnd->task_attribute = TSK_SIMPLE;
         }
 
         cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */
@@ -1525,7 +1527,12 @@ qla24xx_start_scsi(srb_t *sp)
                 case ORDERED_QUEUE_TAG:
                         cmd_pkt->task = TSK_ORDERED;
                         break;
+                default:
+                    cmd_pkt->task = TSK_SIMPLE;
+                    break;
                 }
+        } else {
+                cmd_pkt->task = TSK_SIMPLE;
         }
 
         /* Load SCSI command packet. */
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 80f39b8b0223..86fcf2c313ad 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -838,10 +838,17 @@ static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq)
 
 static void sd_unprep_fn(struct request_queue *q, struct request *rq)
 {
+        struct scsi_cmnd *SCpnt = rq->special;
+
         if (rq->cmd_flags & REQ_DISCARD) {
                 free_page((unsigned long)rq->buffer);
                 rq->buffer = NULL;
         }
+        if (SCpnt->cmnd != rq->cmd) {
+                mempool_free(SCpnt->cmnd, sd_cdb_pool);
+                SCpnt->cmnd = NULL;
+                SCpnt->cmd_len = 0;
+        }
 }
 
 /**
@@ -1720,21 +1727,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
         if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
                 sd_dif_complete(SCpnt, good_bytes);
 
-        if (scsi_host_dif_capable(sdkp->device->host, sdkp->protection_type)
-            == SD_DIF_TYPE2_PROTECTION && SCpnt->cmnd != SCpnt->request->cmd) {
-
-                /* We have to print a failed command here as the
-                 * extended CDB gets freed before scsi_io_completion()
-                 * is called.
-                 */
-                if (result)
-                        scsi_print_command(SCpnt);
-
-                mempool_free(SCpnt->cmnd, sd_cdb_pool);
-                SCpnt->cmnd = NULL;
-                SCpnt->cmd_len = 0;
-        }
-
         return good_bytes;
 }
 
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 080abf2faf97..a8c344422a77 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -469,7 +469,7 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov,
                          unsigned long nr_segs, loff_t ppos)
 {
         struct logger_log *log = file_get_log(iocb->ki_filp);
-        size_t orig = log->w_off;
+        size_t orig;
         struct logger_entry header;
         struct timespec now;
         ssize_t ret = 0;
@@ -490,6 +490,8 @@ static ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov,
 
         mutex_lock(&log->mutex);
 
+        orig = log->w_off;
+
         /*
          * Fix up any readers, pulling them forward to the first readable
          * entry after (what will be) the new write offset. We do this now
diff --git a/drivers/staging/comedi/TODO b/drivers/staging/comedi/TODO
index b10f739b7e3e..fa8da9aada30 100644
--- a/drivers/staging/comedi/TODO
+++ b/drivers/staging/comedi/TODO
@@ -9,4 +9,4 @@ TODO:
 Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
 copy:
         Ian Abbott <abbotti@mev.co.uk>
-        Frank Mori Hess <fmhess@users.sourceforge.net>
+        H Hartley Sweeten <hsweeten@visionengravers.com>
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 8647518259f6..f4a197b2d1fd 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1413,22 +1413,19 @@ static int do_cmd_ioctl(struct comedi_device *dev,
                 DPRINTK("subdevice busy\n");
                 return -EBUSY;
         }
-        s->busy = file;
 
         /* make sure channel/gain list isn't too long */
         if (cmd.chanlist_len > s->len_chanlist) {
                 DPRINTK("channel/gain list too long %u > %d\n",
                         cmd.chanlist_len, s->len_chanlist);
-                ret = -EINVAL;
-                goto cleanup;
+                return -EINVAL;
         }
 
         /* make sure channel/gain list isn't too short */
         if (cmd.chanlist_len < 1) {
                 DPRINTK("channel/gain list too short %u < 1\n",
                         cmd.chanlist_len);
-                ret = -EINVAL;
-                goto cleanup;
+                return -EINVAL;
         }
 
         async->cmd = cmd;
@@ -1438,8 +1435,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,
             kmalloc(async->cmd.chanlist_len * sizeof(int), GFP_KERNEL);
         if (!async->cmd.chanlist) {
                 DPRINTK("allocation failed\n");
-                ret = -ENOMEM;
-                goto cleanup;
+                return -ENOMEM;
         }
 
         if (copy_from_user(async->cmd.chanlist, user_chanlist,
@@ -1491,6 +1487,9 @@ static int do_cmd_ioctl(struct comedi_device *dev,
 
         comedi_set_subdevice_runflags(s, ~0, SRF_USER | SRF_RUNNING);
 
+        /* set s->busy _after_ setting SRF_RUNNING flag to avoid race with
+         * comedi_read() or comedi_write() */
+        s->busy = file;
         ret = s->do_cmd(dev, s);
         if (ret == 0)
                 return 0;
@@ -1705,6 +1704,7 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,
                            void *file)
 {
         struct comedi_subdevice *s;
+        int ret;
 
         if (arg >= dev->n_subdevices)
                 return -EINVAL;
@@ -1721,7 +1721,11 @@ static int do_cancel_ioctl(struct comedi_device *dev, unsigned int arg,
         if (s->busy != file)
                 return -EBUSY;
 
-        return do_cancel(dev, s);
+        ret = do_cancel(dev, s);
+        if (comedi_get_subdevice_runflags(s) & SRF_USER)
+                wake_up_interruptible(&s->async->wait_head);
+
+        return ret;
 }
 
 /*
@@ -2053,11 +2057,13 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
 
                 if (!comedi_is_subdevice_running(s)) {
                         if (count == 0) {
+                                mutex_lock(&dev->mutex);
                                 if (comedi_is_subdevice_in_error(s))
                                         retval = -EPIPE;
                                 else
                                         retval = 0;
                                 do_become_nonbusy(dev, s);
+                                mutex_unlock(&dev->mutex);
                         }
                         break;
                 }
@@ -2156,11 +2162,13 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
 
                 if (n == 0) {
                         if (!comedi_is_subdevice_running(s)) {
+                                mutex_lock(&dev->mutex);
                                 do_become_nonbusy(dev, s);
                                 if (comedi_is_subdevice_in_error(s))
                                         retval = -EPIPE;
                                 else
                                         retval = 0;
+                                mutex_unlock(&dev->mutex);
                                 break;
                         }
                         if (file->f_flags & O_NONBLOCK) {
@@ -2198,9 +2206,11 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
                 buf += n;
                 break;          /* makes device work like a pipe */
         }
-        if (comedi_is_subdevice_idle(s) &&
-            async->buf_read_count - async->buf_write_count == 0) {
-                do_become_nonbusy(dev, s);
+        if (comedi_is_subdevice_idle(s)) {
+                mutex_lock(&dev->mutex);
+                if (async->buf_read_count - async->buf_write_count == 0)
+                        do_become_nonbusy(dev, s);
+                mutex_unlock(&dev->mutex);
         }
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&async->wait_head, &wait);
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 5590ebf1da15..817f837b240d 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -827,11 +827,11 @@ static void usb_alphatrack_disconnect(struct usb_interface *intf)
                 mutex_unlock(&dev->mtx);
                 usb_alphatrack_delete(dev);
         } else {
+                atomic_set(&dev->writes_pending, 0);
                 dev->intf = NULL;
                 mutex_unlock(&dev->mtx);
         }
 
-        atomic_set(&dev->writes_pending, 0);
         mutex_unlock(&disconnect_mutex);
 
         dev_info(&intf->dev, "Alphatrack Surface #%d now disconnected\n",
diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c
index b795353e8348..cc3692439a5c 100644
--- a/drivers/staging/gdm72xx/gdm_qos.c
+++ b/drivers/staging/gdm72xx/gdm_qos.c
@@ -250,8 +250,8 @@ static void send_qos_list(struct nic *nic, struct list_head *head)
 
         list_for_each_entry_safe(entry, n, head, list) {
                 list_del(&entry->list);
-                free_qos_entry(entry);
                 gdm_wimax_send_tx(entry->skb, entry->dev);
+                free_qos_entry(entry);
         }
 }
 
diff --git a/drivers/staging/imx-drm/Kconfig b/drivers/staging/imx-drm/Kconfig
index 22339059837f..bd0f2fd01db4 100644
--- a/drivers/staging/imx-drm/Kconfig
+++ b/drivers/staging/imx-drm/Kconfig
@@ -33,7 +33,6 @@ config DRM_IMX_TVE
 config DRM_IMX_LDB
         tristate "Support for LVDS displays"
         depends on DRM_IMX
-        select OF_VIDEOMODE
         help
           Choose this to enable the internal LVDS Display Bridge (LDB)
           found on i.MX53 and i.MX6 processors.
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index 9854a1daf606..e826086ec308 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -69,28 +69,20 @@ struct imx_drm_connector {
         struct module                           *owner;
 };
 
-static int imx_drm_driver_firstopen(struct drm_device *drm)
-{
-        if (!imx_drm_device_get())
-                return -EINVAL;
-
-        return 0;
-}
-
 static void imx_drm_driver_lastclose(struct drm_device *drm)
 {
         struct imx_drm_device *imxdrm = drm->dev_private;
 
         if (imxdrm->fbhelper)
                 drm_fbdev_cma_restore_mode(imxdrm->fbhelper);
-
-        imx_drm_device_put();
 }
 
 static int imx_drm_driver_unload(struct drm_device *drm)
 {
         struct imx_drm_device *imxdrm = drm->dev_private;
 
+        imx_drm_device_put();
+
         drm_mode_config_cleanup(imxdrm->drm);
         drm_kms_helper_poll_fini(imxdrm->drm);
 
@@ -207,7 +199,6 @@ static const struct file_operations imx_drm_driver_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = drm_gem_cma_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
         .llseek = noop_llseek,
 };
@@ -226,8 +217,6 @@ struct drm_device *imx_drm_device_get(void)
         struct imx_drm_connector *con;
         struct imx_drm_crtc *crtc;
 
-        mutex_lock(&imxdrm->mutex);
-
         list_for_each_entry(enc, &imxdrm->encoder_list, list) {
                 if (!try_module_get(enc->owner)) {
                         dev_err(imxdrm->dev, "could not get module %s\n",
@@ -254,8 +243,6 @@ struct drm_device *imx_drm_device_get(void)
 
         imxdrm->references++;
 
-        mutex_unlock(&imxdrm->mutex);
-
         return imxdrm->drm;
 
 unwind_crtc:
@@ -447,6 +434,9 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags)
          */
         imxdrm->drm->vblank_disable_allowed = 1;
 
+        if (!imx_drm_device_get())
+                ret = -EINVAL;
+
         ret = 0;
 
 err_init:
@@ -783,7 +773,7 @@ int imx_drm_remove_connector(struct imx_drm_connector *imx_drm_connector)
 }
 EXPORT_SYMBOL_GPL(imx_drm_remove_connector);
 
-static struct drm_ioctl_desc imx_drm_ioctls[] = {
+static const struct drm_ioctl_desc imx_drm_ioctls[] = {
         /* none so far */
 };
 
@@ -791,13 +781,12 @@ static struct drm_driver imx_drm_driver = {
         .driver_features        = DRIVER_MODESET | DRIVER_GEM,
         .load                   = imx_drm_driver_load,
         .unload                 = imx_drm_driver_unload,
-        .firstopen              = imx_drm_driver_firstopen,
         .lastclose              = imx_drm_driver_lastclose,
         .gem_free_object        = drm_gem_cma_free_object,
         .gem_vm_ops             = &drm_gem_cma_vm_ops,
         .dumb_create            = drm_gem_cma_dumb_create,
         .dumb_map_offset        = drm_gem_cma_dumb_map_offset,
-        .dumb_destroy           = drm_gem_cma_dumb_destroy,
+        .dumb_destroy           = drm_gem_dumb_destroy,
 
         .get_vblank_counter     = drm_vblank_count,
         .enable_vblank          = imx_drm_enable_vblank,
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c
index 9176a8171e6f..e39690a03e38 100644
--- a/drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -129,7 +129,8 @@ static void ipu_crtc_dpms(struct drm_crtc *crtc, int mode)
 
 static int ipu_page_flip(struct drm_crtc *crtc,
                 struct drm_framebuffer *fb,
-                struct drm_pending_vblank_event *event)
+                struct drm_pending_vblank_event *event,
+                uint32_t page_flip_flags)
 {
         struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
         int ret;
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index c191ae203565..41e88abe47af 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -1120,8 +1120,11 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
            or DYN_EXTERNAL, then mem granularity information is present
            within the section name - only process if there are at least three
            tokens within the section name (just a minor optimization) */
-        if (count >= 3)
-                strict_strtol(sz_last_token, 10, (long *)&req);
+        if (count >= 3) {
+                status = kstrtos32(sz_last_token, 10, &req);
+                if (status)
+                        goto func_cont;
+        }
 
         if ((req == 0) || (req == 1)) {
                 if (strcmp(sz_sec_last_token, "DYN_DARAM") == 0) {
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 82c7202fd5cc..e77fb6ea40c9 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -527,8 +527,11 @@ static void zram_reset_device(struct zram *zram)
         size_t index;
         struct zram_meta *meta;
 
-        if (!zram->init_done)
+        down_write(&zram->init_lock);
+        if (!zram->init_done) {
+                up_write(&zram->init_lock);
                 return;
+        }
 
         meta = zram->meta;
         zram->init_done = 0;
@@ -549,6 +552,7 @@ static void zram_reset_device(struct zram *zram)
 
         zram->disksize = 0;
         set_capacity(zram->disk, 0);
+        up_write(&zram->init_lock);
 }
 
 static void zram_init_device(struct zram *zram, struct zram_meta *meta)
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index 721904f8efa9..946ddd2b3a54 100644
--- a/drivers/tty/serial/8250/8250_early.c
+++ b/drivers/tty/serial/8250/8250_early.c
@@ -193,7 +193,8 @@ static int __init parse_options(struct early_serial8250_device *device,
         if (options) {
                 options++;
                 device->baud = simple_strtoul(options, NULL, 0);
-                length = min(strcspn(options, " "), sizeof(device->options));
+                length = min(strcspn(options, " ") + 1,
+                             sizeof(device->options));
                 strlcpy(device->options, options, length);
         } else {
                 device->baud = probe_baud(port);
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 5e3d68917ffe..1456673bcca0 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -277,7 +277,7 @@ config SERIAL_TEGRA
         select SERIAL_CORE
         help
           Support for the on-chip UARTs on the NVIDIA Tegra series SOCs
-          providing /dev/ttyHS0, 1, 2, 3 and 4 (note, some machines may not
+          providing /dev/ttyTHS0, 1, 2, 3 and 4 (note, some machines may not
           provide all of these ports, depending on how the serial port
           are enabled). This driver uses the APB DMA to achieve higher baudrate
           and better performance.
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index ff171384ea52..dc6e96996ead 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -3478,7 +3478,7 @@ static int alloc_buf_list(SLMP_INFO *info)
         for ( i = 0; i < info->rx_buf_count; i++ ) {
                 /* calculate and store physical address of this buffer entry */
                 info->rx_buf_list_ex[i].phys_entry =
-                        info->buffer_list_phys + (i * sizeof(SCABUFSIZE));
+                        info->buffer_list_phys + (i * SCABUFSIZE);
 
                 /* calculate and store physical address of */
                 /* next entry in cirular list of entries */
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 4191db32f12c..4a8a1d68002c 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -668,6 +668,15 @@ resubmit:
 static inline int
 hub_clear_tt_buffer (struct usb_device *hdev, u16 devinfo, u16 tt)
 {
+        /* Need to clear both directions for control ep */
+        if (((devinfo >> 11) & USB_ENDPOINT_XFERTYPE_MASK) ==
+                        USB_ENDPOINT_XFER_CONTROL) {
+                int status = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+                                HUB_CLEAR_TT_BUFFER, USB_RT_PORT,
+                                devinfo ^ 0x8000, tt, NULL, 0, 1000);
+                if (status)
+                        return status;
+        }
         return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
                                HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,
                                tt, NULL, 0, 1000);
@@ -2848,6 +2857,15 @@ static int usb_disable_function_remotewakeup(struct usb_device *udev)
                                 USB_CTRL_SET_TIMEOUT);
 }
 
+/* Count of wakeup-enabled devices at or below udev */
+static unsigned wakeup_enabled_descendants(struct usb_device *udev)
+{
+        struct usb_hub *hub = usb_hub_to_struct_hub(udev);
+
+        return udev->do_remote_wakeup +
+                        (hub ? hub->wakeup_enabled_descendants : 0);
+}
+
 /*
  * usb_port_suspend - suspend a usb device's upstream port
  * @udev: device that's no longer in active use, not a root hub
@@ -2888,8 +2906,8 @@ static int usb_disable_function_remotewakeup(struct usb_device *udev)
  * Linux (2.6) currently has NO mechanisms to initiate that:  no khubd
  * timer, no SRP, no requests through sysfs.
  *
- * If Runtime PM isn't enabled or used, non-SuperSpeed devices really get
- * suspended only when their bus goes into global suspend (i.e., the root
+ * If Runtime PM isn't enabled or used, non-SuperSpeed devices may not get
+ * suspended until their bus goes into global suspend (i.e., the root
  * hub is suspended).  Nevertheless, we change @udev->state to
  * USB_STATE_SUSPENDED as this is the device's "logical" state.  The actual
  * upstream port setting is stored in @udev->port_is_suspended.
@@ -2960,15 +2978,21 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
         /* see 7.1.7.6 */
         if (hub_is_superspeed(hub->hdev))
                 status = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_U3);
-        else if (PMSG_IS_AUTO(msg))
-                status = set_port_feature(hub->hdev, port1,
-                                                USB_PORT_FEAT_SUSPEND);
+
         /*
          * For system suspend, we do not need to enable the suspend feature
          * on individual USB-2 ports.  The devices will automatically go
          * into suspend a few ms after the root hub stops sending packets.
          * The USB 2.0 spec calls this "global suspend".
+         *
+         * However, many USB hubs have a bug: They don't relay wakeup requests
+         * from a downstream port if the port's suspend feature isn't on.
+         * Therefore we will turn on the suspend feature if udev or any of its
+         * descendants is enabled for remote wakeup.
          */
+        else if (PMSG_IS_AUTO(msg) || wakeup_enabled_descendants(udev) > 0)
+                status = set_port_feature(hub->hdev, port1,
+                                USB_PORT_FEAT_SUSPEND);
         else {
                 really_suspend = false;
                 status = 0;
@@ -3003,15 +3027,16 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
                 if (!PMSG_IS_AUTO(msg))
                         status = 0;
         } else {
-                /* device has up to 10 msec to fully suspend */
                 dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n",
                                 (PMSG_IS_AUTO(msg) ? "auto-" : ""),
                                 udev->do_remote_wakeup);
-                usb_set_device_state(udev, USB_STATE_SUSPENDED);
                 if (really_suspend) {
                         udev->port_is_suspended = 1;
+
+                        /* device has up to 10 msec to fully suspend */
                         msleep(10);
                 }
+                usb_set_device_state(udev, USB_STATE_SUSPENDED);
         }
 
         /*
@@ -3293,7 +3318,11 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
         unsigned                port1;
         int                     status;
 
-        /* Warn if children aren't already suspended */
+        /*
+         * Warn if children aren't already suspended.
+         * Also, add up the number of wakeup-enabled descendants.
+         */
+        hub->wakeup_enabled_descendants = 0;
         for (port1 = 1; port1 <= hdev->maxchild; port1++) {
                 struct usb_device       *udev;
 
@@ -3303,6 +3332,9 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                         if (PMSG_IS_AUTO(msg))
                                 return -EBUSY;
                 }
+                if (udev)
+                        hub->wakeup_enabled_descendants +=
+                                        wakeup_enabled_descendants(udev);
         }
 
         if (hdev->do_remote_wakeup && hub->quirk_check_port_auto_suspend) {
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 6508e02b3dac..4e4790dea343 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -59,6 +59,9 @@ struct usb_hub {
         struct usb_tt           tt;             /* Transaction Translator */
 
         unsigned                mA_per_port;    /* current for each child */
+#ifdef  CONFIG_PM
+        unsigned                wakeup_enabled_descendants;
+#endif
 
         unsigned                limited_power:1;
         unsigned                quiescing:1;
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 757aa18027d0..2378958ea63e 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,6 +1,6 @@
 config USB_DWC3
         tristate "DesignWare USB3 DRD Core Support"
-        depends on (USB || USB_GADGET) && GENERIC_HARDIRQS
+        depends on (USB || USB_GADGET) && GENERIC_HARDIRQS && HAS_DMA
         select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
         help
           Say Y or M here if your system has a Dual Role SuperSpeed
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c35d49d39b76..358375e0b291 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -450,7 +450,7 @@ static int dwc3_probe(struct platform_device *pdev)
         }
 
         if (IS_ERR(dwc->usb3_phy)) {
-                ret = PTR_ERR(dwc->usb2_phy);
+                ret = PTR_ERR(dwc->usb3_phy);
 
                 /*
                  * if -ENXIO is returned, it means PHY layer wasn't
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index b69d322e3cab..27dad993b007 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -759,8 +759,8 @@ struct dwc3 {
 
 struct dwc3_event_type {
         u32     is_devspec:1;
-        u32     type:6;
-        u32     reserved8_31:25;
+        u32     type:7;
+        u32     reserved8_31:24;
 } __packed;
 
 #define DWC3_DEPEVT_XFERCOMPLETE        0x01
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index b5e5b35df49c..f77083fedc68 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1584,6 +1584,7 @@ err1:
         __dwc3_gadget_ep_disable(dwc->eps[0]);
 
 err0:
+        dwc->gadget_driver = NULL;
         spin_unlock_irqrestore(&dwc->lock, flags);
 
         return ret;
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 62f6802f6e0f..8e9368330b10 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -193,6 +193,7 @@ config USB_FUSB300
            Faraday usb device controller FUSB300 driver
 
 config USB_FOTG210_UDC
+        depends on HAS_DMA
         tristate "Faraday FOTG210 USB Peripheral Controller"
         help
            Faraday USB2.0 OTG controller which can be configured as
@@ -328,13 +329,14 @@ config USB_S3C_HSUDC
 
 config USB_MV_UDC
         tristate "Marvell USB2.0 Device Controller"
-        depends on GENERIC_HARDIRQS
+        depends on GENERIC_HARDIRQS && HAS_DMA
         help
           Marvell Socs (including PXA and MMP series) include a high speed
           USB2.0 OTG controller, which can be configured as high speed or
           full speed USB peripheral.
 
 config USB_MV_U3D
+        depends on HAS_DMA
         tristate "MARVELL PXA2128 USB 3.0 controller"
         help
           MARVELL PXA2128 Processor series include a super speed USB3.0 device
@@ -639,6 +641,7 @@ config USB_CONFIGFS_RNDIS
         depends on USB_CONFIGFS
         depends on NET
         select USB_U_ETHER
+        select USB_U_RNDIS
         select USB_F_RNDIS
         help
            Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 073b938f9135..d9a6add0c852 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -870,8 +870,8 @@ static void clk_on(struct at91_udc *udc)
         if (udc->clocked)
                 return;
         udc->clocked = 1;
-        clk_enable(udc->iclk);
-        clk_enable(udc->fclk);
+        clk_prepare_enable(udc->iclk);
+        clk_prepare_enable(udc->fclk);
 }
 
 static void clk_off(struct at91_udc *udc)
@@ -880,8 +880,8 @@ static void clk_off(struct at91_udc *udc)
                 return;
         udc->clocked = 0;
         udc->gadget.speed = USB_SPEED_UNKNOWN;
-        clk_disable(udc->fclk);
-        clk_disable(udc->iclk);
+        clk_disable_unprepare(udc->fclk);
+        clk_disable_unprepare(udc->iclk);
 }
 
 /*
@@ -1725,7 +1725,7 @@ static int at91udc_probe(struct platform_device *pdev)
         /* init software state */
         udc = &controller;
         udc->gadget.dev.parent = dev;
-        if (pdev->dev.of_node)
+        if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
                 at91udc_of_init(udc, pdev->dev.of_node);
         else
                 memcpy(&udc->board, dev->platform_data,
@@ -1782,12 +1782,14 @@ static int at91udc_probe(struct platform_device *pdev)
         }
 
         /* don't do anything until we have both gadget driver and VBUS */
-        clk_enable(udc->iclk);
+        retval = clk_prepare_enable(udc->iclk);
+        if (retval)
+                goto fail1;
         at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
         at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);
         /* Clear all pending interrupts - UDP may be used by bootloader. */
         at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);
-        clk_disable(udc->iclk);
+        clk_disable_unprepare(udc->iclk);
 
         /* request UDC and maybe VBUS irqs */
         udc->udp_irq = platform_get_irq(pdev, 0);
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 5d3561ea1c15..edab45da3741 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -959,8 +959,11 @@ static struct usb_function_instance *ecm_alloc_inst(void)
         mutex_init(&opts->lock);
         opts->func_inst.free_func_inst = ecm_free_inst;
         opts->net = gether_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_PTR(PTR_ERR(opts->net));
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "", &ecm_func_type);
 
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
index 90ee8022e8d8..d00392d879db 100644
--- a/drivers/usb/gadget/f_eem.c
+++ b/drivers/usb/gadget/f_eem.c
@@ -593,8 +593,11 @@ static struct usb_function_instance *eem_alloc_inst(void)
         mutex_init(&opts->lock);
         opts->func_inst.free_func_inst = eem_free_inst;
         opts->net = gether_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_CAST(opts->net);
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "", &eem_func_type);
 
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 952177f7eb9b..1c28fe13328a 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -1350,8 +1350,11 @@ static struct usb_function_instance *ncm_alloc_inst(void)
         mutex_init(&opts->lock);
         opts->func_inst.free_func_inst = ncm_free_inst;
         opts->net = gether_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_PTR(PTR_ERR(opts->net));
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "", &ncm_func_type);
 
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 7944fb0efe3b..1bf26e9f38cd 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -656,8 +656,11 @@ static struct usb_function_instance *phonet_alloc_inst(void)
 
         opts->func_inst.free_func_inst = phonet_free_inst;
         opts->net = gphonet_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_PTR(PTR_ERR(opts->net));
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "",
                         &phonet_func_type);
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 191df35ae69d..717ed7f95639 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -963,8 +963,11 @@ static struct usb_function_instance *rndis_alloc_inst(void)
         mutex_init(&opts->lock);
         opts->func_inst.free_func_inst = rndis_free_inst;
         opts->net = gether_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_CAST(opts->net);
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "",
                                     &rndis_func_type);
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index 5601e1d96c4f..7c8674fa7e80 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -505,8 +505,11 @@ static struct usb_function_instance *geth_alloc_inst(void)
         mutex_init(&opts->lock);
         opts->func_inst.free_func_inst = geth_free_inst;
         opts->net = gether_setup_default();
-        if (IS_ERR(opts->net))
-                return ERR_CAST(opts->net);
+        if (IS_ERR(opts->net)) {
+                struct net_device *net = opts->net;
+                kfree(opts);
+                return ERR_CAST(net);
+        }
 
         config_group_init_type_name(&opts->func_inst.group, "",
                                     &gether_func_type);
diff --git a/drivers/usb/gadget/fotg210-udc.c b/drivers/usb/gadget/fotg210-udc.c
index cce5535b1dc6..10cd18ddd0d4 100644
--- a/drivers/usb/gadget/fotg210-udc.c
+++ b/drivers/usb/gadget/fotg210-udc.c
@@ -1074,7 +1074,7 @@ static struct usb_gadget_ops fotg210_gadget_ops = {
         .udc_stop               = fotg210_udc_stop,
 };
 
-static int __exit fotg210_udc_remove(struct platform_device *pdev)
+static int fotg210_udc_remove(struct platform_device *pdev)
 {
         struct fotg210_udc *fotg210 = dev_get_drvdata(&pdev->dev);
 
@@ -1088,7 +1088,7 @@ static int __exit fotg210_udc_remove(struct platform_device *pdev)
         return 0;
 }
 
-static int __init fotg210_udc_probe(struct platform_device *pdev)
+static int fotg210_udc_probe(struct platform_device *pdev)
 {
         struct resource *res, *ires;
         struct fotg210_udc *fotg210 = NULL;
diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c
index 07fdb3eaf48a..ec6a2d290398 100644
--- a/drivers/usb/gadget/mv_u3d_core.c
+++ b/drivers/usb/gadget/mv_u3d_core.c
@@ -1776,7 +1776,7 @@ static int mv_u3d_remove(struct platform_device *dev)
         kfree(u3d->eps);
 
         if (u3d->irq)
-                free_irq(u3d->irq, &dev->dev);
+                free_irq(u3d->irq, u3d);
 
         if (u3d->cap_regs)
                 iounmap(u3d->cap_regs);
@@ -1974,7 +1974,7 @@ static int mv_u3d_probe(struct platform_device *dev)
         return 0;
 
 err_unregister:
-        free_irq(u3d->irq, &dev->dev);
+        free_irq(u3d->irq, u3d);
 err_request_irq:
 err_get_irq:
         kfree(u3d->status_req);
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index ffd8fa541101..c28ac9872030 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -50,6 +50,8 @@ static DEFINE_MUTEX(udc_lock);
 
 /* ------------------------------------------------------------------------- */
 
+#ifdef  CONFIG_HAS_DMA
+
 int usb_gadget_map_request(struct usb_gadget *gadget,
                 struct usb_request *req, int is_in)
 {
@@ -99,6 +101,8 @@ void usb_gadget_unmap_request(struct usb_gadget *gadget,
 }
 EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
 
+#endif  /* CONFIG_HAS_DMA */
+
 /* ------------------------------------------------------------------------- */
 
 void usb_gadget_set_state(struct usb_gadget *gadget,
@@ -194,9 +198,11 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
         dev_set_name(&gadget->dev, "gadget");
         gadget->dev.parent = parent;
 
+#ifdef  CONFIG_HAS_DMA
         dma_set_coherent_mask(&gadget->dev, parent->coherent_dma_mask);
         gadget->dev.dma_parms = parent->dma_parms;
         gadget->dev.dma_mask = parent->dma_mask;
+#endif
 
         if (release)
                 gadget->dev.release = release;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 2b702772d04d..6dce37555c4f 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -874,6 +874,7 @@ static int ehci_hub_control (
                                 ehci->reset_done[wIndex] = jiffies
                                                 + msecs_to_jiffies(20);
                                 usb_hcd_start_port_resume(&hcd->self, wIndex);
+                                set_bit(wIndex, &ehci->resuming_ports);
                                 /* check the port again */
                                 mod_timer(&ehci_to_hcd(ehci)->rh_timer,
                                                 ehci->reset_done[wIndex]);
diff --git a/drivers/usb/host/pci-quirks.h b/drivers/usb/host/pci-quirks.h
index 4b8a2092432f..978c849f9c9a 100644
--- a/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h
@@ -13,6 +13,7 @@ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
 void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
 void sb800_prefetch(struct device *dev, int on);
 #else
+struct pci_dev;
 static inline void usb_amd_quirk_pll_disable(void) {}
 static inline void usb_amd_quirk_pll_enable(void) {}
 static inline void usb_amd_dev_put(void) {}
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index cc24e39b97d5..f00cb203faea 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -93,7 +93,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
         }
         if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
                         pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI) {
-                xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
                 xhci->quirks |= XHCI_EP_LIMIT_QUIRK;
                 xhci->limit_active_eps = 64;
                 xhci->quirks |= XHCI_SW_BW_CHECKING;
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 1e57eafa6910..5b08cd85f8e7 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -434,7 +434,7 @@ static void ring_doorbell_for_active_rings(struct xhci_hcd *xhci,
 
         /* A ring has pending URBs if its TD list is not empty */
         if (!(ep->ep_state & EP_HAS_STREAMS)) {
-                if (!(list_empty(&ep->ring->td_list)))
+                if (ep->ring && !(list_empty(&ep->ring->td_list)))
                         xhci_ring_ep_doorbell(xhci, slot_id, ep_index, 0);
                 return;
         }
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2c49f00260ca..41eb4fc33453 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -329,7 +329,7 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci)
         return;
 }
 
-static void xhci_msix_sync_irqs(struct xhci_hcd *xhci)
+static void __maybe_unused xhci_msix_sync_irqs(struct xhci_hcd *xhci)
 {
         int i;
 
@@ -1181,9 +1181,6 @@ static int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev,
         }
 
         xhci = hcd_to_xhci(hcd);
-        if (xhci->xhc_state & XHCI_STATE_HALTED)
-                return -ENODEV;
-
         if (check_virt_dev) {
                 if (!udev->slot_id || !xhci->devs[udev->slot_id]) {
                         printk(KERN_DEBUG "xHCI %s called with unaddressed "
@@ -1199,6 +1196,9 @@ static int xhci_check_args(struct usb_hcd *hcd, struct usb_device *udev,
                 }
         }
 
+        if (xhci->xhc_state & XHCI_STATE_HALTED)
+                return -ENODEV;
+
         return 1;
 }
 
@@ -3898,7 +3898,7 @@ int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1)
  * Issue an Evaluate Context command to change the Maximum Exit Latency in the
  * slot context.  If that succeeds, store the new MEL in the xhci_virt_device.
  */
-static int xhci_change_max_exit_latency(struct xhci_hcd *xhci,
+static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
                         struct usb_device *udev, u16 max_exit_latency)
 {
         struct xhci_virt_device *virt_dev;
@@ -4892,6 +4892,13 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
 
         get_quirks(dev, xhci);
 
+        /* In xhci controllers which follow xhci 1.0 spec gives a spurious
+         * success event after a short transfer. This quirk will ignore such
+         * spurious event.
+         */
+        if (xhci->hci_version > 0x96)
+                xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
+
         /* Make sure the HC is halted. */
         retval = xhci_halt(xhci);
         if (retval)
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index c21386ec5d35..de98906f786d 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3247,6 +3247,7 @@ static const struct usb_device_id sisusb_table[] = {
         { USB_DEVICE(0x0711, 0x0903) },
         { USB_DEVICE(0x0711, 0x0918) },
         { USB_DEVICE(0x0711, 0x0920) },
+        { USB_DEVICE(0x0711, 0x0950) },
         { USB_DEVICE(0x182d, 0x021c) },
         { USB_DEVICE(0x182d, 0x0269) },
         { }
diff --git a/drivers/usb/phy/phy-omap-usb3.c b/drivers/usb/phy/phy-omap-usb3.c
index efe6e1464f45..a2fb30bbb971 100644
--- a/drivers/usb/phy/phy-omap-usb3.c
+++ b/drivers/usb/phy/phy-omap-usb3.c
@@ -71,9 +71,9 @@ static struct usb_dpll_params omap_usb3_dpll_params[NUM_SYS_CLKS] = {
         {1250, 5, 4, 20, 0},            /* 12 MHz */
         {3125, 20, 4, 20, 0},           /* 16.8 MHz */
         {1172, 8, 4, 20, 65537},        /* 19.2 MHz */
+        {1000, 7, 4, 10, 0},            /* 20 MHz */
         {1250, 12, 4, 20, 0},           /* 26 MHz */
         {3125, 47, 4, 20, 92843},       /* 38.4 MHz */
-        {1000, 7, 4, 10, 0},            /* 20 MHz */
 
 };
 
diff --git a/drivers/usb/phy/phy-samsung-usb2.c b/drivers/usb/phy/phy-samsung-usb2.c
index 1011c16ade7e..758b86d0fcb3 100644
--- a/drivers/usb/phy/phy-samsung-usb2.c
+++ b/drivers/usb/phy/phy-samsung-usb2.c
@@ -388,7 +388,7 @@ static int samsung_usb2phy_probe(struct platform_device *pdev)
                 clk = devm_clk_get(dev, "otg");
 
         if (IS_ERR(clk)) {
-                dev_err(dev, "Failed to get otg clock\n");
+                dev_err(dev, "Failed to get usbhost/otg clock\n");
                 return PTR_ERR(clk);
         }
 
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index ed4949faa70d..805940c37353 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -855,10 +855,6 @@ static int usbhsg_gadget_stop(struct usb_gadget *gadget,
         struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
         struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
 
-        if (!driver             ||
-            !driver->unbind)
-                return -EINVAL;
-
         usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
         gpriv->driver = NULL;
 
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index d6ef2f8da37d..0eae4ba3760e 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -53,6 +53,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
         { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
         { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */
+        { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */
         { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
         { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */
         { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */
@@ -118,6 +119,8 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */
         { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */
         { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */
+        { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */
+        { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
@@ -148,6 +151,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
         { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
         { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
+        { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */
         { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
         { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */
         { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 0a818b238508..603fb70dde80 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -905,20 +905,20 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
         status = mos7840_get_reg_sync(port, mos7840_port->SpRegOffset, &Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "Reading Spreg failed\n");
-                return -1;
+                goto err;
         }
         Data |= 0x80;
         status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "writing Spreg failed\n");
-                return -1;
+                goto err;
         }
 
         Data &= ~0x80;
         status = mos7840_set_reg_sync(port, mos7840_port->SpRegOffset, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "writing Spreg failed\n");
-                return -1;
+                goto err;
         }
         /* End of block to be checked */
 
@@ -927,7 +927,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
                                                                         &Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "Reading Controlreg failed\n");
-                return -1;
+                goto err;
         }
         Data |= 0x08;           /* Driver done bit */
         Data |= 0x20;           /* rx_disable */
@@ -935,7 +935,7 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
                                 mos7840_port->ControlRegOffset, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "writing Controlreg failed\n");
-                return -1;
+                goto err;
         }
         /* do register settings here */
         /* Set all regs to the device default values. */
@@ -946,21 +946,21 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
         status = mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "disabling interrupts failed\n");
-                return -1;
+                goto err;
         }
         /* Set FIFO_CONTROL_REGISTER to the default value */
         Data = 0x00;
         status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER  failed\n");
-                return -1;
+                goto err;
         }
 
         Data = 0xcf;
         status = mos7840_set_uart_reg(port, FIFO_CONTROL_REGISTER, Data);
         if (status < 0) {
                 dev_dbg(&port->dev, "Writing FIFO_CONTROL_REGISTER  failed\n");
-                return -1;
+                goto err;
         }
 
         Data = 0x03;
@@ -1103,6 +1103,15 @@ static int mos7840_open(struct tty_struct *tty, struct usb_serial_port *port)
         /* mos7840_change_port_settings(mos7840_port,old_termios); */
 
         return 0;
+err:
+        for (j = 0; j < NUM_URBS; ++j) {
+                urb = mos7840_port->write_urb_pool[j];
+                if (!urb)
+                        continue;
+                kfree(urb->transfer_buffer);
+                usb_free_urb(urb);
+        }
+        return status;
 }
 
 /*****************************************************************************
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5dd857de05b0..1cf6f125f5f0 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -341,17 +341,12 @@ static void option_instat_callback(struct urb *urb);
 #define OLIVETTI_VENDOR_ID                      0x0b3c
 #define OLIVETTI_PRODUCT_OLICARD100             0xc000
 #define OLIVETTI_PRODUCT_OLICARD145             0xc003
+#define OLIVETTI_PRODUCT_OLICARD200             0xc005
 
 /* Celot products */
 #define CELOT_VENDOR_ID                         0x211f
 #define CELOT_PRODUCT_CT680M                    0x6801
 
-/* ONDA Communication vendor id */
-#define ONDA_VENDOR_ID       0x1ee8
-
-/* ONDA MT825UP HSDPA 14.2 modem */
-#define ONDA_MT825UP         0x000b
-
 /* Samsung products */
 #define SAMSUNG_VENDOR_ID                       0x04e8
 #define SAMSUNG_PRODUCT_GT_B3730                0x6889
@@ -444,7 +439,8 @@ static void option_instat_callback(struct urb *urb);
 
 /* Hyundai Petatel Inc. products */
 #define PETATEL_VENDOR_ID                       0x1ff4
-#define PETATEL_PRODUCT_NP10T                   0x600e
+#define PETATEL_PRODUCT_NP10T_600A              0x600a
+#define PETATEL_PRODUCT_NP10T_600E              0x600e
 
 /* TP-LINK Incorporated products */
 #define TPLINK_VENDOR_ID                        0x2357
@@ -782,6 +778,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
+        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6280) }, /* BP3-USB & BP3-EXT HSDPA */
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) },
@@ -817,7 +814,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff),
+                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff),
                 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
@@ -1256,8 +1254,8 @@ static const struct usb_device_id option_ids[] = {
 
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
+        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200) },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
-        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM610) },
@@ -1329,9 +1327,12 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
         { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
         { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
-        { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
+        { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600A) },
+        { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) },
         { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180),
           .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+        { USB_DEVICE(TPLINK_VENDOR_ID, 0x9000),                                 /* TP-Link MA260 */
+          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
         { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x02, 0x01) },    /* D-Link DWM-156 (variant) */
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d01, 0xff, 0x00, 0x00) },    /* D-Link DWM-156 (variant) */
@@ -1339,6 +1340,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d02, 0xff, 0x00, 0x00) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) },
+        { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
+        { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 7182bb774b79..375b5a400b6f 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -371,7 +371,7 @@ static int ti_startup(struct usb_serial *serial)
         usb_set_serial_data(serial, tdev);
 
         /* determine device type */
-        if (usb_match_id(serial->interface, ti_id_table_3410))
+        if (serial->type == &ti_1port_device)
                 tdev->td_is_3410 = 1;
         dev_dbg(&dev->dev, "%s - device type is %s\n", __func__,
                 tdev->td_is_3410 ? "3410" : "5052");
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 1799335288bd..c015f2c16729 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -665,6 +665,13 @@ UNUSUAL_DEV(  0x054c, 0x016a, 0x0000, 0x9999,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_FIX_INQUIRY ),
 
+/* Submitted by Ren Bigcren <bigcren.ren@sonymobile.com> */
+UNUSUAL_DEV(  0x054c, 0x02a5, 0x0100, 0x0100,
+                "Sony Corp.",
+                "MicroVault Flash Drive",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_NO_READ_CAPACITY_16 ),
+
 /* floppy reports multiple luns */
 UNUSUAL_DEV(  0x055d, 0x2020, 0x0000, 0x0210,
                 "SAMSUNG",
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c
index 5ca11b066b7e..886e797f75f9 100644
--- a/drivers/video/backlight/max8925_bl.c
+++ b/drivers/video/backlight/max8925_bl.c
@@ -101,33 +101,37 @@ static const struct backlight_ops max8925_backlight_ops = {
         .get_brightness = max8925_backlight_get_brightness,
 };
 
-#ifdef CONFIG_OF
-static int max8925_backlight_dt_init(struct platform_device *pdev,
-                              struct max8925_backlight_pdata *pdata)
+static void max8925_backlight_dt_init(struct platform_device *pdev)
 {
         struct device_node *nproot = pdev->dev.parent->of_node, *np;
-        int dual_string;
+        struct max8925_backlight_pdata *pdata;
+        u32 val;
+
+        if (!nproot || !IS_ENABLED(CONFIG_OF))
+                return;
+
+        pdata = devm_kzalloc(&pdev->dev,
+                             sizeof(struct max8925_backlight_pdata),
+                             GFP_KERNEL);
+        if (!pdata)
+                return;
 
-        if (!nproot)
-                return -ENODEV;
         np = of_find_node_by_name(nproot, "backlight");
         if (!np) {
                 dev_err(&pdev->dev, "failed to find backlight node\n");
-                return -ENODEV;
+                return;
         }
 
-        of_property_read_u32(np, "maxim,max8925-dual-string", &dual_string);
-        pdata->dual_string = dual_string;
-        return 0;
+        if (!of_property_read_u32(np, "maxim,max8925-dual-string", &val))
+                pdata->dual_string = val;
+
+        pdev->dev.platform_data = pdata;
 }
-#else
-#define max8925_backlight_dt_init(x, y) (-1)
-#endif
 
 static int max8925_backlight_probe(struct platform_device *pdev)
 {
         struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
-        struct max8925_backlight_pdata *pdata = pdev->dev.platform_data;
+        struct max8925_backlight_pdata *pdata;
         struct max8925_backlight_data *data;
         struct backlight_device *bl;
         struct backlight_properties props;
@@ -170,13 +174,10 @@ static int max8925_backlight_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, bl);
 
         value = 0;
-        if (pdev->dev.parent->of_node && !pdata) {
-                pdata = devm_kzalloc(&pdev->dev,
-                                     sizeof(struct max8925_backlight_pdata),
-                                     GFP_KERNEL);
-                max8925_backlight_dt_init(pdev, pdata);
-        }
+        if (!pdev->dev.platform_data)
+                max8925_backlight_dt_init(pdev);
 
+        pdata = pdev->dev.platform_data;
         if (pdata) {
                 if (pdata->lxw_scl)
                         value |= (1 << 7);
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 635d5690dd5a..9e758a8f890d 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -96,13 +96,18 @@ ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
 
         ptr[0] = ((frame->colorspace & 0x3) << 5) | (frame->scan_mode & 0x3);
 
-        if (frame->active_info_valid)
+        /*
+         * Data byte 1, bit 4 has to be set if we provide the active format
+         * aspect ratio
+         */
+        if (frame->active_aspect & 0xf)
                 ptr[0] |= BIT(4);
 
-        if (frame->horizontal_bar_valid)
+        /* Bit 3 and 2 indicate if we transmit horizontal/vertical bar data */
+        if (frame->top_bar || frame->bottom_bar)
                 ptr[0] |= BIT(3);
 
-        if (frame->vertical_bar_valid)
+        if (frame->left_bar || frame->right_bar)
                 ptr[0] |= BIT(2);
 
         ptr[1] = ((frame->colorimetry & 0x3) << 6) |
@@ -283,9 +288,33 @@ ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame,
 EXPORT_SYMBOL(hdmi_audio_infoframe_pack);
 
 /**
- * hdmi_vendor_infoframe_pack() - write a HDMI vendor infoframe to binary
- *                                buffer
+ * hdmi_vendor_infoframe_init() - initialize an HDMI vendor infoframe
  * @frame: HDMI vendor infoframe
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame)
+{
+        memset(frame, 0, sizeof(*frame));
+
+        frame->type = HDMI_INFOFRAME_TYPE_VENDOR;
+        frame->version = 1;
+
+        frame->oui = HDMI_IEEE_OUI;
+
+        /*
+         * 0 is a valid value for s3d_struct, so we use a special "not set"
+         * value
+         */
+        frame->s3d_struct = HDMI_3D_STRUCTURE_INVALID;
+
+        return 0;
+}
+EXPORT_SYMBOL(hdmi_vendor_infoframe_init);
+
+/**
+ * hdmi_vendor_infoframe_pack() - write a HDMI vendor infoframe to binary buffer
+ * @frame: HDMI infoframe
  * @buffer: destination buffer
  * @size: size of buffer
  *
@@ -298,11 +327,25 @@ EXPORT_SYMBOL(hdmi_audio_infoframe_pack);
  * error code on failure.
  */
 ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
-                                   void *buffer, size_t size)
+                                 void *buffer, size_t size)
 {
         u8 *ptr = buffer;
         size_t length;
 
+        /* empty info frame */
+        if (frame->vic == 0 && frame->s3d_struct == HDMI_3D_STRUCTURE_INVALID)
+                return -EINVAL;
+
+        /* only one of those can be supplied */
+        if (frame->vic != 0 && frame->s3d_struct != HDMI_3D_STRUCTURE_INVALID)
+                return -EINVAL;
+
+        /* for side by side (half) we also need to provide 3D_Ext_Data */
+        if (frame->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF)
+                frame->length = 6;
+        else
+                frame->length = 5;
+
         length = HDMI_INFOFRAME_HEADER_SIZE + frame->length;
 
         if (size < length)
@@ -315,7 +358,20 @@ ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
         ptr[2] = frame->length;
         ptr[3] = 0; /* checksum */
 
-        memcpy(&ptr[HDMI_INFOFRAME_HEADER_SIZE], frame->data, frame->length);
+        /* HDMI OUI */
+        ptr[4] = 0x03;
+        ptr[5] = 0x0c;
+        ptr[6] = 0x00;
+
+        if (frame->vic) {
+                ptr[7] = 0x1 << 5;      /* video format */
+                ptr[8] = frame->vic;
+        } else {
+                ptr[7] = 0x2 << 5;      /* video format */
+                ptr[8] = (frame->s3d_struct & 0xf) << 4;
+                if (frame->s3d_struct >= HDMI_3D_STRUCTURE_SIDE_BY_SIDE_HALF)
+                        ptr[9] = (frame->s3d_ext_data & 0xf) << 4;
+        }
 
         hdmi_infoframe_checksum(buffer, length);
 
@@ -323,6 +379,20 @@ ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
 }
 EXPORT_SYMBOL(hdmi_vendor_infoframe_pack);
 
+/*
+ * hdmi_vendor_any_infoframe_pack() - write a vendor infoframe to binary buffer
+ */
+static ssize_t
+hdmi_vendor_any_infoframe_pack(union hdmi_vendor_any_infoframe *frame,
+                           void *buffer, size_t size)
+{
+        /* we only know about HDMI vendor infoframes */
+        if (frame->any.oui != HDMI_IEEE_OUI)
+                return -EINVAL;
+
+        return hdmi_vendor_infoframe_pack(&frame->hdmi, buffer, size);
+}
+
 /**
  * hdmi_infoframe_pack() - write a HDMI infoframe to binary buffer
  * @frame: HDMI infoframe
@@ -353,8 +423,8 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size)
                 length = hdmi_audio_infoframe_pack(&frame->audio, buffer, size);
                 break;
         case HDMI_INFOFRAME_TYPE_VENDOR:
-                length = hdmi_vendor_infoframe_pack(&frame->vendor,
-                                                    buffer, size);
+                length = hdmi_vendor_any_infoframe_pack(&frame->vendor,
+                                                        buffer, size);
                 break;
         default:
                 WARN(1, "Bad infoframe type %d\n", frame->any.type);