Commit 69ddce09 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.7-2020-03-10' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.7-2020-03-10:

amdgpu:
- SR-IOV fixes
- Fix up fallout from drm load/unload callback removal
- Navi, renoir power management watermark fixes
- Refactor smu parameter handling
- Display FEC fixes
- Display DCC fixes
- HDCP fixes
- Add support for USB-C PD firmware updates
- Pollock detection fix
- Rework compute ring priority handling
- RAS fixes
- Misc cleanups

amdkfd:
- Consolidate more gfx config details in amdgpu
- Consolidate bo alloc flags
- Improve code comments
- SDMA MQD fixes
- Misc cleanups

gpu scheduler:
- Add suport for modifying the sched list

uapi:
- Clarify comments about GEM_CREATE flags that are not used by userspace.
  The kernel driver has always prevented userspace from using these.
  They are only used internally in the kernel driver.

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

From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310212748.4519-1-alexander.deucher@amd.com
parents 9e12da08 5d11e37c

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

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ struct amdgpu_asic_funcs { 
	/* invalidate hdp read cache */

	void (*invalidate_hdp)(struct amdgpu_device *adev,

			       struct amdgpu_ring *ring);

	void (*reset_hdp_ras_error_count)(struct amdgpu_device *adev);

	/* check if the asic needs a full reset of if soft reset will work */

	bool (*need_full_reset)(struct amdgpu_device *adev);

	/* initialize doorbell layout for specific asic*/

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

+7 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/module.h>

#include <linux/dma-buf.h>

#include "amdgpu_xgmi.h"

#include <uapi/linux/kfd_ioctl.h>



static const unsigned int compute_vmid_bitmap = 0xFF00;
@@ -224,7 +225,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd) 


int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9)

				void **cpu_ptr, bool cp_mqd_gfx9)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	struct amdgpu_bo *bo = NULL;
@@ -240,8 +241,8 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;



	if (mqd_gfx9)

		bp.flags |= AMDGPU_GEM_CREATE_MQD_GFX9;

	if (cp_mqd_gfx9)

		bp.flags |= AMDGPU_GEM_CREATE_CP_MQD_GFX9;



	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r) {
@@ -501,10 +502,11 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, 
					   metadata_size, &metadata_flags);

	if (flags) {

		*flags = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) ?

			ALLOC_MEM_FLAGS_VRAM : ALLOC_MEM_FLAGS_GTT;

				KFD_IOC_ALLOC_MEM_FLAGS_VRAM

				: KFD_IOC_ALLOC_MEM_FLAGS_GTT;



		if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

			*flags |= ALLOC_MEM_FLAGS_PUBLIC;

			*flags |= KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC;

	}



out_put:

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

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

void amdgpu_amdkfd_unreserve_memory_limit(struct amdgpu_bo *bo);



int amdgpu_amdkfd_get_tile_config(struct kgd_dev *kgd,

				struct tile_config *config);



/* KGD2KFD callbacks */

int kgd2kfd_init(void);

void kgd2kfd_exit(void);

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

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ const struct kfd2kgd_calls arcturus_kfd2kgd = { 
	.address_watch_get_offset = kgd_gfx_v9_address_watch_get_offset,

	.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_set_vm_context_page_table_base,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

};

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

+0 −33
Original line number Diff line number Diff line
@@ -42,38 +42,6 @@ enum hqd_dequeue_request_type { 
	SAVE_WAVES

};



/* Because of REG_GET_FIELD() being used, we put this function in the

 * asic specific file.

 */

static int amdgpu_amdkfd_get_tile_config(struct kgd_dev *kgd,

		struct tile_config *config)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	config->gb_addr_config = adev->gfx.config.gb_addr_config;

#if 0

/* TODO - confirm REG_GET_FIELD x2, should be OK as is... but

 * MC_ARB_RAMCFG register doesn't exist on Vega10 - initial amdgpu

 * changes commented out related code, doing the same here for now but

 * need to sync with Ken et al

 */

	config->num_banks = REG_GET_FIELD(adev->gfx.config.mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFBANK);

	config->num_ranks = REG_GET_FIELD(adev->gfx.config.mc_arb_ramcfg,

				MC_ARB_RAMCFG, NOOFRANKS);

#endif



	config->tile_config_ptr = adev->gfx.config.tile_mode_array;

	config->num_tile_configs =

			ARRAY_SIZE(adev->gfx.config.tile_mode_array);

	config->macro_tile_config_ptr =

			adev->gfx.config.macrotile_mode_array;

	config->num_macro_tile_configs =

			ARRAY_SIZE(adev->gfx.config.macrotile_mode_array);



	return 0;

}



static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd)

{

	return (struct amdgpu_device *)kgd;
@@ -805,7 +773,6 @@ const struct kfd2kgd_calls gfx_v10_kfd2kgd = { 
	.address_watch_get_offset = kgd_address_watch_get_offset,

	.get_atc_vmid_pasid_mapping_info =

			get_atc_vmid_pasid_mapping_info,

	.get_tile_config = amdgpu_amdkfd_get_tile_config,

	.set_vm_context_page_table_base = set_vm_context_page_table_base,

	.get_hive_id = amdgpu_amdkfd_get_hive_id,

	.get_unique_id = amdgpu_amdkfd_get_unique_id,

CRA Git | Maintained and supported by SUSTech CRA and CCSE