From: Dave Airlie <airlied@redhat.com>
Date: Mon, 10 Apr 2017 21:41:10 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc... 
X-Git-Tag: v4.13~831^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=df45eaca51f4826f328859e5b203fbeab6fcf2a3;p=mirror_ubuntu-bionic-kernel.git

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

Last drm-misc-next pull req for 4.12

Core changes:
 - fb_helper checkpatch cleanup and simplified _add_one_connector() (Thierry)
 - drm_ioctl and drm_sysfs improved/gained documentation (Daniel)
 - [ABI] Repurpose reserved field in drm_event_vblank for crtc_id (Ander)
 - Plumb acquire ctx through legacy paths to avoid lock_all and legacy_backoff
   (Daniel)
 - Add connector_atomic_check to check conn constraints on modeset (Maarten)
 - Add drm_of_find_panel_or_bridge to remove boilerplate in drivers (Rob)

Driver changes:
 - meson moved to drm-misc (Neil)
 - Added support for Amlogic GX SoCs in dw-hdmi (Neil)
 - Rockchip unbind actually cleans up the things bind initializes (Jeffy)
 - A couple misc fixes in virtio, dw-hdmi

NOTE: this also includes a backmerge of drm-next as well rc5 (we needed vmwgfx
      as well as the new synopsys media formats)

* tag 'drm-misc-next-2017-04-07' of git://anongit.freedesktop.org/git/drm-misc: (77 commits)
  Revert "drm: Don't allow interruptions when opening debugfs/crc"
  drm: Only take cursor locks when the cursor plane exists
  drm/vmwgfx: Fix fbdev emulation using legacy functions
  drm/rockchip: Shutdown all crtcs when unbinding drm
  drm/rockchip: Reorder drm bind/unbind sequence
  drm/rockchip: analogix_dp: Disable clock when unbinding
  drm/rockchip: vop: Unprepare clocks when unbinding
  drm/rockchip: vop: Enable pm domain before vop_initial
  drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding
  drm/rockchip: cdn-dp: Don't try to release firmware when not loaded
  drm: bridge: analogix: Destroy connector & encoder when unbinding
  drm: bridge: analogix: Disable clock when unbinding
  drm: bridge: analogix: Unregister dp aux when unbinding
  drm: bridge: analogix: Detach panel when unbinding analogix dp
  drm: Don't allow interruptions when opening debugfs/crc
  drm/virtio: don't leak bo on drm_gem_object_init failure
  drm: bridge: dw-hdmi: fix input format/encoding from plat_data
  drm: omap: use common OF graph helpers
  drm: convert drivers to use drm_of_find_panel_or_bridge
  drm: convert drivers to use of_graph_get_remote_node
  ...
---

df45eaca51f4826f328859e5b203fbeab6fcf2a3
diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
index 1a5b0f7795b8,4d837b29ee9e..808b995a990f
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@@ -16,15 -16,13 +16,15 @@@
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_mipi_dsi.h>
  #include <drm/drm_panel.h>
+ #include <drm/drm_of.h>
  #include <linux/clk.h>
  #include <linux/component.h>
 +#include <linux/irq.h>
  #include <linux/of.h>
  #include <linux/of_platform.h>
- #include <linux/of_graph.h>
  #include <linux/phy/phy.h>
  #include <linux/platform_device.h>
 +#include <video/mipi_display.h>
  #include <video/videomode.h>
  
  #include "mtk_drm_ddp_comp.h"
@@@ -1097,9 -801,7 +1097,8 @@@ static int mtk_dsi_probe(struct platfor
  {
  	struct mtk_dsi *dsi;
  	struct device *dev = &pdev->dev;
- 	struct device_node *remote_node, *endpoint;
  	struct resource *regs;
 +	int irq_num;
  	int comp_id;
  	int ret;