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

drm/tegra: Changes for v3.13-rc1

The biggest part of the changes is the decoupling of the host1x and DRM
drivers followed by the move of Tegra DRM back to drivers/gpu/drm/tegra
from whence it came. There is a lot of cleanup as well, and the drivers
can now be properly unloaded and reloaded.

HDMI support for the Tegra114 SoC was contributed by Mikko Perttunen.

gr2d support was extended to Tegra114 and the gr3d driver that has been
in the works for quite some time finally made it in. All pieces to run
an OpenGL driver on top of an upstream kernel are now available.

Support for syncpoint bases was added by Arto Merilainen. This is useful
for synchronizing between command streams from different engines such as
gr2d and gr3d.

Erik Faye-Lund and Wei Yongjun contributed various small fixes. Thanks!

* tag 'drm/for-3.13-rc1' of git://anongit.freedesktop.org/tegra/linux: (45 commits)
  drm/tegra: Reserve syncpoint base for gr3d
  drm/tegra: Reserve base for gr2d
  drm/tegra: Deliver syncpoint base to user space
  gpu: host1x: Add syncpoint base support
  gpu: host1x: Add 'flags' field to syncpt request
  drm/tegra: Disable clock on probe failure
  gpu: host1x: Disable clock on probe failure
  drm/tegra: Support bottom-up buffer objects
  drm/tegra: Add support for tiled buffer objects
  drm/tegra: Add 3D support
  drm/tegra: Introduce tegra_drm_submit()
  drm/tegra: Use symbolic names for gr2d registers
  drm/tegra: Start connectors with correct DPMS mode
  drm/tegra: hdmi: Enable VDD earlier for hotplug/DDC
  drm/tegra: hdmi: Fix build warnings
  drm/tegra: hdmi: Detect DVI-only displays
  drm/tegra: Add Tegra114 HDMI support
  drm/tegra: hdmi: Parameterize based on compatible property
  drm/tegra: hdmi: Rename tegra{2,3} to tegra{20,30}
  gpu: host1x: Add support for Tegra114
  ...

3 files changed, 305 insertions, 9 deletions

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 7062307a4a2d..e6d0cd9f518e 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -150,6 +150,7 @@ int drm_err(const char *func, const char *format, ...);
 #define DRIVER_BUS_PCI 0x1
 #define DRIVER_BUS_PLATFORM 0x2
 #define DRIVER_BUS_USB 0x3
