Commit 49eea1c6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux into drm-next 



amd-drm-next-5.8-2020-05-12:

amdgpu:
- Misc cleanups
- RAS fixes
- Expose FP16 for modesetting
- DP 1.4 compliance test fixes
- Clockgating fixes
- MAINTAINERS update
- Soft recovery for gfx10
- Runtime PM cleanups
- PSP code cleanups

amdkfd:
- Track GPU memory utilization per process
- Report PCI domain in topology

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200512213703.4039-1-alexander.deucher@amd.com
parents a1fb5489 37e4f052

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14063,7 +14063,6 @@ F: drivers/net/wireless/quantenna 
RADEON and AMDGPU DRM DRIVERS

M:	Alex Deucher <alexander.deucher@amd.com>

M:	Christian König <christian.koenig@amd.com>

M:	David (ChunMing) Zhou <David1.Zhou@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

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

+4 −2
Original line number Diff line number Diff line
@@ -765,7 +765,6 @@ struct amdgpu_device { 
	uint8_t				*bios;

	uint32_t			bios_size;

	struct amdgpu_bo		*stolen_vga_memory;

	struct amdgpu_bo		*discovery_memory;

	uint32_t			bios_scratch_reg_offset;

	uint32_t			bios_scratch[AMDGPU_BIOS_NUM_SCRATCH];
@@ -918,7 +917,9 @@ struct amdgpu_device { 
	struct amdgpu_display_manager dm;



	/* discovery */

	uint8_t				*discovery;

	uint8_t				*discovery_bin;

	uint32_t			discovery_tmr_size;

	struct amdgpu_bo		*discovery_memory;



	/* mes */

	bool                            enable_mes;
@@ -957,6 +958,7 @@ struct amdgpu_device { 


	/* s3/s4 mask */

	bool                            in_suspend;

	bool				in_hibernate;



	bool                            in_gpu_reset;

	enum pp_mp1_state               mp1_state;

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

+21 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 


		DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count);



		/* todo: add DC handling */

		if ((req.pending & ATIF_PANEL_BRIGHTNESS_CHANGE_REQUEST) &&

		    !amdgpu_device_has_dc_support(adev)) {

			struct amdgpu_encoder *enc = atif->encoder_for_bl;
@@ -463,6 +462,27 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
#endif

			}

		}

#if defined(CONFIG_DRM_AMD_DC)

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

		if ((req.pending & ATIF_PANEL_BRIGHTNESS_CHANGE_REQUEST) &&

		    amdgpu_device_has_dc_support(adev)) {

			struct amdgpu_display_manager *dm = &adev->dm;

			struct backlight_device *bd = dm->backlight_dev;



			if (bd) {

				DRM_DEBUG_DRIVER("Changing brightness to %d\n",

						 req.backlight_level);



				/*

				 * XXX backlight_device_set_brightness() is

				 * hardwired to post BACKLIGHT_UPDATE_SYSFS.

				 * It probably should accept 'reason' parameter.

				 */

				backlight_device_set_brightness(bd, req.backlight_level);

			}

		}

#endif

#endif

		if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {

			if (adev->flags & AMD_IS_PX) {

				pm_runtime_get_sync(adev->ddev->dev);

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

+5 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct kgd_mem { 
	struct amdgpu_sync sync;



	bool aql_queue;

	bool is_imported;

};



/* KFD Memory Eviction */
@@ -148,6 +149,9 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev); 


void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd);



int amdgpu_queue_mask_bit_to_set_resource_bit(struct amdgpu_device *adev,

					int queue_bit);



/* Shared API */

int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

				void **mem_obj, uint64_t *gpu_addr,
@@ -219,7 +223,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
		void *vm, struct kgd_mem **mem,

		uint64_t *offset, uint32_t flags);

int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem);

		struct kgd_dev *kgd, struct kgd_mem *mem, uint64_t *size);

int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *vm);

int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(

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

+18 −3
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ err: 
}



int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem)

		struct kgd_dev *kgd, struct kgd_mem *mem, uint64_t *size)

{

	struct amdkfd_process_info *process_info = mem->process_info;

	unsigned long bo_size = mem->bo->tbo.mem.size;
@@ -1286,9 +1286,11 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
	struct ttm_validate_buffer *bo_list_entry;

	unsigned int mapped_to_gpu_memory;

	int ret;

	bool is_imported = 0;



	mutex_lock(&mem->lock);

	mapped_to_gpu_memory = mem->mapped_to_gpu_memory;

	is_imported = mem->is_imported;

	mutex_unlock(&mem->lock);

	/* lock is not needed after this, since mem is unused and will

	 * be freed anyway
@@ -1340,8 +1342,19 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
		kfree(mem->bo->tbo.sg);

	}



	/* Update the size of the BO being freed if it was allocated from

	 * VRAM and is not imported.

	 */

	if (size) {

		if ((mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_VRAM) &&

		    (!is_imported))

			*size = bo_size;

		else

			*size = 0;

	}



	/* Free the BO*/

	amdgpu_bo_unref(&mem->bo);

	drm_gem_object_put_unlocked(&mem->bo->tbo.base);

	mutex_destroy(&mem->lock);

	kfree(mem);
@@ -1686,7 +1699,8 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
		| KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE

		| KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE;



	(*mem)->bo = amdgpu_bo_ref(bo);

	drm_gem_object_get(&bo->tbo.base);

	(*mem)->bo = bo;

	(*mem)->va = va;

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) ?

		AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;
@@ -1694,6 +1708,7 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
	(*mem)->process_info = avm->process_info;

	add_kgd_mem_to_kfd_bo_list(*mem, avm->process_info, false);

	amdgpu_sync_create(&(*mem)->sync);

	(*mem)->is_imported = true;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE