Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc into drm-next

UAPI Changes:
- Return -ENODEV instead of -ENXIO when creating cma fb w/o valid gem (Daniel)
- Add aspect ratio and custom scaling propertis to connector state (Maarten)

Cross-subsystem Changes:
- None

Core Changes:
- Add Laurent as bridge reviewer and Andrzej as bridge maintainer (Archit)
- Maintain new STM driver through -misc (Yannick)
- Misc doc improvements (as is tradition) (Daniel)
- Add driver-private objects to atomic state (Dhinakaran)
- Deprecate preclose hook in modern drivers (use postclose) (Daniel)
- Add hwmode to vblank struct. This fixes mode access in irq context and reduced
  a bunch of boilerplate (Daniel)

Driver Changes:
- vc4: Add out-fence support to vc4 V3D rendering (Eric)
- stm: Add stm32f429 display hw and am-480272h3tmqw-t01h panel support (Yannick)
- vc4: Remove 256MB cma limit from vc4 (Eric)
- dw-hdmi: Disable audio when inactive, instead of always enabled (Romain)
- zte: Add support for VGA to the ZTE driver (Shawn)
- i915: Track DP MST bandwidth and check it in atomic_check (Dhinakaran)
- vgem: Enable gem dmabuf import iface to facilitate ion testing (Laura)
- vc4: Add support for Cygnus (new dt compat string + couple bug fixes) (Eric)
- pl111: Add driver for pl111 CLCD display controller (Eric/Tom)
- vgem: Subclass drm_device instead of standalone platform device (Chris)

Cc: Archit Taneja <architt@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Yannick Fertre <yannick.fertre@st.com>
Cc: Romain Perier <romain.perier@collabora.com>
Cc: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Tom Cooksey <tom.cooksey@arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>

* tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc: (72 commits)
  drm: add missing declaration to drm_blend.h
  drm/dp: Wait up all outstanding tx waiters
  drm/dp: Read the tx msg state once after checking for an event
  drm/prime: Forward declare struct device
  drm/vblank: Lock down vblank->hwmode more
  drm/vblank: drop the mode argument from drm_calc_vbltimestamp_from_scanoutpos
  drm/vblank: Add FIXME comments about moving the vblank ts hooks
  drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
  drm/vblank: Switch drm_driver->get_vblank_timestamp to return a bool
  drm/vgem: Convert to a struct drm_device subclass
  gpu: drm: gma500: remove dead code
  drm/sti: Adjust two checks for null pointers in sti_hqvdp_probe()
  drm/sti: Fix typos in a comment line
  drm/sti: Fix a typo in a comment line
  drm/sti: Replace 17 seq_puts() calls by seq_putc()
  drm/sti: Reduce function calls for sequence output at five places
  drm/sti: use seq_puts to display a string
  drm: Nerf the preclose callback for modern drivers
  drm/exynos: Merge pre/postclose hooks
  drm/tegra: switch to postclose
  ...

3 files changed, 82 insertions, 70 deletions

diff --git a/include/linux/amba/clcd-regs.h b/include/linux/amba/clcd-regs.h
new file mode 100644
index 000000000000..69c0e2143003
--- /dev/null
+++ b/include/linux/amba/clcd-regs.h
@@ -0,0 +1,81 @@
+/*
+ * David A Rusling
+ *
+ * Copyright (C) 2001 ARM Limited
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ */
+
+#ifndef AMBA_CLCD_REGS_H
+#define AMBA_CLCD_REGS_H
+
+/*
+ * CLCD Controller Internal Register addresses
+ */
+#define CLCD_TIM0               0x00000000
+#define CLCD_TIM1               0x00000004
+#define CLCD_TIM2               0x00000008
+#define CLCD_TIM3               0x0000000c
+#define CLCD_UBAS               0x00000010
+#define CLCD_LBAS               0x00000014
+
+#define CLCD_PL110_IENB         0x00000018
+#define CLCD_PL110_CNTL         0x0000001c
+#define CLCD_PL110_STAT         0x00000020
+#define CLCD_PL110_INTR         0x00000024
+#define CLCD_PL110_UCUR         0x00000028
+#define CLCD_PL110_LCUR         0x0000002C
+
+#define CLCD_PL111_CNTL         0x00000018
+#define CLCD_PL111_IENB         0x0000001c
+#define CLCD_PL111_RIS          0x00000020
+#define CLCD_PL111_MIS          0x00000024
+#define CLCD_PL111_ICR          0x00000028
+#define CLCD_PL111_UCUR         0x0000002c
+#define CLCD_PL111_LCUR         0x00000030
+
+#define CLCD_PALL               0x00000200
+#define CLCD_PALETTE            0x00000200
+
+#define TIM2_CLKSEL             (1 << 5)
+#define TIM2_IVS                (1 << 11)
+#define TIM2_IHS                (1 << 12)
+#define TIM2_IPC                (1 << 13)
+#define TIM2_IOE                (1 << 14)
+#define TIM2_BCD                (1 << 26)
+
+#define CNTL_LCDEN              (1 << 0)
+#define CNTL_LCDBPP1            (0 << 1)
+#define CNTL_LCDBPP2            (1 << 1)
+#define CNTL_LCDBPP4            (2 << 1)
+#define CNTL_LCDBPP8            (3 << 1)
+#define CNTL_LCDBPP16           (4 << 1)
+#define CNTL_LCDBPP16_565       (6 << 1)
+#define CNTL_LCDBPP16_444       (7 << 1)
+#define CNTL_LCDBPP24           (5 << 1)
+#define CNTL_LCDBW              (1 << 4)
+#define CNTL_LCDTFT             (1 << 5)
+#define CNTL_LCDMONO8           (1 << 6)
+#define CNTL_LCDDUAL            (1 << 7)
+#define CNTL_BGR                (1 << 8)
+#define CNTL_BEBO               (1 << 9)
+#define CNTL_BEPO               (1 << 10)
+#define CNTL_LCDPWR             (1 << 11)
+#define CNTL_LCDVCOMP(x)        ((x) << 12)
+#define CNTL_LDMAFIFOTIME       (1 << 15)
+#define CNTL_WATERMARK          (1 << 16)
+
+/* ST Microelectronics variant bits */
+#define CNTL_ST_1XBPP_444       0x0
+#define CNTL_ST_1XBPP_5551      (1 << 17)
+#define CNTL_ST_1XBPP_565       (1 << 18)
+#define CNTL_ST_CDWID_12        0x0
+#define CNTL_ST_CDWID_16        (1 << 19)
+#define CNTL_ST_CDWID_18        (1 << 20)
+#define CNTL_ST_CDWID_24        ((1 << 19)|(1 << 20))
+#define CNTL_ST_CEAEN           (1 << 21)
+#define CNTL_ST_LCDBPP24_PACKED (6 << 1)
+
+#endif /* AMBA_CLCD_REGS_H */
diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 1035879b322c..d0c3be77c18e 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -10,73 +10,7 @@
  * for more details.
  */
 #include <linux/fb.h>
