Commit 400ef298 authored by Jonathan Kim's avatar Jonathan Kim Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup ttm debug sdma vram access function 



Some suggested cleanups to declutter ttm when doing debug VRAM access over
SDMA.

Signed-off-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb5cc4f5

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -1446,6 +1446,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev, 
int amdgpu_device_set_pg_state(struct amdgpu_device *adev,

int amdgpu_device_set_pg_state(struct amdgpu_device *adev,

			       enum amd_powergating_state state);

			       enum amd_powergating_state state);





static inline bool amdgpu_device_has_timeouts_enabled(struct amdgpu_device *adev)

{

	return amdgpu_gpu_recovery != 0 &&

		adev->gfx_timeout != MAX_SCHEDULE_TIMEOUT &&

		adev->compute_timeout != MAX_SCHEDULE_TIMEOUT &&

		adev->sdma_timeout != MAX_SCHEDULE_TIMEOUT &&

		adev->video_timeout != MAX_SCHEDULE_TIMEOUT;

}



#include "amdgpu_object.h"

#include "amdgpu_object.h"





static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)

static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)

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

+7 −16
Original line number Original line Diff line number Diff line
@@ -1463,10 +1463,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo, 
	if (r)

	if (r)

		goto out;

		goto out;





	src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :

	src_addr = amdgpu_bo_gpu_offset(abo);

			amdgpu_bo_gpu_offset(abo);

	dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);

	dst_addr = write ? amdgpu_bo_gpu_offset(abo) :

	if (write)

			amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);

		swap(src_addr, dst_addr);



	amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr, dst_addr, PAGE_SIZE, false);

	amdgpu_emit_copy_buffer(adev, &job->ibs[0], src_addr, dst_addr, PAGE_SIZE, false);





	amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]);

	amdgpu_ring_pad_ib(adev->mman.buffer_funcs_ring, &job->ibs[0]);
@@ -1489,15 +1490,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo, 
	return r;

	return r;

}

}





static inline bool amdgpu_ttm_allow_post_mortem_debug(struct amdgpu_device *adev)

{

	return amdgpu_gpu_recovery == 0 ||

		adev->gfx_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->compute_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->sdma_timeout == MAX_SCHEDULE_TIMEOUT ||

		adev->video_timeout == MAX_SCHEDULE_TIMEOUT;

}



/**

/**

 * amdgpu_ttm_access_memory - Read or Write memory that backs a buffer object.

 * amdgpu_ttm_access_memory - Read or Write memory that backs a buffer object.

 *

 *
@@ -1522,7 +1514,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo, 
	if (bo->resource->mem_type != TTM_PL_VRAM)

	if (bo->resource->mem_type != TTM_PL_VRAM)

		return -EIO;

		return -EIO;





	if (!amdgpu_ttm_allow_post_mortem_debug(adev) &&

	if (amdgpu_device_has_timeouts_enabled(adev) &&

			!amdgpu_ttm_access_memory_sdma(bo, offset, buf, len, write))

			!amdgpu_ttm_access_memory_sdma(bo, offset, buf, len, write))

		return len;

		return len;
@@ -1912,7 +1904,6 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);

	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);

	ttm_device_fini(&adev->mman.bdev);

	ttm_device_fini(&adev->mman.bdev);

	adev->mman.initialized = false;

	adev->mman.initialized = false;

	if (adev->mman.sdma_access_ptr)

	amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,

	amdgpu_bo_free_kernel(&adev->mman.sdma_access_bo, NULL,

					&adev->mman.sdma_access_ptr);

					&adev->mman.sdma_access_ptr);

	DRM_INFO("amdgpu: ttm finalized\n");

	DRM_INFO("amdgpu: ttm finalized\n");