Commit fd496ca8 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: split BOCO and ATPX handling 



In preparation for systems that support d3cold on dGPUs
independent of PX/HG.  No functional change intended.

Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ccbfdf0

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

+1 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,7 @@ void amdgpu_device_program_register_sequence(struct amdgpu_device *adev, 
					     const u32 *registers,

					     const u32 array_size);



bool amdgpu_device_supports_atpx(struct drm_device *dev);

bool amdgpu_device_supports_boco(struct drm_device *dev);

bool amdgpu_device_supports_baco(struct drm_device *dev);

bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev,

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

+25 −8
Original line number Diff line number Diff line
@@ -211,6 +211,23 @@ static ssize_t amdgpu_device_get_serial_number(struct device *dev, 
static DEVICE_ATTR(serial_number, S_IRUGO,

		amdgpu_device_get_serial_number, NULL);



/**

 * amdgpu_device_supports_atpx - Is the device a dGPU with HG/PX power control

 *

 * @dev: drm_device pointer

 *

 * Returns true if the device is a dGPU with HG/PX power control,

 * otherwise return false.

 */

bool amdgpu_device_supports_atpx(struct drm_device *dev)

{

	struct amdgpu_device *adev = drm_to_adev(dev);



	if (adev->flags & AMD_IS_PX)

		return true;

	return false;

}



/**

 * amdgpu_device_supports_boco - Is the device a dGPU with HG/PX power control

 *
@@ -1398,7 +1415,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, 
	struct drm_device *dev = pci_get_drvdata(pdev);

	int r;



	if (amdgpu_device_supports_boco(dev) && state == VGA_SWITCHEROO_OFF)

	if (amdgpu_device_supports_atpx(dev) && state == VGA_SWITCHEROO_OFF)

		return;



	if (state == VGA_SWITCHEROO_ON) {
@@ -3177,7 +3194,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	struct drm_device *ddev = adev_to_drm(adev);

	struct pci_dev *pdev = adev->pdev;

	int r, i;

	bool boco = false;

	bool atpx = false;

	u32 max_MBps;



	adev->shutdown = false;
@@ -3349,15 +3366,15 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)

		vga_client_register(adev->pdev, adev, NULL, amdgpu_device_vga_set_decode);



	if (amdgpu_device_supports_boco(ddev))

		boco = true;

	if (amdgpu_device_supports_atpx(ddev))

		atpx = true;

	if (amdgpu_has_atpx() &&

	    (amdgpu_is_atpx_hybrid() ||

	     amdgpu_has_atpx_dgpu_power_cntl()) &&

	    !pci_is_thunderbolt_attached(adev->pdev))

		vga_switcheroo_register_client(adev->pdev,

					       &amdgpu_switcheroo_ops, boco);

	if (boco)

					       &amdgpu_switcheroo_ops, atpx);

	if (atpx)

		vga_switcheroo_init_domain_pm_ops(adev->dev, &adev->vga_pm_domain);



	if (amdgpu_emu_mode == 1) {
@@ -3540,7 +3557,7 @@ fence_driver_init: 


failed:

	amdgpu_vf_error_trans_all(adev);

	if (boco)

	if (atpx)

		vga_switcheroo_fini_domain_pm_ops(adev->dev);



failed_unmap:
@@ -3604,7 +3621,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
	     amdgpu_has_atpx_dgpu_power_cntl()) &&

	    !pci_is_thunderbolt_attached(adev->pdev))

		vga_switcheroo_unregister_client(adev->pdev);

	if (amdgpu_device_supports_boco(adev_to_drm(adev)))

	if (amdgpu_device_supports_atpx(adev_to_drm(adev)))

		vga_switcheroo_fini_domain_pm_ops(adev->dev);

	if ((adev->pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)

		vga_client_register(adev->pdev, NULL, NULL, NULL);

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

+14 −4
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) 
	}



	adev->in_runpm = true;

	if (amdgpu_device_supports_boco(drm_dev))

	if (amdgpu_device_supports_atpx(drm_dev))

		drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;

	drm_kms_helper_poll_disable(drm_dev);
@@ -1348,7 +1348,7 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) 
	if (ret)

		return ret;



	if (amdgpu_device_supports_boco(drm_dev)) {

	if (amdgpu_device_supports_atpx(drm_dev)) {

		/* Only need to handle PCI state in the driver for ATPX

		 * PCI core handles it for _PR3.

		 */
@@ -1361,6 +1361,11 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) 
			pci_set_power_state(pdev, PCI_D3cold);

		}

		drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;

	} else if (amdgpu_device_supports_boco(drm_dev)) {

		/* Only need to handle PCI state in the driver for ATPX

		 * PCI core handles it for _PR3.

		 */

		pci_ignore_hotplug(pdev);

	} else if (amdgpu_device_supports_baco(drm_dev)) {

		amdgpu_device_baco_enter(drm_dev);

	}
@@ -1378,7 +1383,7 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) 
	if (!adev->runpm)

		return -EINVAL;



	if (amdgpu_device_supports_boco(drm_dev)) {

	if (amdgpu_device_supports_atpx(drm_dev)) {

		drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;



		/* Only need to handle PCI state in the driver for ATPX
@@ -1394,12 +1399,17 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) 
				return ret;

			pci_set_master(pdev);

		}

	} else if (amdgpu_device_supports_boco(drm_dev)) {

		/* Only need to handle PCI state in the driver for ATPX

		 * PCI core handles it for _PR3.

		 */

		pci_set_master(pdev);

	} else if (amdgpu_device_supports_baco(drm_dev)) {

		amdgpu_device_baco_exit(drm_dev);

	}

	ret = amdgpu_device_resume(drm_dev, false);

	drm_kms_helper_poll_enable(drm_dev);

	if (amdgpu_device_supports_boco(drm_dev))

	if (amdgpu_device_supports_atpx(drm_dev))

		drm_dev->switch_power_state = DRM_SWITCH_POWER_ON;

	adev->in_runpm = false;

	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags) 
		goto out;

	}



	if (amdgpu_device_supports_boco(dev) &&

	if (amdgpu_device_supports_atpx(dev) &&

	    (amdgpu_runtime_pm != 0)) { /* enable runpm by default for boco */

		adev->runpm = true;

	} else if (amdgpu_device_supports_baco(dev) &&
@@ -192,7 +192,7 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags) 


	if (adev->runpm) {

		/* only need to skip on ATPX */

		if (amdgpu_device_supports_boco(dev) &&

		if (amdgpu_device_supports_atpx(dev) &&

		    !amdgpu_is_atpx_hybrid())

			dev_pm_set_driver_flags(dev->dev, DPM_FLAG_NO_DIRECT_COMPLETE);

		pm_runtime_use_autosuspend(dev->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE