Commit 60693e3a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.20-2022-07-14' of... 

Merge tag 'amd-drm-next-5.20-2022-07-14' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.20-2022-07-14:

amdgpu:
- DCN3.2 updates
- DC SubVP support
- DP MST fixes
- Audio fixes
- DC code cleanup
- SMU13 updates
- Adjust GART size on newer APUs for S/G display
- Soft reset for GFX 11
- Soft reset for SDMA 6
- Add gfxoff status query for vangogh
- Improve BO domain pinning
- Fix timestamps for cursor only commits
- MES fixes
- DCN 3.1.4 support
- Misc fixes
- Misc code cleanup

amdkfd:
- Simplify GPUVM validation
- Unified memory for CWSR save/restore area
- fix possible list corruption on queue failure

radeon:
- Fix bogus power of two warning

UAPI:
- Unified memory for CWSR save/restore area for KFD
  Proposed userspace: https://lists.freedesktop.org/archives/amd-gfx/2022-June/080952.html



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

Documentation/gpu/amdgpu/amdgpu-glossary.rst

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ we have a dedicated glossary for Display Core at 
    PSP

        Platform Security Processor



    RCL

    RLC

      RunList Controller



    SDMA

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

+2 −3
Original line number Diff line number Diff line
@@ -1253,9 +1253,8 @@ int emu_soc_asic_init(struct amdgpu_device *adev); 
bool amdgpu_device_has_job_running(struct amdgpu_device *adev);

bool amdgpu_device_should_recover_gpu(struct amdgpu_device *adev);

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job* job);

int amdgpu_device_gpu_recover(struct amdgpu_device *adev,

			      struct amdgpu_job *job);

			      struct amdgpu_job *job,

			      struct amdgpu_reset_context *reset_context);

void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

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

+8 −1
Original line number Diff line number Diff line
@@ -129,7 +129,14 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work) 
	struct amdgpu_device *adev = container_of(work, struct amdgpu_device,

						  kfd.reset_work);



	amdgpu_device_gpu_recover(adev, NULL);

	struct amdgpu_reset_context reset_context;

	memset(&reset_context, 0, sizeof(reset_context));



	reset_context.method = AMD_RESET_METHOD_NONE;

	reset_context.reset_req_dev = adev;

	clear_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags);



	amdgpu_device_gpu_recover(adev, NULL, &reset_context);

}



void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)

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

+0 −20
Original line number Diff line number Diff line
@@ -401,22 +401,8 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) 
		return ret;

	}



	ret = amdgpu_amdkfd_validate_vm_bo(NULL, pd);

	if (ret) {

		pr_err("failed to validate PD\n");

		return ret;

	}



	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);



	if (vm->use_cpu_for_update) {

		ret = amdgpu_bo_kmap(pd, NULL);

		if (ret) {

			pr_err("failed to kmap PD, ret=%d\n", ret);

			return ret;

		}

	}



	return 0;

}
@@ -1555,16 +1541,10 @@ void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev, 
				    struct amdgpu_vm *vm)

{

	struct amdkfd_process_info *process_info = vm->process_info;

	struct amdgpu_bo *pd = vm->root.bo;



	if (!process_info)

		return;



	/* Release eviction fence from PD */

	amdgpu_bo_reserve(pd, false);

	amdgpu_bo_fence(pd, NULL, false);

	amdgpu_bo_unreserve(pd);



	/* Update process info */

	mutex_lock(&process_info->lock);

	process_info->n_vms--;

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

+42 −65
Original line number Diff line number Diff line
@@ -383,12 +383,8 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, 


		value = RREG32_PCIE(*pos);

		r = put_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		result += 4;

		buf += 4;
@@ -396,11 +392,12 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -441,12 +438,8 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user 
		uint32_t value;



		r = get_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		WREG32_PCIE(*pos, value);
@@ -456,11 +449,12 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -502,12 +496,8 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 


		value = RREG32_DIDT(*pos >> 2);

		r = put_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		result += 4;

		buf += 4;
@@ -515,11 +505,12 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -560,12 +551,8 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user 
		uint32_t value;



		r = get_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		WREG32_DIDT(*pos >> 2, value);
@@ -575,11 +562,12 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -621,12 +609,8 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, 


		value = RREG32_SMC(*pos);

		r = put_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		result += 4;

		buf += 4;
@@ -634,11 +618,12 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -679,12 +664,8 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * 
		uint32_t value;



		r = get_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			amdgpu_virt_disable_access_debugfs(adev);

			return r;

		}

		if (r)

			goto out;



		WREG32_SMC(*pos, value);
@@ -694,11 +675,12 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	amdgpu_virt_disable_access_debugfs(adev);

	return result;

	return r;

}



/**
@@ -1090,11 +1072,8 @@ static ssize_t amdgpu_debugfs_gfxoff_write(struct file *f, const char __user *bu 
		uint32_t value;



		r = get_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			return r;

		}

		if (r)

			goto out;



		amdgpu_gfx_off_ctrl(adev, value ? true : false);
@@ -1104,10 +1083,12 @@ static ssize_t amdgpu_debugfs_gfxoff_write(struct file *f, const char __user *bu 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return result;

	return r;

}
@@ -1139,18 +1120,12 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struct file *f, char __user *buf, 
		uint32_t value;



		r = amdgpu_get_gfx_off_status(adev, &value);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			return r;

		}

		if (r)

			goto out;



		r = put_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

			pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			return r;

		}

		if (r)

			goto out;



		result += 4;

		buf += 4;
@@ -1158,10 +1133,12 @@ static ssize_t amdgpu_debugfs_gfxoff_read(struct file *f, char __user *buf, 
		size -= 4;

	}



	r = result;

out:

	pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

	pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);



	return result;

	return r;

}



static const struct file_operations amdgpu_debugfs_regs2_fops = {