Hi Linus, Maarten was away, so Maxine stepped up and sent me the drm-fixes merge, so no point leaving it for another week. The big change is an OF revert around bridge/panels, it may have some driver fallout, but hopefully this revert gets them shook out in the next week easier. Otherwise it's a bunch of locking/refcounts across drivers, a radeon dma_resv logic fix and some raspberry pi panel fixes. Regards, Dave. drm-fixes-2022-04-23: drm fixes for 5.18-rc4 - 2nd part panel: - revert of patch that broke panel/bridge issues dma-buf: - remove unused header file. amdgpu: - partial revert of locking change radeon: - fix dma_resv logic inversion panel: - pi touchscreen panel init fixes vc4: - build fix - runtime pm refcount fix vmwgfx: - refcounting fix The following changes since commit 70da382e1c5b9b2049c10abfd4489a40c1b60df0: Merge tag 'drm-msm-fixes-2022-04-20' of https://gitlab.freedesktop.org/drm/msm into drm-fixes (2022-04-22 09:25:47 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-04-23 for you to fetch changes up to c18a2a280c073f70569a91ef0d7434d12e66e200: Merge tag 'drm-misc-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-04-23 15:00:44 +1000) ---------------------------------------------------------------- drm fixes for 5.18-rc4 - 2nd part panel: - revert of patch that broke panel/bridge issues dma-buf: - remove unused header file. amdgpu: - partial revert of locking change radeon: - fix dma_resv logic inversion panel: - pi touchscreen panel init fixes vc4: - build fix - runtime pm refcount fix vmwgfx: - refcounting fix ---------------------------------------------------------------- Bjorn Andersson (2): Revert "drm: of: Properly try all possible cases for bridge/panel detection" Revert "drm: of: Lookup if child node has panel or bridge" Christian König (2): drm/radeon: fix logic inversion in radeon_sync_resv drm/amdgpu: partial revert "remove ctx->lock" v2 Dave Airlie (1): Merge tag 'drm-misc-fixes-2022-04-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Dave Stevenson (2): drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare Karol Herbst (1): dma-buf-map: remove renamed header file Miaoqian Lin (1): drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage Zack Rusin (1): drm/vmwgfx: Fix gem refcounting and memory evictions Zheng Bin (1): drm/vc4: Fix build error when CONFIG_DRM_VC4=y && CONFIG_RASPBERRYPI_FIRMWARE=m drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 21 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + drivers/gpu/drm/drm_of.c | 84 +++---- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 +- drivers/gpu/drm/radeon/radeon_sync.c | 2 +- drivers/gpu/drm/vc4/Kconfig | 3 + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 43 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 7 +- include/linux/dma-buf-map.h | 266 --------------------- 12 files changed, 94 insertions(+), 358 deletions(-) delete mode 100644 include/linux/dma-buf-map.h