From: Dave Airlie <airlied@redhat.com>
Date: Thu, 17 Jan 2019 23:20:10 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2019-01-16' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f164a94c2c87752caeb1a3cbe068c440e7f7921f;p=openwrt%2Fstaging%2Fblogic.git

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

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
---

f164a94c2c87752caeb1a3cbe068c440e7f7921f
diff --cc drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
index 603bb340e8cf,790d499daa10..452461dc96f2
--- a/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) */