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

drm-misc-next for 5.8:

UAPI Changes:

  - drm: error out with EBUSY when device has existing master
  - drm: rework SET_MASTER and DROP_MASTER perm handling

Cross-subsystem Changes:

  - mm: export two symbols from slub/slob
  - fbdev: savage: fix -Wextra build warning
  - video: omap2: Use scnprintf() for avoiding potential buffer overflow

Core Changes:

  - Remove drm_pci.h
  - drm_pci_{alloc/free)() are now legacy
  - Introduce managed DRM resourcesA
  - Allow drivers to subclass struct drm_framebuffer
  - Introduce struct drm_afbc_framebuffer and helpers
  - fbdev: remove return value from generic fbdev setup
  - Introduce simple-encoder helper
  - vram-helpers: set fence on plane
  - dp_mst: ACT timeout improvements
  - dp_mst: Remove drm_dp_mst_has_audio()
  - TTM: ttm_trace_dma_{map/unmap}() cleanups
  - dma-buf: add flag for PCIP2P support
  - EDID: Various improvements
  - Encoder: cleanup semantics of possible_clones and possible_crtcs
  - VBLANK documentation updates
  - Writeback documentation updates

Driver Changes:

  - Convert several drivers to i2c_new_client_device()
  - Drop explicit drm_mode_config_cleanup() calls from drivers
  - Auto-release device structures with drmm_add_final_kfree()
  - Init bfdev console after registering DRM device
  - Make various .debugfs functions return 0 unconditionally; ignore errors
  - video: Use scnprintf() to avoid buffer overflows
  - Convert drivers to simple encoders

  - drm/amdgpu: note that we can handle peer2peer DMA-buf
  - drm/amdgpu: add support for exporting VRAM using DMA-buf v3
  - drm/kirin: Revert change to register connectors
  - drm/lima: Add optional devfreq and cooling device support
  - drm/lima: Various improvements wrt. task handling
  - drm/panel: nt39016: Support multiple modes and 50Hz
  - drm/panel: Support Leadtek LTK050H3146W
  - drm/rockchip: Add support for afbc
  - drm/virtio: Various cleanups
  - drm/hisilicon/hibmc: Enforce 128-byte stride alignment
  - drm/qxl: Fix notify port address of cursor ring buffer
  - drm/sun4i: Improvements to format handling
  - drm/bridge: dw-hdmi: Various improvements

Signed-off-by: Dave Airlie <[email protected]>
From: Thomas Zimmermann <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20200414090738.GA16827@linux-uq9g

diff --cc MAINTAINERS
index b816a453b10eba4288be034f340dd135a32742a9,50b068f3580a8b35cc435bff9f3c6af8b0aa5b91..32eb552c972d9df17b0feea7f6713f35e2732240
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5038,14 -5019,32 +5038,14 @@@ M:   Sumit Semwal <[email protected]
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (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 <[email protected]>
 -R:    Andrew F. Davis <[email protected]>
 -R:    Benjamin Gaignard <[email protected]>
 -R:    Liam Mark <[email protected]>
 -R:    Laura Abbott <[email protected]>
 -R:    Brian Starkey <[email protected]>
 -R:    John Stultz <[email protected]>
 -S:    Maintained
 -L:    [email protected]
 -L:    [email protected]
 -L:    [email protected] (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 <[email protected]>
@@@ -5300,8 -5272,8 +5300,8 @@@ F:      drivers/gpu/drm/panel/panel-feixin-k
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:    Jagan Teki <[email protected]>
  S:    Maintained
- F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 -F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+ F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 +F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:    Hans de Goede <[email protected]>
@@@ -5440,18 -5412,18 +5440,18 @@@ S:   Orphan / Obsolet
  F:    drivers/gpu/drm/sis/
  F:    include/uapi/drm/sis_drm.h
  
 -DRM DRIVER FOR SITRONIX ST7701 PANELS
 -M:    Jagan Teki <[email protected]>
 -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 <[email protected]>
 -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:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
 +F:    drivers/gpu/drm/tiny/st7586.c
 +
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:    Jagan Teki <[email protected]>
 +S:    Maintained
++F:    Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 +F:    drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:    David Lechner <[email protected]>

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 383b1073d7de43cf1afe41d8d611b79ea5be3591,ec3b06433d980fb4427705dc85aff5bc50ab82e2..30681398cfb0576af7698219aa0ec7693f72ad2f
--- 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
@@@ -1624,38 -1659,30 +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/display/intel_display_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/display/intel_display_types.h
Simple merge

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

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
index 2905bcff79cf69a87542980be04a29cd3f2bb4f5,25bf997e2dd17be6e7f1091437a852ff33241410..aa35a59f1c7d873d23827fb8a2969ed7e04ba2ca
--- 1/drivers/gpu/drm/i915/i915_debugfs.c
--- 2/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@@ -1882,9 -2172,11 +1882,9 @@@ static const struct i915_debugfs_files 
        {"i915_error_state", &i915_error_state_fops},
        {"i915_gpu_info", &i915_gpu_info_fops},
  #endif
 -      {"i915_guc_log_level", &i915_guc_log_level_fops},
 -      {"i915_guc_log_relay", &i915_guc_log_relay_fops},
  };
  
- int i915_debugfs_register(struct drm_i915_private *dev_priv)
+ void i915_debugfs_register(struct drm_i915_private *dev_priv)
  {
        struct drm_minor *minor = dev_priv->drm.primary;
        int i;

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

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

diff --cc drivers/gpu/drm/i915/selftests/mock_gem_device.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