These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / gpu / drm / tegra / sor.c
index 7591d89..3eff7cf 100644 (file)
@@ -10,7 +10,9 @@
 #include <linux/debugfs.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 
 #include <soc/tegra/pmc.h>
 #include "drm.h"
 #include "sor.h"
 
+#define SOR_REKEY 0x38
+
+struct tegra_sor_hdmi_settings {
+       unsigned long frequency;
+
+       u8 vcocap;
+       u8 ichpmp;
+       u8 loadadj;
+       u8 termadj;
+       u8 tx_pu;
+       u8 bg_vref;
+
+       u8 drive_current[4];
+       u8 preemphasis[4];
+};
+
+#if 1
+static const struct tegra_sor_hdmi_settings tegra210_sor_hdmi_defaults[] = {
+       {
+               .frequency = 54000000,
+               .vcocap = 0x0,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x10,
+               .bg_vref = 0x8,
+               .drive_current = { 0x33, 0x3a, 0x3a, 0x3a },
+               .preemphasis = { 0x00, 0x00, 0x00, 0x00 },
+       }, {
+               .frequency = 75000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x40,
+               .bg_vref = 0x8,
+               .drive_current = { 0x33, 0x3a, 0x3a, 0x3a },
+               .preemphasis = { 0x00, 0x00, 0x00, 0x00 },
+       }, {
+               .frequency = 150000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x66,
+               .bg_vref = 0x8,
+               .drive_current = { 0x33, 0x3a, 0x3a, 0x3a },
+               .preemphasis = { 0x00, 0x00, 0x00, 0x00 },
+       }, {
+               .frequency = 300000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x66,
+               .bg_vref = 0xa,
+               .drive_current = { 0x33, 0x3f, 0x3f, 0x3f },
+               .preemphasis = { 0x00, 0x17, 0x17, 0x17 },
+       }, {
+               .frequency = 600000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x66,
+               .bg_vref = 0x8,
+               .drive_current = { 0x33, 0x3f, 0x3f, 0x3f },
+               .preemphasis = { 0x00, 0x00, 0x00, 0x00 },
+       },
+};
+#else
+static const struct tegra_sor_hdmi_settings tegra210_sor_hdmi_defaults[] = {
+       {
+               .frequency = 75000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x40,
+               .bg_vref = 0x8,
+               .drive_current = { 0x29, 0x29, 0x29, 0x29 },
+               .preemphasis = { 0x00, 0x00, 0x00, 0x00 },
+       }, {
+               .frequency = 150000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x1,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x66,
+               .bg_vref = 0x8,
+               .drive_current = { 0x30, 0x37, 0x37, 0x37 },
+               .preemphasis = { 0x01, 0x02, 0x02, 0x02 },
+       }, {
+               .frequency = 300000000,
+               .vcocap = 0x3,
+               .ichpmp = 0x6,
+               .loadadj = 0x3,
+               .termadj = 0x9,
+               .tx_pu = 0x66,
+               .bg_vref = 0xf,
+               .drive_current = { 0x30, 0x37, 0x37, 0x37 },
+               .preemphasis = { 0x10, 0x3e, 0x3e, 0x3e },
+       }, {
+               .frequency = 600000000,
+               .vcocap = 0x3,
+               .ichpmp = 0xa,
+               .loadadj = 0x3,
+               .termadj = 0xb,
+               .tx_pu = 0x66,
+               .bg_vref = 0xe,
+               .drive_current = { 0x35, 0x3e, 0x3e, 0x3e },
+               .preemphasis = { 0x02, 0x3f, 0x3f, 0x3f },
+       },
+};
+#endif
+
+struct tegra_sor_soc {
+       bool supports_edp;
+       bool supports_lvds;
+       bool supports_hdmi;
+       bool supports_dp;
+
+       const struct tegra_sor_hdmi_settings *settings;
+       unsigned int num_settings;
+};
+
+struct tegra_sor;
+
+struct tegra_sor_ops {
+       const char *name;
+       int (*probe)(struct tegra_sor *sor);
+       int (*remove)(struct tegra_sor *sor);
+};
+
 struct tegra_sor {
        struct host1x_client client;
        struct tegra_output output;
        struct device *dev;
 
+       const struct tegra_sor_soc *soc;
        void __iomem *regs;
 
        struct reset_control *rst;
@@ -38,12 +175,19 @@ struct tegra_sor {
 
        struct tegra_dpaux *dpaux;
 
-       struct mutex lock;
-       bool enabled;
-
        struct drm_info_list *debugfs_files;
        struct drm_minor *minor;
        struct dentry *debugfs;
+
+       const struct tegra_sor_ops *ops;
+
+       /* for HDMI 2.0 */
+       struct tegra_sor_hdmi_settings *settings;
+       unsigned int num_settings;
+
+       struct regulator *avdd_io_supply;
+       struct regulator *vdd_pll_supply;
+       struct regulator *hdmi_supply;
 };
 
 struct tegra_sor_config {
@@ -94,40 +238,40 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
                SOR_LANE_DRIVE_CURRENT_LANE2(0x40) |
                SOR_LANE_DRIVE_CURRENT_LANE1(0x40) |
                SOR_LANE_DRIVE_CURRENT_LANE0(0x40);
-       tegra_sor_writel(sor, value, SOR_LANE_DRIVE_CURRENT_0);
+       tegra_sor_writel(sor, value, SOR_LANE_DRIVE_CURRENT0);
 
        value = SOR_LANE_PREEMPHASIS_LANE3(0x0f) |
                SOR_LANE_PREEMPHASIS_LANE2(0x0f) |
                SOR_LANE_PREEMPHASIS_LANE1(0x0f) |
                SOR_LANE_PREEMPHASIS_LANE0(0x0f);
-       tegra_sor_writel(sor, value, SOR_LANE_PREEMPHASIS_0);
+       tegra_sor_writel(sor, value, SOR_LANE_PREEMPHASIS0);
 
-       value = SOR_LANE_POST_CURSOR_LANE3(0x00) |
-               SOR_LANE_POST_CURSOR_LANE2(0x00) |
-               SOR_LANE_POST_CURSOR_LANE1(0x00) |
-               SOR_LANE_POST_CURSOR_LANE0(0x00);
-       tegra_sor_writel(sor, value, SOR_LANE_POST_CURSOR_0);
+       value = SOR_LANE_POSTCURSOR_LANE3(0x00) |
+               SOR_LANE_POSTCURSOR_LANE2(0x00) |
+               SOR_LANE_POSTCURSOR_LANE1(0x00) |
+               SOR_LANE_POSTCURSOR_LANE0(0x00);
+       tegra_sor_writel(sor, value, SOR_LANE_POSTCURSOR0);
 
        /* disable LVDS mode */
        tegra_sor_writel(sor, 0, SOR_LVDS);
 
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value |= SOR_DP_PADCTL_TX_PU_ENABLE;
        value &= ~SOR_DP_PADCTL_TX_PU_MASK;
        value |= SOR_DP_PADCTL_TX_PU(2); /* XXX: don't hardcode? */
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value |= SOR_DP_PADCTL_CM_TXD_3 | SOR_DP_PADCTL_CM_TXD_2 |
                 SOR_DP_PADCTL_CM_TXD_1 | SOR_DP_PADCTL_CM_TXD_0;
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
        usleep_range(10, 100);
 
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value &= ~(SOR_DP_PADCTL_CM_TXD_3 | SOR_DP_PADCTL_CM_TXD_2 |
                   SOR_DP_PADCTL_CM_TXD_1 | SOR_DP_PADCTL_CM_TXD_0);
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
        err = tegra_dpaux_prepare(sor->dpaux, DP_SET_ANSI_8B10B);
        if (err < 0)
@@ -148,11 +292,11 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
        if (err < 0)
                return err;
 
-       value = tegra_sor_readl(sor, SOR_DP_SPARE_0);
+       value = tegra_sor_readl(sor, SOR_DP_SPARE0);
        value |= SOR_DP_SPARE_SEQ_ENABLE;
        value &= ~SOR_DP_SPARE_PANEL_INTERNAL;
        value |= SOR_DP_SPARE_MACRO_SOR_CLK;
-       tegra_sor_writel(sor, value, SOR_DP_SPARE_0);
+       tegra_sor_writel(sor, value, SOR_DP_SPARE0);
 
        for (i = 0, value = 0; i < link->num_lanes; i++) {
                unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
@@ -187,18 +331,59 @@ static int tegra_sor_dp_train_fast(struct tegra_sor *sor,
        return 0;
 }
 
+static void tegra_sor_dp_term_calibrate(struct tegra_sor *sor)
+{
+       u32 mask = 0x08, adj = 0, value;
+
+       /* enable pad calibration logic */
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value &= ~SOR_DP_PADCTL_PAD_CAL_PD;
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+
+       value = tegra_sor_readl(sor, SOR_PLL1);
+       value |= SOR_PLL1_TMDS_TERM;
+       tegra_sor_writel(sor, value, SOR_PLL1);
+
+       while (mask) {
+               adj |= mask;
+
+               value = tegra_sor_readl(sor, SOR_PLL1);
+               value &= ~SOR_PLL1_TMDS_TERMADJ_MASK;
+               value |= SOR_PLL1_TMDS_TERMADJ(adj);
+               tegra_sor_writel(sor, value, SOR_PLL1);
+
+               usleep_range(100, 200);
+
+               value = tegra_sor_readl(sor, SOR_PLL1);
+               if (value & SOR_PLL1_TERM_COMPOUT)
+                       adj &= ~mask;
+
+               mask >>= 1;
+       }
+
+       value = tegra_sor_readl(sor, SOR_PLL1);
+       value &= ~SOR_PLL1_TMDS_TERMADJ_MASK;
+       value |= SOR_PLL1_TMDS_TERMADJ(adj);
+       tegra_sor_writel(sor, value, SOR_PLL1);
+
+       /* disable pad calibration logic */
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value |= SOR_DP_PADCTL_PAD_CAL_PD;
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+}
+
 static void tegra_sor_super_update(struct tegra_sor *sor)
 {
-       tegra_sor_writel(sor, 0, SOR_SUPER_STATE_0);
-       tegra_sor_writel(sor, 1, SOR_SUPER_STATE_0);
-       tegra_sor_writel(sor, 0, SOR_SUPER_STATE_0);
+       tegra_sor_writel(sor, 0, SOR_SUPER_STATE0);
+       tegra_sor_writel(sor, 1, SOR_SUPER_STATE0);
+       tegra_sor_writel(sor, 0, SOR_SUPER_STATE0);
 }
 
 static void tegra_sor_update(struct tegra_sor *sor)
 {
-       tegra_sor_writel(sor, 0, SOR_STATE_0);
-       tegra_sor_writel(sor, 1, SOR_STATE_0);
-       tegra_sor_writel(sor, 0, SOR_STATE_0);
+       tegra_sor_writel(sor, 0, SOR_STATE0);
+       tegra_sor_writel(sor, 1, SOR_STATE0);
+       tegra_sor_writel(sor, 0, SOR_STATE0);
 }
 
 static int tegra_sor_setup_pwm(struct tegra_sor *sor, unsigned long timeout)
@@ -235,16 +420,16 @@ static int tegra_sor_attach(struct tegra_sor *sor)
        unsigned long value, timeout;
 
        /* wake up in normal mode */
-       value = tegra_sor_readl(sor, SOR_SUPER_STATE_1);
+       value = tegra_sor_readl(sor, SOR_SUPER_STATE1);
        value |= SOR_SUPER_STATE_HEAD_MODE_AWAKE;
        value |= SOR_SUPER_STATE_MODE_NORMAL;
-       tegra_sor_writel(sor, value, SOR_SUPER_STATE_1);
+       tegra_sor_writel(sor, value, SOR_SUPER_STATE1);
        tegra_sor_super_update(sor);
 
        /* attach */
-       value = tegra_sor_readl(sor, SOR_SUPER_STATE_1);
+       value = tegra_sor_readl(sor, SOR_SUPER_STATE1);
        value |= SOR_SUPER_STATE_ATTACHED;
-       tegra_sor_writel(sor, value, SOR_SUPER_STATE_1);
+       tegra_sor_writel(sor, value, SOR_SUPER_STATE1);
        tegra_sor_super_update(sor);
 
        timeout = jiffies + msecs_to_jiffies(250);
@@ -370,11 +555,11 @@ static int tegra_sor_compute_params(struct tegra_sor *sor,
        error = div_s64(active_sym - approx, tu_size);
        error *= params->num_clocks;
 
-       if (error <= 0 && abs64(error) < params->error) {
+       if (error <= 0 && abs(error) < params->error) {
                params->active_count = div_u64(active_count, f);
                params->active_polarity = active_polarity;
                params->active_frac = active_frac;
-               params->error = abs64(error);
+               params->error = abs(error);
                params->tu_size = tu_size;
 
                if (error == 0)
@@ -385,7 +570,7 @@ static int tegra_sor_compute_params(struct tegra_sor *sor,
 }
 
 static int tegra_sor_calc_config(struct tegra_sor *sor,
-                                struct drm_display_mode *mode,
+                                const struct drm_display_mode *mode,
                                 struct tegra_sor_config *config,
                                 struct drm_dp_link *link)
 {
@@ -481,9 +666,9 @@ static int tegra_sor_detach(struct tegra_sor *sor)
        unsigned long value, timeout;
 
        /* switch to safe mode */
-       value = tegra_sor_readl(sor, SOR_SUPER_STATE_1);
+       value = tegra_sor_readl(sor, SOR_SUPER_STATE1);
        value &= ~SOR_SUPER_STATE_MODE_NORMAL;
-       tegra_sor_writel(sor, value, SOR_SUPER_STATE_1);
+       tegra_sor_writel(sor, value, SOR_SUPER_STATE1);
        tegra_sor_super_update(sor);
 
        timeout = jiffies + msecs_to_jiffies(250);
@@ -498,15 +683,15 @@ static int tegra_sor_detach(struct tegra_sor *sor)
                return -ETIMEDOUT;
 
        /* go to sleep */
-       value = tegra_sor_readl(sor, SOR_SUPER_STATE_1);
+       value = tegra_sor_readl(sor, SOR_SUPER_STATE1);
        value &= ~SOR_SUPER_STATE_HEAD_MODE_MASK;
-       tegra_sor_writel(sor, value, SOR_SUPER_STATE_1);
+       tegra_sor_writel(sor, value, SOR_SUPER_STATE1);
        tegra_sor_super_update(sor);
 
        /* detach */
-       value = tegra_sor_readl(sor, SOR_SUPER_STATE_1);
+       value = tegra_sor_readl(sor, SOR_SUPER_STATE1);
        value &= ~SOR_SUPER_STATE_ATTACHED;
-       tegra_sor_writel(sor, value, SOR_SUPER_STATE_1);
+       tegra_sor_writel(sor, value, SOR_SUPER_STATE1);
        tegra_sor_super_update(sor);
 
        timeout = jiffies + msecs_to_jiffies(250);
@@ -552,10 +737,10 @@ static int tegra_sor_power_down(struct tegra_sor *sor)
        if (err < 0)
                dev_err(sor->dev, "failed to set safe parent clock: %d\n", err);
 
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value &= ~(SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_0 |
                   SOR_DP_PADCTL_PD_TXD_1 | SOR_DP_PADCTL_PD_TXD_2);
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
        /* stop lane sequencer */
        value = SOR_LANE_SEQ_CTL_TRIGGER | SOR_LANE_SEQ_CTL_SEQUENCE_UP |
@@ -575,39 +760,26 @@ static int tegra_sor_power_down(struct tegra_sor *sor)
        if ((value & SOR_LANE_SEQ_CTL_TRIGGER) != 0)
                return -ETIMEDOUT;
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value |= SOR_PLL_2_PORT_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value |= SOR_PLL2_PORT_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        usleep_range(20, 100);
 
-       value = tegra_sor_readl(sor, SOR_PLL_0);
-       value |= SOR_PLL_0_POWER_OFF;
-       value |= SOR_PLL_0_VCOPD;
-       tegra_sor_writel(sor, value, SOR_PLL_0);
+       value = tegra_sor_readl(sor, SOR_PLL0);
+       value |= SOR_PLL0_VCOPD | SOR_PLL0_PWR;
+       tegra_sor_writel(sor, value, SOR_PLL0);
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value |= SOR_PLL_2_SEQ_PLLCAPPD;
-       value |= SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value |= SOR_PLL2_SEQ_PLLCAPPD;
+       value |= SOR_PLL2_SEQ_PLLCAPPD_ENFORCE;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        usleep_range(20, 100);
 
        return 0;
 }
 
-static int tegra_sor_crc_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-
-       return 0;
-}
-
-static int tegra_sor_crc_release(struct inode *inode, struct file *file)
-{
-       return 0;
-}
-
 static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout)
 {
        u32 value;
@@ -615,8 +787,8 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout)
        timeout = jiffies + msecs_to_jiffies(timeout);
 
        while (time_before(jiffies, timeout)) {
-               value = tegra_sor_readl(sor, SOR_CRC_A);
-               if (value & SOR_CRC_A_VALID)
+               value = tegra_sor_readl(sor, SOR_CRCA);
+               if (value & SOR_CRCA_VALID)
                        return 0;
 
                usleep_range(100, 200);
@@ -625,24 +797,25 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout)
        return -ETIMEDOUT;
 }
 
-static ssize_t tegra_sor_crc_read(struct file *file, char __user *buffer,
-                                 size_t size, loff_t *ppos)
+static int tegra_sor_show_crc(struct seq_file *s, void *data)
 {
-       struct tegra_sor *sor = file->private_data;
-       ssize_t num, err;
-       char buf[10];
+       struct drm_info_node *node = s->private;
+       struct tegra_sor *sor = node->info_ent->data;
+       struct drm_crtc *crtc = sor->output.encoder.crtc;
+       struct drm_device *drm = node->minor->dev;
+       int err = 0;
        u32 value;
 
-       mutex_lock(&sor->lock);
+       drm_modeset_lock_all(drm);
 
-       if (!sor->enabled) {
-               err = -EAGAIN;
+       if (!crtc || !crtc->state->active) {
+               err = -EBUSY;
                goto unlock;
        }
 
-       value = tegra_sor_readl(sor, SOR_STATE_1);
+       value = tegra_sor_readl(sor, SOR_STATE1);
        value &= ~SOR_STATE_ASY_CRC_MODE_MASK;
-       tegra_sor_writel(sor, value, SOR_STATE_1);
+       tegra_sor_writel(sor, value, SOR_STATE1);
 
        value = tegra_sor_readl(sor, SOR_CRC_CNTRL);
        value |= SOR_CRC_CNTRL_ENABLE;
@@ -656,65 +829,66 @@ static ssize_t tegra_sor_crc_read(struct file *file, char __user *buffer,
        if (err < 0)
                goto unlock;
 
-       tegra_sor_writel(sor, SOR_CRC_A_RESET, SOR_CRC_A);
-       value = tegra_sor_readl(sor, SOR_CRC_B);
-
-       num = scnprintf(buf, sizeof(buf), "%08x\n", value);
+       tegra_sor_writel(sor, SOR_CRCA_RESET, SOR_CRCA);
+       value = tegra_sor_readl(sor, SOR_CRCB);
 
-       err = simple_read_from_buffer(buffer, size, ppos, buf, num);
+       seq_printf(s, "%08x\n", value);
 
 unlock:
-       mutex_unlock(&sor->lock);
+       drm_modeset_unlock_all(drm);
        return err;
 }
 
-static const struct file_operations tegra_sor_crc_fops = {
-       .owner = THIS_MODULE,
-       .open = tegra_sor_crc_open,
-       .read = tegra_sor_crc_read,
-       .release = tegra_sor_crc_release,
-};
-
 static int tegra_sor_show_regs(struct seq_file *s, void *data)
 {
        struct drm_info_node *node = s->private;
        struct tegra_sor *sor = node->info_ent->data;
+       struct drm_crtc *crtc = sor->output.encoder.crtc;
+       struct drm_device *drm = node->minor->dev;
+       int err = 0;
+
+       drm_modeset_lock_all(drm);
+
+       if (!crtc || !crtc->state->active) {
+               err = -EBUSY;
+               goto unlock;
+       }
 
 #define DUMP_REG(name)                                         \
        seq_printf(s, "%-38s %#05x %08x\n", #name, name,        \
                   tegra_sor_readl(sor, name))
 
        DUMP_REG(SOR_CTXSW);
-       DUMP_REG(SOR_SUPER_STATE_0);
-       DUMP_REG(SOR_SUPER_STATE_1);
-       DUMP_REG(SOR_STATE_0);
-       DUMP_REG(SOR_STATE_1);
-       DUMP_REG(SOR_HEAD_STATE_0(0));
-       DUMP_REG(SOR_HEAD_STATE_0(1));
-       DUMP_REG(SOR_HEAD_STATE_1(0));
-       DUMP_REG(SOR_HEAD_STATE_1(1));
-       DUMP_REG(SOR_HEAD_STATE_2(0));
-       DUMP_REG(SOR_HEAD_STATE_2(1));
-       DUMP_REG(SOR_HEAD_STATE_3(0));
-       DUMP_REG(SOR_HEAD_STATE_3(1));
-       DUMP_REG(SOR_HEAD_STATE_4(0));
-       DUMP_REG(SOR_HEAD_STATE_4(1));
-       DUMP_REG(SOR_HEAD_STATE_5(0));
-       DUMP_REG(SOR_HEAD_STATE_5(1));
+       DUMP_REG(SOR_SUPER_STATE0);
+       DUMP_REG(SOR_SUPER_STATE1);
+       DUMP_REG(SOR_STATE0);
+       DUMP_REG(SOR_STATE1);
+       DUMP_REG(SOR_HEAD_STATE0(0));
+       DUMP_REG(SOR_HEAD_STATE0(1));
+       DUMP_REG(SOR_HEAD_STATE1(0));
+       DUMP_REG(SOR_HEAD_STATE1(1));
+       DUMP_REG(SOR_HEAD_STATE2(0));
+       DUMP_REG(SOR_HEAD_STATE2(1));
+       DUMP_REG(SOR_HEAD_STATE3(0));
+       DUMP_REG(SOR_HEAD_STATE3(1));
+       DUMP_REG(SOR_HEAD_STATE4(0));
+       DUMP_REG(SOR_HEAD_STATE4(1));
+       DUMP_REG(SOR_HEAD_STATE5(0));
+       DUMP_REG(SOR_HEAD_STATE5(1));
        DUMP_REG(SOR_CRC_CNTRL);
        DUMP_REG(SOR_DP_DEBUG_MVID);
        DUMP_REG(SOR_CLK_CNTRL);
        DUMP_REG(SOR_CAP);
        DUMP_REG(SOR_PWR);
        DUMP_REG(SOR_TEST);
-       DUMP_REG(SOR_PLL_0);
-       DUMP_REG(SOR_PLL_1);
-       DUMP_REG(SOR_PLL_2);
-       DUMP_REG(SOR_PLL_3);
+       DUMP_REG(SOR_PLL0);
+       DUMP_REG(SOR_PLL1);
+       DUMP_REG(SOR_PLL2);
+       DUMP_REG(SOR_PLL3);
        DUMP_REG(SOR_CSTM);
        DUMP_REG(SOR_LVDS);
-       DUMP_REG(SOR_CRC_A);
-       DUMP_REG(SOR_CRC_B);
+       DUMP_REG(SOR_CRCA);
+       DUMP_REG(SOR_CRCB);
        DUMP_REG(SOR_BLANK);
        DUMP_REG(SOR_SEQ_CTL);
        DUMP_REG(SOR_LANE_SEQ_CTL);
@@ -736,86 +910,89 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data)
        DUMP_REG(SOR_SEQ_INST(15));
        DUMP_REG(SOR_PWM_DIV);
        DUMP_REG(SOR_PWM_CTL);
-       DUMP_REG(SOR_VCRC_A_0);
-       DUMP_REG(SOR_VCRC_A_1);
-       DUMP_REG(SOR_VCRC_B_0);
-       DUMP_REG(SOR_VCRC_B_1);
-       DUMP_REG(SOR_CCRC_A_0);
-       DUMP_REG(SOR_CCRC_A_1);
-       DUMP_REG(SOR_CCRC_B_0);
-       DUMP_REG(SOR_CCRC_B_1);
-       DUMP_REG(SOR_EDATA_A_0);
-       DUMP_REG(SOR_EDATA_A_1);
-       DUMP_REG(SOR_EDATA_B_0);
-       DUMP_REG(SOR_EDATA_B_1);
-       DUMP_REG(SOR_COUNT_A_0);
-       DUMP_REG(SOR_COUNT_A_1);
-       DUMP_REG(SOR_COUNT_B_0);
-       DUMP_REG(SOR_COUNT_B_1);
-       DUMP_REG(SOR_DEBUG_A_0);
-       DUMP_REG(SOR_DEBUG_A_1);
-       DUMP_REG(SOR_DEBUG_B_0);
-       DUMP_REG(SOR_DEBUG_B_1);
+       DUMP_REG(SOR_VCRC_A0);
+       DUMP_REG(SOR_VCRC_A1);
+       DUMP_REG(SOR_VCRC_B0);
+       DUMP_REG(SOR_VCRC_B1);
+       DUMP_REG(SOR_CCRC_A0);
+       DUMP_REG(SOR_CCRC_A1);
+       DUMP_REG(SOR_CCRC_B0);
+       DUMP_REG(SOR_CCRC_B1);
+       DUMP_REG(SOR_EDATA_A0);
+       DUMP_REG(SOR_EDATA_A1);
+       DUMP_REG(SOR_EDATA_B0);
+       DUMP_REG(SOR_EDATA_B1);
+       DUMP_REG(SOR_COUNT_A0);
+       DUMP_REG(SOR_COUNT_A1);
+       DUMP_REG(SOR_COUNT_B0);
+       DUMP_REG(SOR_COUNT_B1);
+       DUMP_REG(SOR_DEBUG_A0);
+       DUMP_REG(SOR_DEBUG_A1);
+       DUMP_REG(SOR_DEBUG_B0);
+       DUMP_REG(SOR_DEBUG_B1);
        DUMP_REG(SOR_TRIG);
        DUMP_REG(SOR_MSCHECK);
        DUMP_REG(SOR_XBAR_CTRL);
        DUMP_REG(SOR_XBAR_POL);
-       DUMP_REG(SOR_DP_LINKCTL_0);
-       DUMP_REG(SOR_DP_LINKCTL_1);
-       DUMP_REG(SOR_LANE_DRIVE_CURRENT_0);
-       DUMP_REG(SOR_LANE_DRIVE_CURRENT_1);
-       DUMP_REG(SOR_LANE4_DRIVE_CURRENT_0);
-       DUMP_REG(SOR_LANE4_DRIVE_CURRENT_1);
-       DUMP_REG(SOR_LANE_PREEMPHASIS_0);
-       DUMP_REG(SOR_LANE_PREEMPHASIS_1);
-       DUMP_REG(SOR_LANE4_PREEMPHASIS_0);
-       DUMP_REG(SOR_LANE4_PREEMPHASIS_1);
-       DUMP_REG(SOR_LANE_POST_CURSOR_0);
-       DUMP_REG(SOR_LANE_POST_CURSOR_1);
-       DUMP_REG(SOR_DP_CONFIG_0);
-       DUMP_REG(SOR_DP_CONFIG_1);
-       DUMP_REG(SOR_DP_MN_0);
-       DUMP_REG(SOR_DP_MN_1);
-       DUMP_REG(SOR_DP_PADCTL_0);
-       DUMP_REG(SOR_DP_PADCTL_1);
-       DUMP_REG(SOR_DP_DEBUG_0);
-       DUMP_REG(SOR_DP_DEBUG_1);
-       DUMP_REG(SOR_DP_SPARE_0);
-       DUMP_REG(SOR_DP_SPARE_1);
+       DUMP_REG(SOR_DP_LINKCTL0);
+       DUMP_REG(SOR_DP_LINKCTL1);
+       DUMP_REG(SOR_LANE_DRIVE_CURRENT0);
+       DUMP_REG(SOR_LANE_DRIVE_CURRENT1);
+       DUMP_REG(SOR_LANE4_DRIVE_CURRENT0);
+       DUMP_REG(SOR_LANE4_DRIVE_CURRENT1);
+       DUMP_REG(SOR_LANE_PREEMPHASIS0);
+       DUMP_REG(SOR_LANE_PREEMPHASIS1);
+       DUMP_REG(SOR_LANE4_PREEMPHASIS0);
+       DUMP_REG(SOR_LANE4_PREEMPHASIS1);
+       DUMP_REG(SOR_LANE_POSTCURSOR0);
+       DUMP_REG(SOR_LANE_POSTCURSOR1);
+       DUMP_REG(SOR_DP_CONFIG0);
+       DUMP_REG(SOR_DP_CONFIG1);
+       DUMP_REG(SOR_DP_MN0);
+       DUMP_REG(SOR_DP_MN1);
+       DUMP_REG(SOR_DP_PADCTL0);
+       DUMP_REG(SOR_DP_PADCTL1);
+       DUMP_REG(SOR_DP_DEBUG0);
+       DUMP_REG(SOR_DP_DEBUG1);
+       DUMP_REG(SOR_DP_SPARE0);
+       DUMP_REG(SOR_DP_SPARE1);
        DUMP_REG(SOR_DP_AUDIO_CTRL);
        DUMP_REG(SOR_DP_AUDIO_HBLANK_SYMBOLS);
        DUMP_REG(SOR_DP_AUDIO_VBLANK_SYMBOLS);
        DUMP_REG(SOR_DP_GENERIC_INFOFRAME_HEADER);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_0);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_1);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_2);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_3);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_4);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_5);
