Merge drm/drm-next into drm-misc-next

Backmerging required to pull topic/phy-compliance.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc MAINTAINERS
index ccd0ccf,e64e5db..ad29107
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5019,32 -5035,14 +5035,35 @@@ M:   Sumit Semwal <sumit.semwal@linaro.or
  L:    linux-media@vger.kernel.org
  L:    dri-devel@lists.freedesktop.org
  L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
+ S:    Maintained
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    Documentation/driver-api/dma-buf.rst
  F:    drivers/dma-buf/
+ F:    include/linux/*fence.h
  F:    include/linux/dma-buf*
  F:    include/linux/dma-resv.h
 -K:    dma_(buf|fence|resv)
 +F:    include/linux/*fence.h
 +F:    Documentation/driver-api/dma-buf.rst
 +K:    \bdma_(?:buf|fence|resv)\b
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
 +DMA-BUF HEAPS FRAMEWORK
 +M:    Sumit Semwal <sumit.semwal@linaro.org>
 +R:    Andrew F. Davis <afd@ti.com>
 +R:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 +R:    Liam Mark <lmark@codeaurora.org>
 +R:    Laura Abbott <labbott@redhat.com>
 +R:    Brian Starkey <Brian.Starkey@arm.com>
 +R:    John Stultz <john.stultz@linaro.org>
 +S:    Maintained
 +L:    linux-media@vger.kernel.org
 +L:    dri-devel@lists.freedesktop.org
 +L:    linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 +F:    include/uapi/linux/dma-heap.h
 +F:    include/linux/dma-heap.h
 +F:    drivers/dma-buf/dma-heap.c
 +F:    drivers/dma-buf/heaps/*
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <vkoul@kernel.org>
@@@ -5226,15 -5251,10 +5272,14 @@@ F:   drivers/gpu/drm/pl111
  
  DRM DRIVER FOR ARM VERSATILE TFT PANELS
  M:    Linus Walleij <linus.walleij@linaro.org>
- T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
  F:    drivers/gpu/drm/panel/panel-arm-versatile.c
 +F:    Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
 +
 +DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 +M:    Dave Airlie <airlied@redhat.com>
 +S:    Odd Fixes
 +F:    drivers/gpu/drm/ast/
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:    Joel Stanley <joel@jms.id.au>
@@@ -5412,18 -5437,18 +5468,24 @@@ S:   Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:    Jagan Teki <jagan@amarulasolutions.com>
 +S:    Maintained
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7701.c
 +F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 +
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:    David Lechner <david@lechnology.com>
- T:    git git://anongit.freedesktop.org/drm/drm-misc
  S:    Maintained
- F:    drivers/gpu/drm/tiny/st7586.c
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/sitronix,st7586.txt
+ F:    drivers/gpu/drm/tiny/st7586.c
+ 
+ DRM DRIVER FOR SITRONIX ST7701 PANELS
+ M:    Jagan Teki <jagan@amarulasolutions.com>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
+ F:    drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:    David Lechner <david@lechnology.com>

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
Simple merge

diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ec3b064,383b107..3068139
--- 1/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
--- 2/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@@ -1659,30 -1624,38 +1659,36 @@@ static void hdmi_config_AVI(struct dw_h
                frame.colorspace = HDMI_COLORSPACE_RGB;
  
        /* Set up colorimetry */
-       switch (hdmi->hdmi_data.enc_out_encoding) {
-       case V4L2_YCBCR_ENC_601:
-               if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601)
-                       frame.colorimetry = HDMI_COLORIMETRY_EXTENDED;
-               else
+       if (!hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
+               switch (hdmi->hdmi_data.enc_out_encoding) {
+               case V4L2_YCBCR_ENC_601:
+                       if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601)
+                               frame.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+                       else
+                               frame.colorimetry = HDMI_COLORIMETRY_ITU_601;
+                       frame.extended_colorimetry =
+                                       HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+                       break;
+               case V4L2_YCBCR_ENC_709:
+                       if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709)
+                               frame.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+                       else
+                               frame.colorimetry = HDMI_COLORIMETRY_ITU_709;
+                       frame.extended_colorimetry =
+                                       HDMI_EXTENDED_COLORIMETRY_XV_YCC_709;
+                       break;
+               default: /* Carries no data */
                        frame.colorimetry = HDMI_COLORIMETRY_ITU_601;
+                       frame.extended_colorimetry =
+                                       HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+                       break;
+               }
+       } else {
+               frame.colorimetry = HDMI_COLORIMETRY_NONE;
                frame.extended_colorimetry =
-                               HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
-               break;
-       case V4L2_YCBCR_ENC_709:
-               if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709)
-                       frame.colorimetry = HDMI_COLORIMETRY_EXTENDED;
-               else
-                       frame.colorimetry = HDMI_COLORIMETRY_ITU_709;
-               frame.extended_colorimetry =
-                               HDMI_EXTENDED_COLORIMETRY_XV_YCC_709;
-               break;
-       default: /* Carries no data */
-               frame.colorimetry = HDMI_COLORIMETRY_ITU_601;
-               frame.extended_colorimetry =
-                               HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
-               break;
+                       HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
        }
  
 -      frame.scan_mode = HDMI_SCAN_MODE_NONE;
 -
        /*
         * The Designware IP uses a different byte format from standard
         * AVI info frames, though generally the bits are in the correct

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

diff --cc drivers/gpu/drm/exynos/exynos_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
Simple merge

diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
Simple merge

diff --cc drivers/gpu/drm/vboxvideo/vbox_drv.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/xen/xen_drm_front.c
Simple merge

diff --cc include/drm/drm_dp_mst_helper.h
Simple merge

diff --cc include/drm/drm_file.h
Simple merge

diff --cc include/drm/drm_legacy.h
Simple merge

diff --cc mm/slub.c
Simple merge