From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Thu, 19 Jan 2023 09:56:12 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f84981772535e670e4e2df051a672af229b6694;p=linux.git

Merge drm/drm-next into drm-misc-next

Backmerging into drm-misc-next to get DRM accelerator infrastructure,
which is required by ipuv driver.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---

6f84981772535e670e4e2df051a672af229b6694
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 09042486e66e2,4f38c55e767e1..76a2b4a4de10e
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -36,8 -36,8 +36,9 @@@
  #include <generated/utsrelease.h>
  #include <linux/pci-p2pdma.h>
  
+ #include <drm/drm_aperture.h>
  #include <drm/drm_atomic_helper.h>
 +#include <drm/drm_crtc_helper.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/amdgpu_drm.h>