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

Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next 



- Fix a crash on gpu reset at driver load time
- ATPX hotplug fix for when the dGPU is powered off
- PLL fix for r5xx asics
- SR-IOV fixes

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

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

+1 −2
Original line number Diff line number Diff line
@@ -464,8 +464,7 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
			}

		}

		if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {

			if ((adev->flags & AMD_IS_PX) &&

			    amdgpu_atpx_dgpu_req_power_for_displays()) {

			if (adev->flags & AMD_IS_PX) {

				pm_runtime_get_sync(adev->ddev->dev);

				/* Just fire off a uevent and let userspace tell us what to do */

				drm_helper_hpd_irq_event(adev->ddev);

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

+10 −0
Original line number Diff line number Diff line
@@ -342,6 +342,16 @@ static ssize_t amdgpu_set_dpm_forced_performance_level(struct device *dev, 
	if (current_level == level)

		return count;



	/* profile_exit setting is valid only when current mode is in profile mode */

	if (!(current_level & (AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |

	    AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |

	    AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |

	    AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)) &&

	    (level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)) {

		pr_err("Currently not in any profile mode!\n");

		return -EINVAL;

	}



	if (is_support_sw_smu(adev)) {

		mutex_lock(&adev->pm.mutex);

		if (adev->pm.dpm.thermal_active) {

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

+10 −9
Original line number Diff line number Diff line
@@ -38,18 +38,10 @@ static void psp_set_funcs(struct amdgpu_device *adev); 
static int psp_early_init(void *handle)

{

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

	struct psp_context *psp = &adev->psp;



	psp_set_funcs(adev);



	return 0;

}



static int psp_sw_init(void *handle)

{

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

	struct psp_context *psp = &adev->psp;

	int ret;



	switch (adev->asic_type) {

	case CHIP_VEGA10:

	case CHIP_VEGA12:
@@ -67,6 +59,15 @@ static int psp_sw_init(void *handle) 


	psp->adev = adev;



	return 0;

}



static int psp_sw_init(void *handle)

{

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

	struct psp_context *psp = &adev->psp;

	int ret;



	ret = psp_init_microcode(psp);

	if (ret) {

		DRM_ERROR("Failed to load psp firmware!\n");

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

+33 −3
Original line number Diff line number Diff line
@@ -2756,6 +2756,37 @@ error_free_sched_entity: 
	return r;

}



/**

 * amdgpu_vm_check_clean_reserved - check if a VM is clean

 *

 * @adev: amdgpu_device pointer

 * @vm: the VM to check

 *

 * check all entries of the root PD, if any subsequent PDs are allocated,

 * it means there are page table creating and filling, and is no a clean

 * VM

 *

 * Returns:

 *	0 if this VM is clean

 */

static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,

	struct amdgpu_vm *vm)

{

	enum amdgpu_vm_level root = adev->vm_manager.root_level;

	unsigned int entries = amdgpu_vm_num_entries(adev, root);

	unsigned int i = 0;



	if (!(vm->root.entries))

		return 0;



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

		if (vm->root.entries[i].base.bo)

			return -EINVAL;

	}



	return 0;

}



/**

 * amdgpu_vm_make_compute - Turn a GFX VM into a compute VM

 *
@@ -2786,10 +2817,9 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, uns 
		return r;



	/* Sanity checks */

	if (!RB_EMPTY_ROOT(&vm->va.rb_root) || vm->root.entries) {

		r = -EINVAL;

	r = amdgpu_vm_check_clean_reserved(adev, vm);

	if (r)

		goto unreserve_bo;

	}



	if (pasid) {

		unsigned long flags;

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

+3 −0
Original line number Diff line number Diff line
@@ -372,6 +372,9 @@ static int xgpu_ai_mailbox_rcv_irq(struct amdgpu_device *adev, 
		if (amdgpu_sriov_runtime(adev))

			schedule_work(&adev->virt.flr_work);

		break;

		case IDH_QUERY_ALIVE:

			xgpu_ai_mailbox_send_ack(adev);

			break;

		/* READY_TO_ACCESS_GPU is fetched by kernel polling, IRQ can ignore

		 * it byfar since that polling thread will handle it,

		 * other msg like flr complete is not handled here.

CRA Git | Maintained and supported by SUSTech CRA and CCSE