8 files changed, 188 insertions, 37 deletions

diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index 8b552b1a6ce9..268b2cf0052a 100644
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -90,7 +90,7 @@ struct drm_client_dev {
 int drm_client_init(struct drm_device *dev, struct drm_client_dev *client,
                     const char *name, const struct drm_client_funcs *funcs);
 void drm_client_release(struct drm_client_dev *client);
-void drm_client_add(struct drm_client_dev *client);
+void drm_client_register(struct drm_client_dev *client);
 
 void drm_client_dev_unregister(struct drm_device *dev);
 void drm_client_dev_hotplug(struct drm_device *dev);
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 17857e458ac3..40af2866c26a 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -102,29 +102,6 @@ struct drm_fb_helper_funcs {
          */
         int (*fb_probe)(struct drm_fb_helper *helper,
                         struct drm_fb_helper_surface_size *sizes);
-
-        /**
-         * @initial_config:
-         *
-         * Driver callback to setup an initial fbdev display configuration.
-         * Drivers can use this callback to tell the fbdev emulation what the
-         * preferred initial configuration is. This is useful to implement
-         * smooth booting where the fbdev (and subsequently all userspace) never
-         * changes the mode, but always inherits the existing configuration.
-         *
-         * This callback is optional.
-         *
-         * RETURNS:
-         *
-         * The driver should return true if a suitable initial configuration has
-         * been filled out and false when the fbdev helper should fall back to
-         * the default probing logic.
-         */
-        bool (*initial_config)(struct drm_fb_helper *fb_helper,
-                               struct drm_fb_helper_crtc **crtcs,
-                               struct drm_display_mode **modes,
-                               struct drm_fb_offset *offsets,
-                               bool *enabled, int width, int height);
 };
 
 struct drm_fb_helper_connector {
diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
index 6f84380757ee..085d63faee12 100644
--- a/include/drm/drm_format_helper.h
+++ b/include/drm/drm_format_helper.h
@@ -15,17 +15,18 @@ struct drm_rect;
 
 void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
                    struct drm_rect *clip);
-void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb,
+void drm_fb_memcpy_dstclip(void __iomem *dst, void *vaddr,
+                           struct drm_framebuffer *fb,
                            struct drm_rect *clip);
 void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,
                    struct drm_rect *clip);
 void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr,
                                struct drm_framebuffer *fb,
-                               struct drm_rect *clip, bool swap);
-void drm_fb_xrgb8888_to_rgb565_dstclip(void *dst, unsigned int dst_pitch,
+                               struct drm_rect *clip, bool swab);
+void drm_fb_xrgb8888_to_rgb565_dstclip(void __iomem *dst, unsigned int dst_pitch,
                                        void *vaddr, struct drm_framebuffer *fb,
-                                       struct drm_rect *clip, bool swap);
-void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,
+                                       struct drm_rect *clip, bool swab);
+void drm_fb_xrgb8888_to_rgb888_dstclip(void __iomem *dst, unsigned int dst_pitch,
                                        void *vaddr, struct drm_framebuffer *fb,
                                        struct drm_rect *clip);
 void drm_fb_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
index 2955aaab3dca..5047c7ee25f5 100644
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@ -381,6 +381,8 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj);
 void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
                 bool dirty, bool accessed);
 
+int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
+                           int count, struct drm_gem_object ***objs_out);
 struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle);
 long drm_gem_reservation_object_wait(struct drm_file *filep, u32 handle,
                                     bool wait_all, unsigned long timeout);
@@ -388,6 +390,11 @@ int drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
                               struct ww_acquire_ctx *acquire_ctx);
 void drm_gem_unlock_reservations(struct drm_gem_object **objs, int count,
                                  struct ww_acquire_ctx *acquire_ctx);
