Merge tag 'drm/tegra/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 05:52:39 +0000 (15:52 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 05:52:39 +0000 (15:52 +1000)
drm/tegra: Changes for v4.3-rc1

There are a bunch of non-critical fixes here that I've collected over
the past few months, but the biggest part is Tegra210 support, in the
DC, DSI and SOR/HDMI drivers.

Also this finally restores DPMS with atomic mode-setting, something
that has been broken since the conversion and which I had originally
expected to take far less longer to fix.

* tag 'drm/tegra/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux: (41 commits)
  drm/tegra: sor: Add HDMI support
  drm/tegra: sor: Add Tegra210 eDP support
  drm/tegra: dc: Implement atomic DPMS
  drm/tegra: sor: Restore DPMS
  drm/tegra: dsi: Restore DPMS
  drm/tegra: hdmi: Restore DPMS
  drm/tegra: rgb: Restore DPMS
  drm/tegra: sor: Use DRM debugfs infrastructure for CRC
  drm/tegra: sor: Write correct head state registers
  drm/tegra: sor: Constify display mode
  drm/tegra: sor: Reset the correct debugfs fields
  drm/tegra: sor: Set minor after debugfs initialization
  drm/tegra: sor: Provide error messages in probe
  drm/tegra: sor: Rename registers for consistency
  drm/tegra: dpaux: Disable interrupt when detached
  drm/tegra: dpaux: Configure pads as I2C by default
  drm/tegra: dpaux: Provide error message in probe
  drm/tegra: dsi: Add Tegra210 support
  drm/tegra: dsi: Add Tegra132 support
  drm/tegra: dsi: Add Tegra124 support
  ...

15 files changed:
Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
drivers/gpu/drm/tegra/dc.c
drivers/gpu/drm/tegra/dc.h
drivers/gpu/drm/tegra/dpaux.c
drivers/gpu/drm/tegra/dpaux.h
drivers/gpu/drm/tegra/drm.c
drivers/gpu/drm/tegra/drm.h
drivers/gpu/drm/tegra/dsi.c
drivers/gpu/drm/tegra/dsi.h
drivers/gpu/drm/tegra/hdmi.c
drivers/gpu/drm/tegra/output.c
drivers/gpu/drm/tegra/rgb.c
drivers/gpu/drm/tegra/sor.c
drivers/gpu/drm/tegra/sor.h
drivers/gpu/host1x/mipi.c

index 009f4bfa1590cc1689097954f5bc8c37e3fad095..e685610d38e26cfa439d986d5f12995593ba1daf 100644 (file)
@@ -197,9 +197,11 @@ of the following host1x client modules:
 - sor: serial output resource
 
   Required properties:
-  - compatible: For Tegra124, must contain "nvidia,tegra124-sor".  Otherwise,
-    must contain '"nvidia,<chip>-sor", "nvidia,tegra124-sor"', where <chip>
-    is tegra132.
+  - compatible: Should be:
+    - "nvidia,tegra124-sor": for Tegra124 and Tegra132
+    - "nvidia,tegra132-sor": for Tegra132
+    - "nvidia,tegra210-sor": for Tegra210
+    - "nvidia,tegra210-sor1": for Tegra210
   - reg: Physical base address and length of the controller's registers.
   - interrupts: The interrupt outputs from the controller.
   - clocks: Must contain an entry for each entry in clock-names.
index bf8ef3133e5bb929e2fa9d644a89bf7311d2472f..ddefb85dc4f72f4ee8d1fd6aa7678d5236144eda 100644 (file)
@@ -76,6 +76,14 @@ to_tegra_plane_state(struct drm_plane_state *state)
        return NULL;
 }
 
+static void tegra_dc_stats_reset(struct tegra_dc_stats *stats)
+{
+       stats->frames = 0;
+       stats->vblank = 0;
+       stats->underflow = 0;
+       stats->overflow = 0;
+}
+
 /*
  * Reads the active copy of a register. This takes the dc->lock spinlock to
  * prevent races with the VBLANK processing which also needs access to the
@@ -759,7 +767,6 @@ static void tegra_cursor_atomic_update(struct drm_plane *plane,
        /* position the cursor */
        value = (state->crtc_y & 0x3fff) << 16 | (state->crtc_x & 0x3fff);
        tegra_dc_writel(dc, value, DC_DISP_CURSOR_POSITION);
-
 }
 
 static void tegra_cursor_atomic_disable(struct drm_plane *plane,
@@ -809,9 +816,11 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm,
                return ERR_PTR(-ENOMEM);
 
        /*
-        * We'll treat the cursor as an overlay plane with index 6 here so
-        * that the update and activation request bits in DC_CMD_STATE_CONTROL
-        * match up.
+        * This index is kind of fake. The cursor isn't a regular plane, but
+        * its update and activation request bits in DC_CMD_STATE_CONTROL do
+        * use the same programming. Setting this fake index here allows the
+        * code in tegra_add_plane_state() to do the right thing without the
+        * need to special-casing the cursor plane.
         */
        plane->index = 6;
 
@@ -1015,6 +1024,8 @@ static void tegra_crtc_reset(struct drm_crtc *crtc)
                crtc->state = &state->base;
                crtc->state->crtc = crtc;
        }
+
+       drm_crtc_vblank_reset(crtc);
 }
 
 static struct drm_crtc_state *
@@ -1052,90 +1063,6 @@ static const struct drm_crtc_funcs tegra_crtc_funcs = {
        .atomic_destroy_state = tegra_crtc_atomic_destroy_state,
 };
 
