Merge drm/drm-fixes into drm-misc-fixes

7.0-rc1 was just released, let's merge it to kick the new release cycle.

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

diff --cc drivers/accel/ethosu/ethosu_gem.c
Simple merge

diff --cc drivers/gpu/drm/bridge/samsung-dsim.c
index ad8c6aa49d48a66ee577f6e42a5b969b8961ba40,930aaa659c9763a7d9f390dd69f781549c4f1aec..ec632f26864422b50efa4b607874f3b4576ff0dd
--- 1/drivers/gpu/drm/bridge/samsung-dsim.c
--- 2/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@@ -1963,9 -1961,12 +1969,12 @@@ of_find_panel_or_bridge
        if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO)) {
                ret = samsung_dsim_register_te_irq(dsi, &device->dev);
                if (ret)
 -                      return ret;
 +                      goto err_remove_bridge;
        }
  
+       // The next bridge can be used by host_ops->attach
+       dsi->bridge.next_bridge = drm_bridge_get(next_bridge);
+ 
        if (pdata->host_ops && pdata->host_ops->attach) {
                ret = pdata->host_ops->attach(dsi, device);
                if (ret)
@@@ -1978,12 -1979,18 +1987,15 @@@
  
        return 0;
  
- err_unregister_te_irq:
+ err_release_next_bridge:
+       drm_bridge_put(dsi->bridge.next_bridge);
+       dsi->bridge.next_bridge = NULL;
 -      return ret;
 -}
+ 
 -static void samsung_dsim_unregister_te_irq(struct samsung_dsim *dsi)
 -{
 -      if (dsi->te_gpio) {
 -              free_irq(gpiod_to_irq(dsi->te_gpio), dsi);
 -              gpiod_put(dsi->te_gpio);
 -      }
 +      if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO))
 +              samsung_dsim_unregister_te_irq(dsi);
 +err_remove_bridge:
 +      drm_bridge_remove(&dsi->bridge);
 +      return ret;
  }
  
  static int samsung_dsim_host_detach(struct mipi_dsi_host *host,

diff --cc drivers/gpu/drm/bridge/synopsys/dw-dp.c
Simple merge

diff --cc drivers/gpu/drm/imx/ipuv3/parallel-display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c
Simple merge

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