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

drm-misc-next for v5.6:

UAPI Changes:
- Commandline parser: Add support for panel orientation, and per-mode options.
- Fix IOCTL naming for dma-buf heaps.

Cross-subsystem Changes:
- Rename DMA_HEAP_IOC_ALLOC to DMA_HEAP_IOCTL_ALLOC before it becomes abi.
- Change DMA-BUF system-heap's name to system.
- Fix leak in error handling in dma_heap_ioctl(), and make a symbol static.
- Fix udma-buf cpu access.
- Fix ti devicetree bindings.

Core Changes:
- Add CTA-861-G modes with VIC >= 193.
- Change error handling and remove bug_on in *drm_dev_init.
- Export drm_panel_of_backlight() correctly once more.
- Add support for lvds decoders.
- Convert drm/client and drm/(gem-,)fb-helper to drm-device based logging and update logging todo.

Driver Changes:
- Add support for dsi/px30 to rockchip.
- Add fb damage support to virtio.
- Use dma_resv locking wrappers in vc4, msm, etnaviv.
- Make functions in virtio static, and perform some simplifications.
- Add suspend support to sun4i.
- Add A64 mipi dsi support to sun4i.
- Add runtime pm suspend to komeda.
- Associated driver fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efc11139-1653-86bc-1b0f-0aefde219850@linux.intel.com

diff --cc Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/phy/allwinner,sun6i-a31-mipi-dphy.yaml
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_kms.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_helper.c
Simple merge

diff --cc drivers/gpu/drm/mcde/mcde_dsi.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 540ef2faa40ae2123a5f7ede8421ec38146f8ecf,e8a3493475cd208953e21c879677ba023c16acc0..f0b0325381e0e9d98469278986533bf728f096a5
--- 1/drivers/gpu/drm/mediatek/mtk_drm_plane.c
--- 2/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@@ -94,14 -87,9 +94,14 @@@ static int mtk_plane_atomic_check(struc
        if (!fb)
                return 0;
  
-       if (!state->crtc)
+       if (WARN_ON(!state->crtc))
                return 0;
  
 +      ret = mtk_drm_crtc_plane_check(state->crtc, plane,
 +                                     to_mtk_plane_state(state));
 +      if (ret)
 +              return ret;
 +
        crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);