diff options
| author | Daniel Vetter <[email protected]> | 2023-11-28 10:52:51 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2023-11-28 10:55:56 +0000 |
| commit | a13fee31f56449fc600d9e064c7b32302f92dcef (patch) | |
| tree | 9b543da3d21a29998eb39054ecb56167d7f276d5 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | |
| parent | Merge tag 'drm-intel-next-2023-11-23' of git://anongit.freedesktop.org/drm/dr... (diff) | |
| parent | Linux 6.7-rc3 (diff) | |
| download | kernel-a13fee31f56449fc600d9e064c7b32302f92dcef.tar.gz kernel-a13fee31f56449fc600d9e064c7b32302f92dcef.zip | |
Merge v6.7-rc3 into drm-next
Thomas Zimermann needs 8d6ef26501 ("drm/ast: Disconnect BMC if
physical connector is connected") for further ast work in -next.
Minor conflicts in ivpu between 3de6d9597892 ("accel/ivpu: Pass D0i3
residency time to the VPU firmware") and 3f7c0634926d
("accel/ivpu/37xx: Fix hangs related to MMIO reset") changing adjacent
lines.
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h')
0 files changed, 0 insertions, 0 deletions