-       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK_6);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK0);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK1);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK2);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK3);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK4);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK5);
+       DUMP_REG(SOR_DP_GENERIC_INFOFRAME_SUBPACK6);
        DUMP_REG(SOR_DP_TPG);
        DUMP_REG(SOR_DP_TPG_CONFIG);
-       DUMP_REG(SOR_DP_LQ_CSTM_0);
-       DUMP_REG(SOR_DP_LQ_CSTM_1);
-       DUMP_REG(SOR_DP_LQ_CSTM_2);
+       DUMP_REG(SOR_DP_LQ_CSTM0);
+       DUMP_REG(SOR_DP_LQ_CSTM1);
+       DUMP_REG(SOR_DP_LQ_CSTM2);
 
 #undef DUMP_REG
 
-       return 0;
+unlock:
+       drm_modeset_unlock_all(drm);
+       return err;
 }
 
 static const struct drm_info_list debugfs_files[] = {
+       { "crc", tegra_sor_show_crc, 0, NULL },
        { "regs", tegra_sor_show_regs, 0, NULL },
 };
 
 static int tegra_sor_debugfs_init(struct tegra_sor *sor,
                                  struct drm_minor *minor)
 {
-       struct dentry *entry;
+       const char *name = sor->soc->supports_dp ? "sor1" : "sor";
        unsigned int i;
-       int err = 0;
+       int err;
 
-       sor->debugfs = debugfs_create_dir("sor", minor->debugfs_root);
+       sor->debugfs = debugfs_create_dir(name, minor->debugfs_root);
        if (!sor->debugfs)
                return -ENOMEM;
 
@@ -835,14 +1012,9 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor,
        if (err < 0)
                goto free;
 
-       entry = debugfs_create_file("crc", 0644, sor->debugfs, sor,
-                                   &tegra_sor_crc_fops);
-       if (!entry) {
-               err = -ENOMEM;
-               goto free;
-       }
+       sor->minor = minor;
 
-       return err;
+       return 0;
 
 free:
        kfree(sor->debugfs_files);
@@ -860,14 +1032,10 @@ static void tegra_sor_debugfs_exit(struct tegra_sor *sor)
        sor->minor = NULL;
 
        kfree(sor->debugfs_files);
-       sor->debugfs = NULL;
-
-       debugfs_remove_recursive(sor->debugfs);
        sor->debugfs_files = NULL;
-}
 
