git.ipfire.org Git - people/ms/linux.git/commit

]> git.ipfire.org Git - people/ms/linux.git/commit

projects / people / ms / linux.git / commit

author	Thomas Zimmermann <tzimmermann@suse.de>
	Wed, 12 Aug 2020 17:17:18 +0000 (19:17 +0200)
committer	Thomas Zimmermann <tzimmermann@suse.de>
	Wed, 12 Aug 2020 18:42:08 +0000 (20:42 +0200)
commit	534b1f9071d95325044c21d47d9f63a45cdf425e
tree	5c2aa3cd65bfb6b9e73d9ad22c021d800380f0f6	tree \| snapshot
parent	82dd18096c718962379e61cd8a7a0dc219db174f	commit \| diff
parent	62975d27d647a40c58d3b96c29b911fc4f33c310	commit \| diff

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

Backmerging drm-next into drm-misc-next for nouveau and panel updates.
Resolves a conflict between ttm and nouveau, where struct ttm_mem_res got
renamed to struct ttm_resource.

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

51 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/imx-ldb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/parallel-display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo0039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo5039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo74c1.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo85b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo9039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo90b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_boa0b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_mem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_sgdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv17_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panel/panel-simple.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_agp_backend.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_util.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_tt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/core/fbmem.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_mode_config.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_api.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_driver.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_tt.h	diff1 \|	diff2 \|	blob \| history
include/linux/fb.h	diff1 \|	diff2 \|	blob \| history

Michael's Linux tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/imx-ldb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/imx/parallel-display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo0039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo5039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo74c1.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo85b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo9039.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bo90b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_boa0b5.c	\|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_mem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_sgdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv17_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_fence.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/panel/panel-simple.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_agp_backend.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_util.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_vm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_tt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c	diff1 \|	diff2 \|	blob \| history
drivers/video/fbdev/core/fbmem.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_mode_config.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_api.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_bo_driver.h	diff1 \|	diff2 \|	blob \| history
include/drm/ttm/ttm_tt.h	diff1 \|	diff2 \|	blob \| history
include/linux/fb.h	diff1 \|	diff2 \|	blob \| history