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

Merge tag 'amd-drm-fixes-6.1-2022-11-23' of... 

Merge tag 'amd-drm-fixes-6.1-2022-11-23' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-11-23:

amdgpu:
- DCN 3.1.4 fixes
- DP MST DSC deadlock fixes
- HMM userptr fixes
- Fix Aldebaran CU occupancy reporting
- GFX11 fixes
- PSP suspend/resume fix
- DCE12 KASAN fix
- DCN 3.2.x fixes
- Rotated cursor fix
- SMU 13.x fix
- DELL platform suspend/resume fixes
- VCN4 SR-IOV fix
- Display regression fix for polled connectors

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123143453.8977-1-alexander.deucher@amd.com
parents b65a6488 ecb41b71

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

+1 −0
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = { 
	.get_atc_vmid_pasid_mapping_info =

				kgd_gfx_v9_get_atc_vmid_pasid_mapping_info,

	.set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base,

	.get_cu_occupancy = kgd_gfx_v9_get_cu_occupancy,

	.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings

};

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

+8 −4
Original line number Diff line number Diff line
@@ -986,6 +986,7 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
	struct amdkfd_process_info *process_info = mem->process_info;

	struct amdgpu_bo *bo = mem->bo;

	struct ttm_operation_ctx ctx = { true, false };

	struct hmm_range *range;

	int ret = 0;



	mutex_lock(&process_info->lock);
@@ -1015,7 +1016,7 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
		return 0;

	}



	ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

	ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages, &range);

	if (ret) {

		pr_err("%s: Failed to get user pages: %d\n", __func__, ret);

		goto unregister_out;
@@ -1033,7 +1034,7 @@ static int init_user_pages(struct kgd_mem *mem, uint64_t user_addr, 
	amdgpu_bo_unreserve(bo);



release_out:

	amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);

	amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm, range);

unregister_out:

	if (ret)

		amdgpu_mn_unregister(bo);
@@ -2370,6 +2371,8 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
	/* Go through userptr_inval_list and update any invalid user_pages */

	list_for_each_entry(mem, &process_info->userptr_inval_list,

			    validate_list.head) {

		struct hmm_range *range;



		invalid = atomic_read(&mem->invalid);

		if (!invalid)

			/* BO hasn't been invalidated since the last
@@ -2380,7 +2383,8 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
		bo = mem->bo;



		/* Get updated user pages */

		ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);

		ret = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages,

						   &range);

		if (ret) {

			pr_debug("Failed %d to get user pages\n", ret);
@@ -2399,7 +2403,7 @@ static int update_invalid_user_pages(struct amdkfd_process_info *process_info, 
			 * FIXME: Cannot ignore the return code, must hold

			 * notifier_lock

			 */

			amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);

			amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm, range);

		}



		/* Mark the BO as valid unless it was invalidated

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

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ void amdgpu_bo_list_get_list(struct amdgpu_bo_list *list, 
			list_add_tail(&e->tv.head, &bucket[priority]);



		e->user_pages = NULL;

		e->range = NULL;

	}



	/* Connect the sorted buckets in the output list. */

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <drm/ttm/ttm_execbuf_util.h>

#include <drm/amdgpu_drm.h>



struct hmm_range;



struct amdgpu_device;

struct amdgpu_bo;

struct amdgpu_bo_va;
@@ -36,6 +38,7 @@ struct amdgpu_bo_list_entry { 
	struct amdgpu_bo_va		*bo_va;

	uint32_t			priority;

	struct page			**user_pages;

	struct hmm_range		*range;

	bool				user_invalidated;

};

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

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ static void amdgpu_connector_free_edid(struct drm_connector *connector) 


	kfree(amdgpu_connector->edid);

	amdgpu_connector->edid = NULL;

	drm_connector_update_edid_property(connector, NULL);

}



static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)