-static void tegra_sor_connector_dpms(struct drm_connector *connector, int mode)
-{
+       debugfs_remove_recursive(sor->debugfs);
+       sor->debugfs = NULL;
 }
 
 static enum drm_connector_status
@@ -879,11 +1047,11 @@ tegra_sor_connector_detect(struct drm_connector *connector, bool force)
        if (sor->dpaux)
                return tegra_dpaux_detect(sor->dpaux);
 
-       return connector_status_unknown;
+       return tegra_output_connector_detect(connector, force);
 }
 
 static const struct drm_connector_funcs tegra_sor_connector_funcs = {
-       .dpms = tegra_sor_connector_dpms,
+       .dpms = drm_atomic_helper_connector_dpms,
        .reset = drm_atomic_helper_connector_reset,
        .detect = tegra_sor_connector_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
@@ -926,22 +1094,102 @@ static const struct drm_encoder_funcs tegra_sor_encoder_funcs = {
        .destroy = tegra_output_encoder_destroy,
 };
 
-static void tegra_sor_encoder_dpms(struct drm_encoder *encoder, int mode)
+static void tegra_sor_edp_disable(struct drm_encoder *encoder)
 {
-}
+       struct tegra_output *output = encoder_to_output(encoder);
+       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
+       struct tegra_sor *sor = to_sor(output);
+       u32 value;
+       int err;
 
-static void tegra_sor_encoder_prepare(struct drm_encoder *encoder)
-{
+       if (output->panel)
+               drm_panel_disable(output->panel);
+
+       err = tegra_sor_detach(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to detach SOR: %d\n", err);
+
+       tegra_sor_writel(sor, 0, SOR_STATE1);
+       tegra_sor_update(sor);
+
+       /*
+        * The following accesses registers of the display controller, so make
+        * sure it's only executed when the output is attached to one.
+        */
+       if (dc) {
+               value = tegra_dc_readl(dc, DC_DISP_DISP_WIN_OPTIONS);
+               value &= ~SOR_ENABLE;
+               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
+
+               tegra_dc_commit(dc);
+       }
+
+       err = tegra_sor_power_down(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power down SOR: %d\n", err);
+
+       if (sor->dpaux) {
+               err = tegra_dpaux_disable(sor->dpaux);
+               if (err < 0)
+                       dev_err(sor->dev, "failed to disable DP: %d\n", err);
+       }
+
+       err = tegra_io_rail_power_off(TEGRA_IO_RAIL_LVDS);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power off I/O rail: %d\n", err);
+
+       if (output->panel)
+               drm_panel_unprepare(output->panel);
+
+       reset_control_assert(sor->rst);
+       clk_disable_unprepare(sor->clk);
 }
 
-static void tegra_sor_encoder_commit(struct drm_encoder *encoder)
+#if 0
+static int calc_h_ref_to_sync(const struct drm_display_mode *mode,
+                             unsigned int *value)
 {
+       unsigned int hfp, hsw, hbp, a = 0, b;
+
+       hfp = mode->hsync_start - mode->hdisplay;
+       hsw = mode->hsync_end - mode->hsync_start;
+       hbp = mode->htotal - mode->hsync_end;
+
+       pr_info("hfp: %u, hsw: %u, hbp: %u\n", hfp, hsw, hbp);
+
+       b = hfp - 1;
+
+       pr_info("a: %u, b: %u\n", a, b);
+       pr_info("a + hsw + hbp = %u\n", a + hsw + hbp);
+
+       if (a + hsw + hbp <= 11) {
+               a = 1 + 11 - hsw - hbp;
+               pr_info("a: %u\n", a);
+       }
+
+       if (a > b)
+               return -EINVAL;
+
+       if (hsw < 1)
+               return -EINVAL;
+
+       if (mode->hdisplay < 16)
+               return -EINVAL;
+
+       if (value) {
+               if (b > a && a % 2)
+                       *value = a + 1;
+               else
+                       *value = a;
+       }
+
+       return 0;
 }
+#endif
 
-static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
-                                      struct drm_display_mode *mode,
-                                      struct drm_display_mode *adjusted)
+static void tegra_sor_edp_enable(struct drm_encoder *encoder)
 {
+       struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
        struct tegra_output *output = encoder_to_output(encoder);
        struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
        unsigned int vbe, vse, hbe, hse, vbs, hbs, i;
@@ -952,14 +1200,9 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        int err = 0;
        u32 value;
 
-       mutex_lock(&sor->lock);
-
-       if (sor->enabled)
-               goto unlock;
-
        err = clk_prepare_enable(sor->clk);
        if (err < 0)
-               goto unlock;
+               dev_err(sor->dev, "failed to enable clock: %d\n", err);
 
        reset_control_deassert(sor->rst);
 
@@ -978,7 +1221,7 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
                if (err < 0) {
                        dev_err(sor->dev, "failed to probe eDP link: %d\n",
                                err);
-                       goto unlock;
+                       return;
                }
        }
 
@@ -999,40 +1242,40 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        value |= SOR_CLK_CNTRL_DP_CLK_SEL_SINGLE_DPCLK;
        tegra_sor_writel(sor, value, SOR_CLK_CNTRL);
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value &= ~SOR_PLL_2_BANDGAP_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_BANDGAP_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
        usleep_range(20, 100);
 
-       value = tegra_sor_readl(sor, SOR_PLL_3);
-       value |= SOR_PLL_3_PLL_VDD_MODE_V3_3;
-       tegra_sor_writel(sor, value, SOR_PLL_3);
+       value = tegra_sor_readl(sor, SOR_PLL3);
+       value |= SOR_PLL3_PLL_VDD_MODE_3V3;
+       tegra_sor_writel(sor, value, SOR_PLL3);
 
-       value = SOR_PLL_0_ICHPMP(0xf) | SOR_PLL_0_VCOCAP_RST |
-               SOR_PLL_0_PLLREG_LEVEL_V45 | SOR_PLL_0_RESISTOR_EXT;
-       tegra_sor_writel(sor, value, SOR_PLL_0);
+       value = SOR_PLL0_ICHPMP(0xf) | SOR_PLL0_VCOCAP_RST |
+               SOR_PLL0_PLLREG_LEVEL_V45 | SOR_PLL0_RESISTOR_EXT;
+       tegra_sor_writel(sor, value, SOR_PLL0);
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value |= SOR_PLL_2_SEQ_PLLCAPPD;
-       value &= ~SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE;
-       value |= SOR_PLL_2_LVDS_ENABLE;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value |= SOR_PLL2_SEQ_PLLCAPPD;
+       value &= ~SOR_PLL2_SEQ_PLLCAPPD_ENFORCE;
+       value |= SOR_PLL2_LVDS_ENABLE;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
-       value = SOR_PLL_1_TERM_COMPOUT | SOR_PLL_1_TMDS_TERM;
-       tegra_sor_writel(sor, value, SOR_PLL_1);
+       value = SOR_PLL1_TERM_COMPOUT | SOR_PLL1_TMDS_TERM;
+       tegra_sor_writel(sor, value, SOR_PLL1);
 
        while (true) {
-               value = tegra_sor_readl(sor, SOR_PLL_2);
-               if ((value & SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE) == 0)
+               value = tegra_sor_readl(sor, SOR_PLL2);
+               if ((value & SOR_PLL2_SEQ_PLLCAPPD_ENFORCE) == 0)
                        break;
 
                usleep_range(250, 1000);
        }
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value &= ~SOR_PLL_2_POWERDOWN_OVERRIDE;
-       value &= ~SOR_PLL_2_PORT_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_POWERDOWN_OVERRIDE;
+       value &= ~SOR_PLL2_PORT_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        /*
         * power up
@@ -1045,51 +1288,49 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        tegra_sor_writel(sor, value, SOR_CLK_CNTRL);
 
        /* step 1 */
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value |= SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE | SOR_PLL_2_PORT_POWERDOWN |
-                SOR_PLL_2_BANDGAP_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value |= SOR_PLL2_SEQ_PLLCAPPD_ENFORCE | SOR_PLL2_PORT_POWERDOWN |
+                SOR_PLL2_BANDGAP_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
-       value = tegra_sor_readl(sor, SOR_PLL_0);
-       value |= SOR_PLL_0_VCOPD | SOR_PLL_0_POWER_OFF;
-       tegra_sor_writel(sor, value, SOR_PLL_0);
+       value = tegra_sor_readl(sor, SOR_PLL0);
+       value |= SOR_PLL0_VCOPD | SOR_PLL0_PWR;
+       tegra_sor_writel(sor, value, SOR_PLL0);
 
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value &= ~SOR_DP_PADCTL_PAD_CAL_PD;
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
        /* step 2 */
        err = tegra_io_rail_power_on(TEGRA_IO_RAIL_LVDS);
-       if (err < 0) {
+       if (err < 0)
                dev_err(sor->dev, "failed to power on I/O rail: %d\n", err);
-               goto unlock;
-       }
 
        usleep_range(5, 100);
 
        /* step 3 */
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value &= ~SOR_PLL_2_BANDGAP_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_BANDGAP_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        usleep_range(20, 100);
 
        /* step 4 */
-       value = tegra_sor_readl(sor, SOR_PLL_0);
-       value &= ~SOR_PLL_0_POWER_OFF;
-       value &= ~SOR_PLL_0_VCOPD;
-       tegra_sor_writel(sor, value, SOR_PLL_0);
+       value = tegra_sor_readl(sor, SOR_PLL0);
+       value &= ~SOR_PLL0_VCOPD;
+       value &= ~SOR_PLL0_PWR;
+       tegra_sor_writel(sor, value, SOR_PLL0);
 
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value &= ~SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_SEQ_PLLCAPPD_ENFORCE;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        usleep_range(200, 1000);
 
        /* step 5 */
-       value = tegra_sor_readl(sor, SOR_PLL_2);
-       value &= ~SOR_PLL_2_PORT_POWERDOWN;
-       tegra_sor_writel(sor, value, SOR_PLL_2);
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_PORT_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
 
        /* switch to DP clock */
        err = clk_set_parent(sor->clk, sor->clk_dp);
@@ -1097,7 +1338,7 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
                dev_err(sor->dev, "failed to set DP parent clock: %d\n", err);
 
        /* power DP lanes */
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
 
        if (link.num_lanes <= 2)
                value &= ~(SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_2);
@@ -1114,12 +1355,12 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        else
                value |= SOR_DP_PADCTL_PD_TXD_0;
 
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
-       value = tegra_sor_readl(sor, SOR_DP_LINKCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_LINKCTL0);
        value &= ~SOR_DP_LINKCTL_LANE_COUNT_MASK;
        value |= SOR_DP_LINKCTL_LANE_COUNT(link.num_lanes);
-       tegra_sor_writel(sor, value, SOR_DP_LINKCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_LINKCTL0);
 
        /* start lane sequencer */
        value = SOR_LANE_SEQ_CTL_TRIGGER | SOR_LANE_SEQ_CTL_SEQUENCE_DOWN |
@@ -1141,14 +1382,14 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        tegra_sor_writel(sor, value, SOR_CLK_CNTRL);
 
        /* set linkctl */
-       value = tegra_sor_readl(sor, SOR_DP_LINKCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_LINKCTL0);
        value |= SOR_DP_LINKCTL_ENABLE;
 
        value &= ~SOR_DP_LINKCTL_TU_SIZE_MASK;
        value |= SOR_DP_LINKCTL_TU_SIZE(config.tu_size);
 
        value |= SOR_DP_LINKCTL_ENHANCED_FRAME;
-       tegra_sor_writel(sor, value, SOR_DP_LINKCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_LINKCTL0);
 
        for (i = 0, value = 0; i < 4; i++) {
                unsigned long lane = SOR_DP_TPG_CHANNEL_CODING |
@@ -1159,7 +1400,7 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
 
        tegra_sor_writel(sor, value, SOR_DP_TPG);
 
-       value = tegra_sor_readl(sor, SOR_DP_CONFIG_0);
+       value = tegra_sor_readl(sor, SOR_DP_CONFIG0);
        value &= ~SOR_DP_CONFIG_WATERMARK_MASK;
        value |= SOR_DP_CONFIG_WATERMARK(config.watermark);
 
@@ -1176,7 +1417,7 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
 
        value |= SOR_DP_CONFIG_ACTIVE_SYM_ENABLE;
        value |= SOR_DP_CONFIG_DISPARITY_NEGATIVE;
-       tegra_sor_writel(sor, value, SOR_DP_CONFIG_0);
+       tegra_sor_writel(sor, value, SOR_DP_CONFIG0);
 
        value = tegra_sor_readl(sor, SOR_DP_AUDIO_HBLANK_SYMBOLS);
        value &= ~SOR_DP_AUDIO_HBLANK_SYMBOLS_MASK;
@@ -1189,33 +1430,27 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        tegra_sor_writel(sor, value, SOR_DP_AUDIO_VBLANK_SYMBOLS);
 
        /* enable pad calibration logic */
-       value = tegra_sor_readl(sor, SOR_DP_PADCTL_0);
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
        value |= SOR_DP_PADCTL_PAD_CAL_PD;
-       tegra_sor_writel(sor, value, SOR_DP_PADCTL_0);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
 
        if (sor->dpaux) {
                u8 rate, lanes;
 
                err = drm_dp_link_probe(aux, &link);
-               if (err < 0) {
+               if (err < 0)
                        dev_err(sor->dev, "failed to probe eDP link: %d\n",
                                err);
-                       goto unlock;
-               }
 
                err = drm_dp_link_power_up(aux, &link);
-               if (err < 0) {
+               if (err < 0)
                        dev_err(sor->dev, "failed to power up eDP link: %d\n",
                                err);
-                       goto unlock;
-               }
 
                err = drm_dp_link_configure(aux, &link);
-               if (err < 0) {
+               if (err < 0)
                        dev_err(sor->dev, "failed to configure eDP link: %d\n",
                                err);
-                       goto unlock;
-               }
 
                rate = drm_dp_link_rate_to_bw_code(link.rate);
                lanes = link.num_lanes;
@@ -1225,14 +1460,14 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
                value |= SOR_CLK_CNTRL_DP_LINK_SPEED(rate);
                tegra_sor_writel(sor, value, SOR_CLK_CNTRL);
 
-               value = tegra_sor_readl(sor, SOR_DP_LINKCTL_0);
+               value = tegra_sor_readl(sor, SOR_DP_LINKCTL0);
                value &= ~SOR_DP_LINKCTL_LANE_COUNT_MASK;
                value |= SOR_DP_LINKCTL_LANE_COUNT(lanes);
 
                if (link.capabilities & DP_LINK_CAP_ENHANCED_FRAMING)
                        value |= SOR_DP_LINKCTL_ENHANCED_FRAME;
 
-               tegra_sor_writel(sor, value, SOR_DP_LINKCTL_0);
+               tegra_sor_writel(sor, value, SOR_DP_LINKCTL0);
 
                /* disable training pattern generator */
 
@@ -1249,17 +1484,14 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
                if (err < 0) {
                        dev_err(sor->dev, "DP fast link training failed: %d\n",
                                err);
-                       goto unlock;
                }
 
                dev_dbg(sor->dev, "fast link training succeeded\n");
        }
 
        err = tegra_sor_power_up(sor, 250);
-       if (err < 0) {
+       if (err < 0)
                dev_err(sor->dev, "failed to power up SOR: %d\n", err);
-               goto unlock;
-       }
 
        /*
         * configure panel (24bpp, vsync-, hsync-, DP-A protocol, complete
@@ -1295,7 +1527,7 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
                break;
        }
 
-       tegra_sor_writel(sor, value, SOR_STATE_1);
+       tegra_sor_writel(sor, value, SOR_STATE1);
 
        /*
         * TODO: The video timing programming below doesn't seem to match the
@@ -1303,25 +1535,27 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
         */
 
        value = ((mode->vtotal & 0x7fff) << 16) | (mode->htotal & 0x7fff);
-       tegra_sor_writel(sor, value, SOR_HEAD_STATE_1(0));
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE1(dc->pipe));
 
        vse = mode->vsync_end - mode->vsync_start - 1;
        hse = mode->hsync_end - mode->hsync_start - 1;
 
        value = ((vse & 0x7fff) << 16) | (hse & 0x7fff);
-       tegra_sor_writel(sor, value, SOR_HEAD_STATE_2(0));
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE2(dc->pipe));
 
        vbe = vse + (mode->vsync_start - mode->vdisplay);
        hbe = hse + (mode->hsync_start - mode->hdisplay);
 
        value = ((vbe & 0x7fff) << 16) | (hbe & 0x7fff);
-       tegra_sor_writel(sor, value, SOR_HEAD_STATE_3(0));
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE3(dc->pipe));
 
        vbs = vbe + mode->vdisplay;
        hbs = hbe + mode->hdisplay;
 
        value = ((vbs & 0x7fff) << 16) | (hbs & 0x7fff);
