Merge tag 'drm/tegra/for-4.8-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v4.8-rc1

This set of changes contains a bunch of cleanups to the host1x driver as
well as the addition of a pin controller for DPAUX, which is required by
boards to configure the DPAUX pads in AUX mode (for DisplayPort) or I2C
mode (for HDMI and DDC).

Included is also a bit of rework of the SOR driver in preparation to add
DisplayPort support as well as some refactoring and cleanup.

Finally, all output drivers are converted to runtime PM, which greatly
simplifies the handling of clocks and resets.

* tag 'drm/tegra/for-4.8-rc1' of git://anongit.freedesktop.org/tegra/linux: (35 commits)
  drm/tegra: sor: Reject HDMI 2.0 modes
  drm/tegra: sor: Prepare for generic PM domain support
  drm/tegra: dsi: Prepare for generic PM domain support
  drm/tegra: sor: Make XBAR configurable per SoC
  drm/tegra: sor: Use sor1_src clock to set parent for HDMI
  dt-bindings: display: tegra: Add source clock for SOR
  drm/tegra: sor: Implement sor1_brick clock
  drm/tegra: sor: Implement runtime PM
  drm/tegra: hdmi: Implement runtime PM
  drm/tegra: dsi: Implement runtime PM
  drm/tegra: dc: Implement runtime PM
  drm/tegra: hdmi: Enable audio over HDMI
  drm/tegra: sor: Do not support deep color modes
  drm/tegra: sor: Extract tegra_sor_mode_set()
  drm/tegra: sor: Split out tegra_sor_apply_config()
  drm/tegra: sor: Rename tegra_sor_calc_config()
  drm/tegra: sor: Factor out tegra_sor_set_parent_clock()
  drm/tegra: dpaux: Add pinctrl support
  dt-bindings: Add bindings for Tegra DPAUX pinctrl driver
  drm/tegra: Prepare DPAUX for supporting generic PM domains
  ...

1 files changed, 27 insertions, 11 deletions

diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c
index ee3d12b51c50..d9330fcc62ad 100644
--- a/drivers/gpu/host1x/debug.c
+++ b/drivers/gpu/host1x/debug.c
@@ -39,6 +39,7 @@ void host1x_debug_output(struct output *o, const char *fmt, ...)
         va_start(args, fmt);
         len = vsnprintf(o->buf, sizeof(o->buf), fmt, args);
         va_end(args);
+
         o->fn(o->ctx, o->buf, len);
 }
 
@@ -48,13 +49,17 @@ static int show_channels(struct host1x_channel *ch, void *data, bool show_fifo)
         struct output *o = data;
 
         mutex_lock(&ch->reflock);
+
         if (ch->refcount) {
                 mutex_lock(&ch->cdma.lock);
+
                 if (show_fifo)
                         host1x_hw_show_channel_fifo(m, ch, o);
+
                 host1x_hw_show_channel_cdma(m, ch, o);
                 mutex_unlock(&ch->cdma.lock);
         }
+
         mutex_unlock(&ch->reflock);
 
         return 0;
@@ -62,22 +67,27 @@ static int show_channels(struct host1x_channel *ch, void *data, bool show_fifo)
 
 static void show_syncpts(struct host1x *m, struct output *o)
 {
-        int i;
+        unsigned int i;
+
         host1x_debug_output(o, "---- syncpts ----\n");
+
         for (i = 0; i < host1x_syncpt_nb_pts(m); i++) {
                 u32 max = host1x_syncpt_read_max(m->syncpt + i);
                 u32 min = host1x_syncpt_load(m->syncpt + i);
+
                 if (!min && !max)
                         continue;
-                host1x_debug_output(o, "id %d (%s) min %d max %d\n",
+
+                host1x_debug_output(o, "id %u (%s) min %d max %d\n",
                                     i, m->syncpt[i].name, min, max);
         }
 
         for (i = 0; i < host1x_syncpt_nb_bases(m); i++) {
                 u32 base_val;
+
                 base_val = host1x_syncpt_load_wait_base(m->syncpt + i);
                 if (base_val)
-                        host1x_debug_output(o, "waitbase id %d val %d\n", i,
+                        host1x_debug_output(o, "waitbase id %u val %d\n", i,
                                             base_val);
         }
 
@@ -114,7 +124,9 @@ static int host1x_debug_show_all(struct seq_file *s, void *unused)
                 .fn = write_to_seqfile,
                 .ctx = s
         };
+
         show_all(s->private, &o);
+
         return 0;
 }
 
@@ -124,7 +136,9 @@ static int host1x_debug_show(struct seq_file *s, void *unused)
                 .fn = write_to_seqfile,
                 .ctx = s
         };
+
         show_all_no_fifo(s->private, &o);
+
         return 0;
 }
 
@@ -134,10 +148,10 @@ static int host1x_debug_open_all(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations host1x_debug_all_fops = {
-        .open           = host1x_debug_open_all,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
+        .open = host1x_debug_open_all,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
 static int host1x_debug_open(struct inode *inode, struct file *file)
@@ -146,10 +160,10 @@ static int host1x_debug_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations host1x_debug_fops = {
-        .open           = host1x_debug_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
+        .open = host1x_debug_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
 static void host1x_debugfs_init(struct host1x *host1x)
@@ -201,6 +215,7 @@ void host1x_debug_dump(struct host1x *host1x)
         struct output o = {
                 .fn = write_to_printk
         };
+
         show_all(host1x, &o);
 }
 
@@ -209,5 +224,6 @@ void host1x_debug_dump_syncpts(struct host1x *host1x)
         struct output o = {
                 .fn = write_to_printk
         };
+
         show_syncpts(host1x, &o);
 }