-static void tegra_dc_stop(struct tegra_dc *dc)
-{
-       u32 value;
-
-       /* stop the display controller */
-       value = tegra_dc_readl(dc, DC_CMD_DISPLAY_COMMAND);
-       value &= ~DISP_CTRL_MODE_MASK;
-       tegra_dc_writel(dc, value, DC_CMD_DISPLAY_COMMAND);
-
-       tegra_dc_commit(dc);
-}
-
-static bool tegra_dc_idle(struct tegra_dc *dc)
-{
-       u32 value;
-
-       value = tegra_dc_readl_active(dc, DC_CMD_DISPLAY_COMMAND);
-
-       return (value & DISP_CTRL_MODE_MASK) == 0;
-}
-
-static int tegra_dc_wait_idle(struct tegra_dc *dc, unsigned long timeout)
-{
-       timeout = jiffies + msecs_to_jiffies(timeout);
-
-       while (time_before(jiffies, timeout)) {
-               if (tegra_dc_idle(dc))
-                       return 0;
-
-               usleep_range(1000, 2000);
-       }
-
-       dev_dbg(dc->dev, "timeout waiting for DC to become idle\n");
-       return -ETIMEDOUT;
-}
-
-static void tegra_crtc_disable(struct drm_crtc *crtc)
-{
-       struct tegra_dc *dc = to_tegra_dc(crtc);
-       u32 value;
-
-       if (!tegra_dc_idle(dc)) {
-               tegra_dc_stop(dc);
-
-               /*
-                * Ignore the return value, there isn't anything useful to do
-                * in case this fails.
-                */
-               tegra_dc_wait_idle(dc, 100);
-       }
-
-       /*
-        * This should really be part of the RGB encoder driver, but clearing
-        * these bits has the side-effect of stopping the display controller.
-        * When that happens no VBLANK interrupts will be raised. At the same
-        * time the encoder is disabled before the display controller, so the
-        * above code is always going to timeout waiting for the controller
-        * to go idle.
-        *
-        * Given the close coupling between the RGB encoder and the display
-        * controller doing it here is still kind of okay. None of the other
-        * encoder drivers require these bits to be cleared.
-        *
-        * XXX: Perhaps given that the display controller is switched off at
-        * this point anyway maybe clearing these bits isn't even useful for
-        * the RGB encoder?
-        */
-       if (dc->rgb) {
-               value = tegra_dc_readl(dc, DC_CMD_DISPLAY_POWER_CONTROL);
-               value &= ~(PW0_ENABLE | PW1_ENABLE | PW2_ENABLE | PW3_ENABLE |
-                          PW4_ENABLE | PM0_ENABLE | PM1_ENABLE);
-               tegra_dc_writel(dc, value, DC_CMD_DISPLAY_POWER_CONTROL);
-       }
-
-       drm_crtc_vblank_off(crtc);
-}
-
-static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc,
-                                 const struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted)
-{
-       return true;
-}
-
 static int tegra_dc_set_timings(struct tegra_dc *dc,
                                struct drm_display_mode *mode)
 {
@@ -1229,7 +1156,85 @@ static void tegra_dc_commit_state(struct tegra_dc *dc,
        tegra_dc_writel(dc, value, DC_DISP_DISP_CLOCK_CONTROL);
 }
 
-static void tegra_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static void tegra_dc_stop(struct tegra_dc *dc)
+{
+       u32 value;
+
+       /* stop the display controller */
+       value = tegra_dc_readl(dc, DC_CMD_DISPLAY_COMMAND);
+       value &= ~DISP_CTRL_MODE_MASK;
+       tegra_dc_writel(dc, value, DC_CMD_DISPLAY_COMMAND);
+
+       tegra_dc_commit(dc);
+}
+
+static bool tegra_dc_idle(struct tegra_dc *dc)
+{
+       u32 value;
+
+       value = tegra_dc_readl_active(dc, DC_CMD_DISPLAY_COMMAND);
+
+       return (value & DISP_CTRL_MODE_MASK) == 0;
+}
+
+static int tegra_dc_wait_idle(struct tegra_dc *dc, unsigned long timeout)
+{
+       timeout = jiffies + msecs_to_jiffies(timeout);
+
+       while (time_before(jiffies, timeout)) {
+               if (tegra_dc_idle(dc))
+                       return 0;
+
+               usleep_range(1000, 2000);
+       }
+
+       dev_dbg(dc->dev, "timeout waiting for DC to become idle\n");
+       return -ETIMEDOUT;
+}
+
+static void tegra_crtc_disable(struct drm_crtc *crtc)
+{
+       struct tegra_dc *dc = to_tegra_dc(crtc);
+       u32 value;
+
+       if (!tegra_dc_idle(dc)) {
+               tegra_dc_stop(dc);
+
+               /*
+                * Ignore the return value, there isn't anything useful to do
+                * in case this fails.
+                */
+               tegra_dc_wait_idle(dc, 100);
+       }
+
+       /*
+        * This should really be part of the RGB encoder driver, but clearing
+        * these bits has the side-effect of stopping the display controller.
+        * When that happens no VBLANK interrupts will be raised. At the same
+        * time the encoder is disabled before the display controller, so the
+        * above code is always going to timeout waiting for the controller
+        * to go idle.
+        *
+        * Given the close coupling between the RGB encoder and the display
+        * controller doing it here is still kind of okay. None of the other
+        * encoder drivers require these bits to be cleared.
+        *
+        * XXX: Perhaps given that the display controller is switched off at
+        * this point anyway maybe clearing these bits isn't even useful for
+        * the RGB encoder?
+        */
+       if (dc->rgb) {
+               value = tegra_dc_readl(dc, DC_CMD_DISPLAY_POWER_CONTROL);
+               value &= ~(PW0_ENABLE | PW1_ENABLE | PW2_ENABLE | PW3_ENABLE |
+                          PW4_ENABLE | PM0_ENABLE | PM1_ENABLE);
+               tegra_dc_writel(dc, value, DC_CMD_DISPLAY_POWER_CONTROL);
+       }
+
+       tegra_dc_stats_reset(&dc->stats);
+       drm_crtc_vblank_off(crtc);
+}
+
+static void tegra_crtc_enable(struct drm_crtc *crtc)
 {
        struct drm_display_mode *mode = &crtc->state->adjusted_mode;
        struct tegra_dc_state *state = to_dc_state(crtc->state);
@@ -1259,15 +1264,7 @@ static void tegra_crtc_mode_set_nofb(struct drm_crtc *crtc)
        tegra_dc_writel(dc, value, DC_CMD_DISPLAY_POWER_CONTROL);
 
        tegra_dc_commit(dc);
-}
-
-static void tegra_crtc_prepare(struct drm_crtc *crtc)
-{
-       drm_crtc_vblank_off(crtc);
-}
 
-static void tegra_crtc_commit(struct drm_crtc *crtc)
-{
        drm_crtc_vblank_on(crtc);
 }
 
@@ -1304,10 +1301,7 @@ static void tegra_crtc_atomic_flush(struct drm_crtc *crtc,
 
 static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = {
        .disable = tegra_crtc_disable,
-       .mode_fixup = tegra_crtc_mode_fixup,
-       .mode_set_nofb = tegra_crtc_mode_set_nofb,
-       .prepare = tegra_crtc_prepare,
-       .commit = tegra_crtc_commit,
+       .enable = tegra_crtc_enable,
        .atomic_check = tegra_crtc_atomic_check,
        .atomic_begin = tegra_crtc_atomic_begin,
        .atomic_flush = tegra_crtc_atomic_flush,
@@ -1325,6 +1319,7 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)
                /*
                dev_dbg(dc->dev, "%s(): frame end\n", __func__);
                */
+               dc->stats.frames++;
        }
 
        if (status & VBLANK_INT) {
@@ -1333,12 +1328,21 @@ static irqreturn_t tegra_dc_irq(int irq, void *data)
                */
                drm_crtc_handle_vblank(&dc->base);
                tegra_dc_finish_page_flip(dc);
+               dc->stats.vblank++;
        }
 
        if (status & (WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT)) {
                /*
                dev_dbg(dc->dev, "%s(): underflow\n", __func__);
                */
+               dc->stats.underflow++;
+       }
+
+       if (status & (WIN_A_OF_INT | WIN_B_OF_INT | WIN_C_OF_INT)) {
+               /*
+               dev_dbg(dc->dev, "%s(): overflow\n", __func__);
+               */
+               dc->stats.overflow++;
        }
 
        return IRQ_HANDLED;
@@ -1348,6 +1352,14 @@ static int tegra_dc_show_regs(struct seq_file *s, void *data)
 {
        struct drm_info_node *node = s->private;
        struct tegra_dc *dc = node->info_ent->data;
+       int err = 0;
+
+       drm_modeset_lock_crtc(&dc->base, NULL);
+
+       if (!dc->base.state->active) {
+               err = -EBUSY;
+               goto unlock;
+       }
 
 #define DUMP_REG(name)                                         \
        seq_printf(s, "%-40s %#05x %08x\n", #name, name,        \
@@ -1568,11 +1580,59 @@ static int tegra_dc_show_regs(struct seq_file *s, void *data)
 
 #undef DUMP_REG
 
+unlock:
+       drm_modeset_unlock_crtc(&dc->base);
+       return err;
+}
+
+static int tegra_dc_show_crc(struct seq_file *s, void *data)
+{
+       struct drm_info_node *node = s->private;
+       struct tegra_dc *dc = node->info_ent->data;
+       int err = 0;
+       u32 value;
+
+       drm_modeset_lock_crtc(&dc->base, NULL);
+
+       if (!dc->base.state->active) {
+               err = -EBUSY;
+               goto unlock;
+       }
+
+       value = DC_COM_CRC_CONTROL_ACTIVE_DATA | DC_COM_CRC_CONTROL_ENABLE;
+       tegra_dc_writel(dc, value, DC_COM_CRC_CONTROL);
+       tegra_dc_commit(dc);
+
+       drm_crtc_wait_one_vblank(&dc->base);
+       drm_crtc_wait_one_vblank(&dc->base);
+
+       value = tegra_dc_readl(dc, DC_COM_CRC_CHECKSUM);
+       seq_printf(s, "%08x\n", value);
+
+       tegra_dc_writel(dc, 0, DC_COM_CRC_CONTROL);
+
+unlock:
+       drm_modeset_unlock_crtc(&dc->base);
+       return err;
+}
+
+static int tegra_dc_show_stats(struct seq_file *s, void *data)
+{
+       struct drm_info_node *node = s->private;
+       struct tegra_dc *dc = node->info_ent->data;
+
+       seq_printf(s, "frames: %lu\n", dc->stats.frames);
+       seq_printf(s, "vblank: %lu\n", dc->stats.vblank);
+       seq_printf(s, "underflow: %lu\n", dc->stats.underflow);
+       seq_printf(s, "overflow: %lu\n", dc->stats.overflow);
+
        return 0;
 }
 
 static struct drm_info_list debugfs_files[] = {
        { "regs", tegra_dc_show_regs, 0, NULL },
+       { "crc", tegra_dc_show_crc, 0, NULL },
+       { "stats", tegra_dc_show_stats, 0, NULL },
 };
 
 static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
@@ -1718,7 +1778,8 @@ static int tegra_dc_init(struct host1x_client *client)
                tegra_dc_writel(dc, value, DC_CMD_CONT_SYNCPT_VSYNC);
        }
 
-       value = WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT | WIN_A_OF_INT;
+       value = WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT |
+               WIN_A_OF_INT | WIN_B_OF_INT | WIN_C_OF_INT;
        tegra_dc_writel(dc, value, DC_CMD_INT_TYPE);
 
        value = WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT |
@@ -1734,15 +1795,19 @@ static int tegra_dc_init(struct host1x_client *client)
                WINDOW_B_THRESHOLD(1) | WINDOW_C_THRESHOLD(1);
        tegra_dc_writel(dc, value, DC_DISP_DISP_MEM_HIGH_PRIORITY_TIMER);
 
-       value = VBLANK_INT | WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT;
+       value = VBLANK_INT | WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT |
+               WIN_A_OF_INT | WIN_B_OF_INT | WIN_C_OF_INT;
        tegra_dc_writel(dc, value, DC_CMD_INT_ENABLE);
 
-       value = WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT;
+       value = WIN_A_UF_INT | WIN_B_UF_INT | WIN_C_UF_INT |
+               WIN_A_OF_INT | WIN_B_OF_INT | WIN_C_OF_INT;
        tegra_dc_writel(dc, value, DC_CMD_INT_MASK);
 
        if (dc->soc->supports_border_color)
                tegra_dc_writel(dc, 0, DC_DISP_BORDER_COLOR);
 
+       tegra_dc_stats_reset(&dc->stats);
+
        return 0;
 
 cleanup:
@@ -1828,8 +1893,20 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = {
        .has_powergate = true,
 };
 
+static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
+       .supports_border_color = false,
+       .supports_interlacing = true,
+       .supports_cursor = true,
+       .supports_block_linear = true,
+       .pitch_align = 64,
+       .has_powergate = true,
+};
+
 static const struct of_device_id tegra_dc_of_match[] = {
        {
+               .compatible = "nvidia,tegra210-dc",
+               .data = &tegra210_dc_soc_info,
+       }, {
                .compatible = "nvidia,tegra124-dc",
                .data = &tegra124_dc_soc_info,
        }, {
@@ -1959,6 +2036,10 @@ static int tegra_dc_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
+       dc->syncpt = host1x_syncpt_request(&pdev->dev, flags);
+       if (!dc->syncpt)
+               dev_warn(&pdev->dev, "failed to allocate syncpoint\n");
+
        INIT_LIST_HEAD(&dc->client.list);
        dc->client.ops = &dc_client_ops;
        dc->client.dev = &pdev->dev;
@@ -1976,10 +2057,6 @@ static int tegra_dc_probe(struct platform_device *pdev)
                return err;
        }
 
-       dc->syncpt = host1x_syncpt_request(&pdev->dev, flags);
-       if (!dc->syncpt)
-               dev_warn(&pdev->dev, "failed to allocate syncpoint\n");
-
        platform_set_drvdata(pdev, dc);
 
        return 0;
@@ -2018,7 +2095,6 @@ static int tegra_dc_remove(struct platform_device *pdev)
 struct platform_driver tegra_dc_driver = {
        .driver = {
                .name = "tegra-dc",
-               .owner = THIS_MODULE,
                .of_match_table = tegra_dc_of_match,
        },
        .probe = tegra_dc_probe,
index 55792daabbb587b80712c684742c902c1303ee65..4a268635749bdc667ef3ec86b3c7e3774f1faf09 100644 (file)
 #define DC_CMD_REG_ACT_CONTROL                 0x043
 
 #define DC_COM_CRC_CONTROL                     0x300
+#define  DC_COM_CRC_CONTROL_ALWAYS (1 << 3)
+#define  DC_COM_CRC_CONTROL_FULL_FRAME  (0 << 2)
+#define  DC_COM_CRC_CONTROL_ACTIVE_DATA (1 << 2)
+#define  DC_COM_CRC_CONTROL_WAIT (1 << 1)
+#define  DC_COM_CRC_CONTROL_ENABLE (1 << 0)
 #define DC_COM_CRC_CHECKSUM                    0x301
 #define DC_COM_PIN_OUTPUT_ENABLE(x) (0x302 + (x))
 #define DC_COM_PIN_OUTPUT_POLARITY(x) (0x306 + (x))
 #define DC_COM_CRC_CHECKSUM_LATCHED            0x329
 
 #define DC_DISP_DISP_SIGNAL_OPTIONS0           0x400
-#define H_PULSE_0_ENABLE (1 <<  8)
-#define H_PULSE_1_ENABLE (1 << 10)
-#define H_PULSE_2_ENABLE (1 << 12)
+#define H_PULSE0_ENABLE (1 <<  8)
+#define H_PULSE1_ENABLE (1 << 10)
+#define H_PULSE2_ENABLE (1 << 12)
 
 #define DC_DISP_DISP_SIGNAL_OPTIONS1           0x401
 
 #define DC_DISP_DISP_WIN_OPTIONS               0x402
 #define HDMI_ENABLE    (1 << 30)
 #define DSI_ENABLE     (1 << 29)
+#define SOR1_TIMING_CYA        (1 << 27)
+#define SOR1_ENABLE    (1 << 26)
 #define SOR_ENABLE     (1 << 25)
 #define CURSOR_ENABLE  (1 << 16)
 
 #define BASE_COLOR_SIZE565     (6 << 0)
 #define BASE_COLOR_SIZE332     (7 << 0)
 #define BASE_COLOR_SIZE888     (8 << 0)
+#define DITHER_CONTROL_MASK    (3 << 8)
 #define DITHER_CONTROL_DISABLE (0 << 8)
 #define DITHER_CONTROL_ORDERED (2 << 8)
 #define DITHER_CONTROL_ERRDIFF (3 << 8)
+#define BASE_COLOR_SIZE_MASK   (0xf << 0)
+#define BASE_COLOR_SIZE_666    (0 << 0)
+#define BASE_COLOR_SIZE_111    (1 << 0)
+#define BASE_COLOR_SIZE_222    (2 << 0)
+#define BASE_COLOR_SIZE_333    (3 << 0)
+#define BASE_COLOR_SIZE_444    (4 << 0)
+#define BASE_COLOR_SIZE_555    (5 << 0)
+#define BASE_COLOR_SIZE_565    (6 << 0)
+#define BASE_COLOR_SIZE_332    (7 << 0)
+#define BASE_COLOR_SIZE_888    (8 << 0)
 
 #define DC_DISP_SHIFT_CLOCK_OPTIONS            0x431
 #define  SC1_H_QUALIFIER_NONE  (1 << 16)
index 07b26972f487967cb1b4203488f0387c9e0736fc..224a7dc8e4ed683a40bd0456045ca6e02fbaaa18 100644 (file)
@@ -294,26 +294,41 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        }
 
        dpaux->rst = devm_reset_control_get(&pdev->dev, "dpaux");
-       if (IS_ERR(dpaux->rst))
+       if (IS_ERR(dpaux->rst)) {
+               dev_err(&pdev->dev, "failed to get reset control: %ld\n",
+                       PTR_ERR(dpaux->rst));
                return PTR_ERR(dpaux->rst);
+       }
 
        dpaux->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(dpaux->clk))
+       if (IS_ERR(dpaux->clk)) {
+               dev_err(&pdev->dev, "failed to get module clock: %ld\n",
+                       PTR_ERR(dpaux->clk));
                return PTR_ERR(dpaux->clk);
+       }
 
        err = clk_prepare_enable(dpaux->clk);