-       tegra_sor_writel(sor, value, SOR_HEAD_STATE_4(0));
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE4(dc->pipe));
+
+       tegra_sor_writel(sor, 0x1, SOR_HEAD_STATE5(dc->pipe));
 
        /* CSTM (LVDS, link A/B, upper) */
        value = SOR_CSTM_LVDS | SOR_CSTM_LINK_ACT_A | SOR_CSTM_LINK_ACT_B |
@@ -1330,10 +1564,8 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
 
        /* PWM setup */
        err = tegra_sor_setup_pwm(sor, 250);
-       if (err < 0) {
+       if (err < 0)
                dev_err(sor->dev, "failed to setup PWM: %d\n", err);
-               goto unlock;
-       }
 
        tegra_sor_update(sor);
 
@@ -1344,93 +1576,15 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
        tegra_dc_commit(dc);
 
        err = tegra_sor_attach(sor);
-       if (err < 0) {
+       if (err < 0)
                dev_err(sor->dev, "failed to attach SOR: %d\n", err);
-               goto unlock;
-       }
 
        err = tegra_sor_wakeup(sor);
-       if (err < 0) {
+       if (err < 0)
                dev_err(sor->dev, "failed to enable DC: %d\n", err);
-               goto unlock;
-       }
 
        if (output->panel)
                drm_panel_enable(output->panel);