+#define DRIVER_BUS_HOST1X 0x4
 
 /***********************************************************************/
 /** \name Begin the DRM... */
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
new file mode 100644
index 000000000000..f5b9b87ac9a9
--- /dev/null
+++ b/include/linux/host1x.h
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2009-2013, NVIDIA Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __LINUX_HOST1X_H
+#define __LINUX_HOST1X_H
+
+#include <linux/device.h>
+#include <linux/types.h>
+
+enum host1x_class {
+        HOST1X_CLASS_HOST1X = 0x1,
+        HOST1X_CLASS_GR2D = 0x51,
+        HOST1X_CLASS_GR2D_SB = 0x52,
+        HOST1X_CLASS_GR3D = 0x60,
+};
+
+struct host1x_client;
+
+struct host1x_client_ops {
+        int (*init)(struct host1x_client *client);
+        int (*exit)(struct host1x_client *client);
+};
+
+struct host1x_client {
+        struct list_head list;
+        struct device *parent;
+        struct device *dev;
+
+        const struct host1x_client_ops *ops;
+
+        enum host1x_class class;
+        struct host1x_channel *channel;
+
+        struct host1x_syncpt **syncpts;
+        unsigned int num_syncpts;
+};
+
+/*
+ * host1x buffer objects
+ */
+
+struct host1x_bo;
+struct sg_table;
+
+struct host1x_bo_ops {
+        struct host1x_bo *(*get)(struct host1x_bo *bo);
+        void (*put)(struct host1x_bo *bo);
+        dma_addr_t (*pin)(struct host1x_bo *bo, struct sg_table **sgt);
+        void (*unpin)(struct host1x_bo *bo, struct sg_table *sgt);
+        void *(*mmap)(struct host1x_bo *bo);
+        void (*munmap)(struct host1x_bo *bo, void *addr);
+        void *(*kmap)(struct host1x_bo *bo, unsigned int pagenum);
+        void (*kunmap)(struct host1x_bo *bo, unsigned int pagenum, void *addr);
+};
+
+struct host1x_bo {
+        const struct host1x_bo_ops *ops;
+};
+
+static inline void host1x_bo_init(struct host1x_bo *bo,
+                                  const struct host1x_bo_ops *ops)
+{
+        bo->ops = ops;
+}
+
+static inline struct host1x_bo *host1x_bo_get(struct host1x_bo *bo)
+{
+        return bo->ops->get(bo);
+}
+
+static inline void host1x_bo_put(struct host1x_bo *bo)
+{
+        bo->ops->put(bo);
+}
+
+static inline dma_addr_t host1x_bo_pin(struct host1x_bo *bo,
+                                       struct sg_table **sgt)
+{
+        return bo->ops->pin(bo, sgt);
+}
+
+static inline void host1x_bo_unpin(struct host1x_bo *bo, struct sg_table *sgt)
+{
+        bo->ops->unpin(bo, sgt);
+}
+
+static inline void *host1x_bo_mmap(struct host1x_bo *bo)
+{
+        return bo->ops->mmap(bo);
+}
+
+static inline void host1x_bo_munmap(struct host1x_bo *bo, void *addr)
+{
+        bo->ops->munmap(bo, addr);
+}
+
+static inline void *host1x_bo_kmap(struct host1x_bo *bo, unsigned int pagenum)
+{
+        return bo->ops->kmap(bo, pagenum);
+}
+
+static inline void host1x_bo_kunmap(struct host1x_bo *bo,
+                                    unsigned int pagenum, void *addr)
+{
+        bo->ops->kunmap(bo, pagenum, addr);
+}
+
+/*
+ * host1x syncpoints
+ */
+
+#define HOST1X_SYNCPT_CLIENT_MANAGED    (1 << 0)
+#define HOST1X_SYNCPT_HAS_BASE          (1 << 1)
+
+struct host1x_syncpt_base;
+struct host1x_syncpt;
+struct host1x;
+
+struct host1x_syncpt *host1x_syncpt_get(struct host1x *host, u32 id);
+u32 host1x_syncpt_id(struct host1x_syncpt *sp);
+u32 host1x_syncpt_read_min(struct host1x_syncpt *sp);
+u32 host1x_syncpt_read_max(struct host1x_syncpt *sp);
+int host1x_syncpt_incr(struct host1x_syncpt *sp);
+int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout,
+                       u32 *value);
+struct host1x_syncpt *host1x_syncpt_request(struct device *dev,
+                                            unsigned long flags);
+void host1x_syncpt_free(struct host1x_syncpt *sp);
+
+struct host1x_syncpt_base *host1x_syncpt_get_base(struct host1x_syncpt *sp);
+u32 host1x_syncpt_base_id(struct host1x_syncpt_base *base);
+
+/*
+ * host1x channel
+ */
+
+struct host1x_channel;
+struct host1x_job;
+
+struct host1x_channel *host1x_channel_request(struct device *dev);
+void host1x_channel_free(struct host1x_channel *channel);
+struct host1x_channel *host1x_channel_get(struct host1x_channel *channel);
+void host1x_channel_put(struct host1x_channel *channel);
+int host1x_job_submit(struct host1x_job *job);
+
+/*
+ * host1x job
+ */
+
+struct host1x_reloc {
+        struct host1x_bo *cmdbuf;
+        u32 cmdbuf_offset;
+        struct host1x_bo *target;
+        u32 target_offset;
+        u32 shift;
+        u32 pad;
+};
+
+struct host1x_job {
+        /* When refcount goes to zero, job can be freed */
+        struct kref ref;
+
+        /* List entry */
+        struct list_head list;
+
+        /* Channel where job is submitted to */
+        struct host1x_channel *channel;
+
+        u32 client;
+
+        /* Gathers and their memory */
+        struct host1x_job_gather *gathers;
+        unsigned int num_gathers;
+
+        /* Wait checks to be processed at submit time */
+        struct host1x_waitchk *waitchk;
+        unsigned int num_waitchk;
+        u32 waitchk_mask;
+
+        /* Array of handles to be pinned & unpinned */
+        struct host1x_reloc *relocarray;
+        unsigned int num_relocs;
+        struct host1x_job_unpin_data *unpins;
+        unsigned int num_unpins;
+
+        dma_addr_t *addr_phys;
+        dma_addr_t *gather_addr_phys;
+        dma_addr_t *reloc_addr_phys;
+
+        /* Sync point id, number of increments and end related to the submit */
+        u32 syncpt_id;
+        u32 syncpt_incrs;
+        u32 syncpt_end;
+
+        /* Maximum time to wait for this job */
+        unsigned int timeout;
+
+        /* Index and number of slots used in the push buffer */
+        unsigned int first_get;
+        unsigned int num_slots;
+
+        /* Copy of gathers */
+        size_t gather_copy_size;
+        dma_addr_t gather_copy;
+        u8 *gather_copy_mapped;
+
+        /* Check if register is marked as an address reg */
+        int (*is_addr_reg)(struct device *dev, u32 reg, u32 class);
+
+        /* Request a SETCLASS to this class */
+        u32 class;
+
+        /* Add a channel wait for previous ops to complete */
+        bool serialize;
+};
+
+struct host1x_job *host1x_job_alloc(struct host1x_channel *ch,
+                                    u32 num_cmdbufs, u32 num_relocs,
+                                    u32 num_waitchks);
+void host1x_job_add_gather(struct host1x_job *job, struct host1x_bo *mem_id,
+                           u32 words, u32 offset);
+struct host1x_job *host1x_job_get(struct host1x_job *job);
+void host1x_job_put(struct host1x_job *job);
+int host1x_job_pin(struct host1x_job *job, struct device *dev);
+void host1x_job_unpin(struct host1x_job *job);
+
+/*
+ * subdevice probe infrastructure
+ */
+
+struct host1x_device;
+
+struct host1x_driver {
+        const struct of_device_id *subdevs;
+        struct list_head list;
+        const char *name;
+
+        int (*probe)(struct host1x_device *device);
+        int (*remove)(struct host1x_device *device);
+};
+
+int host1x_driver_register(struct host1x_driver *driver);
+void host1x_driver_unregister(struct host1x_driver *driver);
+
+struct host1x_device {
+        struct host1x_driver *driver;
+        struct list_head list;
+        struct device dev;
+
+        struct mutex subdevs_lock;
+        struct list_head subdevs;
+        struct list_head active;
+
+        struct mutex clients_lock;
+        struct list_head clients;
+};
+
+static inline struct host1x_device *to_host1x_device(struct device *dev)
+{
+        return container_of(dev, struct host1x_device, dev);
+}
+
+int host1x_device_init(struct host1x_device *device);
+int host1x_device_exit(struct host1x_device *device);
+
+int host1x_client_register(struct host1x_client *client);
+int host1x_client_unregister(struct host1x_client *client);
+
+#endif
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
index 73bde4eaf16c..5e1ab552cbed 100644
--- a/include/uapi/drm/tegra_drm.h
+++ b/include/uapi/drm/tegra_drm.h
@@ -19,6 +19,9 @@
 
 #include <drm/drm.h>
 