-       if (err < 0)
+       if (err < 0) {
+               dev_err(&pdev->dev, "failed to enable module clock: %d\n",
+                       err);
                return err;
+       }
 
        reset_control_deassert(dpaux->rst);
 
        dpaux->clk_parent = devm_clk_get(&pdev->dev, "parent");
-       if (IS_ERR(dpaux->clk_parent))
+       if (IS_ERR(dpaux->clk_parent)) {
+               dev_err(&pdev->dev, "failed to get parent clock: %ld\n",
+                       PTR_ERR(dpaux->clk_parent));
                return PTR_ERR(dpaux->clk_parent);
+       }
 
        err = clk_prepare_enable(dpaux->clk_parent);
-       if (err < 0)
+       if (err < 0) {
+               dev_err(&pdev->dev, "failed to enable parent clock: %d\n",
+                       err);
                return err;
+       }
 
        err = clk_set_rate(dpaux->clk_parent, 270000000);
        if (err < 0) {
@@ -323,8 +338,11 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        }
 
        dpaux->vdd = devm_regulator_get(&pdev->dev, "vdd");
-       if (IS_ERR(dpaux->vdd))
+       if (IS_ERR(dpaux->vdd)) {
+               dev_err(&pdev->dev, "failed to get VDD supply: %ld\n",
+                       PTR_ERR(dpaux->vdd));
                return PTR_ERR(dpaux->vdd);
+       }
 
        err = devm_request_irq(dpaux->dev, dpaux->irq, tegra_dpaux_irq, 0,
                               dev_name(dpaux->dev), dpaux);
@@ -334,6 +352,8 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
                return err;
        }
 
+       disable_irq(dpaux->irq);
+
        dpaux->aux.transfer = tegra_dpaux_transfer;
        dpaux->aux.dev = &pdev->dev;
 
@@ -341,6 +361,24 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
        if (err < 0)
                return err;
 
+       /*
+        * Assume that by default the DPAUX/I2C pads will be used for HDMI,
+        * so power them up and configure them in I2C mode.
+        *
+        * The DPAUX code paths reconfigure the pads in AUX mode, but there
+        * is no possibility to perform the I2C mode configuration in the
+        * HDMI path.
+        */
+       value = tegra_dpaux_readl(dpaux, DPAUX_HYBRID_SPARE);
+       value &= ~DPAUX_HYBRID_SPARE_PAD_POWER_DOWN;
+       tegra_dpaux_writel(dpaux, value, DPAUX_HYBRID_SPARE);
+
+       value = tegra_dpaux_readl(dpaux, DPAUX_HYBRID_PADCTL);
+       value = DPAUX_HYBRID_PADCTL_I2C_SDA_INPUT_RCV |
+               DPAUX_HYBRID_PADCTL_I2C_SCL_INPUT_RCV |
+               DPAUX_HYBRID_PADCTL_MODE_I2C;
+       tegra_dpaux_writel(dpaux, value, DPAUX_HYBRID_PADCTL);
+
        /* enable and clear all interrupts */
        value = DPAUX_INTR_AUX_DONE | DPAUX_INTR_IRQ_EVENT |
                DPAUX_INTR_UNPLUG_EVENT | DPAUX_INTR_PLUG_EVENT;
@@ -359,6 +397,12 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
 static int tegra_dpaux_remove(struct platform_device *pdev)
 {
        struct tegra_dpaux *dpaux = platform_get_drvdata(pdev);
+       u32 value;
+
+       /* make sure pads are powered down when not in use */
+       value = tegra_dpaux_readl(dpaux, DPAUX_HYBRID_SPARE);
+       value |= DPAUX_HYBRID_SPARE_PAD_POWER_DOWN;
+       tegra_dpaux_writel(dpaux, value, DPAUX_HYBRID_SPARE);
 
        drm_dp_aux_unregister(&dpaux->aux);
 
@@ -376,6 +420,7 @@ static int tegra_dpaux_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id tegra_dpaux_of_match[] = {
+       { .compatible = "nvidia,tegra210-dpaux", },
        { .compatible = "nvidia,tegra124-dpaux", },
        { },
 };
@@ -425,8 +470,10 @@ int tegra_dpaux_attach(struct tegra_dpaux *dpaux, struct tegra_output *output)
                enum drm_connector_status status;
 
                status = tegra_dpaux_detect(dpaux);
-               if (status == connector_status_connected)
+               if (status == connector_status_connected) {
+                       enable_irq(dpaux->irq);
                        return 0;
+               }
 
                usleep_range(1000, 2000);
        }
@@ -439,6 +486,8 @@ int tegra_dpaux_detach(struct tegra_dpaux *dpaux)
        unsigned long timeout;
        int err;
 
+       disable_irq(dpaux->irq);
+
        err = regulator_disable(dpaux->vdd);
        if (err < 0)
                return err;
index 806e245ca7874d3929e7f22227096d630d37cc13..20783d9f4728fb5ff1de8ce361e165e8ede5c609 100644 (file)
@@ -57,6 +57,8 @@
 #define DPAUX_DP_AUX_CONFIG 0x45
 
 #define DPAUX_HYBRID_PADCTL 0x49
+#define DPAUX_HYBRID_PADCTL_I2C_SDA_INPUT_RCV (1 << 15)
+#define DPAUX_HYBRID_PADCTL_I2C_SCL_INPUT_RCV (1 << 14)
 #define DPAUX_HYBRID_PADCTL_AUX_CMH(x) (((x) & 0x3) << 12)
 #define DPAUX_HYBRID_PADCTL_AUX_DRVZ(x) (((x) & 0x7) << 8)
 #define DPAUX_HYBRID_PADCTL_AUX_DRVI(x) (((x) & 0x3f) << 2)
index 427f50c6803cba7d3ed5424547ac7c812d6bb536..6d88cf1fcd1cd3e0a6335fa766d8ca578c0815e3 100644 (file)
@@ -171,8 +171,6 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
        if (err < 0)
                goto fbdev;
 
-       drm_mode_config_reset(drm);
-
        /*
         * We don't use the drm_irq_install() helpers provided by the DRM
         * core, so we need to set this manually in order to allow the
@@ -182,11 +180,14 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
 
        /* syncpoints are used for full 32-bit hardware VBLANK counters */
        drm->max_vblank_count = 0xffffffff;
+       drm->vblank_disable_allowed = true;
 
        err = drm_vblank_init(drm, drm->mode_config.num_crtc);
        if (err < 0)
                goto device;
 
+       drm_mode_config_reset(drm);
+
        err = tegra_drm_fb_init(drm);
        if (err < 0)
                goto vblank;
@@ -1037,9 +1038,8 @@ static int host1x_drm_resume(struct device *dev)
 }
 #endif
 