-
-       sor->enabled = true;
-
-unlock:
-       mutex_unlock(&sor->lock);
-}
-
-static void tegra_sor_encoder_disable(struct drm_encoder *encoder)
-{
-       struct tegra_output *output = encoder_to_output(encoder);
-       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
-       struct tegra_sor *sor = to_sor(output);
-       u32 value;
-       int err;
-
-       mutex_lock(&sor->lock);
-
-       if (!sor->enabled)
-               goto unlock;
-
-       if (output->panel)
-               drm_panel_disable(output->panel);
-
-       err = tegra_sor_detach(sor);
-       if (err < 0) {
-               dev_err(sor->dev, "failed to detach SOR: %d\n", err);
-               goto unlock;
-       }
-
-       tegra_sor_writel(sor, 0, SOR_STATE_1);
-       tegra_sor_update(sor);
-
-       /*
-        * The following accesses registers of the display controller, so make
-        * sure it's only executed when the output is attached to one.
-        */
-       if (dc) {
-               value = tegra_dc_readl(dc, DC_DISP_DISP_WIN_OPTIONS);
-               value &= ~SOR_ENABLE;
-               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
-
-               tegra_dc_commit(dc);
-       }
-
-       err = tegra_sor_power_down(sor);
-       if (err < 0) {
-               dev_err(sor->dev, "failed to power down SOR: %d\n", err);
-               goto unlock;
-       }
-
-       if (sor->dpaux) {
-               err = tegra_dpaux_disable(sor->dpaux);
-               if (err < 0) {
-                       dev_err(sor->dev, "failed to disable DP: %d\n", err);
-                       goto unlock;
-               }
-       }
-
-       err = tegra_io_rail_power_off(TEGRA_IO_RAIL_LVDS);
-       if (err < 0) {
-               dev_err(sor->dev, "failed to power off I/O rail: %d\n", err);
-               goto unlock;
-       }
-
-       if (output->panel)
-               drm_panel_unprepare(output->panel);
-
-       clk_disable_unprepare(sor->clk);
-       reset_control_assert(sor->rst);
-
-       sor->enabled = false;
-
-unlock:
-       mutex_unlock(&sor->lock);
 }
 
 static int
@@ -1454,41 +1608,582 @@ tegra_sor_encoder_atomic_check(struct drm_encoder *encoder,
        return 0;
 }
 
