git.maquefel.me Git - linux.git/commit

author	Thomas Zimmermann <tzimmermann@suse.de>
	Thu, 19 Jan 2023 09:56:12 +0000 (10:56 +0100)
committer	Thomas Zimmermann <tzimmermann@suse.de>
	Thu, 19 Jan 2023 09:56:12 +0000 (10:56 +0100)
commit	6f84981772535e670e4e2df051a672af229b6694
tree	407cec2ba38b75fc2a1bdefae5b6d3c6405be435	tree \| snapshot
parent	cba83c1fc38612c3d2c7b1bfed9d882e4848fb0d	commit \| diff
parent	0b45ac1170ea6416bc1d36798414c04870cd356d	commit \| diff

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>

20 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/core/fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/hyperv_fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_drv.h	diff1 \|	diff2 \|	blob \| history
samples/vfio-mdev/mdpy-fb.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/core/fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/hyperv_fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_drv.h	diff1 \|	diff2 \|	blob \| history
samples/vfio-mdev/mdpy-fb.c	diff1 \|	diff2 \|	blob \| history