+#define DRM_TEGRA_GEM_CREATE_TILED     (1 << 0)
+#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)
+
 struct drm_tegra_gem_create {
         __u64 size;
         __u32 flags;
@@ -65,6 +68,12 @@ struct drm_tegra_get_syncpt {
         __u32 id;
 };
 
+struct drm_tegra_get_syncpt_base {
+        __u64 context;
+        __u32 syncpt;
+        __u32 id;
+};
+
 struct drm_tegra_syncpt {
         __u32 id;
         __u32 incrs;
@@ -115,15 +124,16 @@ struct drm_tegra_submit {
         __u32 reserved[5];      /* future expansion */
 };
 
-#define DRM_TEGRA_GEM_CREATE    0x00
-#define DRM_TEGRA_GEM_MMAP      0x01
-#define DRM_TEGRA_SYNCPT_READ   0x02
-#define DRM_TEGRA_SYNCPT_INCR   0x03
-#define DRM_TEGRA_SYNCPT_WAIT   0x04
-#define DRM_TEGRA_OPEN_CHANNEL  0x05
-#define DRM_TEGRA_CLOSE_CHANNEL 0x06
-#define DRM_TEGRA_GET_SYNCPT    0x07
-#define DRM_TEGRA_SUBMIT        0x08
+#define DRM_TEGRA_GEM_CREATE            0x00
+#define DRM_TEGRA_GEM_MMAP              0x01
+#define DRM_TEGRA_SYNCPT_READ           0x02
+#define DRM_TEGRA_SYNCPT_INCR           0x03
+#define DRM_TEGRA_SYNCPT_WAIT           0x04
+#define DRM_TEGRA_OPEN_CHANNEL          0x05
+#define DRM_TEGRA_CLOSE_CHANNEL         0x06
+#define DRM_TEGRA_GET_SYNCPT            0x07
+#define DRM_TEGRA_SUBMIT                0x08
+#define DRM_TEGRA_GET_SYNCPT_BASE       0x09
 
 #define DRM_IOCTL_TEGRA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_CREATE, struct drm_tegra_gem_create)
 #define DRM_IOCTL_TEGRA_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_MMAP, struct drm_tegra_gem_mmap)
@@ -134,5 +144,6 @@ struct drm_tegra_submit {
 #define DRM_IOCTL_TEGRA_CLOSE_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_CLOSE_CHANNEL, struct drm_tegra_open_channel)
 #define DRM_IOCTL_TEGRA_GET_SYNCPT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT, struct drm_tegra_get_syncpt)
 #define DRM_IOCTL_TEGRA_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SUBMIT, struct drm_tegra_submit)
+#define DRM_IOCTL_TEGRA_GET_SYNCPT_BASE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT_BASE, struct drm_tegra_get_syncpt_base)
 
 #endif