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

Merge drm-next to bring the drm_atomic_state renaming patch.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/adp/adp_drv.c
Simple merge

diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
Simple merge

diff --cc drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
Simple merge

diff --cc drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ite-it6263.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ite-it6505.c
Simple merge

diff --cc drivers/gpu/drm/bridge/microchip-lvds.c
index 12fc442f986796fbf2fe9beda1760ec956132937,9f4ff82bc6b49010f8727da3b367f5a744a28edc..5fb8633f43c5c60a6d31eb8510e395f0eb32197b
--- 1/drivers/gpu/drm/bridge/microchip-lvds.c
--- 2/drivers/gpu/drm/bridge/microchip-lvds.c
+++ b/drivers/gpu/drm/bridge/microchip-lvds.c
@@@ -128,11 -113,9 +128,11 @@@ static int mchp_lvds_attach(struct drm_
                                 bridge, flags);
  }
  
 -static void mchp_lvds_enable(struct drm_bridge *bridge)
 +static void mchp_lvds_atomic_enable(struct drm_bridge *bridge,
-                                   struct drm_atomic_state *state)
++                                  struct drm_atomic_commit *state)
  {
        struct mchp_lvds *lvds = bridge_to_lvds(bridge);
 +      struct drm_connector *connector;
        int ret;
  
        ret = clk_prepare_enable(lvds->pclk);
@@@ -147,18 -130,10 +147,18 @@@
                return;
        }
  
 -      lvds_serialiser_on(lvds);
 +      /* default to jeida-24 */
 +      u32 bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;
 +
 +      connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
 +      if (connector && connector->display_info.num_bus_formats)
 +              bus_format = connector->display_info.bus_formats[0];
 +
 +      lvds_serialiser_on(lvds, bus_format);
  }
  
 -static void mchp_lvds_disable(struct drm_bridge *bridge)
 +static void mchp_lvds_atomic_disable(struct drm_bridge *bridge,
-                                    struct drm_atomic_state *state)
++                                   struct drm_atomic_commit *state)
  {
        struct mchp_lvds *lvds = bridge_to_lvds(bridge);
  

diff --cc drivers/gpu/drm/bridge/tc358768.c
index e0b5a4b5abbe950df050f70f0a15317c01e74999,e652a2bcd64aa577dcdadaadd1c59560cf1917ff..0f2820b373029286038971178a1044d7ce37c792
--- 1/drivers/gpu/drm/bridge/tc358768.c
--- 2/drivers/gpu/drm/bridge/tc358768.c
+++ b/drivers/gpu/drm/bridge/tc358768.c
@@@ -1161,41 -1090,8 +1161,41 @@@ static void tc358768_bridge_atomic_pre_
                dev_err(dev, "Bridge pre_enable failed: %d\n", ret);
  }
  
 +static void tc358768_config_video_format(struct tc358768_priv *priv)
 +{
 +      struct mipi_dsi_device *dsi_dev = priv->output.dev;
 +      u32 val, data_type;
 +
 +      /* Data Format Control Register */
 +      val = BIT(2) | BIT(1) | BIT(0); /* rdswap_en | dsitx_en | txdt_en */
 +      switch (dsi_dev->format) {
 +      case MIPI_DSI_FMT_RGB888:
 +              val |= (0x3 << 4);
 +              data_type = MIPI_DSI_PACKED_PIXEL_STREAM_24;
 +              break;
 +      case MIPI_DSI_FMT_RGB666:
 +              val |= (0x4 << 4);
 +              data_type = MIPI_DSI_PACKED_PIXEL_STREAM_18;
 +              break;
 +      case MIPI_DSI_FMT_RGB666_PACKED:
 +              val |= (0x4 << 4) | BIT(3);
 +              data_type = MIPI_DSI_PIXEL_STREAM_3BYTE_18;
 +              break;
 +      case MIPI_DSI_FMT_RGB565:
 +              val |= (0x5 << 4);
 +              data_type = MIPI_DSI_PACKED_PIXEL_STREAM_16;
 +              break;
 +      default:
 +              dev_err(priv->dev, "Invalid data format (%u)\n", dsi_dev->format);
 +              return;
 +      }
 +
 +      tc358768_write(priv, TC358768_DATAFMT, val);
 +      tc358768_write(priv, TC358768_DSITX_DT, data_type);
 +}
 +
  static void tc358768_bridge_atomic_enable(struct drm_bridge *bridge,
-                                         struct drm_atomic_state *state)
+                                         struct drm_atomic_commit *state)
  {
        struct tc358768_priv *priv = bridge_to_tc358768(bridge);
        int ret;

diff --cc drivers/gpu/drm/bridge/ti-sn65dsi83.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ti-sn65dsi86.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/imagination/pvr_fw_trace.c
Simple merge

diff --cc drivers/gpu/drm/ingenic/ingenic-drm-drv.c
Simple merge

diff --cc drivers/gpu/drm/kmb/kmb_dsi.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_encoder_cvbs.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_encoder_hdmi.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
Simple merge

diff --cc drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c
Simple merge

diff --cc drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c
Simple merge

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

diff --cc drivers/gpu/drm/rockchip/cdn-dp-core.c
Simple merge

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

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

diff --cc drivers/gpu/drm/sysfb/ofdrm.c
Simple merge

diff --cc drivers/gpu/drm/sysfb/vesadrm.c
Simple merge

diff --cc drivers/gpu/drm/tests/drm_bridge_test.c
Simple merge

diff --cc drivers/gpu/drm/verisilicon/vs_bridge.c
Simple merge

diff --cc drivers/gpu/drm/verisilicon/vs_primary_plane.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h
index 40c679f59db27e608fad873dc933cfd19b233756,825b31bf8d39ffb01531422781739b02182ad0dc..27bc846313caf681e48540f258588e71dcbef430
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h
@@@ -29,9 -29,10 +29,9 @@@
  #ifndef VMWGFX_VKMS_H_
  #define VMWGFX_VKMS_H_
  
 -#include <linux/hrtimer_types.h>
  #include <linux/types.h>
  
- struct drm_atomic_state;
+ struct drm_atomic_commit;
  struct drm_crtc;
  struct vmw_private;
  struct vmw_surface;

diff --cc drivers/gpu/drm/xe/xe_vm.c
Simple merge

diff --cc drivers/gpu/drm/xlnx/zynqmp_kms.c
Simple merge