Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 5.1:

UAPI Changes:
 - New fourcc identifier for ARM Framebuffer Compression v1.3

Cross-subsystem Changes:

Core Changes:
 - Reorganisation of drm_device and drm_framebuffer headers
 - Cleanup of the drmP inclusion
 - Fix leaks in the fb-helpers
 - Allow for depth different from bpp in fb-helper fbdev emulation
 - Remove drm_mode_object from drm_display_mode

Driver Changes:
 - Add reflection properties to rockchip
 - a bunch of fixes for virtio
 - a bunch of fixes for dp_mst and drivers using it, and introduction of a
   new refcounting scheme
 - Convertion of bochs to atomic and generic fbdev emulation
 - Allow meson to remove the firmware framebuffers

[airlied: patch rcar-du to add drm_modes.h]
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190116200428.u2n4jbk4mzza7n6e@flea

diff --cc drivers/gpu/drm/bridge/analogix-anx78xx.c
Simple merge

diff --cc drivers/gpu/drm/bridge/sii902x.c
Simple merge

diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
Simple merge

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_manager.c
Simple merge

diff --cc drivers/gpu/drm/msm/edp/edp_bridge.c
Simple merge

diff --cc drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 603bb34,790d499..452461d
--- 1/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
--- 2/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
+++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
@@@ -11,6 -12,6 +12,7 @@@
  #include <linux/platform_device.h>
  
  #include <drm/bridge/dw_hdmi.h>
++#include <drm/drm_modes.h>
  
  #define RCAR_HDMI_PHY_OPMODE_PLLCFG   0x06    /* Mode of operation and PLL dividers */
  #define RCAR_HDMI_PHY_PLLCURRGMPCTRL  0x10    /* PLL current and Gmp (conductance) */

diff --cc drivers/gpu/drm/sti/sti_hdmi.c
Simple merge