+int drm_gem_fence_array_add(struct xarray *fence_array,
+                            struct dma_fence *fence);
+int drm_gem_fence_array_add_implicit(struct xarray *fence_array,
+                                     struct drm_gem_object *obj,
+                                     bool write);
 int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
                             u32 handle, u64 *offset);
 int drm_gem_dumb_destroy(struct drm_file *file,
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h
index 6b788467b2e3..974717d6ac0c 100644
--- a/include/linux/dma-fence.h
+++ b/include/linux/dma-fence.h
@@ -112,6 +112,14 @@ struct dma_fence_cb {
  */
 struct dma_fence_ops {
         /**
+         * @use_64bit_seqno:
+         *
+         * True if this dma_fence implementation uses 64bit seqno, false
+         * otherwise.
+         */
+        bool use_64bit_seqno;
+
+        /**
          * @get_driver_name:
          *
          * Returns the driver name. This is a callback to allow drivers to
@@ -410,18 +418,19 @@ dma_fence_is_signaled(struct dma_fence *fence)
  * __dma_fence_is_later - return if f1 is chronologically later than f2
  * @f1: the first fence's seqno
  * @f2: the second fence's seqno from the same context
+ * @ops: dma_fence_ops associated with the seqno
  *
  * Returns true if f1 is chronologically later than f2. Both fences must be
  * from the same context, since a seqno is not common across contexts.
  */
-static inline bool __dma_fence_is_later(u64 f1, u64 f2)
+static inline bool __dma_fence_is_later(u64 f1, u64 f2,
+                                        const struct dma_fence_ops *ops)
 {
         /* This is for backward compatibility with drivers which can only handle
-         * 32bit sequence numbers. Use a 64bit compare when any of the higher
-         * bits are none zero, otherwise use a 32bit compare with wrap around
-         * handling.
+         * 32bit sequence numbers. Use a 64bit compare when the driver says to
+         * do so.
          */
-        if (upper_32_bits(f1) || upper_32_bits(f2))
+        if (ops->use_64bit_seqno)
                 return f1 > f2;
 
         return (int)(lower_32_bits(f1) - lower_32_bits(f2)) > 0;
@@ -441,7 +450,7 @@ static inline bool dma_fence_is_later(struct dma_fence *f1,
         if (WARN_ON(f1->context != f2->context))
                 return false;
 
-        return __dma_fence_is_later(f1->seqno, f2->seqno);
+        return __dma_fence_is_later(f1->seqno, f2->seqno, f1->ops);
 }
 
 /**
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h
index 47d5ae559329..76969a564831 100644
--- a/include/linux/io-pgtable.h
+++ b/include/linux/io-pgtable.h
@@ -12,6 +12,7 @@ enum io_pgtable_fmt {
         ARM_64_LPAE_S1,
         ARM_64_LPAE_S2,
         ARM_V7S,
+        ARM_MALI_LPAE,
         IO_PGTABLE_NUM_FMTS,
 };
 
@@ -108,6 +109,11 @@ struct io_pgtable_cfg {
                         u32     nmrr;
                         u32     prrr;
                 } arm_v7s_cfg;
+
+                struct {
+                        u64     transtab;
+                        u64     memattr;
+                } arm_mali_lpae_cfg;
         };
 };
 
@@ -209,5 +215,6 @@ extern struct io_pgtable_init_fns io_pgtable_arm_32_lpae_s2_init_fns;
 extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s1_init_fns;
 extern struct io_pgtable_init_fns io_pgtable_arm_64_lpae_s2_init_fns;
 extern struct io_pgtable_init_fns io_pgtable_arm_v7s_init_fns;
+extern struct io_pgtable_init_fns io_pgtable_arm_mali_lpae_init_fns;
 
 #endif /* __IO_PGTABLE_H */
diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h
new file mode 100644
index 000000000000..a52e0283b90d
--- /dev/null
+++ b/include/uapi/drm/panfrost_drm.h
@@ -0,0 +1,142 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2014-2018 Broadcom
+ * Copyright © 2019 Collabora ltd.
+ */
+#ifndef _PANFROST_DRM_H_
+#define _PANFROST_DRM_H_
+
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#define DRM_PANFROST_SUBMIT                     0x00
+#define DRM_PANFROST_WAIT_BO                    0x01
+#define DRM_PANFROST_CREATE_BO                  0x02
+#define DRM_PANFROST_MMAP_BO                    0x03
+#define DRM_PANFROST_GET_PARAM                  0x04
+#define DRM_PANFROST_GET_BO_OFFSET              0x05
+
+#define DRM_IOCTL_PANFROST_SUBMIT               DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_SUBMIT, struct drm_panfrost_submit)
+#define DRM_IOCTL_PANFROST_WAIT_BO              DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_WAIT_BO, struct drm_panfrost_wait_bo)
+#define DRM_IOCTL_PANFROST_CREATE_BO            DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_CREATE_BO, struct drm_panfrost_create_bo)
+#define DRM_IOCTL_PANFROST_MMAP_BO              DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_MMAP_BO, struct drm_panfrost_mmap_bo)
+#define DRM_IOCTL_PANFROST_GET_PARAM            DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_PARAM, struct drm_panfrost_get_param)
+#define DRM_IOCTL_PANFROST_GET_BO_OFFSET        DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_BO_OFFSET, struct drm_panfrost_get_bo_offset)
+
+#define PANFROST_JD_REQ_FS (1 << 0)
+/**
+ * struct drm_panfrost_submit - ioctl argument for submitting commands to the 3D
+ * engine.
+ *
+ * This asks the kernel to have the GPU execute a render command list.
+ */
+struct drm_panfrost_submit {
+
+        /** Address to GPU mapping of job descriptor */
+        __u64 jc;
+
+        /** An optional array of sync objects to wait on before starting this job. */
+        __u64 in_syncs;
+
+        /** Number of sync objects to wait on before starting this job. */
+        __u32 in_sync_count;
+
+        /** An optional sync object to place the completion fence in. */
+        __u32 out_sync;
+
+        /** Pointer to a u32 array of the BOs that are referenced by the job. */
+        __u64 bo_handles;
+
+        /** Number of BO handles passed in (size is that times 4). */
+        __u32 bo_handle_count;
+
+        /** A combination of PANFROST_JD_REQ_* */
+        __u32 requirements;
+};
+
+/**
+ * struct drm_panfrost_wait_bo - ioctl argument for waiting for
+ * completion of the last DRM_PANFROST_SUBMIT on a BO.
+ *
+ * This is useful for cases where multiple processes might be
+ * rendering to a BO and you want to wait for all rendering to be
+ * completed.
+ */
+struct drm_panfrost_wait_bo {
+        __u32 handle;
+        __u32 pad;
+        __s64 timeout_ns;       /* absolute */
+};
+
+/**
+ * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs.
+ *
+ * There are currently no values for the flags argument, but it may be
+ * used in a future extension.
+ */
+struct drm_panfrost_create_bo {
+        __u32 size;
+        __u32 flags;
+        /** Returned GEM handle for the BO. */
+        __u32 handle;
+        /* Pad, must be zero-filled. */
+        __u32 pad;
+        /**
+         * Returned offset for the BO in the GPU address space.  This offset
+         * is private to the DRM fd and is valid for the lifetime of the GEM
+         * handle.
+         *
+         * This offset value will always be nonzero, since various HW
+         * units treat 0 specially.
+         */
+        __u64 offset;
+};
+
+/**
+ * struct drm_panfrost_mmap_bo - ioctl argument for mapping Panfrost BOs.
+ *
+ * This doesn't actually perform an mmap.  Instead, it returns the
+ * offset you need to use in an mmap on the DRM device node.  This
+ * means that tools like valgrind end up knowing about the mapped
+ * memory.
+ *
+ * There are currently no values for the flags argument, but it may be
+ * used in a future extension.
+ */
+struct drm_panfrost_mmap_bo {
+        /** Handle for the object being mapped. */
+        __u32 handle;
+        __u32 flags;
+        /** offset into the drm node to use for subsequent mmap call. */
+        __u64 offset;
+};
+
+enum drm_panfrost_param {
+        DRM_PANFROST_PARAM_GPU_PROD_ID,
+};
+
+struct drm_panfrost_get_param {
+        __u32 param;
+        __u32 pad;
+        __u64 value;
+};
+
+/**
+ * Returns the offset for the BO in the GPU address space for this DRM fd.
+ * This is the same value returned by drm_panfrost_create_bo, if that was called
+ * from this DRM fd.
+ */
+struct drm_panfrost_get_bo_offset {
+        __u32 handle;
+        __u32 pad;
+        __u64 offset;
+};
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* _PANFROST_DRM_H_ */
diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h
index 8e88eba1fa7a..0c85914d9369 100644
--- a/include/uapi/linux/virtio_gpu.h
+++ b/include/uapi/linux/virtio_gpu.h
@@ -40,8 +40,16 @@
 
 #include <linux/types.h>
 
-#define VIRTIO_GPU_F_VIRGL 0
-#define VIRTIO_GPU_F_EDID  1
+/*
+ * VIRTIO_GPU_CMD_CTX_*
+ * VIRTIO_GPU_CMD_*_3D
+ */
+#define VIRTIO_GPU_F_VIRGL               0
+
+/*
+ * VIRTIO_GPU_CMD_GET_EDID
+ */
+#define VIRTIO_GPU_F_EDID                1
 
 enum virtio_gpu_ctrl_type {
         VIRTIO_GPU_UNDEFINED = 0,