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, 40 insertions, 18 deletions

diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c
index 6b7fdc1e2ed0..95589328ad52 100644
--- a/drivers/gpu/host1x/syncpt.c
+++ b/drivers/gpu/host1x/syncpt.c
@@ -73,7 +73,7 @@ static struct host1x_syncpt *host1x_syncpt_alloc(struct host1x *host,
                         return NULL;
         }
 
-        name = kasprintf(GFP_KERNEL, "%02d-%s", sp->id,
+        name = kasprintf(GFP_KERNEL, "%02u-%s", sp->id,
                         dev ? dev_name(dev) : NULL);
         if (!name)
                 return NULL;
@@ -110,12 +110,14 @@ EXPORT_SYMBOL(host1x_syncpt_incr_max);
 void host1x_syncpt_restore(struct host1x *host)
 {
         struct host1x_syncpt *sp_base = host->syncpt;
-        u32 i;
+        unsigned int i;
 
         for (i = 0; i < host1x_syncpt_nb_pts(host); i++)
                 host1x_hw_syncpt_restore(host, sp_base + i);
+
         for (i = 0; i < host1x_syncpt_nb_bases(host); i++)
                 host1x_hw_syncpt_restore_wait_base(host, sp_base + i);
+
         wmb();
 }
 
@@ -126,7 +128,7 @@ void host1x_syncpt_restore(struct host1x *host)
 void host1x_syncpt_save(struct host1x *host)
 {
         struct host1x_syncpt *sp_base = host->syncpt;
-        u32 i;
+        unsigned int i;
 
         for (i = 0; i < host1x_syncpt_nb_pts(host); i++) {
                 if (host1x_syncpt_client_managed(sp_base + i))
@@ -146,6 +148,7 @@ void host1x_syncpt_save(struct host1x *host)
 u32 host1x_syncpt_load(struct host1x_syncpt *sp)
 {
         u32 val;
+
         val = host1x_hw_syncpt_load(sp->host, sp);
         trace_host1x_syncpt_load_min(sp->id, val);
 
@@ -157,10 +160,9 @@ u32 host1x_syncpt_load(struct host1x_syncpt *sp)
  */
 u32 host1x_syncpt_load_wait_base(struct host1x_syncpt *sp)
 {
-        u32 val;
         host1x_hw_syncpt_load_wait_base(sp->host, sp);
-        val = sp->base_val;
-        return val;
+
+        return sp->base_val;
 }
 
 /*
@@ -179,6 +181,7 @@ EXPORT_SYMBOL(host1x_syncpt_incr);
 static bool syncpt_load_min_is_expired(struct host1x_syncpt *sp, u32 thresh)
 {
         host1x_hw_syncpt_load(sp->host, sp);
+
         return host1x_syncpt_is_expired(sp, thresh);
 }
 
@@ -186,7 +189,7 @@ static bool syncpt_load_min_is_expired(struct host1x_syncpt *sp, u32 thresh)
  * Main entrypoint for syncpoint value waits.
  */
 int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
-                        u32 *value)
+                       u32 *value)
 {
         DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
         void *ref;
@@ -201,6 +204,7 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
         if (host1x_syncpt_is_expired(sp, thresh)) {
                 if (value)
                         *value = host1x_syncpt_load(sp);
+
                 return 0;
         }
 
@@ -209,6 +213,7 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
         if (host1x_syncpt_is_expired(sp, thresh)) {
                 if (value)
                         *value = val;
+
                 goto done;
         }
 
@@ -239,32 +244,42 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
         /* wait for the syncpoint, or timeout, or signal */
         while (timeout) {
                 long check = min_t(long, SYNCPT_CHECK_PERIOD, timeout);
-                int remain = wait_event_interruptible_timeout(wq,
+                int remain;
+
+                remain = wait_event_interruptible_timeout(wq,
                                 syncpt_load_min_is_expired(sp, thresh),
                                 check);
                 if (remain > 0 || host1x_syncpt_is_expired(sp, thresh)) {
                         if (value)
                                 *value = host1x_syncpt_load(sp);
+
                         err = 0;
+
                         break;
                 }
+
                 if (remain < 0) {
                         err = remain;
                         break;
                 }
+
                 timeout -= check;
+
                 if (timeout && check_count <= MAX_STUCK_CHECK_COUNT) {
                         dev_warn(sp->host->dev,
-                                "%s: syncpoint id %d (%s) stuck waiting %d, timeout=%ld\n",
+                                "%s: syncpoint id %u (%s) stuck waiting %d, timeout=%ld\n",
                                  current->comm, sp->id, sp->name,
                                  thresh, timeout);
 
                         host1x_debug_dump_syncpts(sp->host);
+
                         if (check_count == MAX_STUCK_CHECK_COUNT)
                                 host1x_debug_dump(sp->host);
+
                         check_count++;
                 }
         }
+
         host1x_intr_put_ref(sp->host, sp->id, ref);
 
 done:
@@ -279,7 +294,9 @@ bool host1x_syncpt_is_expired(struct host1x_syncpt *sp, u32 thresh)
 {
         u32 current_val;
         u32 future_val;
+
         smp_rmb();
+
         current_val = (u32)atomic_read(&sp->min_val);
         future_val = (u32)atomic_read(&sp->max_val);
 
@@ -341,14 +358,14 @@ int host1x_syncpt_init(struct host1x *host)
 {
         struct host1x_syncpt_base *bases;
         struct host1x_syncpt *syncpt;
-        int i;
+        unsigned int i;
 
-        syncpt = devm_kzalloc(host->dev, sizeof(*syncpt) * host->info->nb_pts,
+        syncpt = devm_kcalloc(host->dev, host->info->nb_pts, sizeof(*syncpt),
                               GFP_KERNEL);
         if (!syncpt)
                 return -ENOMEM;
 
-        bases = devm_kzalloc(host->dev, sizeof(*bases) * host->info->nb_bases,
+        bases = devm_kcalloc(host->dev, host->info->nb_bases, sizeof(*bases),
                              GFP_KERNEL);
         if (!bases)
                 return -ENOMEM;
@@ -378,6 +395,7 @@ struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
                                             unsigned long flags)
 {
         struct host1x *host = dev_get_drvdata(dev->parent);
+
         return host1x_syncpt_alloc(host, dev, flags);
 }
 EXPORT_SYMBOL(host1x_syncpt_request);
@@ -398,8 +416,9 @@ EXPORT_SYMBOL(host1x_syncpt_free);
 
 void host1x_syncpt_deinit(struct host1x *host)
 {
-        int i;
         struct host1x_syncpt *sp = host->syncpt;
+        unsigned int i;
+
         for (i = 0; i < host->info->nb_pts; i++, sp++)
                 kfree(sp->name);
 }
@@ -407,10 +426,11 @@ void host1x_syncpt_deinit(struct host1x *host)
 /*
  * Read max. It indicates how many operations there are in queue, either in
  * channel or in a software thread.
- * */
+ */
 u32 host1x_syncpt_read_max(struct host1x_syncpt *sp)
 {
         smp_rmb();
+
         return (u32)atomic_read(&sp->max_val);
 }
 EXPORT_SYMBOL(host1x_syncpt_read_max);
@@ -421,6 +441,7 @@ EXPORT_SYMBOL(host1x_syncpt_read_max);
 u32 host1x_syncpt_read_min(struct host1x_syncpt *sp)
 {
         smp_rmb();
+
         return (u32)atomic_read(&sp->min_val);
 }
 EXPORT_SYMBOL(host1x_syncpt_read_min);
@@ -431,25 +452,26 @@ u32 host1x_syncpt_read(struct host1x_syncpt *sp)
 }
 EXPORT_SYMBOL(host1x_syncpt_read);
 
-int host1x_syncpt_nb_pts(struct host1x *host)
+unsigned int host1x_syncpt_nb_pts(struct host1x *host)
 {
         return host->info->nb_pts;
 }
 
-int host1x_syncpt_nb_bases(struct host1x *host)
+unsigned int host1x_syncpt_nb_bases(struct host1x *host)
 {
         return host->info->nb_bases;
 }
 
-int host1x_syncpt_nb_mlocks(struct host1x *host)
+unsigned int host1x_syncpt_nb_mlocks(struct host1x *host)
 {
         return host->info->nb_mlocks;
 }
 
-struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, u32 id)
+struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, unsigned int id)
 {
         if (host->info->nb_pts < id)
                 return NULL;
+
         return host->syncpt + id;
 }
 EXPORT_SYMBOL(host1x_syncpt_get);