Re: [PATCH] drm/amdgpu: use adev_to_drm for consistency when accessing drm_device

[Christian König <christian.koenig@xxxxxxx>]

Am 07.10.21 um 13:40 schrieb Guchun Chen:
> adev_to_drm is used everywhere, so improve recent changes
> when accessing drm_device pointer from amdgpu_device.
>
> Signed-off-by: Guchun Chen <guchun.chen@xxxxxxx>

Acked-by: Christian König <christian.koenig@xxxxxxx>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c  | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c   | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c    | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c    | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c    | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c    | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c    | 6 +++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c    | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c    | 6 +++---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c     | 6 +++---
>   drivers/gpu/drm/amd/amdgpu/psp_v11_0.c     | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vce_v4_0.c      | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c      | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c      | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c      | 2 +-
>   16 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 57638fe9cfc2..37f6c3a43541 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -306,7 +306,7 @@ void amdgpu_device_mm_access(struct amdgpu_device *adev, loff_t pos,
>   	uint64_t last;
>   	int idx;
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return;
>   
>   	BUG_ON(!IS_ALIGNED(pos, 4) || !IS_ALIGNED(size, 4));
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> index fd4ba076ff8a..1320f84c63cd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
> @@ -556,7 +556,7 @@ void amdgpu_fence_driver_hw_fini(struct amdgpu_device *adev)
>   			drm_sched_stop(&ring->sched, NULL);
>   
>   		/* You can't wait for HW to signal if it's gone */
> -		if (!drm_dev_is_unplugged(&adev->ddev))
> +		if (!drm_dev_is_unplugged(adev_to_drm(adev)))
>   			r = amdgpu_fence_wait_empty(ring);
>   		else
>   			r = -ENODEV;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> index d7e4f4660acf..d3e4203f6217 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> @@ -238,7 +238,7 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
>   		return -EINVAL;
>   	}
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return 0;
>   
>   	t = offset / AMDGPU_GPU_PAGE_SIZE;
> @@ -289,7 +289,7 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,
>   		return -EINVAL;
>   	}
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return 0;
>   
>   	t = offset / AMDGPU_GPU_PAGE_SIZE;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> index 8d2716297070..45761d0328c7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
> @@ -748,7 +748,7 @@ void amdgpu_gmc_init_pdb0(struct amdgpu_device *adev)
>   	u64 gart_ptb_gpu_pa = amdgpu_gmc_vram_pa(adev, adev->gart.bo);
>   	int idx;
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return;
>   
>   	flags |= AMDGPU_PTE_VALID | AMDGPU_PTE_READABLE;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> index e1aa4a5e6a98..054d6210be7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> @@ -368,7 +368,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
>   void amdgpu_irq_fini_hw(struct amdgpu_device *adev)
>   {
>   	if (adev->irq.installed) {
> -		drm_irq_uninstall(&adev->ddev);
> +		drm_irq_uninstall(adev_to_drm(adev));
>   		adev->irq.installed = false;
>   		if (adev->irq.msi_enabled)
>   			pci_free_irq_vectors(adev->pdev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> index de29518673dd..f222ec17a523 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
> @@ -38,7 +38,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
>   	struct amdgpu_device *adev = ring->adev;
>   	int idx;
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx)) {
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		DRM_INFO("%s - device unplugged skipping recovery on scheduler:%s",
>   			 __func__, s_job->sched->name);
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index fd6e38ad493c..6b39e6c02dd8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -440,7 +440,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
>   	if (psp->adev->no_hw_access)
>   		return 0;
>   
> -	if (!drm_dev_enter(&psp->adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(psp->adev), &idx))
>   		return 0;
>   
>   	memset(psp->cmd_buf_mem, 0, PSP_CMD_BUFFER_SIZE);
> @@ -3272,7 +3272,7 @@ void psp_copy_fw(struct psp_context *psp, uint8_t *start_addr, uint32_t bin_size
>   {
>   	int idx;
>   
> -	if (!drm_dev_enter(&psp->adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(psp->adev), &idx))
>   		return;
>   
>   	memset(psp->fw_pri_buf, 0, PSP_1_MEG);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index 8a26459bd80b..6f8de11a17f1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -454,7 +454,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)
>   		if (!adev->uvd.inst[j].saved_bo)
>   			return -ENOMEM;
>   
> -		if (drm_dev_enter(&adev->ddev, &idx)) {
> +		if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   			/* re-write 0 since err_event_athub will corrupt VCPU buffer */
>   			if (in_ras_intr)
>   				memset(adev->uvd.inst[j].saved_bo, 0, size);
> @@ -487,7 +487,7 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev)
>   		ptr = adev->uvd.inst[i].cpu_addr;
>   
>   		if (adev->uvd.inst[i].saved_bo != NULL) {
> -			if (drm_dev_enter(&adev->ddev, &idx)) {
> +			if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   				memcpy_toio(ptr, adev->uvd.inst[i].saved_bo, size);
>   				drm_dev_exit(idx);
>   			}
> @@ -500,7 +500,7 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev)
>   			hdr = (const struct common_firmware_header *)adev->uvd.fw->data;
>   			if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
>   				offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
> -				if (drm_dev_enter(&adev->ddev, &idx)) {
> +				if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   					memcpy_toio(adev->uvd.inst[i].cpu_addr, adev->uvd.fw->data + offset,
>   						    le32_to_cpu(hdr->ucode_size_bytes));
>   					drm_dev_exit(idx);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index caa4d3420e00..688bef1649b5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -313,7 +313,7 @@ int amdgpu_vce_resume(struct amdgpu_device *adev)
>   	hdr = (const struct common_firmware_header *)adev->vce.fw->data;
>   	offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
>   
> -	if (drm_dev_enter(&adev->ddev, &idx)) {
> +	if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		memcpy_toio(cpu_addr, adev->vce.fw->data + offset,
>   			    adev->vce.fw->size - offset);
>   		drm_dev_exit(idx);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 4d3f2386ef53..c7d316850570 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -325,7 +325,7 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev)
>   		if (!adev->vcn.inst[i].saved_bo)
>   			return -ENOMEM;
>   
> -		if (drm_dev_enter(&adev->ddev, &idx)) {
> +		if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   			memcpy_fromio(adev->vcn.inst[i].saved_bo, ptr, size);
>   			drm_dev_exit(idx);
>   		}
> @@ -349,7 +349,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev)
>   		ptr = adev->vcn.inst[i].cpu_addr;
>   
>   		if (adev->vcn.inst[i].saved_bo != NULL) {
> -			if (drm_dev_enter(&adev->ddev, &idx)) {
> +			if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   				memcpy_toio(ptr, adev->vcn.inst[i].saved_bo, size);
>   				drm_dev_exit(idx);
>   			}
> @@ -362,7 +362,7 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev)
>   			hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
>   			if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
>   				offset = le32_to_cpu(hdr->ucode_array_offset_bytes);
> -				if (drm_dev_enter(&adev->ddev, &idx)) {
> +				if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   					memcpy_toio(adev->vcn.inst[i].cpu_addr, adev->vcn.fw->data + offset,
>   						    le32_to_cpu(hdr->ucode_size_bytes));
>   					drm_dev_exit(idx);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index a1ddf74bbdba..0e7dc23f78e7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -845,7 +845,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
>   			return r;
>   	}
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return -ENODEV;
>   
>   	r = vm->update_funcs->map_table(vmbo);
> @@ -1395,7 +1395,7 @@ int amdgpu_vm_update_pdes(struct amdgpu_device *adev,
>   	if (list_empty(&vm->relocated))
>   		return 0;
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return -ENODEV;
>   
>   	memset(&params, 0, sizeof(params));
> @@ -1718,7 +1718,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
>   	enum amdgpu_sync_mode sync_mode;
>   	int r, idx;
>   
> -	if (!drm_dev_enter(&adev->ddev, &idx))
> +	if (!drm_dev_enter(adev_to_drm(adev), &idx))
>   		return -ENODEV;
>   
>   	memset(&params, 0, sizeof(params));
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index aaf200ec982b..21a325ea49cb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -698,7 +698,7 @@ static int psp_v11_0_memory_training(struct psp_context *psp, uint32_t ops)
>   			return -ENOMEM;
>   		}
>   
> -		if (drm_dev_enter(&adev->ddev, &idx)) {
> +		if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   			memcpy_fromio(buf, adev->mman.aper_base_kaddr, sz);
>   			ret = psp_v11_0_memory_training_send_msg(psp, PSP_BL__DRAM_LONG_TRAIN);
>   			if (ret) {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> index 226b79254db8..d1fc4e0b8265 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
> @@ -565,7 +565,7 @@ static int vce_v4_0_suspend(void *handle)
>   	if (adev->vce.vcpu_bo == NULL)
>   		return 0;
>   
> -	if (drm_dev_enter(&adev->ddev, &idx)) {
> +	if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
>   			unsigned size = amdgpu_bo_size(adev->vce.vcpu_bo);
>   			void *ptr = adev->vce.cpu_addr;
> @@ -615,7 +615,7 @@ static int vce_v4_0_resume(void *handle)
>   
>   	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
>   
> -		if (drm_dev_enter(&adev->ddev, &idx)) {
> +		if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   			unsigned size = amdgpu_bo_size(adev->vce.vcpu_bo);
>   			void *ptr = adev->vce.cpu_addr;
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index 43f46ab07dda..091d8c0f6801 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -198,7 +198,7 @@ static int vcn_v2_0_sw_fini(void *handle)
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	volatile struct amdgpu_fw_shared *fw_shared = adev->vcn.inst->fw_shared_cpu_addr;
>   
> -	if (drm_dev_enter(&adev->ddev, &idx)) {
> +	if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		fw_shared->present_flag_0 = 0;
>   		drm_dev_exit(idx);
>   	}
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index f4a7a30ecebd..59f469bab005 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -240,7 +240,7 @@ static int vcn_v2_5_sw_fini(void *handle)
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	volatile struct amdgpu_fw_shared *fw_shared;
>   
> -	if (drm_dev_enter(&adev->ddev, &idx)) {
> +	if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
>   			if (adev->vcn.harvest_config & (1 << i))
>   				continue;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index 135a9c553af8..dbfd92984655 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -263,7 +263,7 @@ static int vcn_v3_0_sw_fini(void *handle)
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	int i, r, idx;
>   
> -	if (drm_dev_enter(&adev->ddev, &idx)) {
> +	if (drm_dev_enter(adev_to_drm(adev), &idx)) {
>   		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
>   			volatile struct amdgpu_fw_shared *fw_shared;
>