Received-SPF: pass (google.com: domain of linux-kernel+bounces-189084-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
From: Dave Airlie <airlied@gmail.com>
Date: Sat, 25 May 2024 06:23:25 +1000
Message-ID: <CAPM=9txzvSpHASKuse2VFjbdVKftTfWNtPP8Jibck6jC_n_c1Q@mail.gmail.com>
Subject: [git pull] drm fixes for 6.10-rc1
To: Linus Torvalds <torvalds@linux-foundation.org>, Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>, LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"

Hi Linus,

Some fixes for the end of the merge window, mostly amdgpu and panthor,
with one nouveau uAPI change that fixes a bad decision we made a few
months back.

Regards,
Dave.

drm-next-2024-05-25:
drm fixes for 6.10-rc1

nouveau:
- fix bo metadata uAPI for vm bind

panthor:
- Fixes for panthor's heap logical block.
- Reset on unrecoverable fault
- Fix VM references.
- Reset fix.

xlnx:
- xlnx compile and doc fixes.

amdgpu:
- Handle vbios table integrated info v2.3

amdkfd:
- Handle duplicate BOs in reserve_bo_and_cond_vms
- Handle memory limitations on small APUs

dp/mst:
- MST null deref fix.

bridge:
- Don't let next bridge create connector in adv7511 to make probe work.
The following changes since commit 431c590c3ab0469dfedad3a832fe73556396ee52:

  drm/tests: Add a unit test for range bias allocation (2024-05-16
12:50:14 +1000)

are available in the Git repository at:

  https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2024-05-25

for you to fetch changes up to 32a0bb7ef217aa37e6b67ca7950f5e504312ed72:

  Merge tag 'drm-misc-next-fixes-2024-05-23' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
(2024-05-23 16:01:39 +1000)

----------------------------------------------------------------
drm fixes for 6.10-rc1

nouveau:
- fix bo metadata uAPI for vm bind

panthor:
- Fixes for panthor's heap logical block.
- Reset on unrecoverable fault
- Fix VM references.
- Reset fix.

xlnx:
- xlnx compile and doc fixes.

amdgpu:
- Handle vbios table integrated info v2.3

amdkfd:
- Handle duplicate BOs in reserve_bo_and_cond_vms
- Handle memory limitations on small APUs

dp/mst:
- MST null deref fix.

bridge:
- Don't let next bridge create connector in adv7511 to make probe work.

----------------------------------------------------------------
Anatoliy Klymenko (2):
      drm: xlnx: zynqmp_dpsub: Fix few function comments
      drm: xlnx: zynqmp_dpsub: Fix compilation error

Antonino Maniscalco (1):
      drm/panthor: Fix tiler OOM handling to allow incremental rendering

Arunpravin Paneer Selvam (1):
      drm/buddy: Fix the warn on's during force merge

Boris Brezillon (8):
      drm/panthor: Make sure the tiler initial/max chunks are consistent
      drm/panthor: Relax the constraints on the tiler chunk size
      drm/panthor: Fix an off-by-one in the heap context retrieval logic
      drm/panthor: Document drm_panthor_tiler_heap_destroy::handle
validity constraints
      drm/panthor: Force an immediate reset on unrecoverable faults
      drm/panthor: Keep a ref to the VM at the panthor_kernel_bo level
      drm/panthor: Reset the FW VM to NULL on unplug
      drm/panthor: Call panthor_sched_post_reset() even if the reset failed

Dave Airlie (3):
      Merge tag 'drm-misc-next-fixes-2024-05-16' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
      Merge tag 'amd-drm-fixes-6.10-2024-05-22' of
https://gitlab.freedesktop.org/agd5f/linux into drm-next
      Merge tag 'drm-misc-next-fixes-2024-05-23' of
https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

Lang Yu (2):
      drm/amdkfd: handle duplicate BOs in reserve_bo_and_cond_vms
      drm/amdkfd: Let VRAM allocations go to GTT domain on small APUs

Li Ma (1):
      drm/amdgpu/atomfirmware: add intergrated info v2.3 table

Liu Ying (1):
      drm/bridge: adv7511: Attach next bridge without creating connector

Mohamed Ahmed (1):
      drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations

Wayne Lin (1):
      drm/mst: Fix NULL pointer dereference at drm_dp_add_payload_part2

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |  5 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c   | 23 ++++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c   | 15 +++++++
 drivers/gpu/drm/amd/amdkfd/kfd_migrate.c           |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c               |  6 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.h               |  3 +-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  |  2 +-
 drivers/gpu/drm/amd/include/atomfirmware.h         | 43 +++++++++++++++++++
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |  3 +-
 drivers/gpu/drm/display/drm_dp_mst_topology.c      |  4 +-
 drivers/gpu/drm/drm_buddy.c                        |  6 +--
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |  2 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c            |  2 +-
 drivers/gpu/drm/nouveau/nouveau_abi16.c            |  3 ++
 drivers/gpu/drm/nouveau/nouveau_bo.c               | 44 +++++++++-----------
 drivers/gpu/drm/panthor/panthor_device.c           |  8 +---
 drivers/gpu/drm/panthor/panthor_device.h           |  1 +
 drivers/gpu/drm/panthor/panthor_fw.c               |  5 ++-
 drivers/gpu/drm/panthor/panthor_gem.c              |  8 ++--
 drivers/gpu/drm/panthor/panthor_gem.h              |  8 +++-
 drivers/gpu/drm/panthor/panthor_heap.c             | 36 +++++++++-------
 drivers/gpu/drm/panthor/panthor_sched.c            | 48 ++++++++++++++++------
 drivers/gpu/drm/panthor/panthor_sched.h            |  2 +-
 drivers/gpu/drm/xlnx/zynqmp_disp.c                 |  6 +--
 include/drm/display/drm_dp_mst_helper.h            |  1 -
 include/uapi/drm/nouveau_drm.h                     |  7 ++++
 include/uapi/drm/panthor_drm.h                     | 20 +++++++--
 27 files changed, 215 insertions(+), 98 deletions(-)