-static const struct dev_pm_ops host1x_drm_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(host1x_drm_suspend, host1x_drm_resume)
-};
+static SIMPLE_DEV_PM_OPS(host1x_drm_pm_ops, host1x_drm_suspend,
+                        host1x_drm_resume);
 
 static const struct of_device_id host1x_drm_subdevs[] = {
        { .compatible = "nvidia,tegra20-dc", },
@@ -1056,6 +1056,12 @@ static const struct of_device_id host1x_drm_subdevs[] = {
        { .compatible = "nvidia,tegra124-dc", },
        { .compatible = "nvidia,tegra124-sor", },
        { .compatible = "nvidia,tegra124-hdmi", },
+       { .compatible = "nvidia,tegra124-dsi", },
+       { .compatible = "nvidia,tegra132-dsi", },
+       { .compatible = "nvidia,tegra210-dc", },
+       { .compatible = "nvidia,tegra210-dsi", },
+       { .compatible = "nvidia,tegra210-sor", },
+       { .compatible = "nvidia,tegra210-sor1", },
        { /* sentinel */ }
 };
 
index 659b2fcc986dcf1c8ef4abc7364f288b128a3411..ec49275ffb247c419a70a2f8aed9cd7d922c46d6 100644 (file)
@@ -12,6 +12,7 @@
 
 #include <uapi/drm/tegra_drm.h>
 #include <linux/host1x.h>
+#include <linux/of_gpio.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
@@ -104,6 +105,13 @@ int tegra_drm_exit(struct tegra_drm *tegra);
 struct tegra_dc_soc_info;
 struct tegra_output;
 
+struct tegra_dc_stats {
+       unsigned long frames;
+       unsigned long vblank;
+       unsigned long underflow;
+       unsigned long overflow;
+};
+
 struct tegra_dc {
        struct host1x_client client;
        struct host1x_syncpt *syncpt;
@@ -121,6 +129,7 @@ struct tegra_dc {
 
        struct tegra_output *rgb;
 
+       struct tegra_dc_stats stats;
        struct list_head list;
 
        struct drm_info_list *debugfs_files;
@@ -200,6 +209,7 @@ struct tegra_output {
        const struct edid *edid;
        unsigned int hpd_irq;
        int hpd_gpio;
+       enum of_gpio_flags hpd_gpio_flags;
 
        struct drm_encoder encoder;
        struct drm_connector connector;
index dc97c0b3681d95d60c6b983c29afd036c7aa14f5..f0a138ef68ce8935bdb33d0a9c6191989b77c7f9 100644 (file)
@@ -119,6 +119,16 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data)
 {
        struct drm_info_node *node = s->private;
        struct tegra_dsi *dsi = node->info_ent->data;
+       struct drm_crtc *crtc = dsi->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, "%-32s %#05x %08x\n", #name, name,        \
@@ -208,7 +218,9 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data)
 
 #undef DUMP_REG
 
-       return 0;
+unlock:
+       drm_modeset_unlock_all(drm);
+       return err;
 }
 
 static struct drm_info_list debugfs_files[] = {
@@ -548,14 +560,19 @@ static void tegra_dsi_configure(struct tegra_dsi *dsi, unsigned int pipe,
 
                /* horizontal sync width */
                hsw = (mode->hsync_end - mode->hsync_start) * mul / div;
-               hsw -= 10;
 
                /* horizontal back porch */
                hbp = (mode->htotal - mode->hsync_end) * mul / div;
-               hbp -= 14;
+
+               if ((dsi->flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE) == 0)
+                       hbp += hsw;
 
                /* horizontal front porch */
                hfp = (mode->hsync_start - mode->hdisplay) * mul / div;
+
+               /* subtract packet overhead */
+               hsw -= 10;
+               hbp -= 14;
                hfp -= 8;
 
                tegra_dsi_writel(dsi, hsw << 16 | 0, DSI_PKT_LEN_0_1);
@@ -726,11 +743,6 @@ static void tegra_dsi_soft_reset(struct tegra_dsi *dsi)
                tegra_dsi_soft_reset(dsi->slave);
 }
 
-static int tegra_dsi_connector_dpms(struct drm_connector *connector, int mode)
-{
-       return 0;
-}
-
 static void tegra_dsi_connector_reset(struct drm_connector *connector)
 {
        struct tegra_dsi_state *state;
@@ -757,7 +769,7 @@ tegra_dsi_connector_duplicate_state(struct drm_connector *connector)
 }
 
 static const struct drm_connector_funcs tegra_dsi_connector_funcs = {
-       .dpms = tegra_dsi_connector_dpms,
+       .dpms = drm_atomic_helper_connector_dpms,
        .reset = tegra_dsi_connector_reset,
        .detect = tegra_output_connector_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
@@ -783,22 +795,48 @@ static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = {
        .destroy = tegra_output_encoder_destroy,
 };
 
-static void tegra_dsi_encoder_dpms(struct drm_encoder *encoder, int mode)
+static void tegra_dsi_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_dsi *dsi = to_dsi(output);
+       u32 value;
+       int err;
 
-static void tegra_dsi_encoder_prepare(struct drm_encoder *encoder)
-{
-}
+       if (output->panel)
+               drm_panel_disable(output->panel);
 
-static void tegra_dsi_encoder_commit(struct drm_encoder *encoder)
-{
+       tegra_dsi_video_disable(dsi);
+
+       /*
+        * 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 &= ~DSI_ENABLE;
+               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
+
+               tegra_dc_commit(dc);
+       }
+
+       err = tegra_dsi_wait_idle(dsi, 100);
+       if (err < 0)
+               dev_dbg(dsi->dev, "failed to idle DSI: %d\n", err);
+
+       tegra_dsi_soft_reset(dsi);
+
+       if (output->panel)
+               drm_panel_unprepare(output->panel);
+
+       tegra_dsi_disable(dsi);
+
+       return;
 }
 
-static void tegra_dsi_encoder_mode_set(struct drm_encoder *encoder,
-                                      struct drm_display_mode *mode,
-                                      struct drm_display_mode *adjusted)
+static void tegra_dsi_encoder_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);
        struct tegra_dsi *dsi = to_dsi(output);
@@ -836,45 +874,6 @@ static void tegra_dsi_encoder_mode_set(struct drm_encoder *encoder,
        return;
 }
 
-static void tegra_dsi_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_dsi *dsi = to_dsi(output);
-       u32 value;
-       int err;
-
-       if (output->panel)
-               drm_panel_disable(output->panel);
-
-       tegra_dsi_video_disable(dsi);
-
-       /*
-        * 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 &= ~DSI_ENABLE;
-               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
-
-               tegra_dc_commit(dc);
-       }
-
-       err = tegra_dsi_wait_idle(dsi, 100);
-       if (err < 0)
-               dev_dbg(dsi->dev, "failed to idle DSI: %d\n", err);
-
-       tegra_dsi_soft_reset(dsi);
-
-       if (output->panel)
-               drm_panel_unprepare(output->panel);
-
-       tegra_dsi_disable(dsi);
-
-       return;
-}
-
 static int
 tegra_dsi_encoder_atomic_check(struct drm_encoder *encoder,
                               struct drm_crtc_state *crtc_state,
@@ -957,11 +956,8 @@ tegra_dsi_encoder_atomic_check(struct drm_encoder *encoder,
 }
 
 static const struct drm_encoder_helper_funcs tegra_dsi_encoder_helper_funcs = {
-       .dpms = tegra_dsi_encoder_dpms,
-       .prepare = tegra_dsi_encoder_prepare,
-       .commit = tegra_dsi_encoder_commit,
-       .mode_set = tegra_dsi_encoder_mode_set,
        .disable = tegra_dsi_encoder_disable,
+       .enable = tegra_dsi_encoder_enable,
        .atomic_check = tegra_dsi_encoder_atomic_check,
 };
 
@@ -993,6 +989,10 @@ static int tegra_dsi_pad_calibrate(struct tegra_dsi *dsi)
                DSI_PAD_OUT_CLK(0x0);
        tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_2);
 
+       value = DSI_PAD_PREEMP_PD_CLK(0x3) | DSI_PAD_PREEMP_PU_CLK(0x3) |
+               DSI_PAD_PREEMP_PD(0x03) | DSI_PAD_PREEMP_PU(0x3);
+       tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_3);
+
        return tegra_mipi_calibrate(dsi->mipi);
 }
 
@@ -1622,6 +1622,9 @@ static int tegra_dsi_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id tegra_dsi_of_match[] = {
+       { .compatible = "nvidia,tegra210-dsi", },
+       { .compatible = "nvidia,tegra132-dsi", },
+       { .compatible = "nvidia,tegra124-dsi", },
        { .compatible = "nvidia,tegra114-dsi", },
        { },
 };
index bad1006a51509da2868d83115245cb742ec29385..2192636153991fbcd554d1a1125862e81cfcbbe7 100644 (file)
 #define DSI_PAD_SLEW_DN(x)             (((x) & 0x7) << 12)
 #define DSI_PAD_SLEW_UP(x)             (((x) & 0x7) << 16)
 #define DSI_PAD_CONTROL_3              0x51
+#define  DSI_PAD_PREEMP_PD_CLK(x)      (((x) & 0x3) << 12)
+#define  DSI_PAD_PREEMP_PU_CLK(x)      (((x) & 0x3) << 8)
+#define  DSI_PAD_PREEMP_PD(x)          (((x) & 0x3) << 4)
+#define  DSI_PAD_PREEMP_PU(x)          (((x) & 0x3) << 0)
 #define DSI_PAD_CONTROL_4              0x52
 #define DSI_GANGED_MODE_CONTROL                0x53
 #define DSI_GANGED_MODE_CONTROL_ENABLE (1 << 0)
index fe4008a7ddba56695439bafd5c3e185e34d766ad..52b32cbd9de665c6e017218e1cd1b0e3782a994b 100644 (file)
@@ -772,14 +772,8 @@ static bool tegra_output_is_hdmi(struct tegra_output *output)
        return drm_detect_hdmi_monitor(edid);
 }
 
-static int tegra_hdmi_connector_dpms(struct drm_connector *connector,
-                                    int mode)
-{
-       return 0;
-}
-
 static const struct drm_connector_funcs tegra_hdmi_connector_funcs = {
-       .dpms = tegra_hdmi_connector_dpms,
+       .dpms = drm_atomic_helper_connector_dpms,
        .reset = drm_atomic_helper_connector_reset,
        .detect = tegra_output_connector_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
@@ -819,22 +813,27 @@ static const struct drm_encoder_funcs tegra_hdmi_encoder_funcs = {
        .destroy = tegra_output_encoder_destroy,
 };
 
-static void tegra_hdmi_encoder_dpms(struct drm_encoder *encoder, int mode)
+static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder)
 {
-}
+       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
+       u32 value;
 
-static void tegra_hdmi_encoder_prepare(struct drm_encoder *encoder)
-{
-}
+       /*
+        * 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 &= ~HDMI_ENABLE;
+               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
 
-static void tegra_hdmi_encoder_commit(struct drm_encoder *encoder)
-{
+               tegra_dc_commit(dc);
+       }
 }
 
-static void tegra_hdmi_encoder_mode_set(struct drm_encoder *encoder,
-                                       struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted)
+static void tegra_hdmi_encoder_enable(struct drm_encoder *encoder)
 {
+       struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
        unsigned int h_sync_width, h_front_porch, h_back_porch, i, rekey;
        struct tegra_output *output = encoder_to_output(encoder);
        struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
@@ -873,13 +872,13 @@ static void tegra_hdmi_encoder_mode_set(struct drm_encoder *encoder,
 
        tegra_dc_writel(dc, VSYNC_H_POSITION(1),
                        DC_DISP_DISP_TIMING_OPTIONS);
-       tegra_dc_writel(dc, DITHER_CONTROL_DISABLE | BASE_COLOR_SIZE888,
+       tegra_dc_writel(dc, DITHER_CONTROL_DISABLE | BASE_COLOR_SIZE_888,
                        DC_DISP_DISP_COLOR_CONTROL);
 
        /* video_preamble uses h_pulse2 */
        pulse_start = 1 + h_sync_width + h_back_porch - 10;
 
-       tegra_dc_writel(dc, H_PULSE_2_ENABLE, DC_DISP_DISP_SIGNAL_OPTIONS0);
+       tegra_dc_writel(dc, H_PULSE2_ENABLE, DC_DISP_DISP_SIGNAL_OPTIONS0);
 
        value = PULSE_MODE_NORMAL | PULSE_POLARITY_HIGH | PULSE_QUAL_VACTIVE |
                PULSE_LAST_END_A;
@@ -1036,24 +1035,6 @@ static void tegra_hdmi_encoder_mode_set(struct drm_encoder *encoder,
        /* TODO: add HDCP support */
 }
 
-static void tegra_hdmi_encoder_disable(struct drm_encoder *encoder)
-{
-       struct tegra_dc *dc = to_tegra_dc(encoder->crtc);
-       u32 value;
-
-       /*
-        * 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 &= ~HDMI_ENABLE;
-               tegra_dc_writel(dc, value, DC_DISP_DISP_WIN_OPTIONS);
-
-               tegra_dc_commit(dc);
-       }
-}
-
 static int
 tegra_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
                                struct drm_crtc_state *crtc_state,
@@ -1076,11 +1057,8 @@ tegra_hdmi_encoder_atomic_check(struct drm_encoder *encoder,
 }
 
 static const struct drm_encoder_helper_funcs tegra_hdmi_encoder_helper_funcs = {
-       .dpms = tegra_hdmi_encoder_dpms,
-       .prepare = tegra_hdmi_encoder_prepare,
-       .commit = tegra_hdmi_encoder_commit,
-       .mode_set = tegra_hdmi_encoder_mode_set,
        .disable = tegra_hdmi_encoder_disable,
+       .enable = tegra_hdmi_encoder_enable,
        .atomic_check = tegra_hdmi_encoder_atomic_check,
 };
 
@@ -1088,11 +1066,16 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
 {
        struct drm_info_node *node = s->private;
        struct tegra_hdmi *hdmi = node->info_ent->data;
-       int err;
+       struct drm_crtc *crtc = hdmi->output.encoder.crtc;
+       struct drm_device *drm = node->minor->dev;
+       int err = 0;
 
-       err = clk_prepare_enable(hdmi->clk);
-       if (err)
-               return err;
+       drm_modeset_lock_all(drm);
+
+       if (!crtc || !crtc->state->active) {
+               err = -EBUSY;
+               goto unlock;
+       }
 
 #define DUMP_REG(name)                                         \
        seq_printf(s, "%-56s %#05x %08x\n", #name, name,        \
@@ -1259,9 +1242,9 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
 
 #undef DUMP_REG
 
-       clk_disable_unprepare(hdmi->clk);
-
-       return 0;
+unlock:
+       drm_modeset_unlock_all(drm);
+       return err;
 }
 
 static struct drm_info_list debugfs_files[] = {
index 37db47975d486bfd4ce982e93cdfee59fcfc2a8c..46664b6222707e3d4e51e4629305268711503c33 100644 (file)
@@ -7,8 +7,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/of_gpio.h>
-
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_panel.h>
 #include "drm.h"
@@ -59,10 +57,17 @@ tegra_output_connector_detect(struct drm_connector *connector, bool force)
        enum drm_connector_status status = connector_status_unknown;
 
        if (gpio_is_valid(output->hpd_gpio)) {
-               if (gpio_get_value(output->hpd_gpio) == 0)
-                       status = connector_status_disconnected;
-               else
-                       status = connector_status_connected;
+               if (output->hpd_gpio_flags & OF_GPIO_ACTIVE_LOW) {
+                       if (gpio_get_value(output->hpd_gpio) != 0)
+                               status = connector_status_disconnected;
+                       else
+                               status = connector_status_connected;
+               } else {
+                       if (gpio_get_value(output->hpd_gpio) == 0)
+                               status = connector_status_disconnected;
+                       else
+                               status = connector_status_connected;
+               }
        } else {
                if (!output->panel)
                        status = connector_status_disconnected;
@@ -97,7 +102,6 @@ static irqreturn_t hpd_irq(int irq, void *data)
 int tegra_output_probe(struct tegra_output *output)
 {
        struct device_node *ddc, *panel;
-       enum of_gpio_flags flags;
        int err, size;
 
        if (!output->of_node)
@@ -128,7 +132,7 @@ int tegra_output_probe(struct tegra_output *output)
 
        output->hpd_gpio = of_get_named_gpio_flags(output->of_node,
                                                   "nvidia,hpd-gpio", 0,
-                                                  &flags);
+                                                  &output->hpd_gpio_flags);
        if (gpio_is_valid(output->hpd_gpio)) {
                unsigned long flags;
 
index 9a99d213e1b1e8aeb2481771aac46c4a3fa2b3b6..bc9735b4ad605a21d304ccaf39d5d0038e7e8512 100644 (file)
@@ -18,7 +18,6 @@
 struct tegra_rgb {
        struct tegra_output output;
        struct tegra_dc *dc;
-       bool enabled;
 
        struct clk *clk_parent;
        struct clk *clk;
@@ -88,14 +87,8 @@ static void tegra_dc_write_regs(struct tegra_dc *dc,
                tegra_dc_writel(dc, table[i].value, table[i].offset);
 }
 
-static int tegra_rgb_connector_dpms(struct drm_connector *connector,
-                                   int mode)
-{
-       return 0;
-}
-
 static const struct drm_connector_funcs tegra_rgb_connector_funcs = {
-       .dpms = tegra_rgb_connector_dpms,
+       .dpms = drm_atomic_helper_connector_dpms,
        .reset = drm_atomic_helper_connector_reset,
        .detect = tegra_output_connector_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
@@ -126,21 +119,22 @@ static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = {
        .destroy = tegra_output_encoder_destroy,
 };
 
-static void tegra_rgb_encoder_dpms(struct drm_encoder *encoder, int mode)
+static void tegra_rgb_encoder_disable(struct drm_encoder *encoder)
 {
-}
+       struct tegra_output *output = encoder_to_output(encoder);
+       struct tegra_rgb *rgb = to_rgb(output);
 
-static void tegra_rgb_encoder_prepare(struct drm_encoder *encoder)
-{
-}
+       if (output->panel)
+               drm_panel_disable(output->panel);
 
-static void tegra_rgb_encoder_commit(struct drm_encoder *encoder)
-{
+       tegra_dc_write_regs(rgb->dc, rgb_disable, ARRAY_SIZE(rgb_disable));
+       tegra_dc_commit(rgb->dc);
+
+       if (output->panel)
+               drm_panel_unprepare(output->panel);
 }
 
-static void tegra_rgb_encoder_mode_set(struct drm_encoder *encoder,
-                                      struct drm_display_mode *mode,
-                                      struct drm_display_mode *adjusted)
+static void tegra_rgb_encoder_enable(struct drm_encoder *encoder)
 {
        struct tegra_output *output = encoder_to_output(encoder);
        struct tegra_rgb *rgb = to_rgb(output);
@@ -175,21 +169,6 @@ static void tegra_rgb_encoder_mode_set(struct drm_encoder *encoder,
                drm_panel_enable(output->panel);
 }
 
-static void tegra_rgb_encoder_disable(struct drm_encoder *encoder)
-{
-       struct tegra_output *output = encoder_to_output(encoder);
-       struct tegra_rgb *rgb = to_rgb(output);
-
-       if (output->panel)
-               drm_panel_disable(output->panel);
-
-       tegra_dc_write_regs(rgb->dc, rgb_disable, ARRAY_SIZE(rgb_disable));
-       tegra_dc_commit(rgb->dc);
-
-       if (output->panel)
-               drm_panel_unprepare(output->panel);
-}
-
 static int
 tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder,
                               struct drm_crtc_state *crtc_state,
@@ -232,11 +211,8 @@ tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder,
 }
 
 static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = {
-       .dpms = tegra_rgb_encoder_dpms,
-       .prepare = tegra_rgb_encoder_prepare,
-       .commit = tegra_rgb_encoder_commit,
-       .mode_set = tegra_rgb_encoder_mode_set,
        .disable = tegra_rgb_encoder_disable,
+       .enable = tegra_rgb_encoder_enable,
        .atomic_check = tegra_rgb_encoder_atomic_check,
 };
 
index ee8ad0d4a0f28700ab54d663716cc37889ef7034..da1715ebdd7118c698621e574764b0054aeb125b 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);
@@ -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,15 +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 int tegra_sor_connector_dpms(struct drm_connector *connector, int mode)
-{
-       return 0;
+       debugfs_remove_recursive(sor->debugfs);
+       sor->debugfs = NULL;
 }
 
 static enum drm_connector_status
@@ -880,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,
@@ -927,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;
@@ -953,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);
 
@@ -979,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;
                }
        }
 
@@ -1000,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
@@ -1046,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);
@@ -1098,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);
@@ -1115,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 |
@@ -1142,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 |
@@ -1160,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);
 
@@ -1177,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;
@@ -1190,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;
@@ -1226,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 */
 
@@ -1250,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
@@ -1296,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
@@ -1304,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 |
@@ -1331,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);
 
@@ -1345,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
@@ -1455,40 +1608,581 @@ 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);
+       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);
@@ -1578,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) {
@@ -1600,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)
@@ -1659,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",
index a5f8853fedb5aaf391e794c45ab49f754cb6df9a..2d31d027e3f68cfe22d36d03cd4f75f6a575333b 100644 (file)
@@ -11,9 +11,9 @@
 
 #define SOR_CTXSW 0x00
 
-#define SOR_SUPER_STATE_0 0x01
+#define SOR_SUPER_STATE0 0x01
 
-#define SOR_SUPER_STATE_1 0x02
+#define SOR_SUPER_STATE1 0x02
 #define  SOR_SUPER_STATE_ATTACHED              (1 << 3)
 #define  SOR_SUPER_STATE_MODE_NORMAL           (1 << 2)
 #define  SOR_SUPER_STATE_HEAD_MODE_MASK                (3 << 0)
@@ -21,9 +21,9 @@
 #define  SOR_SUPER_STATE_HEAD_MODE_SNOOZE      (1 << 0)
 #define  SOR_SUPER_STATE_HEAD_MODE_SLEEP       (0 << 0)
 
-#define SOR_STATE_0 0x03
+#define SOR_STATE0 0x03
 
-#define SOR_STATE_1 0x04
+#define SOR_STATE1 0x04
 #define  SOR_STATE_ASY_PIXELDEPTH_MASK         (0xf << 17)
 #define  SOR_STATE_ASY_PIXELDEPTH_BPP_18_444   (0x2 << 17)
 #define  SOR_STATE_ASY_PIXELDEPTH_BPP_24_444   (0x5 << 17)
 #define  SOR_STATE_ASY_PROTOCOL_CUSTOM         (0xf << 8)
 #define  SOR_STATE_ASY_PROTOCOL_DP_A           (0x8 << 8)
 #define  SOR_STATE_ASY_PROTOCOL_DP_B           (0x9 << 8)
+#define  SOR_STATE_ASY_PROTOCOL_SINGLE_TMDS_A  (0x1 << 8)
 #define  SOR_STATE_ASY_PROTOCOL_LVDS           (0x0 << 8)
 #define  SOR_STATE_ASY_CRC_MODE_MASK           (0x3 << 6)
 #define  SOR_STATE_ASY_CRC_MODE_NON_ACTIVE     (0x2 << 6)
 #define  SOR_STATE_ASY_CRC_MODE_COMPLETE       (0x1 << 6)
 #define  SOR_STATE_ASY_CRC_MODE_ACTIVE         (0x0 << 6)
+#define  SOR_STATE_ASY_OWNER_MASK              0xf
 #define  SOR_STATE_ASY_OWNER(x)                        (((x) & 0xf) << 0)
 
-#define SOR_HEAD_STATE_0(x) (0x05 + (x))
-#define SOR_HEAD_STATE_1(x) (0x07 + (x))
-#define SOR_HEAD_STATE_2(x) (0x09 + (x))
-#define SOR_HEAD_STATE_3(x) (0x0b + (x))
-#define SOR_HEAD_STATE_4(x) (0x0d + (x))
-#define SOR_HEAD_STATE_5(x) (0x0f + (x))
+#define SOR_HEAD_STATE0(x) (0x05 + (x))
+#define  SOR_HEAD_STATE_RANGECOMPRESS_MASK (0x1 << 3)
+#define  SOR_HEAD_STATE_DYNRANGE_MASK (0x1 << 2)
+#define  SOR_HEAD_STATE_DYNRANGE_VESA (0 << 2)
+#define  SOR_HEAD_STATE_DYNRANGE_CEA (1 << 2)
+#define  SOR_HEAD_STATE_COLORSPACE_MASK (0x3 << 0)
+#define  SOR_HEAD_STATE_COLORSPACE_RGB (0 << 0)
+#define SOR_HEAD_STATE1(x) (0x07 + (x))
+#define SOR_HEAD_STATE2(x) (0x09 + (x))
+#define SOR_HEAD_STATE3(x) (0x0b + (x))
+#define SOR_HEAD_STATE4(x) (0x0d + (x))
+#define SOR_HEAD_STATE5(x) (0x0f + (x))
 #define SOR_CRC_CNTRL 0x11
 #define  SOR_CRC_CNTRL_ENABLE                  (1 << 0)
 #define SOR_DP_DEBUG_MVID 0x12
 #define  SOR_TEST_HEAD_MODE_MASK               (3 << 8)
 #define  SOR_TEST_HEAD_MODE_AWAKE              (2 << 8)
 
-#define SOR_PLL_0 0x17
-#define  SOR_PLL_0_ICHPMP_MASK                 (0xf << 24)
-#define  SOR_PLL_0_ICHPMP(x)                   (((x) & 0xf) << 24)
-#define  SOR_PLL_0_VCOCAP_MASK                 (0xf << 8)
-#define  SOR_PLL_0_VCOCAP(x)                   (((x) & 0xf) << 8)
-#define  SOR_PLL_0_VCOCAP_RST                  SOR_PLL_0_VCOCAP(3)
-#define  SOR_PLL_0_PLLREG_MASK                 (0x3 << 6)
-#define  SOR_PLL_0_PLLREG_LEVEL(x)             (((x) & 0x3) << 6)
-#define  SOR_PLL_0_PLLREG_LEVEL_V25            SOR_PLL_0_PLLREG_LEVEL(0)
-#define  SOR_PLL_0_PLLREG_LEVEL_V15            SOR_PLL_0_PLLREG_LEVEL(1)
-#define  SOR_PLL_0_PLLREG_LEVEL_V35            SOR_PLL_0_PLLREG_LEVEL(2)
-#define  SOR_PLL_0_PLLREG_LEVEL_V45            SOR_PLL_0_PLLREG_LEVEL(3)
-#define  SOR_PLL_0_PULLDOWN                    (1 << 5)
-#define  SOR_PLL_0_RESISTOR_EXT                        (1 << 4)
-#define  SOR_PLL_0_VCOPD                       (1 << 2)
-#define  SOR_PLL_0_POWER_OFF                   (1 << 0)
-
-#define SOR_PLL_1 0x18
+#define SOR_PLL0 0x17
+#define  SOR_PLL0_ICHPMP_MASK                  (0xf << 24)
+#define  SOR_PLL0_ICHPMP(x)                    (((x) & 0xf) << 24)
+#define  SOR_PLL0_VCOCAP_MASK                  (0xf << 8)
+#define  SOR_PLL0_VCOCAP(x)                    (((x) & 0xf) << 8)
+#define  SOR_PLL0_VCOCAP_RST                   SOR_PLL0_VCOCAP(3)
+#define  SOR_PLL0_PLLREG_MASK                  (0x3 << 6)
+#define  SOR_PLL0_PLLREG_LEVEL(x)              (((x) & 0x3) << 6)
+#define  SOR_PLL0_PLLREG_LEVEL_V25             SOR_PLL0_PLLREG_LEVEL(0)
+#define  SOR_PLL0_PLLREG_LEVEL_V15             SOR_PLL0_PLLREG_LEVEL(1)
+#define  SOR_PLL0_PLLREG_LEVEL_V35             SOR_PLL0_PLLREG_LEVEL(2)
+#define  SOR_PLL0_PLLREG_LEVEL_V45             SOR_PLL0_PLLREG_LEVEL(3)
+#define  SOR_PLL0_PULLDOWN                     (1 << 5)
+#define  SOR_PLL0_RESISTOR_EXT                 (1 << 4)
+#define  SOR_PLL0_VCOPD                                (1 << 2)
+#define  SOR_PLL0_PWR                          (1 << 0)
+
+#define SOR_PLL1 0x18
 /* XXX: read-only bit? */
-#define  SOR_PLL_1_TERM_COMPOUT                        (1 << 15)
-#define  SOR_PLL_1_TMDS_TERM                   (1 << 8)
-
-#define SOR_PLL_2 0x19
-#define  SOR_PLL_2_LVDS_ENABLE                 (1 << 25)
-#define  SOR_PLL_2_SEQ_PLLCAPPD_ENFORCE                (1 << 24)
-#define  SOR_PLL_2_PORT_POWERDOWN              (1 << 23)
-#define  SOR_PLL_2_BANDGAP_POWERDOWN           (1 << 22)
-#define  SOR_PLL_2_POWERDOWN_OVERRIDE          (1 << 18)
-#define  SOR_PLL_2_SEQ_PLLCAPPD                        (1 << 17)
-
-#define SOR_PLL_3 0x1a
-#define  SOR_PLL_3_PLL_VDD_MODE_V1_8 (0 << 13)
-#define  SOR_PLL_3_PLL_VDD_MODE_V3_3 (1 << 13)
+#define  SOR_PLL1_LOADADJ_MASK                 (0xf << 20)
+#define  SOR_PLL1_LOADADJ(x)                   (((x) & 0xf) << 20)
+#define  SOR_PLL1_TERM_COMPOUT                 (1 << 15)
+#define  SOR_PLL1_TMDS_TERMADJ_MASK            (0xf << 9)
+#define  SOR_PLL1_TMDS_TERMADJ(x)              (((x) & 0xf) << 9)
+#define  SOR_PLL1_TMDS_TERM                    (1 << 8)
+
+#define SOR_PLL2 0x19
+#define  SOR_PLL2_LVDS_ENABLE                  (1 << 25)
+#define  SOR_PLL2_SEQ_PLLCAPPD_ENFORCE         (1 << 24)
+#define  SOR_PLL2_PORT_POWERDOWN               (1 << 23)
+#define  SOR_PLL2_BANDGAP_POWERDOWN            (1 << 22)
+#define  SOR_PLL2_POWERDOWN_OVERRIDE           (1 << 18)
+#define  SOR_PLL2_SEQ_PLLCAPPD                 (1 << 17)
+#define  SOR_PLL2_SEQ_PLL_PULLDOWN             (1 << 16)
+
+#define SOR_PLL3 0x1a
+#define  SOR_PLL3_BG_VREF_LEVEL_MASK           (0xf << 24)
+#define  SOR_PLL3_BG_VREF_LEVEL(x)             (((x) & 0xf) << 24)
+#define  SOR_PLL3_PLL_VDD_MODE_1V8             (0 << 13)
+#define  SOR_PLL3_PLL_VDD_MODE_3V3             (1 << 13)
 
 #define SOR_CSTM 0x1b
+#define  SOR_CSTM_ROTCLK_MASK                  (0xf << 24)
+#define  SOR_CSTM_ROTCLK(x)                    (((x) & 0xf) << 24)
 #define  SOR_CSTM_LVDS                         (1 << 16)
 #define  SOR_CSTM_LINK_ACT_B                   (1 << 15)
 #define  SOR_CSTM_LINK_ACT_A                   (1 << 14)
 #define  SOR_CSTM_UPPER                                (1 << 11)
 
 #define SOR_LVDS 0x1c
-#define SOR_CRC_A 0x1d
-#define  SOR_CRC_A_VALID                       (1 << 0)
-#define  SOR_CRC_A_RESET                       (1 << 0)
-#define SOR_CRC_B 0x1e
+#define SOR_CRCA 0x1d
+#define  SOR_CRCA_VALID                        (1 << 0)
+#define  SOR_CRCA_RESET                        (1 << 0)
+#define SOR_CRCB 0x1e
 #define SOR_BLANK 0x1f
 #define SOR_SEQ_CTL 0x20
+#define  SOR_SEQ_CTL_PD_PC_ALT(x)      (((x) & 0xf) << 12)
+#define  SOR_SEQ_CTL_PD_PC(x)          (((x) & 0xf) <<  8)
+#define  SOR_SEQ_CTL_PU_PC_ALT(x)      (((x) & 0xf) <<  4)
+#define  SOR_SEQ_CTL_PU_PC(x)          (((x) & 0xf) <<  0)
 
 #define SOR_LANE_SEQ_CTL 0x21
 #define  SOR_LANE_SEQ_CTL_TRIGGER              (1 << 31)
+#define  SOR_LANE_SEQ_CTL_STATE_BUSY           (1 << 28)
 #define  SOR_LANE_SEQ_CTL_SEQUENCE_UP          (0 << 20)
 #define  SOR_LANE_SEQ_CTL_SEQUENCE_DOWN                (1 << 20)
 #define  SOR_LANE_SEQ_CTL_POWER_STATE_UP       (0 << 16)
 #define  SOR_LANE_SEQ_CTL_POWER_STATE_DOWN     (1 << 16)
+#define  SOR_LANE_SEQ_CTL_DELAY(x)             (((x) & 0xf) << 12)
 
 #define SOR_SEQ_INST(x) (0x22 + (x))
+#define  SOR_SEQ_INST_PLL_PULLDOWN (1 << 31)
+#define  SOR_SEQ_INST_POWERDOWN_MACRO (1 << 30)
+#define  SOR_SEQ_INST_ASSERT_PLL_RESET (1 << 29)
+#define  SOR_SEQ_INST_BLANK_V (1 << 28)
+#define  SOR_SEQ_INST_BLANK_H (1 << 27)
+#define  SOR_SEQ_INST_BLANK_DE (1 << 26)
+#define  SOR_SEQ_INST_BLACK_DATA (1 << 25)
+#define  SOR_SEQ_INST_TRISTATE_IOS (1 << 24)
+#define  SOR_SEQ_INST_DRIVE_PWM_OUT_LO (1 << 23)
+#define  SOR_SEQ_INST_PIN_B_LOW (0 << 22)
+#define  SOR_SEQ_INST_PIN_B_HIGH (1 << 22)
+#define  SOR_SEQ_INST_PIN_A_LOW (0 << 21)
+#define  SOR_SEQ_INST_PIN_A_HIGH (1 << 21)
+#define  SOR_SEQ_INST_SEQUENCE_UP (0 << 19)
+#define  SOR_SEQ_INST_SEQUENCE_DOWN (1 << 19)
+#define  SOR_SEQ_INST_LANE_SEQ_STOP (0 << 18)
+#define  SOR_SEQ_INST_LANE_SEQ_RUN (1 << 18)
+#define  SOR_SEQ_INST_PORT_POWERDOWN (1 << 17)
+#define  SOR_SEQ_INST_PLL_POWERDOWN (1 << 16)
+#define  SOR_SEQ_INST_HALT (1 << 15)
+#define  SOR_SEQ_INST_WAIT_US (0 << 12)
+#define  SOR_SEQ_INST_WAIT_MS (1 << 12)
+#define  SOR_SEQ_INST_WAIT_VSYNC (2 << 12)
+#define  SOR_SEQ_INST_WAIT(x) (((x) & 0x3ff) << 0)
 
 #define SOR_PWM_DIV 0x32
 #define  SOR_PWM_DIV_MASK                      0xffffff
 #define  SOR_PWM_CTL_CLK_SEL                   (1 << 30)
 #define  SOR_PWM_CTL_DUTY_CYCLE_MASK           0xffffff
 
-#define SOR_VCRC_A_0 0x34
-#define SOR_VCRC_A_1 0x35
-#define SOR_VCRC_B_0 0x36
-#define SOR_VCRC_B_1 0x37
-#define SOR_CCRC_A_0 0x38
-#define SOR_CCRC_A_1 0x39
-#define SOR_CCRC_B_0 0x3a
-#define SOR_CCRC_B_1 0x3b
-#define SOR_EDATA_A_0 0x3c
-#define SOR_EDATA_A_1 0x3d
-#define SOR_EDATA_B_0 0x3e
-#define SOR_EDATA_B_1 0x3f
-#define SOR_COUNT_A_0 0x40
-#define SOR_COUNT_A_1 0x41
-#define SOR_COUNT_B_0 0x42
-#define SOR_COUNT_B_1 0x43
-#define SOR_DEBUG_A_0 0x44
-#define SOR_DEBUG_A_1 0x45
-#define SOR_DEBUG_B_0 0x46
-#define SOR_DEBUG_B_1 0x47
+#define SOR_VCRC_A0 0x34
+#define SOR_VCRC_A1 0x35
+#define SOR_VCRC_B0 0x36
+#define SOR_VCRC_B1 0x37
+#define SOR_CCRC_A0 0x38
+#define SOR_CCRC_A1 0x39
+#define SOR_CCRC_B0 0x3a
+#define SOR_CCRC_B1 0x3b
+#define SOR_EDATA_A0 0x3c
+#define SOR_EDATA_A1 0x3d
+#define SOR_EDATA_B0 0x3e
+#define SOR_EDATA_B1 0x3f
+#define SOR_COUNT_A0 0x40
+#define SOR_COUNT_A1 0x41
+#define SOR_COUNT_B0 0x42
+#define SOR_COUNT_B1 0x43
+#define SOR_DEBUG_A0 0x44
+#define SOR_DEBUG_A1 0x45
+#define SOR_DEBUG_B0 0x46
+#define SOR_DEBUG_B1 0x47
 #define SOR_TRIG 0x48
 #define SOR_MSCHECK 0x49
 #define SOR_XBAR_CTRL 0x4a
+#define  SOR_XBAR_CTRL_LINK1_XSEL(channel, value) ((((value) & 0x7) << ((channel) * 3)) << 17)
+#define  SOR_XBAR_CTRL_LINK0_XSEL(channel, value) ((((value) & 0x7) << ((channel) * 3)) <<  2)
+#define  SOR_XBAR_CTRL_LINK_SWAP (1 << 1)
+#define  SOR_XBAR_CTRL_BYPASS (1 << 0)
 #define SOR_XBAR_POL 0x4b
 
-#define SOR_DP_LINKCTL_0 0x4c
+#define SOR_DP_LINKCTL0 0x4c
 #define  SOR_DP_LINKCTL_LANE_COUNT_MASK                (0x1f << 16)
 #define  SOR_DP_LINKCTL_LANE_COUNT(x)          (((1 << (x)) - 1) << 16)
 #define  SOR_DP_LINKCTL_ENHANCED_FRAME         (1 << 14)
 #define  SOR_DP_LINKCTL_TU_SIZE(x)             (((x) & 0x7f) << 2)
 #define  SOR_DP_LINKCTL_ENABLE                 (1 << 0)
 
-#define SOR_DP_LINKCTL_1 0x4d
+#define SOR_DP_LINKCTL1 0x4d
 
-#define SOR_LANE_DRIVE_CURRENT_0 0x4e
-#define SOR_LANE_DRIVE_CURRENT_1 0x4f
-#define SOR_LANE4_DRIVE_CURRENT_0 0x50
-#define SOR_LANE4_DRIVE_CURRENT_1 0x51
+#define SOR_LANE_DRIVE_CURRENT0 0x4e
+#define SOR_LANE_DRIVE_CURRENT1 0x4f
+#define SOR_LANE4_DRIVE_CURRENT0 0x50
+#define SOR_LANE4_DRIVE_CURRENT1 0x51
 #define  SOR_LANE_DRIVE_CURRENT_LANE3(x) (((x) & 0xff) << 24)
 #define  SOR_LANE_DRIVE_CURRENT_LANE2(x) (((x) & 0xff) << 16)
 #define  SOR_LANE_DRIVE_CURRENT_LANE1(x) (((x) & 0xff) << 8)
 #define  SOR_LANE_DRIVE_CURRENT_LANE0(x) (((x) & 0xff) << 0)
 
-#define SOR_LANE_PREEMPHASIS_0 0x52
-#define SOR_LANE_PREEMPHASIS_1 0x53
-#define SOR_LANE4_PREEMPHASIS_0 0x54
-#define SOR_LANE4_PREEMPHASIS_1 0x55
+#define SOR_LANE_PREEMPHASIS0 0x52
+#define SOR_LANE_PREEMPHASIS1 0x53
+#define SOR_LANE4_PREEMPHASIS0 0x54
+#define SOR_LANE4_PREEMPHASIS1 0x55
 #define  SOR_LANE_PREEMPHASIS_LANE3(x) (((x) & 0xff) << 24)
 #define  SOR_LANE_PREEMPHASIS_LANE2(x) (((x) & 0xff) << 16)
 #define  SOR_LANE_PREEMPHASIS_LANE1(x) (((x) & 0xff) << 8)
 #define  SOR_LANE_PREEMPHASIS_LANE0(x) (((x) & 0xff) << 0)
 
-#define SOR_LANE_POST_CURSOR_0 0x56
-#define SOR_LANE_POST_CURSOR_1 0x57
-#define  SOR_LANE_POST_CURSOR_LANE3(x) (((x) & 0xff) << 24)
-#define  SOR_LANE_POST_CURSOR_LANE2(x) (((x) & 0xff) << 16)
-#define  SOR_LANE_POST_CURSOR_LANE1(x) (((x) & 0xff) << 8)
-#define  SOR_LANE_POST_CURSOR_LANE0(x) (((x) & 0xff) << 0)
+#define SOR_LANE_POSTCURSOR0 0x56
+#define SOR_LANE_POSTCURSOR1 0x57
+#define  SOR_LANE_POSTCURSOR_LANE3(x) (((x) & 0xff) << 24)
+#define  SOR_LANE_POSTCURSOR_LANE2(x) (((x) & 0xff) << 16)
+#define  SOR_LANE_POSTCURSOR_LANE1(x) (((x) & 0xff) << 8)
+#define  SOR_LANE_POSTCURSOR_LANE0(x) (((x) & 0xff) << 0)
 
-#define SOR_DP_CONFIG_0 0x58
+#define SOR_DP_CONFIG0 0x58
 #define SOR_DP_CONFIG_DISPARITY_NEGATIVE       (1 << 31)
 #define SOR_DP_CONFIG_ACTIVE_SYM_ENABLE                (1 << 26)
 #define SOR_DP_CONFIG_ACTIVE_SYM_POLARITY      (1 << 24)
 #define SOR_DP_CONFIG_WATERMARK_MASK   (0x3f << 0)
 #define SOR_DP_CONFIG_WATERMARK(x)     (((x) & 0x3f) << 0)
 
-#define SOR_DP_CONFIG_1 0x59
-#define SOR_DP_MN_0 0x5a
-#define SOR_DP_MN_1 0x5b
+#define SOR_DP_CONFIG1 0x59
+#define SOR_DP_MN0 0x5a
+#define SOR_DP_MN1 0x5b
 
-#define SOR_DP_PADCTL_0 0x5c
+#define SOR_DP_PADCTL0 0x5c
 #define  SOR_DP_PADCTL_PAD_CAL_PD      (1 << 23)
 #define  SOR_DP_PADCTL_TX_PU_ENABLE    (1 << 22)
 #define  SOR_DP_PADCTL_TX_PU_MASK      (0xff << 8)
 #define  SOR_DP_PADCTL_PD_TXD_1                (1 << 1)
 #define  SOR_DP_PADCTL_PD_TXD_2                (1 << 0)
 
-#define SOR_DP_PADCTL_1 0x5d
+#define SOR_DP_PADCTL1 0x5d
 
-#define SOR_DP_DEBUG_0 0x5e
-#define SOR_DP_DEBUG_1 0x5f
+#define SOR_DP_DEBUG0 0x5e
+#define SOR_DP_DEBUG1 0x5f
 
-#define SOR_DP_SPARE_0 0x60
-#define  SOR_DP_SPARE_MACRO_SOR_CLK    (1 << 2)
-#define  SOR_DP_SPARE_PANEL_INTERNAL   (1 << 1)
-#define  SOR_DP_SPARE_SEQ_ENABLE       (1 << 0)
+#define SOR_DP_SPARE0 0x60
+#define  SOR_DP_SPARE_DISP_VIDEO_PREAMBLE      (1 << 3)
+#define  SOR_DP_SPARE_MACRO_SOR_CLK            (1 << 2)
+#define  SOR_DP_SPARE_PANEL_INTERNAL           (1 << 1)
+#define  SOR_DP_SPARE_SEQ_ENABLE               (1 << 0)
 
-#define SOR_DP_SPARE_1 0x61
+#define SOR_DP_SPARE1 0x61
 #define SOR_DP_AUDIO_CTRL 0x62
 
 #define SOR_DP_AUDIO_HBLANK_SYMBOLS 0x63
 #define SOR_DP_AUDIO_VBLANK_SYMBOLS_MASK (0x1fffff << 0)
 
 #define SOR_DP_GENERIC_INFOFRAME_HEADER 0x65
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_0 0x66
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_1 0x67
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_2 0x68
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_3 0x69
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_4 0x6a
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_5 0x6b
-#define SOR_DP_GENERIC_INFOFRAME_SUBPACK_6 0x6c
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK0 0x66
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK1 0x67
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK2 0x68
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK3 0x69
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK4 0x6a
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK5 0x6b
+#define SOR_DP_GENERIC_INFOFRAME_SUBPACK6 0x6c
 
 #define SOR_DP_TPG 0x6d
 #define  SOR_DP_TPG_CHANNEL_CODING     (1 << 6)
 #define  SOR_DP_TPG_PATTERN_NONE       (0x0 << 0)
 
 #define SOR_DP_TPG_CONFIG 0x6e
-#define SOR_DP_LQ_CSTM_0 0x6f
-#define SOR_DP_LQ_CSTM_1 0x70
-#define SOR_DP_LQ_CSTM_2 0x71
+#define SOR_DP_LQ_CSTM0 0x6f
+#define SOR_DP_LQ_CSTM1 0x70
+#define SOR_DP_LQ_CSTM2 0x71
+
+#define SOR_HDMI_AUDIO_INFOFRAME_CTRL 0x9a
+#define SOR_HDMI_AUDIO_INFOFRAME_STATUS 0x9b
+#define SOR_HDMI_AUDIO_INFOFRAME_HEADER 0x9c
+
+#define SOR_HDMI_AVI_INFOFRAME_CTRL 0x9f
+#define  INFOFRAME_CTRL_CHECKSUM_ENABLE        (1 << 9)
+#define  INFOFRAME_CTRL_SINGLE         (1 << 8)
+#define  INFOFRAME_CTRL_OTHER          (1 << 4)
+#define  INFOFRAME_CTRL_ENABLE         (1 << 0)
+
+#define SOR_HDMI_AVI_INFOFRAME_STATUS 0xa0
+#define  INFOFRAME_STATUS_DONE         (1 << 0)
+
+#define SOR_HDMI_AVI_INFOFRAME_HEADER 0xa1
+#define  INFOFRAME_HEADER_LEN(x) (((x) & 0xff) << 16)
+#define  INFOFRAME_HEADER_VERSION(x) (((x) & 0xff) << 8)
+#define  INFOFRAME_HEADER_TYPE(x) (((x) & 0xff) << 0)
+
+#define SOR_HDMI_CTRL 0xc0
+#define  SOR_HDMI_CTRL_ENABLE (1 << 30)
+#define  SOR_HDMI_CTRL_MAX_AC_PACKET(x) (((x) & 0x1f) << 16)
+#define  SOR_HDMI_CTRL_AUDIO_LAYOUT (1 << 10)
+#define  SOR_HDMI_CTRL_REKEY(x) (((x) & 0x7f) << 0)
+
+#define SOR_REFCLK 0xe6
+#define  SOR_REFCLK_DIV_INT(x) ((((x) >> 2) & 0xff) << 8)
+#define  SOR_REFCLK_DIV_FRAC(x) (((x) & 0x3) << 6)
+
+#define SOR_INPUT_CONTROL 0xe8
+#define  SOR_INPUT_CONTROL_ARM_VIDEO_RANGE_LIMITED (1 << 1)
+#define  SOR_INPUT_CONTROL_HDMI_SRC_SELECT(x) (((x) & 0x1) << 0)
+
+#define SOR_HDMI_VSI_INFOFRAME_CTRL 0x123
+#define SOR_HDMI_VSI_INFOFRAME_STATUS 0x124
+#define SOR_HDMI_VSI_INFOFRAME_HEADER 0x125
 
 #endif
index fbc6ee6ca3374276219c5a8ae5beab08f8149005..52a6fd224127ef113f2d23338a46d10df28e955e 100644 (file)
@@ -31,6 +31,9 @@
 #include "dev.h"
 
 #define MIPI_CAL_CTRL                  0x00
+#define MIPI_CAL_CTRL_NOISE_FILTER(x)  (((x) & 0xf) << 26)
+#define MIPI_CAL_CTRL_PRESCALE(x)      (((x) & 0x3) << 24)
+#define MIPI_CAL_CTRL_CLKEN_OVR                (1 << 4)
 #define MIPI_CAL_CTRL_START            (1 << 0)
 
 #define MIPI_CAL_AUTOCAL_CTRL          0x01
 #define MIPI_CAL_CONFIG_CSIC           0x07
 #define MIPI_CAL_CONFIG_CSID           0x08
 #define MIPI_CAL_CONFIG_CSIE           0x09
+#define MIPI_CAL_CONFIG_CSIF           0x0a
 #define MIPI_CAL_CONFIG_DSIA           0x0e
 #define MIPI_CAL_CONFIG_DSIB           0x0f
 #define MIPI_CAL_CONFIG_DSIC           0x10
 #define MIPI_CAL_CONFIG_DSID           0x11
 
-#define MIPI_CAL_CONFIG_DSIAB_CLK      0x19
-#define MIPI_CAL_CONFIG_DSICD_CLK      0x1a
+#define MIPI_CAL_CONFIG_DSIA_CLK       0x19
+#define MIPI_CAL_CONFIG_DSIB_CLK       0x1a
 #define MIPI_CAL_CONFIG_CSIAB_CLK      0x1b
+#define MIPI_CAL_CONFIG_DSIC_CLK       0x1c
 #define MIPI_CAL_CONFIG_CSICD_CLK      0x1c
+#define MIPI_CAL_CONFIG_DSID_CLK       0x1d
 #define MIPI_CAL_CONFIG_CSIE_CLK       0x1d
 
 /* for data and clock lanes */
 
 #define MIPI_CAL_BIAS_PAD_CFG1         0x17
 #define MIPI_CAL_BIAS_PAD_DRV_DN_REF(x) (((x) & 0x7) << 16)
+#define MIPI_CAL_BIAS_PAD_DRV_UP_REF(x) (((x) & 0x7) << 8)
 
 #define MIPI_CAL_BIAS_PAD_CFG2         0x18
+#define MIPI_CAL_BIAS_PAD_VCLAMP(x)    (((x) & 0x7) << 16)
+#define MIPI_CAL_BIAS_PAD_VAUXP(x)     (((x) & 0x7) << 4)
 #define MIPI_CAL_BIAS_PAD_PDVREG       (1 << 1)
 
 struct tegra_mipi_pad {
@@ -86,13 +95,35 @@ struct tegra_mipi_soc {
        bool has_clk_lane;
        const struct tegra_mipi_pad *pads;
        unsigned int num_pads;
+
+       bool clock_enable_override;
+       bool needs_vclamp_ref;
+
+       /* bias pad configuration settings */
+       u8 pad_drive_down_ref;
+       u8 pad_drive_up_ref;
+
+       u8 pad_vclamp_level;
+       u8 pad_vauxp_level;
+
+       /* calibration settings for data lanes */
+       u8 hspdos;
+       u8 hspuos;
+       u8 termos;
+
+       /* calibration settings for clock lanes */
+       u8 hsclkpdos;
+       u8 hsclkpuos;
 };
 
 struct tegra_mipi {
        const struct tegra_mipi_soc *soc;
+       struct device *dev;
        void __iomem *regs;
        struct mutex lock;
        struct clk *clk;
+
+       unsigned long usage_count;
 };
 
 struct tegra_mipi_device {
@@ -114,6 +145,67 @@ static inline void tegra_mipi_writel(struct tegra_mipi *mipi, u32 value,
        writel(value, mipi->regs + (offset << 2));
 }
 
+static int tegra_mipi_power_up(struct tegra_mipi *mipi)
+{
+       u32 value;
+       int err;
+
+       err = clk_enable(mipi->clk);
+       if (err < 0)
+               return err;
+
+       value = tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
+       value &= ~MIPI_CAL_BIAS_PAD_PDVCLAMP;
+
+       if (mipi->soc->needs_vclamp_ref)
+               value |= MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
+
+       tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
+
+       value = tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
+       value &= ~MIPI_CAL_BIAS_PAD_PDVREG;
+       tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
+
+       clk_disable(mipi->clk);
+
+       return 0;
+}
+
+static int tegra_mipi_power_down(struct tegra_mipi *mipi)
+{
+       u32 value;
+       int err;
+
+       err = clk_enable(mipi->clk);
+       if (err < 0)
+               return err;
+
+       /*
+        * The MIPI_CAL_BIAS_PAD_PDVREG controls a voltage regulator that
+        * supplies the DSI pads. This must be kept enabled until none of the
+        * DSI lanes are used anymore.
+        */
+       value = tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
+       value |= MIPI_CAL_BIAS_PAD_PDVREG;
+       tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
+
+       /*
+        * MIPI_CAL_BIAS_PAD_PDVCLAMP and MIPI_CAL_BIAS_PAD_E_VCLAMP_REF
+        * control a regulator that supplies current to the pre-driver logic.
+        * Powering down this regulator causes DSI to fail, so it must remain
+        * powered on until none of the DSI lanes are used anymore.
+        */
+       value = tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
+
+       if (mipi->soc->needs_vclamp_ref)
+               value &= ~MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
+
+       value |= MIPI_CAL_BIAS_PAD_PDVCLAMP;
+       tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
+
+       return 0;
+}
+
 struct tegra_mipi_device *tegra_mipi_request(struct device *device)
 {
        struct device_node *np = device->of_node;
@@ -150,6 +242,20 @@ struct tegra_mipi_device *tegra_mipi_request(struct device *device)
        dev->pads = args.args[0];
        dev->device = device;
 
+       mutex_lock(&dev->mipi->lock);
+
+       if (dev->mipi->usage_count++ == 0) {
+               err = tegra_mipi_power_up(dev->mipi);
+               if (err < 0) {
+                       dev_err(dev->mipi->dev,
+                               "failed to power up MIPI bricks: %d\n",
+                               err);
+                       return ERR_PTR(err);
+               }
+       }
+
+       mutex_unlock(&dev->mipi->lock);
+
        return dev;
 
 put:
@@ -164,6 +270,25 @@ EXPORT_SYMBOL(tegra_mipi_request);
 
 void tegra_mipi_free(struct tegra_mipi_device *device)
 {
+       int err;
+
+       mutex_lock(&device->mipi->lock);
+
+       if (--device->mipi->usage_count == 0) {
+               err = tegra_mipi_power_down(device->mipi);
+               if (err < 0) {
+                       /*
+                        * Not much that can be done here, so an error message
+                        * will have to do.
+                        */
+                       dev_err(device->mipi->dev,
+                               "failed to power down MIPI bricks: %d\n",
+                               err);
+               }
+       }
+
+       mutex_unlock(&device->mipi->lock);
+
        platform_device_put(device->pdev);
        kfree(device);
 }
@@ -199,16 +324,15 @@ int tegra_mipi_calibrate(struct tegra_mipi_device *device)
 
        mutex_lock(&device->mipi->lock);
 
-       value = tegra_mipi_readl(device->mipi, MIPI_CAL_BIAS_PAD_CFG0);
-       value &= ~MIPI_CAL_BIAS_PAD_PDVCLAMP;
-       value |= MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
-       tegra_mipi_writel(device->mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
-
-       tegra_mipi_writel(device->mipi, MIPI_CAL_BIAS_PAD_DRV_DN_REF(2),
-                         MIPI_CAL_BIAS_PAD_CFG1);
+       value = MIPI_CAL_BIAS_PAD_DRV_DN_REF(soc->pad_drive_down_ref) |
+               MIPI_CAL_BIAS_PAD_DRV_UP_REF(soc->pad_drive_up_ref);
+       tegra_mipi_writel(device->mipi, value, MIPI_CAL_BIAS_PAD_CFG1);
 
        value = tegra_mipi_readl(device->mipi, MIPI_CAL_BIAS_PAD_CFG2);
-       value &= ~MIPI_CAL_BIAS_PAD_PDVREG;
+       value &= ~MIPI_CAL_BIAS_PAD_VCLAMP(0x7);
+       value &= ~MIPI_CAL_BIAS_PAD_VAUXP(0x7);
+       value |= MIPI_CAL_BIAS_PAD_VCLAMP(soc->pad_vclamp_level);
+       value |= MIPI_CAL_BIAS_PAD_VAUXP(soc->pad_vauxp_level);
        tegra_mipi_writel(device->mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
 
        for (i = 0; i < soc->num_pads; i++) {
@@ -216,20 +340,37 @@ int tegra_mipi_calibrate(struct tegra_mipi_device *device)
 
                if (device->pads & BIT(i)) {
                        data = MIPI_CAL_CONFIG_SELECT |
-                              MIPI_CAL_CONFIG_HSPDOS(0) |
-                              MIPI_CAL_CONFIG_HSPUOS(4) |
-                              MIPI_CAL_CONFIG_TERMOS(5);
+                              MIPI_CAL_CONFIG_HSPDOS(soc->hspdos) |
+                              MIPI_CAL_CONFIG_HSPUOS(soc->hspuos) |
+                              MIPI_CAL_CONFIG_TERMOS(soc->termos);
                        clk = MIPI_CAL_CONFIG_SELECT |
-                             MIPI_CAL_CONFIG_HSCLKPDOSD(0) |
-                             MIPI_CAL_CONFIG_HSCLKPUOSD(4);
+                             MIPI_CAL_CONFIG_HSCLKPDOSD(soc->hsclkpdos) |
+                             MIPI_CAL_CONFIG_HSCLKPUOSD(soc->hsclkpuos);
                }
 
                tegra_mipi_writel(device->mipi, data, soc->pads[i].data);
 
-               if (soc->has_clk_lane)
+               if (soc->has_clk_lane && soc->pads[i].clk != 0)
                        tegra_mipi_writel(device->mipi, clk, soc->pads[i].clk);
        }
 
+       value = tegra_mipi_readl(device->mipi, MIPI_CAL_CTRL);
+       value &= ~MIPI_CAL_CTRL_NOISE_FILTER(0xf);
+       value &= ~MIPI_CAL_CTRL_PRESCALE(0x3);
+       value |= MIPI_CAL_CTRL_NOISE_FILTER(0xa);
+       value |= MIPI_CAL_CTRL_PRESCALE(0x2);
+
+       if (!soc->clock_enable_override)
+               value &= ~MIPI_CAL_CTRL_CLKEN_OVR;
+       else
+               value |= MIPI_CAL_CTRL_CLKEN_OVR;
+
+       tegra_mipi_writel(device->mipi, value, MIPI_CAL_CTRL);
+
+       /* clear any pending status bits */
+       value = tegra_mipi_readl(device->mipi, MIPI_CAL_STATUS);
+       tegra_mipi_writel(device->mipi, value, MIPI_CAL_STATUS);
+
        value = tegra_mipi_readl(device->mipi, MIPI_CAL_CTRL);
        value |= MIPI_CAL_CTRL_START;
        tegra_mipi_writel(device->mipi, value, MIPI_CAL_CTRL);
@@ -259,6 +400,17 @@ static const struct tegra_mipi_soc tegra114_mipi_soc = {
        .has_clk_lane = false,
        .pads = tegra114_mipi_pads,
        .num_pads = ARRAY_SIZE(tegra114_mipi_pads),
+       .clock_enable_override = true,
+       .needs_vclamp_ref = true,
+       .pad_drive_down_ref = 0x2,
+       .pad_drive_up_ref = 0x0,
+       .pad_vclamp_level = 0x0,
+       .pad_vauxp_level = 0x0,
+       .hspdos = 0x0,
+       .hspuos = 0x4,
+       .termos = 0x5,
+       .hsclkpdos = 0x0,
+       .hsclkpuos = 0x4,
 };
 
 static const struct tegra_mipi_pad tegra124_mipi_pads[] = {
@@ -266,20 +418,80 @@ static const struct tegra_mipi_pad tegra124_mipi_pads[] = {
        { .data = MIPI_CAL_CONFIG_CSIB, .clk = MIPI_CAL_CONFIG_CSIAB_CLK },
        { .data = MIPI_CAL_CONFIG_CSIC, .clk = MIPI_CAL_CONFIG_CSICD_CLK },
        { .data = MIPI_CAL_CONFIG_CSID, .clk = MIPI_CAL_CONFIG_CSICD_CLK },
-       { .data = MIPI_CAL_CONFIG_CSIE, .clk = MIPI_CAL_CONFIG_CSIE_CLK },
-       { .data = MIPI_CAL_CONFIG_DSIA, .clk = MIPI_CAL_CONFIG_DSIAB_CLK },
-       { .data = MIPI_CAL_CONFIG_DSIB, .clk = MIPI_CAL_CONFIG_DSIAB_CLK },
+       { .data = MIPI_CAL_CONFIG_CSIE, .clk = MIPI_CAL_CONFIG_CSIE_CLK  },
+       { .data = MIPI_CAL_CONFIG_DSIA, .clk = MIPI_CAL_CONFIG_DSIA_CLK  },
+       { .data = MIPI_CAL_CONFIG_DSIB, .clk = MIPI_CAL_CONFIG_DSIB_CLK  },
 };
 
 static const struct tegra_mipi_soc tegra124_mipi_soc = {
        .has_clk_lane = true,
        .pads = tegra124_mipi_pads,
        .num_pads = ARRAY_SIZE(tegra124_mipi_pads),
+       .clock_enable_override = true,
+       .needs_vclamp_ref = true,
+       .pad_drive_down_ref = 0x2,
+       .pad_drive_up_ref = 0x0,
+       .pad_vclamp_level = 0x0,
+       .pad_vauxp_level = 0x0,
+       .hspdos = 0x0,
+       .hspuos = 0x0,
+       .termos = 0x0,
+       .hsclkpdos = 0x1,
+       .hsclkpuos = 0x2,
+};
+
+static const struct tegra_mipi_soc tegra132_mipi_soc = {
+       .has_clk_lane = true,
+       .pads = tegra124_mipi_pads,
+       .num_pads = ARRAY_SIZE(tegra124_mipi_pads),
+       .clock_enable_override = false,
+       .needs_vclamp_ref = false,
+       .pad_drive_down_ref = 0x0,
+       .pad_drive_up_ref = 0x3,
+       .pad_vclamp_level = 0x0,
+       .pad_vauxp_level = 0x0,
+       .hspdos = 0x0,
+       .hspuos = 0x0,
+       .termos = 0x0,
+       .hsclkpdos = 0x3,
+       .hsclkpuos = 0x2,
+};
+
+static const struct tegra_mipi_pad tegra210_mipi_pads[] = {
+       { .data = MIPI_CAL_CONFIG_CSIA, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_CSIB, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_CSIC, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_CSID, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_CSIE, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_CSIF, .clk = 0 },
+       { .data = MIPI_CAL_CONFIG_DSIA, .clk = MIPI_CAL_CONFIG_DSIA_CLK },
+       { .data = MIPI_CAL_CONFIG_DSIB, .clk = MIPI_CAL_CONFIG_DSIB_CLK },
+       { .data = MIPI_CAL_CONFIG_DSIC, .clk = MIPI_CAL_CONFIG_DSIC_CLK },
+       { .data = MIPI_CAL_CONFIG_DSID, .clk = MIPI_CAL_CONFIG_DSID_CLK },
+};
+
+static const struct tegra_mipi_soc tegra210_mipi_soc = {
+       .has_clk_lane = true,
+       .pads = tegra210_mipi_pads,
+       .num_pads = ARRAY_SIZE(tegra210_mipi_pads),
+       .clock_enable_override = true,
+       .needs_vclamp_ref = false,
+       .pad_drive_down_ref = 0x0,
+       .pad_drive_up_ref = 0x3,
+       .pad_vclamp_level = 0x1,
+       .pad_vauxp_level = 0x1,
+       .hspdos = 0x0,
+       .hspuos = 0x2,
+       .termos = 0x0,
+       .hsclkpdos = 0x0,
+       .hsclkpuos = 0x2,
 };
 
-static struct of_device_id tegra_mipi_of_match[] = {
+static const struct of_device_id tegra_mipi_of_match[] = {
        { .compatible = "nvidia,tegra114-mipi", .data = &tegra114_mipi_soc },
        { .compatible = "nvidia,tegra124-mipi", .data = &tegra124_mipi_soc },
+       { .compatible = "nvidia,tegra132-mipi", .data = &tegra132_mipi_soc },
+       { .compatible = "nvidia,tegra210-mipi", .data = &tegra210_mipi_soc },
        { },
 };
 
@@ -299,6 +511,7 @@ static int tegra_mipi_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        mipi->soc = match->data;
+       mipi->dev = &pdev->dev;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        mipi->regs = devm_ioremap_resource(&pdev->dev, res);