-static const struct drm_encoder_helper_funcs tegra_sor_encoder_helper_funcs = {
-       .dpms = tegra_sor_encoder_dpms,
-       .prepare = tegra_sor_encoder_prepare,
-       .commit = tegra_sor_encoder_commit,
-       .mode_set = tegra_sor_encoder_mode_set,
-       .disable = tegra_sor_encoder_disable,
+static const struct drm_encoder_helper_funcs tegra_sor_edp_helpers = {
+       .disable = tegra_sor_edp_disable,
+       .enable = tegra_sor_edp_enable,
        .atomic_check = tegra_sor_encoder_atomic_check,
 };
 
-static int tegra_sor_init(struct host1x_client *client)
+static inline u32 tegra_sor_hdmi_subpack(const u8 *ptr, size_t size)
 {
-       struct drm_device *drm = dev_get_drvdata(client->parent);
-       struct tegra_sor *sor = host1x_client_to_sor(client);
-       int err;
+       u32 value = 0;
+       size_t i;
 
-       if (!sor->dpaux)
-               return -ENODEV;
+       for (i = size; i > 0; i--)
+               value = (value << 8) | ptr[i - 1];
 
-       sor->output.dev = sor->dev;
+       return value;
+}
 
-       drm_connector_init(drm, &sor->output.connector,
-                          &tegra_sor_connector_funcs,
-                          DRM_MODE_CONNECTOR_eDP);
-       drm_connector_helper_add(&sor->output.connector,
-                                &tegra_sor_connector_helper_funcs);
-       sor->output.connector.dpms = DRM_MODE_DPMS_OFF;
+static void tegra_sor_hdmi_write_infopack(struct tegra_sor *sor,
+                                         const void *data, size_t size)
+{
+       const u8 *ptr = data;
+       unsigned long offset;
+       size_t i, j;
+       u32 value;
 
-       drm_encoder_init(drm, &sor->output.encoder, &tegra_sor_encoder_funcs,
-                        DRM_MODE_ENCODER_TMDS);
-       drm_encoder_helper_add(&sor->output.encoder,
-                              &tegra_sor_encoder_helper_funcs);
+       switch (ptr[0]) {
+       case HDMI_INFOFRAME_TYPE_AVI:
+               offset = SOR_HDMI_AVI_INFOFRAME_HEADER;
+               break;
 
-       drm_mode_connector_attach_encoder(&sor->output.connector,
-                                         &sor->output.encoder);
-       drm_connector_register(&sor->output.connector);
+       case HDMI_INFOFRAME_TYPE_AUDIO:
+               offset = SOR_HDMI_AUDIO_INFOFRAME_HEADER;
+               break;
+
+       case HDMI_INFOFRAME_TYPE_VENDOR:
+               offset = SOR_HDMI_VSI_INFOFRAME_HEADER;
+               break;
+
+       default:
+               dev_err(sor->dev, "unsupported infoframe type: %02x\n",
+                       ptr[0]);
+               return;
+       }
+
+       value = INFOFRAME_HEADER_TYPE(ptr[0]) |
+               INFOFRAME_HEADER_VERSION(ptr[1]) |
+               INFOFRAME_HEADER_LEN(ptr[2]);
+       tegra_sor_writel(sor, value, offset);
+       offset++;
+
+       /*
+        * Each subpack contains 7 bytes, divided into:
+        * - subpack_low: bytes 0 - 3
+        * - subpack_high: bytes 4 - 6 (with byte 7 padded to 0x00)
+        */
+       for (i = 3, j = 0; i < size; i += 7, j += 8) {
+               size_t rem = size - i, num = min_t(size_t, rem, 4);
+
+               value = tegra_sor_hdmi_subpack(&ptr[i], num);
+               tegra_sor_writel(sor, value, offset++);
+
+               num = min_t(size_t, rem - num, 3);
+
+               value = tegra_sor_hdmi_subpack(&ptr[i + 4], num);
+               tegra_sor_writel(sor, value, offset++);
+       }
+}
+
+static int
+tegra_sor_hdmi_setup_avi_infoframe(struct tegra_sor *sor,
+                                  const struct drm_display_mode *mode)
+{
+       u8 buffer[HDMI_INFOFRAME_SIZE(AVI)];
+       struct hdmi_avi_infoframe frame;
+       u32 value;
+       int err;
+
+       /* disable AVI infoframe */
+       value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
+       value &= ~INFOFRAME_CTRL_SINGLE;
+       value &= ~INFOFRAME_CTRL_OTHER;
+       value &= ~INFOFRAME_CTRL_ENABLE;
+       tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
+
+       err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode);
+       if (err < 0) {
+               dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err);
+               return err;
+       }
+
+       err = hdmi_avi_infoframe_pack(&frame, buffer, sizeof(buffer));
+       if (err < 0) {
+               dev_err(sor->dev, "failed to pack AVI infoframe: %d\n", err);
+               return err;
+       }
+
+       tegra_sor_hdmi_write_infopack(sor, buffer, err);
+
+       /* enable AVI infoframe */
+       value = tegra_sor_readl(sor, SOR_HDMI_AVI_INFOFRAME_CTRL);
+       value |= INFOFRAME_CTRL_CHECKSUM_ENABLE;
+       value |= INFOFRAME_CTRL_ENABLE;
+       tegra_sor_writel(sor, value, SOR_HDMI_AVI_INFOFRAME_CTRL);
+
+       return 0;
+}
+
+static void tegra_sor_hdmi_disable_audio_infoframe(struct tegra_sor *sor)
+{
+       u32 value;
+
+       value = tegra_sor_readl(sor, SOR_HDMI_AUDIO_INFOFRAME_CTRL);
+       value &= ~INFOFRAME_CTRL_ENABLE;
+       tegra_sor_writel(sor, value, SOR_HDMI_AUDIO_INFOFRAME_CTRL);
+}
+
+static struct tegra_sor_hdmi_settings *
+tegra_sor_hdmi_find_settings(struct tegra_sor *sor, unsigned long frequency)
+{
+       unsigned int i;
+
+       for (i = 0; i < sor->num_settings; i++)
+               if (frequency <= sor->settings[i].frequency)
+                       return &sor->settings[i];
+
+       return NULL;
+}
+
+static void tegra_sor_hdmi_disable(struct drm_encoder *encoder)
+{
+       struct tegra_output *output = encoder_to_output(encoder);
+       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
+       struct tegra_sor *sor = to_sor(output);
+       u32 value;
+       int err;
+
+       err = tegra_sor_detach(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to detach SOR: %d\n", err);
+
+       tegra_sor_writel(sor, 0, SOR_STATE1);
+       tegra_sor_update(sor);
+
+       /* disable display to SOR clock */
+       value = tegra_dc_readl(dc, DC_DISP_DISP_WIN_OPTIONS);
+       value &= ~SOR1_TIMING_CYA;
+       value &= ~SOR1_ENABLE;
+       tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
+
+       tegra_dc_commit(dc);
+
+       err = tegra_sor_power_down(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power down SOR: %d\n", err);
+
+       err = tegra_io_rail_power_off(TEGRA_IO_RAIL_HDMI);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power off HDMI rail: %d\n", err);
+
+       reset_control_assert(sor->rst);
+       usleep_range(1000, 2000);
+       clk_disable_unprepare(sor->clk);
+}
+
+static void tegra_sor_hdmi_enable(struct drm_encoder *encoder)
+{
+       struct tegra_output *output = encoder_to_output(encoder);
+       unsigned int h_ref_to_sync = 1, pulse_start, max_ac;
+       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
+       unsigned int vbe, vse, hbe, hse, vbs, hbs, div;
+       struct tegra_sor_hdmi_settings *settings;
+       struct tegra_sor *sor = to_sor(output);
+       struct drm_display_mode *mode;
+       struct drm_display_info *info;
+       u32 value;
+       int err;
+
+       mode = &encoder->crtc->state->adjusted_mode;
+       info = &output->connector.display_info;
+
+       err = clk_prepare_enable(sor->clk);
+       if (err < 0)
+               dev_err(sor->dev, "failed to enable clock: %d\n", err);
+
+       usleep_range(1000, 2000);
+
+       reset_control_deassert(sor->rst);
+
+       err = clk_set_parent(sor->clk, sor->clk_safe);
+       if (err < 0)
+               dev_err(sor->dev, "failed to set safe parent clock: %d\n", err);
+
+       div = clk_get_rate(sor->clk) / 1000000 * 4;
+
+       err = tegra_io_rail_power_on(TEGRA_IO_RAIL_HDMI);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power on HDMI rail: %d\n", err);
+
+       usleep_range(20, 100);
+
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_BANDGAP_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
+
+       usleep_range(20, 100);
+
+       value = tegra_sor_readl(sor, SOR_PLL3);
+       value &= ~SOR_PLL3_PLL_VDD_MODE_3V3;
+       tegra_sor_writel(sor, value, SOR_PLL3);
+
+       value = tegra_sor_readl(sor, SOR_PLL0);
+       value &= ~SOR_PLL0_VCOPD;
+       value &= ~SOR_PLL0_PWR;
+       tegra_sor_writel(sor, value, SOR_PLL0);
+
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_SEQ_PLLCAPPD_ENFORCE;
+       tegra_sor_writel(sor, value, SOR_PLL2);
+
+       usleep_range(200, 400);
+
+       value = tegra_sor_readl(sor, SOR_PLL2);
+       value &= ~SOR_PLL2_POWERDOWN_OVERRIDE;
+       value &= ~SOR_PLL2_PORT_POWERDOWN;
+       tegra_sor_writel(sor, value, SOR_PLL2);
+
+       usleep_range(20, 100);
+
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value |= SOR_DP_PADCTL_PD_TXD_3 | SOR_DP_PADCTL_PD_TXD_0 |
+                SOR_DP_PADCTL_PD_TXD_1 | SOR_DP_PADCTL_PD_TXD_2;
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+
+       while (true) {
+               value = tegra_sor_readl(sor, SOR_LANE_SEQ_CTL);
+               if ((value & SOR_LANE_SEQ_CTL_STATE_BUSY) == 0)
+                       break;
+
+               usleep_range(250, 1000);
+       }
+
+       value = SOR_LANE_SEQ_CTL_TRIGGER | SOR_LANE_SEQ_CTL_SEQUENCE_DOWN |
+               SOR_LANE_SEQ_CTL_POWER_STATE_UP | SOR_LANE_SEQ_CTL_DELAY(5);
+       tegra_sor_writel(sor, value, SOR_LANE_SEQ_CTL);
+
+       while (true) {
+               value = tegra_sor_readl(sor, SOR_LANE_SEQ_CTL);
+               if ((value & SOR_LANE_SEQ_CTL_TRIGGER) == 0)
+                       break;
+
+               usleep_range(250, 1000);
+       }
+
+       value = tegra_sor_readl(sor, SOR_CLK_CNTRL);
+       value &= ~SOR_CLK_CNTRL_DP_LINK_SPEED_MASK;
+       value &= ~SOR_CLK_CNTRL_DP_CLK_SEL_MASK;
+
+       if (mode->clock < 340000)
+               value |= SOR_CLK_CNTRL_DP_LINK_SPEED_G2_70;
+       else
+               value |= SOR_CLK_CNTRL_DP_LINK_SPEED_G5_40;
+
+       value |= SOR_CLK_CNTRL_DP_CLK_SEL_SINGLE_PCLK;
+       tegra_sor_writel(sor, value, SOR_CLK_CNTRL);
+
+       value = tegra_sor_readl(sor, SOR_DP_SPARE0);
+       value |= SOR_DP_SPARE_DISP_VIDEO_PREAMBLE;
+       value &= ~SOR_DP_SPARE_PANEL_INTERNAL;
+       value |= SOR_DP_SPARE_SEQ_ENABLE;
+       tegra_sor_writel(sor, value, SOR_DP_SPARE0);
+
+       value = SOR_SEQ_CTL_PU_PC(0) | SOR_SEQ_CTL_PU_PC_ALT(0) |
+               SOR_SEQ_CTL_PD_PC(8) | SOR_SEQ_CTL_PD_PC_ALT(8);
+       tegra_sor_writel(sor, value, SOR_SEQ_CTL);
+
+       value = SOR_SEQ_INST_DRIVE_PWM_OUT_LO | SOR_SEQ_INST_HALT |
+               SOR_SEQ_INST_WAIT_VSYNC | SOR_SEQ_INST_WAIT(1);
+       tegra_sor_writel(sor, value, SOR_SEQ_INST(0));
+       tegra_sor_writel(sor, value, SOR_SEQ_INST(8));
+
+       /* program the reference clock */
+       value = SOR_REFCLK_DIV_INT(div) | SOR_REFCLK_DIV_FRAC(div);
+       tegra_sor_writel(sor, value, SOR_REFCLK);
+
+       /* XXX don't hardcode */
+       value = SOR_XBAR_CTRL_LINK1_XSEL(4, 4) |
+               SOR_XBAR_CTRL_LINK1_XSEL(3, 3) |
+               SOR_XBAR_CTRL_LINK1_XSEL(2, 2) |
+               SOR_XBAR_CTRL_LINK1_XSEL(1, 1) |
+               SOR_XBAR_CTRL_LINK1_XSEL(0, 0) |
+               SOR_XBAR_CTRL_LINK0_XSEL(4, 4) |
+               SOR_XBAR_CTRL_LINK0_XSEL(3, 3) |
+               SOR_XBAR_CTRL_LINK0_XSEL(2, 0) |
+               SOR_XBAR_CTRL_LINK0_XSEL(1, 1) |
+               SOR_XBAR_CTRL_LINK0_XSEL(0, 2);
+       tegra_sor_writel(sor, value, SOR_XBAR_CTRL);
+
+       tegra_sor_writel(sor, 0x00000000, SOR_XBAR_POL);
+
+       err = clk_set_parent(sor->clk, sor->clk_parent);
+       if (err < 0)
+               dev_err(sor->dev, "failed to set parent clock: %d\n", err);
+
+       value = SOR_INPUT_CONTROL_HDMI_SRC_SELECT(dc->pipe);
+
+       /* XXX is this the proper check? */
+       if (mode->clock < 75000)
+               value |= SOR_INPUT_CONTROL_ARM_VIDEO_RANGE_LIMITED;
+
+       tegra_sor_writel(sor, value, SOR_INPUT_CONTROL);
+
+       max_ac = ((mode->htotal - mode->hdisplay) - SOR_REKEY - 18) / 32;
+
+       value = SOR_HDMI_CTRL_ENABLE | SOR_HDMI_CTRL_MAX_AC_PACKET(max_ac) |
+               SOR_HDMI_CTRL_AUDIO_LAYOUT | SOR_HDMI_CTRL_REKEY(SOR_REKEY);
+       tegra_sor_writel(sor, value, SOR_HDMI_CTRL);
+
+       /* H_PULSE2 setup */
+       pulse_start = h_ref_to_sync + (mode->hsync_end - mode->hsync_start) +
+                     (mode->htotal - mode->hsync_end) - 10;
+
+       value = PULSE_LAST_END_A | PULSE_QUAL_VACTIVE |
+               PULSE_POLARITY_HIGH | PULSE_MODE_NORMAL;
+       tegra_dc_writel(dc, value, DC_DISP_H_PULSE2_CONTROL);
+
+       value = PULSE_END(pulse_start + 8) | PULSE_START(pulse_start);
+       tegra_dc_writel(dc, value, DC_DISP_H_PULSE2_POSITION_A);
+
+       value = tegra_dc_readl(dc, DC_DISP_DISP_SIGNAL_OPTIONS0);
+       value |= H_PULSE2_ENABLE;
+       tegra_dc_writel(dc, value, DC_DISP_DISP_SIGNAL_OPTIONS0);
+
+       /* infoframe setup */
+       err = tegra_sor_hdmi_setup_avi_infoframe(sor, mode);
+       if (err < 0)
+               dev_err(sor->dev, "failed to setup AVI infoframe: %d\n", err);
+
+       /* XXX HDMI audio support not implemented yet */
+       tegra_sor_hdmi_disable_audio_infoframe(sor);
+
+       /* use single TMDS protocol */
+       value = tegra_sor_readl(sor, SOR_STATE1);
+       value &= ~SOR_STATE_ASY_PROTOCOL_MASK;
+       value |= SOR_STATE_ASY_PROTOCOL_SINGLE_TMDS_A;
+       tegra_sor_writel(sor, value, SOR_STATE1);
+
+       /* power up pad calibration */
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value &= ~SOR_DP_PADCTL_PAD_CAL_PD;
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+
+       /* production settings */
+       settings = tegra_sor_hdmi_find_settings(sor, mode->clock * 1000);
+       if (IS_ERR(settings)) {
+               dev_err(sor->dev, "no settings for pixel clock %d Hz: %ld\n",
+                       mode->clock * 1000, PTR_ERR(settings));
+               return;
+       }
+
+       value = tegra_sor_readl(sor, SOR_PLL0);
+       value &= ~SOR_PLL0_ICHPMP_MASK;
+       value &= ~SOR_PLL0_VCOCAP_MASK;
+       value |= SOR_PLL0_ICHPMP(settings->ichpmp);
+       value |= SOR_PLL0_VCOCAP(settings->vcocap);
+       tegra_sor_writel(sor, value, SOR_PLL0);
+
+       tegra_sor_dp_term_calibrate(sor);
+
+       value = tegra_sor_readl(sor, SOR_PLL1);
+       value &= ~SOR_PLL1_LOADADJ_MASK;
+       value |= SOR_PLL1_LOADADJ(settings->loadadj);
+       tegra_sor_writel(sor, value, SOR_PLL1);
+
+       value = tegra_sor_readl(sor, SOR_PLL3);
+       value &= ~SOR_PLL3_BG_VREF_LEVEL_MASK;
+       value |= SOR_PLL3_BG_VREF_LEVEL(settings->bg_vref);
+       tegra_sor_writel(sor, value, SOR_PLL3);
+
+       value = settings->drive_current[0] << 24 |
+               settings->drive_current[1] << 16 |
+               settings->drive_current[2] <<  8 |
+               settings->drive_current[3] <<  0;
+       tegra_sor_writel(sor, value, SOR_LANE_DRIVE_CURRENT0);
+
+       value = settings->preemphasis[0] << 24 |
+               settings->preemphasis[1] << 16 |
+               settings->preemphasis[2] <<  8 |
+               settings->preemphasis[3] <<  0;
+       tegra_sor_writel(sor, value, SOR_LANE_PREEMPHASIS0);
+
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value &= ~SOR_DP_PADCTL_TX_PU_MASK;
+       value |= SOR_DP_PADCTL_TX_PU_ENABLE;
+       value |= SOR_DP_PADCTL_TX_PU(settings->tx_pu);
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+
+       /* power down pad calibration */
+       value = tegra_sor_readl(sor, SOR_DP_PADCTL0);
+       value |= SOR_DP_PADCTL_PAD_CAL_PD;
+       tegra_sor_writel(sor, value, SOR_DP_PADCTL0);
+
+       /* miscellaneous display controller settings */
+       value = VSYNC_H_POSITION(1);
+       tegra_dc_writel(dc, value, DC_DISP_DISP_TIMING_OPTIONS);
+
+       value = tegra_dc_readl(dc, DC_DISP_DISP_COLOR_CONTROL);
+       value &= ~DITHER_CONTROL_MASK;
+       value &= ~BASE_COLOR_SIZE_MASK;
+
+       switch (info->bpc) {
+       case 6:
+               value |= BASE_COLOR_SIZE_666;
+               break;
+
+       case 8:
+               value |= BASE_COLOR_SIZE_888;
+               break;
+
+       default:
+               WARN(1, "%u bits-per-color not supported\n", info->bpc);
+               break;
+       }
+
+       tegra_dc_writel(dc, value, DC_DISP_DISP_COLOR_CONTROL);
+
+       err = tegra_sor_power_up(sor, 250);
+       if (err < 0)
+               dev_err(sor->dev, "failed to power up SOR: %d\n", err);
+
+       /* configure mode */
+       value = tegra_sor_readl(sor, SOR_STATE1);
+       value &= ~SOR_STATE_ASY_PIXELDEPTH_MASK;
+       value &= ~SOR_STATE_ASY_CRC_MODE_MASK;
+       value &= ~SOR_STATE_ASY_OWNER_MASK;
+
+       value |= SOR_STATE_ASY_CRC_MODE_COMPLETE |
+                SOR_STATE_ASY_OWNER(dc->pipe + 1);
+
+       if (mode->flags & DRM_MODE_FLAG_PHSYNC)
+               value &= ~SOR_STATE_ASY_HSYNCPOL;
+
+       if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+               value |= SOR_STATE_ASY_HSYNCPOL;
+
+       if (mode->flags & DRM_MODE_FLAG_PVSYNC)
+               value &= ~SOR_STATE_ASY_VSYNCPOL;
+
+       if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+               value |= SOR_STATE_ASY_VSYNCPOL;
+
+       switch (info->bpc) {
+       case 8:
+               value |= SOR_STATE_ASY_PIXELDEPTH_BPP_24_444;
+               break;
+
+       case 6:
+               value |= SOR_STATE_ASY_PIXELDEPTH_BPP_18_444;
+               break;
+
+       default:
+               BUG();
+               break;
+       }
+
+       tegra_sor_writel(sor, value, SOR_STATE1);
+
+       value = tegra_sor_readl(sor, SOR_HEAD_STATE0(dc->pipe));
+       value &= ~SOR_HEAD_STATE_RANGECOMPRESS_MASK;
+       value &= ~SOR_HEAD_STATE_DYNRANGE_MASK;
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE0(dc->pipe));
+
+       value = tegra_sor_readl(sor, SOR_HEAD_STATE0(dc->pipe));
+       value &= ~SOR_HEAD_STATE_COLORSPACE_MASK;
+       value |= SOR_HEAD_STATE_COLORSPACE_RGB;
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE0(dc->pipe));
+
+       /*
+        * TODO: The video timing programming below doesn't seem to match the
+        * register definitions.
+        */
+
+       value = ((mode->vtotal & 0x7fff) << 16) | (mode->htotal & 0x7fff);
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE1(dc->pipe));
+
+       /* sync end = sync width - 1 */
+       vse = mode->vsync_end - mode->vsync_start - 1;
+       hse = mode->hsync_end - mode->hsync_start - 1;
+
+       value = ((vse & 0x7fff) << 16) | (hse & 0x7fff);
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE2(dc->pipe));
+
+       /* blank end = sync end + back porch */
+       vbe = vse + (mode->vtotal - mode->vsync_end);
+       hbe = hse + (mode->htotal - mode->hsync_end);
+
+       value = ((vbe & 0x7fff) << 16) | (hbe & 0x7fff);
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE3(dc->pipe));
+
+       /* blank start = blank end + active */
+       vbs = vbe + mode->vdisplay;
+       hbs = hbe + mode->hdisplay;
+
+       value = ((vbs & 0x7fff) << 16) | (hbs & 0x7fff);
+       tegra_sor_writel(sor, value, SOR_HEAD_STATE4(dc->pipe));
+
+       tegra_sor_writel(sor, 0x1, SOR_HEAD_STATE5(dc->pipe));
+
+       tegra_sor_update(sor);
+
+       err = tegra_sor_attach(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to attach SOR: %d\n", err);
+
+       /* enable display to SOR clock and generate HDMI preamble */
+       value = tegra_dc_readl(dc, DC_DISP_DISP_WIN_OPTIONS);
+       value |= SOR1_ENABLE | SOR1_TIMING_CYA;
+       tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
+
+       tegra_dc_commit(dc);
+
+       err = tegra_sor_wakeup(sor);
+       if (err < 0)
+               dev_err(sor->dev, "failed to wakeup SOR: %d\n", err);
+}
+
+static const struct drm_encoder_helper_funcs tegra_sor_hdmi_helpers = {
+       .disable = tegra_sor_hdmi_disable,
+       .enable = tegra_sor_hdmi_enable,
+       .atomic_check = tegra_sor_encoder_atomic_check,
+};
+
+static int tegra_sor_init(struct host1x_client *client)
+{
+       struct drm_device *drm = dev_get_drvdata(client->parent);
+       const struct drm_encoder_helper_funcs *helpers = NULL;
+       struct tegra_sor *sor = host1x_client_to_sor(client);
+       int connector = DRM_MODE_CONNECTOR_Unknown;
+       int encoder = DRM_MODE_ENCODER_NONE;
+       int err;
+
+       if (!sor->dpaux) {
+               if (sor->soc->supports_hdmi) {
+                       connector = DRM_MODE_CONNECTOR_HDMIA;
+                       encoder = DRM_MODE_ENCODER_TMDS;
+                       helpers = &tegra_sor_hdmi_helpers;
+               } else if (sor->soc->supports_lvds) {
+                       connector = DRM_MODE_CONNECTOR_LVDS;
+                       encoder = DRM_MODE_ENCODER_LVDS;
+               }
+       } else {
+               if (sor->soc->supports_edp) {
+                       connector = DRM_MODE_CONNECTOR_eDP;
+                       encoder = DRM_MODE_ENCODER_TMDS;
+                       helpers = &tegra_sor_edp_helpers;
+               } else if (sor->soc->supports_dp) {
+                       connector = DRM_MODE_CONNECTOR_DisplayPort;
+                       encoder = DRM_MODE_ENCODER_TMDS;
+               }
+       }
+
+       sor->output.dev = sor->dev;
+
+       drm_connector_init(drm, &sor->output.connector,
+                          &tegra_sor_connector_funcs,
+                          connector);
+       drm_connector_helper_add(&sor->output.connector,
+                                &tegra_sor_connector_helper_funcs);
+       sor->output.connector.dpms = DRM_MODE_DPMS_OFF;
+
+       drm_encoder_init(drm, &sor->output.encoder, &tegra_sor_encoder_funcs,
+                        encoder);
+       drm_encoder_helper_add(&sor->output.encoder, helpers);
+
+       drm_mode_connector_attach_encoder(&sor->output.connector,
+                                         &sor->output.encoder);
+       drm_connector_register(&sor->output.connector);
 
        err = tegra_output_init(drm, &sor->output);
        if (err < 0) {
@@ -1577,18 +2272,130 @@ static const struct host1x_client_ops sor_client_ops = {
        .exit = tegra_sor_exit,
 };
 
+static const struct tegra_sor_ops tegra_sor_edp_ops = {
+       .name = "eDP",
+};
+
+static int tegra_sor_hdmi_probe(struct tegra_sor *sor)
+{
+       int err;
+
+       sor->avdd_io_supply = devm_regulator_get(sor->dev, "avdd-io");
+       if (IS_ERR(sor->avdd_io_supply)) {
+               dev_err(sor->dev, "cannot get AVDD I/O supply: %ld\n",
+                       PTR_ERR(sor->avdd_io_supply));
+               return PTR_ERR(sor->avdd_io_supply);
+       }
+
+       err = regulator_enable(sor->avdd_io_supply);
+       if (err < 0) {
+               dev_err(sor->dev, "failed to enable AVDD I/O supply: %d\n",
+                       err);
+               return err;
+       }
+
+       sor->vdd_pll_supply = devm_regulator_get(sor->dev, "vdd-pll");
+       if (IS_ERR(sor->vdd_pll_supply)) {
+               dev_err(sor->dev, "cannot get VDD PLL supply: %ld\n",
+                       PTR_ERR(sor->vdd_pll_supply));
+               return PTR_ERR(sor->vdd_pll_supply);
+       }
+
+       err = regulator_enable(sor->vdd_pll_supply);
+       if (err < 0) {
+               dev_err(sor->dev, "failed to enable VDD PLL supply: %d\n",
+                       err);
+               return err;
+       }
+
+       sor->hdmi_supply = devm_regulator_get(sor->dev, "hdmi");
+       if (IS_ERR(sor->hdmi_supply)) {
+               dev_err(sor->dev, "cannot get HDMI supply: %ld\n",
+                       PTR_ERR(sor->hdmi_supply));
+               return PTR_ERR(sor->hdmi_supply);
+       }
+
+       err = regulator_enable(sor->hdmi_supply);
+       if (err < 0) {
+               dev_err(sor->dev, "failed to enable HDMI supply: %d\n", err);
+               return err;
+       }
+
+       return 0;
+}
+
+static int tegra_sor_hdmi_remove(struct tegra_sor *sor)
+{
+       regulator_disable(sor->hdmi_supply);
+       regulator_disable(sor->vdd_pll_supply);
+       regulator_disable(sor->avdd_io_supply);
+
+       return 0;
+}
+
+static const struct tegra_sor_ops tegra_sor_hdmi_ops = {
+       .name = "HDMI",
+       .probe = tegra_sor_hdmi_probe,
+       .remove = tegra_sor_hdmi_remove,
+};
+
+static const struct tegra_sor_soc tegra124_sor = {
+       .supports_edp = true,
+       .supports_lvds = true,
+       .supports_hdmi = false,
+       .supports_dp = false,
+};
+
+static const struct tegra_sor_soc tegra210_sor = {
+       .supports_edp = true,
+       .supports_lvds = false,
+       .supports_hdmi = false,
+       .supports_dp = false,
+};
+
+static const struct tegra_sor_soc tegra210_sor1 = {
+       .supports_edp = false,
+       .supports_lvds = false,
+       .supports_hdmi = true,
+       .supports_dp = true,
+
+       .num_settings = ARRAY_SIZE(tegra210_sor_hdmi_defaults),
+       .settings = tegra210_sor_hdmi_defaults,
+};
+
+static const struct of_device_id tegra_sor_of_match[] = {
+       { .compatible = "nvidia,tegra210-sor1", .data = &tegra210_sor1 },
+       { .compatible = "nvidia,tegra210-sor", .data = &tegra210_sor },
+       { .compatible = "nvidia,tegra124-sor", .data = &tegra124_sor },
+       { },
+};
+MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
+
 static int tegra_sor_probe(struct platform_device *pdev)
 {
+       const struct of_device_id *match;
        struct device_node *np;
        struct tegra_sor *sor;
        struct resource *regs;
        int err;
 
+       match = of_match_device(tegra_sor_of_match, &pdev->dev);
+
        sor = devm_kzalloc(&pdev->dev, sizeof(*sor), GFP_KERNEL);
        if (!sor)
                return -ENOMEM;
 
        sor->output.dev = sor->dev = &pdev->dev;
+       sor->soc = match->data;
+
+       sor->settings = devm_kmemdup(&pdev->dev, sor->soc->settings,
+                                    sor->soc->num_settings *
+                                       sizeof(*sor->settings),
+                                    GFP_KERNEL);
+       if (!sor->settings)
+               return -ENOMEM;
+
+       sor->num_settings = sor->soc->num_settings;
 
        np = of_parse_phandle(pdev->dev.of_node, "nvidia,dpaux", 0);
        if (np) {
@@ -1599,51 +2406,106 @@ static int tegra_sor_probe(struct platform_device *pdev)
                        return -EPROBE_DEFER;
        }
 
+       if (!sor->dpaux) {
+               if (sor->soc->supports_hdmi) {
+                       sor->ops = &tegra_sor_hdmi_ops;
+               } else if (sor->soc->supports_lvds) {
+                       dev_err(&pdev->dev, "LVDS not supported yet\n");
+                       return -ENODEV;
+               } else {
+                       dev_err(&pdev->dev, "unknown (non-DP) support\n");
+                       return -ENODEV;
+               }
+       } else {
+               if (sor->soc->supports_edp) {
+                       sor->ops = &tegra_sor_edp_ops;
+               } else if (sor->soc->supports_dp) {
+                       dev_err(&pdev->dev, "DisplayPort not supported yet\n");
+                       return -ENODEV;
+               } else {
+                       dev_err(&pdev->dev, "unknown (DP) support\n");
+                       return -ENODEV;
+               }
+       }
+
        err = tegra_output_probe(&sor->output);
-       if (err < 0)
+       if (err < 0) {
+               dev_err(&pdev->dev, "failed to probe output: %d\n", err);
                return err;
+       }
+
+       if (sor->ops && sor->ops->probe) {
+               err = sor->ops->probe(sor);
+               if (err < 0) {
+                       dev_err(&pdev->dev, "failed to probe %s: %d\n",
+                               sor->ops->name, err);
+                       goto output;
+               }
+       }
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        sor->regs = devm_ioremap_resource(&pdev->dev, regs);
-       if (IS_ERR(sor->regs))
-               return PTR_ERR(sor->regs);
+       if (IS_ERR(sor->regs)) {
+               err = PTR_ERR(sor->regs);
+               goto remove;
+       }
 
        sor->rst = devm_reset_control_get(&pdev->dev, "sor");
-       if (IS_ERR(sor->rst))
-               return PTR_ERR(sor->rst);
+       if (IS_ERR(sor->rst)) {
+               err = PTR_ERR(sor->rst);
+               dev_err(&pdev->dev, "failed to get reset control: %d\n", err);
+               goto remove;
+       }
 
        sor->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(sor->clk))
-               return PTR_ERR(sor->clk);
+       if (IS_ERR(sor->clk)) {
+               err = PTR_ERR(sor->clk);
+               dev_err(&pdev->dev, "failed to get module clock: %d\n", err);
+               goto remove;
+       }
 
        sor->clk_parent = devm_clk_get(&pdev->dev, "parent");
-       if (IS_ERR(sor->clk_parent))
-               return PTR_ERR(sor->clk_parent);
+       if (IS_ERR(sor->clk_parent)) {
+               err = PTR_ERR(sor->clk_parent);
+               dev_err(&pdev->dev, "failed to get parent clock: %d\n", err);
+               goto remove;
+       }
 
        sor->clk_safe = devm_clk_get(&pdev->dev, "safe");
-       if (IS_ERR(sor->clk_safe))
-               return PTR_ERR(sor->clk_safe);
+       if (IS_ERR(sor->clk_safe)) {
+               err = PTR_ERR(sor->clk_safe);
+               dev_err(&pdev->dev, "failed to get safe clock: %d\n", err);
+               goto remove;
+       }
 
        sor->clk_dp = devm_clk_get(&pdev->dev, "dp");
-       if (IS_ERR(sor->clk_dp))
-               return PTR_ERR(sor->clk_dp);
+       if (IS_ERR(sor->clk_dp)) {
+               err = PTR_ERR(sor->clk_dp);
+               dev_err(&pdev->dev, "failed to get DP clock: %d\n", err);
+               goto remove;
+       }
 
        INIT_LIST_HEAD(&sor->client.list);
        sor->client.ops = &sor_client_ops;
        sor->client.dev = &pdev->dev;
 
-       mutex_init(&sor->lock);
-
        err = host1x_client_register(&sor->client);
        if (err < 0) {
                dev_err(&pdev->dev, "failed to register host1x client: %d\n",
                        err);
-               return err;
+               goto remove;
        }
 
        platform_set_drvdata(pdev, sor);
 
        return 0;
+
+remove:
+       if (sor->ops && sor->ops->remove)
+               sor->ops->remove(sor);
+output:
+       tegra_output_remove(&sor->output);
+       return err;
 }
 
 static int tegra_sor_remove(struct platform_device *pdev)
@@ -1658,17 +2520,17 @@ static int tegra_sor_remove(struct platform_device *pdev)
                return err;
        }
 
+       if (sor->ops && sor->ops->remove) {
+               err = sor->ops->remove(sor);
+               if (err < 0)
+                       dev_err(&pdev->dev, "failed to remove SOR: %d\n", err);
+       }
+
        tegra_output_remove(&sor->output);
 
        return 0;
 }
 
-static const struct of_device_id tegra_sor_of_match[] = {
-       { .compatible = "nvidia,tegra124-sor", },
-       { },
-};
-MODULE_DEVICE_TABLE(of, tegra_sor_of_match);
-
 struct platform_driver tegra_sor_driver = {
        .driver = {
                .name = "tegra-sor",