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

Merge tag 'amd-drm-next-5.6-2020-01-09' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.6-2020-01-09:

amdgpu:
- Enable DCN support on POWER
- Enable GFXOFF for Raven1 refresh
- Clean up MM engine idle handlers
- HDMI 2.0 audio fixes
- Fixes for some 10 bpc EDP panels
- Watermark fixes for renoir
- SR-IOV fixes
- Runtime pm robustness fixes
- Arcturus VCN fixes
- RAS fixes
- BACO fixes for Arcturus
- Stable pstate fixes for swSMU
- HDCP fixes
- PSP cleanup
- HDMI fixes
- Misc cleanups

amdkfd:
- Spread interrupt work across cores to reduce latency
- Topology fixes for APUs
- GPU reset improvements

UAPI:
- Enable DRIVER_SYNCOBJ_TIMELINE for vulkan
- Return better error values for kfd process ioctl

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200109230338.8022-1-alexander.deucher@amd.com
parents 79f88da2 0f899fd4

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

+1 −4
Original line number Diff line number Diff line
@@ -636,9 +636,8 @@ struct amdgpu_fw_vram_usage { 
	struct amdgpu_bo *reserved_bo;

	void *va;



	/* Offset on the top of VRAM, used as c2p write buffer.

	/* GDDR6 training support flag.

	*/

	u64 mem_train_fb_loc;

	bool mem_train_support;

};
@@ -994,8 +993,6 @@ struct amdgpu_device { 


	bool                            pm_sysfs_en;

	bool                            ucode_sysfs_en;



	bool				in_baco;

};



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

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

+19 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#include "soc15.h"

#include "soc15d.h"

#include "amdgpu_amdkfd_gfx_v9.h"

#include "gfxhub_v1_0.h"

#include "mmhub_v9_4.h"



#define HQD_N_REGS 56

#define DUMP_REG(addr) do {				\
@@ -258,6 +260,22 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd, 
	return 0;

}



static void kgd_set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) {

		pr_err("trying to set page table base for wrong VMID %u\n",

		       vmid);

		return;

	}



	mmhub_v9_4_setup_vm_pt_regs(adev, vmid, page_table_base);



	gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base);

}



const struct kfd2kgd_calls arcturus_kfd2kgd = {

	.program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings,

	.set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,
@@ -277,7 +295,7 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

			kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.get_tile_config = kgd_gfx_v9_get_tile_config,

	.set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base,

	.set_vm_context_page_table_base = kgd_set_vm_context_page_table_base,

	.invalidate_tlbs = kgd_gfx_v9_invalidate_tlbs,

	.invalidate_tlbs_vmid = kgd_gfx_v9_invalidate_tlbs_vmid,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

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

+3 −11
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "soc15d.h"

#include "mmhub_v1_0.h"

#include "gfxhub_v1_0.h"

#include "mmhub_v9_4.h"





enum hqd_dequeue_request_type {
@@ -758,8 +757,8 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd, 
	return 0;

}



void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base)

static void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd,

			uint32_t vmid, uint64_t page_table_base)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);
@@ -769,13 +768,6 @@ void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmi 
		return;

	}



	/* TODO: take advantage of per-process address space size. For

	 * now, all processes share the same address space size, like

	 * on GFX8 and older.

	 */

	if (adev->asic_type == CHIP_ARCTURUS) {

		mmhub_v9_4_setup_vm_pt_regs(adev, vmid, page_table_base);

	} else

	mmhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base);



	gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base);

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

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd, 


bool kgd_gfx_v9_get_atc_vmid_pasid_mapping_info(struct kgd_dev *kgd,

					uint8_t vmid, uint16_t *p_pasid);

void kgd_gfx_v9_set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint64_t page_table_base);

int kgd_gfx_v9_invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);

int kgd_gfx_v9_invalidate_tlbs_vmid(struct kgd_dev *kgd, uint16_t vmid);

int kgd_gfx_v9_get_tile_config(struct kgd_dev *kgd,

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

+1 −1
Original line number Diff line number Diff line
@@ -2022,7 +2022,7 @@ int amdgpu_atombios_init(struct amdgpu_device *adev) 
	if (adev->is_atom_fw) {

		amdgpu_atomfirmware_scratch_regs_init(adev);

		amdgpu_atomfirmware_allocate_fb_scratch(adev);

		ret = amdgpu_atomfirmware_get_mem_train_fb_loc(adev);

		ret = amdgpu_atomfirmware_get_mem_train_info(adev);

		if (ret) {

			DRM_ERROR("Failed to get mem train fb location.\n");

			return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE