[PULL] drm-misc-fixes

Pull-request

git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2022-04-22

Message

Maxime Ripard April 22, 2022, 8:44 a.m. UTC

Hi Daniel, Dave,

Here's this week drm-misc-fixes PR.

The two reverts for devm_drm_of_get_bridge are likely to bring more
reverts in the future.

Indeed, it introduced some code to fetch the panel automatically on
device tree child nodes as well, but that broke any driver with a child
node that wasn't a panel.

The reversion seems to be the best course of action right now, but it
was later pointed out that a number of drivers had been converted to
rely on the new behaviour, so those are likely to be broken now.

I'm not sure if it would be acceptable to merge them at this point, or
delay the merge drm-misc-fixes until those drivers are fixed?

Maxime

drm-misc-fixes-2022-04-22:
Two fixes for the raspberrypi panel initialisation, one fix for a logic
inversion in radeon, a build and pm refcounting fix for vc4, two reverts
for drm_of_get_bridge that caused a number of regression and a locking
regression for amdgpu.
The following changes since commit 1ecc0c09f19f8e10a2c52676f8ca47c28c9f73c7:

  dt-bindings: display: panel: mipi-dbi-spi: Make width-mm/height-mm mandatory (2022-04-07 03:28:10 +0200)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2022-04-22

for you to fetch changes up to 94f4c4965e5513ba624488f4b601d6b385635aec:

  drm/amdgpu: partial revert "remove ctx->lock" v2 (2022-04-21 11:26:20 +0200)

----------------------------------------------------------------
Two fixes for the raspberrypi panel initialisation, one fix for a logic
inversion in radeon, a build and pm refcounting fix for vc4, two reverts
for drm_of_get_bridge that caused a number of regression and a locking
regression for amdgpu.

----------------------------------------------------------------
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 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                           |  86 +++----
 .../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, 95 insertions(+), 359 deletions(-)
 delete mode 100644 include/linux/dma-buf-map.h