-
-/*
- * CLCD Controller Internal Register addresses
- */
-#define CLCD_TIM0               0x00000000
-#define CLCD_TIM1               0x00000004
-#define CLCD_TIM2               0x00000008
-#define CLCD_TIM3               0x0000000c
-#define CLCD_UBAS               0x00000010
-#define CLCD_LBAS               0x00000014
-
-#define CLCD_PL110_IENB         0x00000018
-#define CLCD_PL110_CNTL         0x0000001c
-#define CLCD_PL110_STAT         0x00000020
-#define CLCD_PL110_INTR         0x00000024
-#define CLCD_PL110_UCUR         0x00000028
-#define CLCD_PL110_LCUR         0x0000002C
-
-#define CLCD_PL111_CNTL         0x00000018
-#define CLCD_PL111_IENB         0x0000001c
-#define CLCD_PL111_RIS          0x00000020
-#define CLCD_PL111_MIS          0x00000024
-#define CLCD_PL111_ICR          0x00000028
-#define CLCD_PL111_UCUR         0x0000002c
-#define CLCD_PL111_LCUR         0x00000030
-
-#define CLCD_PALL               0x00000200
-#define CLCD_PALETTE            0x00000200
-
-#define TIM2_CLKSEL             (1 << 5)
-#define TIM2_IVS                (1 << 11)
-#define TIM2_IHS                (1 << 12)
-#define TIM2_IPC                (1 << 13)
-#define TIM2_IOE                (1 << 14)
-#define TIM2_BCD                (1 << 26)
-
-#define CNTL_LCDEN              (1 << 0)
-#define CNTL_LCDBPP1            (0 << 1)
-#define CNTL_LCDBPP2            (1 << 1)
-#define CNTL_LCDBPP4            (2 << 1)
-#define CNTL_LCDBPP8            (3 << 1)
-#define CNTL_LCDBPP16           (4 << 1)
-#define CNTL_LCDBPP16_565       (6 << 1)
-#define CNTL_LCDBPP16_444       (7 << 1)
-#define CNTL_LCDBPP24           (5 << 1)
-#define CNTL_LCDBW              (1 << 4)
-#define CNTL_LCDTFT             (1 << 5)
-#define CNTL_LCDMONO8           (1 << 6)
-#define CNTL_LCDDUAL            (1 << 7)
-#define CNTL_BGR                (1 << 8)
-#define CNTL_BEBO               (1 << 9)
-#define CNTL_BEPO               (1 << 10)
-#define CNTL_LCDPWR             (1 << 11)
-#define CNTL_LCDVCOMP(x)        ((x) << 12)
-#define CNTL_LDMAFIFOTIME       (1 << 15)
-#define CNTL_WATERMARK          (1 << 16)
-
-/* ST Microelectronics variant bits */
-#define CNTL_ST_1XBPP_444       0x0
-#define CNTL_ST_1XBPP_5551      (1 << 17)
-#define CNTL_ST_1XBPP_565       (1 << 18)
-#define CNTL_ST_CDWID_12        0x0
-#define CNTL_ST_CDWID_16        (1 << 19)
-#define CNTL_ST_CDWID_18        (1 << 20)
-#define CNTL_ST_CDWID_24        ((1 << 19)|(1 << 20))
-#define CNTL_ST_CEAEN           (1 << 21)
-#define CNTL_ST_LCDBPP24_PACKED (6 << 1)
+#include <linux/amba/clcd-regs.h>
 
 enum {
         /* individual formats */
diff --git a/include/linux/sync_file.h b/include/linux/sync_file.h
index 3e3ab84fc4cd..d37beefdfbd5 100644
--- a/include/linux/sync_file.h
+++ b/include/linux/sync_file.h
@@ -14,7 +14,6 @@
 #define _LINUX_SYNC_FILE_H
 
 #include <linux/types.h>
-#include <linux/kref.h>
 #include <linux/ktime.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
@@ -24,7 +23,6 @@
 /**
  * struct sync_file - sync file to export to the userspace
  * @file:               file representing this fence
- * @kref:               reference count on fence.
  * @name:               name of sync_file.  Useful for debugging
  * @sync_file_list:     membership in global file list
  * @wq:                 wait queue for fence signaling
@@ -33,7 +31,6 @@
  */
 struct sync_file {
         struct file             *file;
-        struct kref             kref;
         char                    name[32];
 #ifdef CONFIG_DEBUG_FS
         struct list_head        sync_file_list;