Commit c58a863b authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: use adev_to_drm for consistency when accessing drm_device 



adev_to_drm is used everywhere, so improve recent changes
when accessing drm_device pointer from amdgpu_device.

Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ec6abe83

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

+1 −1
Original line number Diff line number Diff line
@@ -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));

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

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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);