Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c9c3c9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-next 



This is a new pull for drm-next on top of last weeks with the following
changes:
- Fixed 64 bit divide
- Fixed vram type on vega20
- Misc vega20 fixes
- Misc DC fixes
- Fix GDS/GWS/OA domain handling

Previous changes from last week:
amdgpu/kfd:
- Picasso (new APU) support
- Raven2 (new APU) support
- Vega20 enablement
- ACP powergating improvements
- Add ABGR/XBGR display support
- VCN JPEG engine support
- Initial xGMI support
- Use load balancing for engine scheduling
- Lots of new documentation
- Rework and clean up i2c and aux handling in DC
- Add DP YCbCr 4:2:0 support in DC
- Add DMCU firmware loading for Raven (used for ABM and PSR)
- New debugfs features in DC
- LVDS support in DC
- Implement wave kill for gfx/compute (light weight reset for shaders)
- Use AGP aperture to avoid gart mappings when possible
- GPUVM performance improvements
- Bulk moves for more efficient GPUVM LRU handling
- Merge amdgpu and amdkfd into one module
- Enable gfxoff and stutter mode on Raven
- Misc cleanups

Scheduler:
- Load balancing support
- Bug fixes

ttm:
- Bulk move functionality
- Bug fixes

radeon:
- Misc cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920150438.12693-1-alexander.deucher@amd.com
parents 0320ac51 846311ae

Documentation/gpu/drm-mm.rst

+2 −2
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ GPU Scheduler 
Overview

--------



.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler.c

.. kernel-doc:: drivers/gpu/drm/scheduler/sched_main.c

   :doc: Overview



Scheduler Function References
@@ -514,5 +514,5 @@ Scheduler Function References 
.. kernel-doc:: include/drm/gpu_scheduler.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/scheduler/gpu_scheduler.c

.. kernel-doc:: drivers/gpu/drm/scheduler/sched_main.c

   :export:

drivers/gpu/drm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ source "drivers/gpu/drm/bridge/Kconfig" 


source "drivers/gpu/drm/sti/Kconfig"



source "drivers/gpu/drm/amd/amdkfd/Kconfig"



source "drivers/gpu/drm/imx/Kconfig"



source "drivers/gpu/drm/v3d/Kconfig"

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,3 +42,4 @@ config DRM_AMDGPU_GART_DEBUGFS 


source "drivers/gpu/drm/amd/acp/Kconfig"

source "drivers/gpu/drm/amd/display/Kconfig"

source "drivers/gpu/drm/amd/amdkfd/Kconfig"

drivers/gpu/drm/amd/amdgpu/Makefile

+12 −6
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ 
	-I$(FULL_AMD_DISPLAY_PATH) \

	-I$(FULL_AMD_DISPLAY_PATH)/include \

	-I$(FULL_AMD_DISPLAY_PATH)/dc \

	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm

	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm \

	-I$(FULL_AMD_PATH)/amdkfd



amdgpu-y := amdgpu_drv.o
@@ -51,8 +52,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \

	amdgpu_queue_mgr.o amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o \

	amdgpu_ids.o

	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o amdgpu_xgmi.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \
@@ -62,7 +63,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce 


amdgpu-y += \

	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o

	vega20_reg_init.o nbio_v7_4.o



# add DF block

amdgpu-y += \
@@ -73,7 +74,7 @@ amdgpu-y += \ 
amdgpu-y += \

	gmc_v7_0.o \

	gmc_v8_0.o \

	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o

	gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o gfxhub_v1_1.o



# add IH block

amdgpu-y += \
@@ -88,7 +89,8 @@ amdgpu-y += \ 
amdgpu-y += \

	amdgpu_psp.o \

	psp_v3_1.o \

	psp_v10_0.o

	psp_v10_0.o \

	psp_v11_0.o



# add SMC block

amdgpu-y += \
@@ -108,6 +110,7 @@ amdgpu-y += \ 


# add async DMA block

amdgpu-y += \

	amdgpu_sdma.o \

	sdma_v2_4.o \

	sdma_v3_0.o \

	sdma_v4_0.o
@@ -134,6 +137,9 @@ amdgpu-y += \ 
amdgpu-y += amdgpu_amdkfd.o



ifneq ($(CONFIG_HSA_AMD),)

AMDKFD_PATH := ../amdkfd

include $(FULL_AMD_PATH)/amdkfd/Makefile

amdgpu-y += $(AMDKFD_FILES)

amdgpu-y += \

	 amdgpu_amdkfd_fence.o \

	 amdgpu_amdkfd_gpuvm.o \

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+18 −615

File changed.

Preview size limit exceeded, changes collapsed.