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, 19 insertions, 19 deletions

diff --git a/drivers/gpu/host1x/dev.h b/drivers/gpu/host1x/dev.h
index dace124994bb..5220510f39da 100644
--- a/drivers/gpu/host1x/dev.h
+++ b/drivers/gpu/host1x/dev.h
@@ -45,7 +45,7 @@ struct host1x_cdma_ops {
         void (*start)(struct host1x_cdma *cdma);
         void (*stop)(struct host1x_cdma *cdma);
         void (*flush)(struct  host1x_cdma *cdma);
-        int (*timeout_init)(struct host1x_cdma *cdma, u32 syncpt_id);
+        int (*timeout_init)(struct host1x_cdma *cdma, unsigned int syncpt);
         void (*timeout_destroy)(struct host1x_cdma *cdma);
         void (*freeze)(struct host1x_cdma *cdma);
         void (*resume)(struct host1x_cdma *cdma, u32 getptr);
@@ -82,21 +82,21 @@ struct host1x_intr_ops {
         int (*init_host_sync)(struct host1x *host, u32 cpm,
                 void (*syncpt_thresh_work)(struct work_struct *work));
         void (*set_syncpt_threshold)(
-                struct host1x *host, u32 id, u32 thresh);
-        void (*enable_syncpt_intr)(struct host1x *host, u32 id);
-        void (*disable_syncpt_intr)(struct host1x *host, u32 id);
+                struct host1x *host, unsigned int id, u32 thresh);
+        void (*enable_syncpt_intr)(struct host1x *host, unsigned int id);
+        void (*disable_syncpt_intr)(struct host1x *host, unsigned int id);
         void (*disable_all_syncpt_intrs)(struct host1x *host);
         int (*free_syncpt_irq)(struct host1x *host);
 };
 
 struct host1x_info {
-        int     nb_channels;            /* host1x: num channels supported */
-        int     nb_pts;                 /* host1x: num syncpoints supported */
-        int     nb_bases;               /* host1x: num syncpoints supported */
-        int     nb_mlocks;              /* host1x: number of mlocks */
-        int     (*init)(struct host1x *); /* initialize per SoC ops */
-        int     sync_offset;
-        u64     dma_mask;               /* mask of addressable memory */
+        unsigned int nb_channels; /* host1x: number of channels supported */
+        unsigned int nb_pts; /* host1x: number of syncpoints supported */
+        unsigned int nb_bases; /* host1x: number of syncpoint bases supported */
+        unsigned int nb_mlocks; /* host1x: number of mlocks supported */
+        int (*init)(struct host1x *host1x); /* initialize per SoC ops */
+        unsigned int sync_offset; /* offset of syncpoint registers */
+        u64 dma_mask; /* mask of addressable memory */
 };
 
 struct host1x {
@@ -109,7 +109,6 @@ struct host1x {
         struct clk *clk;
 
         struct mutex intr_mutex;
-        struct workqueue_struct *intr_wq;
         int intr_syncpt_irq;
 
         const struct host1x_syncpt_ops *syncpt_op;
@@ -183,19 +182,20 @@ static inline int host1x_hw_intr_init_host_sync(struct host1x *host, u32 cpm,
 }
 
 static inline void host1x_hw_intr_set_syncpt_threshold(struct host1x *host,
-                                                       u32 id, u32 thresh)
+                                                       unsigned int id,
+                                                       u32 thresh)
 {
         host->intr_op->set_syncpt_threshold(host, id, thresh);
 }
 
 static inline void host1x_hw_intr_enable_syncpt_intr(struct host1x *host,
-                                                     u32 id)
+                                                     unsigned int id)
 {
         host->intr_op->enable_syncpt_intr(host, id);
 }
 
 static inline void host1x_hw_intr_disable_syncpt_intr(struct host1x *host,
-                                                      u32 id)
+                                                      unsigned int id)
 {
         host->intr_op->disable_syncpt_intr(host, id);
 }
@@ -212,9 +212,9 @@ static inline int host1x_hw_intr_free_syncpt_irq(struct host1x *host)
 
 static inline int host1x_hw_channel_init(struct host1x *host,
                                          struct host1x_channel *channel,
-                                         int chid)
+                                         unsigned int id)
 {
-        return host->channel_op->init(channel, host, chid);
+        return host->channel_op->init(channel, host, id);
 }
 
 static inline int host1x_hw_channel_submit(struct host1x *host,
@@ -243,9 +243,9 @@ static inline void host1x_hw_cdma_flush(struct host1x *host,
 
 static inline int host1x_hw_cdma_timeout_init(struct host1x *host,
                                               struct host1x_cdma *cdma,
-                                              u32 syncpt_id)
+                                              unsigned int syncpt)
 {
-        return host->cdma_op->timeout_init(cdma, syncpt_id);
+        return host->cdma_op->timeout_init(cdma, syncpt);
 }
 
 static inline void host1x_hw_cdma_timeout_destroy(struct host1x *host,