Commit 45710982 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



amdgpu:
- Switch to HMM for userptr (reverted until HMM fixes land)
- New experimental SMU 11 replacement for powerplay for vega20 (not enabled by default)
- Initial RAS support for vega20
- BACO support for vega12
- BACO fixes for vega20
- Rework IH handling for page fault and retry interrupts
- Cleanly split CPU and GPU paths for GPUVM updates
- Powerplay fixes
- XGMI fixes
- Rework how DC interacts with atomic for planes
- Clean up and simplify DC/Powerplay interfaces
- Misc cleanups and bug fixes

amdkfd:
- Switch to HMM for userptr (reverted until HMM fixes land)
- Add initial RAS support
- MQD fixes

ttm:
- Unify DRM_FILE_PAGE_OFFSET handling
- Account for kernel allocations in kernel zone only
- Misc cleanups

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

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190402170820.22197-1-alexander.deucher@amd.com
parents b4e4538a 7a65bdc6

drivers/gpu/drm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -231,8 +231,6 @@ config DRM_AMDGPU 


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



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



source "drivers/gpu/drm/nouveau/Kconfig"



source "drivers/gpu/drm/i915/Kconfig"

drivers/gpu/drm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_DRM_TTM) += ttm/ 
obj-$(CONFIG_DRM_SCHED)	+= scheduler/

obj-$(CONFIG_DRM_TDFX)	+= tdfx/

obj-$(CONFIG_DRM_R128)	+= r128/

obj-y			+= amd/lib/

obj-$(CONFIG_HSA_AMD) += amd/amdkfd/

obj-$(CONFIG_DRM_RADEON)+= radeon/

obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.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_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o

	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \

	amdgpu_vm_sdma.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

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

+8 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#include "amdgpu_gem.h"

#include "amdgpu_doorbell.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_smu.h"



#define MAX_GPU_INSTANCE		16
@@ -156,6 +157,8 @@ extern int amdgpu_emu_mode; 
extern uint amdgpu_smu_memory_pool_size;

extern uint amdgpu_dc_feature_mask;

extern struct amdgpu_mgpu_info mgpu_info;

extern int amdgpu_ras_enable;

extern uint amdgpu_ras_mask;



#ifdef CONFIG_DRM_AMDGPU_SI

extern int amdgpu_si_support;
@@ -702,7 +705,6 @@ enum amd_hw_ip_block_type { 
struct amd_powerplay {

	void *pp_handle;

	const struct amd_pm_funcs *pp_funcs;

	uint32_t pp_feature;

};



#define AMDGPU_RESET_MAGIC_NUM 64
@@ -842,6 +844,9 @@ struct amdgpu_device { 
	struct amd_powerplay		powerplay;

	bool				pp_force_state_enabled;



	/* smu */

	struct smu_context		smu;



	/* dpm */

	struct amdgpu_pm		pm;

	u32				cg_flags;
@@ -922,6 +927,8 @@ struct amdgpu_device { 


	int asic_reset_res;

	struct work_struct		xgmi_reset_work;



	bool                            in_baco_reset;

};



static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

+4 −0
Original line number Diff line number Diff line
@@ -640,4 +640,8 @@ int kgd2kfd_post_reset(struct kfd_dev *kfd) 
void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)

{

}



void kgd2kfd_set_sram_ecc_flag(struct kfd_dev *kfd)

{

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE