Commit e9669fb7 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky
Browse files

drm/amdgpu: Add early fini callback 



Use it to call disply code dependent on device->drv_data
before it's set to NULL on device unplug

v5:
Move HW finilization into this callback to prevent MMIO accesses
post cpi remove.

v7:
Split kfd suspend from device exit to expdite HW related
stuff to amdgpu_pci_remove

v8:
Squash previous KFD commit into this commit to avoid compile break.

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210520032057.497334-1-andrey.grodzovsky@amd.com
parent 72c8c97b

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

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
	}

}



void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev)

void amdgpu_amdkfd_device_fini_sw(struct amdgpu_device *adev)

{

	if (adev->kfd.dev) {

		kgd2kfd_device_exit(adev->kfd.dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void amdgpu_amdkfd_interrupt(struct amdgpu_device *adev, 
			const void *ih_ring_entry);

void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev);

void amdgpu_amdkfd_device_init(struct amdgpu_device *adev);

void amdgpu_amdkfd_device_fini(struct amdgpu_device *adev);

void amdgpu_amdkfd_device_fini_sw(struct amdgpu_device *adev);

int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,

				uint32_t vmid, uint64_t gpu_addr,

				uint32_t *ib_cmd, uint32_t ib_len);

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

+40 −19
Original line number Diff line number Diff line
@@ -2558,34 +2558,26 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
	return 0;

}



/**

 * amdgpu_device_ip_fini - run fini for hardware IPs

 *

 * @adev: amdgpu_device pointer

 *

 * Main teardown pass for hardware IPs.  The list of all the hardware

 * IPs that make up the asic is walked and the hw_fini and sw_fini callbacks

 * are run.  hw_fini tears down the hardware associated with each IP

 * and sw_fini tears down any software state associated with each IP.

 * Returns 0 on success, negative error code on failure.

 */

static int amdgpu_device_ip_fini(struct amdgpu_device *adev)

static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev)

{

	int i, r;



	if (amdgpu_sriov_vf(adev) && adev->virt.ras_init_done)

		amdgpu_virt_release_ras_err_handler_data(adev);

	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].version->funcs->early_fini)

			continue;



	amdgpu_ras_pre_fini(adev);

		r = adev->ip_blocks[i].version->funcs->early_fini((void *)adev);

		if (r) {

			DRM_DEBUG("early_fini of IP block <%s> failed %d\n",

				  adev->ip_blocks[i].version->funcs->name, r);

		}

	}



	if (adev->gmc.xgmi.num_physical_nodes > 1)

		amdgpu_xgmi_remove_device(adev);

	amdgpu_amdkfd_suspend(adev, false);



	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_amdkfd_device_fini(adev);



	/* need to disable SMC first */

	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.hw)
@@ -2616,6 +2608,33 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.hw = false;

	}



	return 0;

}



/**

 * amdgpu_device_ip_fini - run fini for hardware IPs

 *

 * @adev: amdgpu_device pointer

 *

 * Main teardown pass for hardware IPs.  The list of all the hardware

 * IPs that make up the asic is walked and the hw_fini and sw_fini callbacks

 * are run.  hw_fini tears down the hardware associated with each IP

 * and sw_fini tears down any software state associated with each IP.

 * Returns 0 on success, negative error code on failure.

 */

static int amdgpu_device_ip_fini(struct amdgpu_device *adev)

{

	int i, r;



	if (amdgpu_sriov_vf(adev) && adev->virt.ras_init_done)

		amdgpu_virt_release_ras_err_handler_data(adev);



	amdgpu_ras_pre_fini(adev);



	if (adev->gmc.xgmi.num_physical_nodes > 1)

		amdgpu_xgmi_remove_device(adev);



	amdgpu_amdkfd_device_fini_sw(adev);



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_blocks[i].status.sw)
@@ -3681,6 +3700,8 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	amdgpu_fbdev_fini(adev);



	amdgpu_irq_fini_hw(adev);



	amdgpu_device_ip_fini_early(adev);

}



void amdgpu_device_fini_sw(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+0 −1
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
void kgd2kfd_device_exit(struct kfd_dev *kfd)

{

	if (kfd->init_complete) {

		kgd2kfd_suspend(kfd, false);

		device_queue_manager_uninit(kfd->dqm);

		kfd_interrupt_exit(kfd);

		kfd_topology_remove_device(kfd);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+10 −2
Original line number Diff line number Diff line
@@ -1251,6 +1251,15 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
	return -EINVAL;

}



static int amdgpu_dm_early_fini(void *handle)

{

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



	amdgpu_dm_audio_fini(adev);



	return 0;

}



static void amdgpu_dm_fini(struct amdgpu_device *adev)

{

	int i;
@@ -1259,8 +1268,6 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) 
		drm_encoder_cleanup(&adev->dm.mst_encoders[i].base);

	}



	amdgpu_dm_audio_fini(adev);



	amdgpu_dm_destroy_drm_device(&adev->dm);



#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
@@ -2298,6 +2305,7 @@ static const struct amd_ip_funcs amdgpu_dm_funcs = { 
	.late_init = dm_late_init,

	.sw_init = dm_sw_init,

	.sw_fini = dm_sw_fini,

	.early_fini = amdgpu_dm_early_fini,

	.hw_init = dm_hw_init,

	.hw_fini = dm_hw_fini,

	.suspend = dm_suspend,