Commit 72c8c97b authored by Andrey Grodzovsky's avatar Andrey Grodzovsky
Browse files

drm/amdgpu: Split amdgpu_device_fini into early and late 



Some of the stuff in amdgpu_device_fini such as HW interrupts
disable and pending fences finilization must be done right away on
pci_remove while most of the stuff which relates to finilizing and
releasing driver data structures can be kept until
drm_driver.release hook is called, i.e. when the last device
reference is dropped.

v4: Change functions prefix early->hw and late->sw

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210512142648.666476-3-andrey.grodzovsky@amd.com
parent 267d51d7

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

+5 −1
Original line number Diff line number Diff line
@@ -1099,7 +1099,9 @@ static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_device *bdev) 


int amdgpu_device_init(struct amdgpu_device *adev,

		       uint32_t flags);

void amdgpu_device_fini(struct amdgpu_device *adev);

void amdgpu_device_fini_hw(struct amdgpu_device *adev);

void amdgpu_device_fini_sw(struct amdgpu_device *adev);



int amdgpu_gpu_wait_for_idle(struct amdgpu_device *adev);



void amdgpu_device_vram_access(struct amdgpu_device *adev, loff_t pos,
@@ -1319,6 +1321,8 @@ void amdgpu_driver_lastclose_kms(struct drm_device *dev); 
int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);

void amdgpu_driver_postclose_kms(struct drm_device *dev,

				 struct drm_file *file_priv);

void amdgpu_driver_release_kms(struct drm_device *dev);



int amdgpu_device_ip_suspend(struct amdgpu_device *adev);

int amdgpu_device_suspend(struct drm_device *dev, bool fbcon);

int amdgpu_device_resume(struct drm_device *dev, bool fbcon);

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

+18 −8
Original line number Diff line number Diff line
@@ -3646,15 +3646,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
 * Tear down the driver info (all asics).

 * Called at driver shutdown.

 */

void amdgpu_device_fini(struct amdgpu_device *adev)

void amdgpu_device_fini_hw(struct amdgpu_device *adev)

{

	dev_info(adev->dev, "amdgpu: finishing device.\n");

	flush_delayed_work(&adev->delayed_init_work);

	ttm_bo_lock_delayed_workqueue(&adev->mman.bdev);

	adev->shutdown = true;



	kfree(adev->pci_state);



	/* make sure IB test finished before entering exclusive mode

	 * to avoid preemption on IB test

	 * */
@@ -3671,11 +3669,24 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
		else

			drm_atomic_helper_shutdown(adev_to_drm(adev));

	}

	amdgpu_fence_driver_fini(adev);

	amdgpu_fence_driver_fini_hw(adev);



	if (adev->pm_sysfs_en)

		amdgpu_pm_sysfs_fini(adev);

	if (adev->ucode_sysfs_en)

		amdgpu_ucode_sysfs_fini(adev);

	sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);





	amdgpu_fbdev_fini(adev);



	amdgpu_irq_fini_hw(adev);

}



void amdgpu_device_fini_sw(struct amdgpu_device *adev)

{

	amdgpu_device_ip_fini(adev);

	amdgpu_fence_driver_fini_sw(adev);

	release_firmware(adev->firmware.gpu_info_fw);

	adev->firmware.gpu_info_fw = NULL;

	adev->accel_working = false;
@@ -3701,14 +3712,13 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	adev->rmmio = NULL;

	amdgpu_device_doorbell_fini(adev);



	if (adev->ucode_sysfs_en)

		amdgpu_ucode_sysfs_fini(adev);



	sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);

	if (IS_ENABLED(CONFIG_PERF_EVENTS))

		amdgpu_pmu_fini(adev);

	if (adev->mman.discovery_bin)

		amdgpu_discovery_fini(adev);



	kfree(adev->pci_state);



}

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

+2 −5
Original line number Diff line number Diff line
@@ -1311,14 +1311,10 @@ amdgpu_pci_remove(struct pci_dev *pdev) 
{

	struct drm_device *dev = pci_get_drvdata(pdev);



#ifdef MODULE

	if (THIS_MODULE->state != MODULE_STATE_GOING)

#endif

		DRM_ERROR("Hotplug removal is not supported\n");

	drm_dev_unplug(dev);

	amdgpu_driver_unload_kms(dev);



	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}



static void
@@ -1751,6 +1747,7 @@ static const struct drm_driver amdgpu_kms_driver = { 
	.dumb_create = amdgpu_mode_dumb_create,

	.dumb_map_offset = amdgpu_mode_dumb_mmap,

	.fops = &amdgpu_driver_kms_fops,

	.release = &amdgpu_driver_release_kms,



	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

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

+14 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ int amdgpu_fence_driver_init(struct amdgpu_device *adev) 
 *

 * Tear down the fence driver for all possible rings (all asics).

 */

void amdgpu_fence_driver_fini(struct amdgpu_device *adev)

void amdgpu_fence_driver_fini_hw(struct amdgpu_device *adev)

{

	unsigned i, j;

	int r;
@@ -545,6 +545,19 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev) 
				       ring->fence_drv.irq_type);



		del_timer_sync(&ring->fence_drv.fallback_timer);

	}

}



void amdgpu_fence_driver_fini_sw(struct amdgpu_device *adev)

{

	unsigned int i, j;



	for (i = 0; i < AMDGPU_MAX_RINGS; i++) {

		struct amdgpu_ring *ring = adev->rings[i];



		if (!ring || !ring->fence_drv.initialized)

			continue;



		for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)

			dma_fence_put(ring->fence_drv.fences[j]);

		kfree(ring->fence_drv.fences);

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

+16 −10
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <drm/drm_irq.h>

#include <drm/drm_vblank.h>

#include <drm/amdgpu_drm.h>

#include <drm/drm_drv.h>

#include "amdgpu.h"

#include "amdgpu_ih.h"

#include "atom.h"
@@ -348,6 +349,20 @@ int amdgpu_irq_init(struct amdgpu_device *adev) 
	return 0;

}





void amdgpu_irq_fini_hw(struct amdgpu_device *adev)

{

	if (adev->irq.installed) {

		drm_irq_uninstall(&adev->ddev);

		adev->irq.installed = false;

		if (adev->irq.msi_enabled)

			pci_free_irq_vectors(adev->pdev);



		if (!amdgpu_device_has_dc_support(adev))

			flush_work(&adev->hotplug_work);

	}

}



/**

 * amdgpu_irq_fini - shut down interrupt handling

 *
@@ -357,19 +372,10 @@ int amdgpu_irq_init(struct amdgpu_device *adev) 
 * functionality, shuts down vblank, hotplug and reset interrupt handling,

 * turns off interrupts from all sources (all ASICs).

 */

void amdgpu_irq_fini(struct amdgpu_device *adev)

void amdgpu_irq_fini_sw(struct amdgpu_device *adev)

{

	unsigned i, j;



	if (adev->irq.installed) {

		drm_irq_uninstall(adev_to_drm(adev));

		adev->irq.installed = false;

		if (adev->irq.msi_enabled)

			pci_free_irq_vectors(adev->pdev);

		if (!amdgpu_device_has_dc_support(adev))

			flush_work(&adev->hotplug_work);

	}



	for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) {

		if (!adev->irq.client[i].sources)

			continue;