Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 115 insertions, 0 deletions

diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h
new file mode 100644
index 000000000000..cf9ca207b8b1
--- /dev/null
+++ b/include/drm/tinydrm/tinydrm.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2016 Noralf Trønnes
+ *
+ * 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.
+ */
+
+#ifndef __LINUX_TINYDRM_H
+#define __LINUX_TINYDRM_H
+
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_simple_kms_helper.h>
+
+/**
+ * struct tinydrm_device - tinydrm device
+ * @drm: DRM device
+ * @pipe: Display pipe structure
+ * @dirty_lock: Serializes framebuffer flushing
+ * @fbdev_cma: CMA fbdev structure
+ * @suspend_state: Atomic state when suspended
+ * @fb_funcs: Framebuffer functions used when creating framebuffers
+ */
+struct tinydrm_device {
+        struct drm_device *drm;
+        struct drm_simple_display_pipe pipe;
+        struct mutex dirty_lock;
+        struct drm_fbdev_cma *fbdev_cma;
+        struct drm_atomic_state *suspend_state;
+        const struct drm_framebuffer_funcs *fb_funcs;
+};
+
+static inline struct tinydrm_device *
+pipe_to_tinydrm(struct drm_simple_display_pipe *pipe)
+{
+        return container_of(pipe, struct tinydrm_device, pipe);
+}
+
+/**
+ * TINYDRM_GEM_DRIVER_OPS - default tinydrm gem operations
+ *
+ * This macro provides a shortcut for setting the tinydrm GEM operations in
+ * the &drm_driver structure.
+ */
+#define TINYDRM_GEM_DRIVER_OPS \
+        .gem_free_object        = tinydrm_gem_cma_free_object, \
+        .gem_vm_ops             = &drm_gem_cma_vm_ops, \
+        .prime_handle_to_fd     = drm_gem_prime_handle_to_fd, \
+        .prime_fd_to_handle     = drm_gem_prime_fd_to_handle, \
+        .gem_prime_import       = drm_gem_prime_import, \
+        .gem_prime_export       = drm_gem_prime_export, \
+        .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, \
+        .gem_prime_import_sg_table = tinydrm_gem_cma_prime_import_sg_table, \
+        .gem_prime_vmap         = drm_gem_cma_prime_vmap, \
+        .gem_prime_vunmap       = drm_gem_cma_prime_vunmap, \
+        .gem_prime_mmap         = drm_gem_cma_prime_mmap, \
+        .dumb_create            = drm_gem_cma_dumb_create, \
+        .dumb_map_offset        = drm_gem_cma_dumb_map_offset, \
+        .dumb_destroy           = drm_gem_dumb_destroy, \
+        .fops                   = &tinydrm_fops
+
+/**
+ * TINYDRM_MODE - tinydrm display mode
+ * @hd: Horizontal resolution, width
+ * @vd: Vertical resolution, height
+ * @hd_mm: Display width in millimeters
+ * @vd_mm: Display height in millimeters
+ *
+ * This macro creates a &drm_display_mode for use with tinydrm.
+ */
+#define TINYDRM_MODE(hd, vd, hd_mm, vd_mm) \
+        .hdisplay = (hd), \
+        .hsync_start = (hd), \
+        .hsync_end = (hd), \
+        .htotal = (hd), \
+        .vdisplay = (vd), \
+        .vsync_start = (vd), \
+        .vsync_end = (vd), \
+        .vtotal = (vd), \
+        .width_mm = (hd_mm), \
+        .height_mm = (vd_mm), \
+        .type = DRM_MODE_TYPE_DRIVER, \
+        .clock = 1 /* pass validation */
+
+extern const struct file_operations tinydrm_fops;
+void tinydrm_lastclose(struct drm_device *drm);
+void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj);
+struct drm_gem_object *
+tinydrm_gem_cma_prime_import_sg_table(struct drm_device *drm,
+                                      struct dma_buf_attachment *attach,
+                                      struct sg_table *sgt);
+int devm_tinydrm_init(struct device *parent, struct tinydrm_device *tdev,
+                      const struct drm_framebuffer_funcs *fb_funcs,
+                      struct drm_driver *driver);
+int devm_tinydrm_register(struct tinydrm_device *tdev);
+void tinydrm_shutdown(struct tinydrm_device *tdev);
+int tinydrm_suspend(struct tinydrm_device *tdev);
+int tinydrm_resume(struct tinydrm_device *tdev);
+
+void tinydrm_display_pipe_update(struct drm_simple_display_pipe *pipe,
+                                 struct drm_plane_state *old_state);
+int tinydrm_display_pipe_prepare_fb(struct drm_simple_display_pipe *pipe,
+                                    struct drm_plane_state *plane_state);
+int
+tinydrm_display_pipe_init(struct tinydrm_device *tdev,
+                          const struct drm_simple_display_pipe_funcs *funcs,
+                          int connector_type,
+                          const uint32_t *formats,
+                          unsigned int format_count,
+                          const struct drm_display_mode *mode,
+                          unsigned int rotation);
+
+#endif /* __LINUX_TINYDRM_H */