Merge branch 'backlight-rework' into drm-intel-next-queued

Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2 files changed, 65 insertions, 9 deletions

diff --git a/include/uapi/drm/armada_drm.h b/include/uapi/drm/armada_drm.h
new file mode 100644
index 000000000000..8dec3fdc99c7
--- /dev/null
+++ b/include/uapi/drm/armada_drm.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2012 Russell King
+ *  With inspiration from the i915 driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef DRM_ARMADA_IOCTL_H
+#define DRM_ARMADA_IOCTL_H
+
+#define DRM_ARMADA_GEM_CREATE           0x00
+#define DRM_ARMADA_GEM_MMAP             0x02
+#define DRM_ARMADA_GEM_PWRITE           0x03
+
+#define ARMADA_IOCTL(dir, name, str) \
+        DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
+
+struct drm_armada_gem_create {
+        uint32_t handle;
+        uint32_t size;
+};
+#define DRM_IOCTL_ARMADA_GEM_CREATE \
+        ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)
+
+struct drm_armada_gem_mmap {
+        uint32_t handle;
+        uint32_t pad;
+        uint64_t offset;
+        uint64_t size;
+        uint64_t addr;
+};
+#define DRM_IOCTL_ARMADA_GEM_MMAP \
+        ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)
+
+struct drm_armada_gem_pwrite {
+        uint64_t ptr;
+        uint32_t handle;
+        uint32_t offset;
+        uint32_t size;
+};
+#define DRM_IOCTL_ARMADA_GEM_PWRITE \
+        ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)
+
+#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