* [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function
@ 2022-01-12 18:52 Jonathan Kim
2022-01-12 19:20 ` Das, Nirmoy
2022-01-13 7:20 ` Christian König
0 siblings, 2 replies; 5+ messages in thread
From: Jonathan Kim @ 2022-01-12 18:52 UTC (permalink / raw)
To: amd-gfx; +Cc: Jonathan Kim, Christian.Koenig
Some suggested cleanups to declutter ttm when doing debug VRAM access over
SDMA.
v2: rename post_mortem_allowed func to has_timeouts_enable.
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +++++++----------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index a675dde81ce0..747d310aa72f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1448,6 +1448,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
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"
static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 33781509838c..b489cd8abe31 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1460,10 +1460,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
if (r)
goto out;
- src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :
- amdgpu_bo_gpu_offset(abo);
- dst_addr = write ? amdgpu_bo_gpu_offset(abo) :
- amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
+ src_addr = amdgpu_bo_gpu_offset(abo);
+ dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
+ if (write)
+ swap(src_addr, dst_addr);
+
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]);
@@ -1486,15 +1487,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
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.
*
@@ -1519,7 +1511,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
if (bo->resource->mem_type != TTM_PL_VRAM)
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))
return len;
@@ -1909,8 +1901,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
ttm_device_fini(&adev->mman.bdev);
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);
DRM_INFO("amdgpu: ttm finalized\n");
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function
2022-01-12 18:52 [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function Jonathan Kim
@ 2022-01-12 19:20 ` Das, Nirmoy
2022-01-13 7:20 ` Christian König
1 sibling, 0 replies; 5+ messages in thread
From: Das, Nirmoy @ 2022-01-12 19:20 UTC (permalink / raw)
To: amd-gfx
LGTM acked-by: Nirmoy Das <nirmoy.das@amd.com>
On 1/12/2022 7:52 PM, Jonathan Kim wrote:
> Some suggested cleanups to declutter ttm when doing debug VRAM access over
> SDMA.
>
> v2: rename post_mortem_allowed func to has_timeouts_enable.
>
> Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +++++++----------------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index a675dde81ce0..747d310aa72f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1448,6 +1448,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
> int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
> 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"
>
> static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 33781509838c..b489cd8abe31 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1460,10 +1460,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> if (r)
> goto out;
>
> - src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :
> - amdgpu_bo_gpu_offset(abo);
> - dst_addr = write ? amdgpu_bo_gpu_offset(abo) :
> - amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + src_addr = amdgpu_bo_gpu_offset(abo);
> + dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + if (write)
> + swap(src_addr, dst_addr);
> +
> 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]);
> @@ -1486,15 +1487,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> 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.
> *
> @@ -1519,7 +1511,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
> if (bo->resource->mem_type != TTM_PL_VRAM)
> 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))
> return len;
>
> @@ -1909,8 +1901,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
> ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
> ttm_device_fini(&adev->mman.bdev);
> 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);
> DRM_INFO("amdgpu: ttm finalized\n");
> }
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function
2022-01-12 18:52 [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function Jonathan Kim
2022-01-12 19:20 ` Das, Nirmoy
@ 2022-01-13 7:20 ` Christian König
1 sibling, 0 replies; 5+ messages in thread
From: Christian König @ 2022-01-13 7:20 UTC (permalink / raw)
To: Jonathan Kim, amd-gfx
Am 12.01.22 um 19:52 schrieb Jonathan Kim:
> Some suggested cleanups to declutter ttm when doing debug VRAM access over
> SDMA.
>
> v2: rename post_mortem_allowed func to has_timeouts_enable.
>
> Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +++++++----------------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index a675dde81ce0..747d310aa72f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1448,6 +1448,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
> int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
> 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"
>
> static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 33781509838c..b489cd8abe31 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1460,10 +1460,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> if (r)
> goto out;
>
> - src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :
> - amdgpu_bo_gpu_offset(abo);
> - dst_addr = write ? amdgpu_bo_gpu_offset(abo) :
> - amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + src_addr = amdgpu_bo_gpu_offset(abo);
> + dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + if (write)
> + swap(src_addr, dst_addr);
> +
> 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]);
> @@ -1486,15 +1487,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> 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.
> *
> @@ -1519,7 +1511,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
> if (bo->resource->mem_type != TTM_PL_VRAM)
> 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))
> return len;
>
> @@ -1909,8 +1901,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
> ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
> ttm_device_fini(&adev->mman.bdev);
> 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);
> DRM_INFO("amdgpu: ttm finalized\n");
> }
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function
2022-01-12 15:59 Jonathan Kim
@ 2022-01-12 16:08 ` Christian König
0 siblings, 0 replies; 5+ messages in thread
From: Christian König @ 2022-01-12 16:08 UTC (permalink / raw)
To: Jonathan Kim, amd-gfx
Am 12.01.22 um 16:59 schrieb Jonathan Kim:
> Some suggested cleanups to declutter ttm when doing debug VRAM access over
> SDMA.
>
> Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +++++++----------------
> 2 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index a675dde81ce0..4d77842f2183 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1448,6 +1448,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
> int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
> enum amd_powergating_state state);
>
> +static inline bool amdgpu_allow_post_mortem_debug(struct amdgpu_device *adev)
Give that a better name, something like
amdgpu_device_are_timeouts_enabled().
Apart from that looks good to me,
Christian.
> +{
> + 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"
>
> static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 33781509838c..02515f1ea5fa 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1460,10 +1460,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> if (r)
> goto out;
>
> - src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :
> - amdgpu_bo_gpu_offset(abo);
> - dst_addr = write ? amdgpu_bo_gpu_offset(abo) :
> - amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + src_addr = amdgpu_bo_gpu_offset(abo);
> + dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
> + if (write)
> + swap(src_addr, dst_addr);
> +
> 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]);
> @@ -1486,15 +1487,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
> 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.
> *
> @@ -1519,7 +1511,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
> if (bo->resource->mem_type != TTM_PL_VRAM)
> return -EIO;
>
> - if (!amdgpu_ttm_allow_post_mortem_debug(adev) &&
> + if (!amdgpu_allow_post_mortem_debug(adev) &&
> !amdgpu_ttm_access_memory_sdma(bo, offset, buf, len, write))
> return len;
>
> @@ -1909,8 +1901,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
> ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
> ttm_device_fini(&adev->mman.bdev);
> 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);
> DRM_INFO("amdgpu: ttm finalized\n");
> }
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function
@ 2022-01-12 15:59 Jonathan Kim
2022-01-12 16:08 ` Christian König
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Kim @ 2022-01-12 15:59 UTC (permalink / raw)
To: amd-gfx; +Cc: Jonathan Kim, Christian.Koenig
Some suggested cleanups to declutter ttm when doing debug VRAM access over
SDMA.
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 +++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +++++++----------------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index a675dde81ce0..4d77842f2183 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1448,6 +1448,15 @@ int amdgpu_device_set_cg_state(struct amdgpu_device *adev,
int amdgpu_device_set_pg_state(struct amdgpu_device *adev,
enum amd_powergating_state state);
+static inline bool amdgpu_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;
+}
+
#include "amdgpu_object.h"
static inline bool amdgpu_is_tmz(struct amdgpu_device *adev)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 33781509838c..02515f1ea5fa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1460,10 +1460,11 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
if (r)
goto out;
- src_addr = write ? amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo) :
- amdgpu_bo_gpu_offset(abo);
- dst_addr = write ? amdgpu_bo_gpu_offset(abo) :
- amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
+ src_addr = amdgpu_bo_gpu_offset(abo);
+ dst_addr = amdgpu_bo_gpu_offset(adev->mman.sdma_access_bo);
+ if (write)
+ swap(src_addr, dst_addr);
+
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]);
@@ -1486,15 +1487,6 @@ static int amdgpu_ttm_access_memory_sdma(struct ttm_buffer_object *bo,
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.
*
@@ -1519,7 +1511,7 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
if (bo->resource->mem_type != TTM_PL_VRAM)
return -EIO;
- if (!amdgpu_ttm_allow_post_mortem_debug(adev) &&
+ if (!amdgpu_allow_post_mortem_debug(adev) &&
!amdgpu_ttm_access_memory_sdma(bo, offset, buf, len, write))
return len;
@@ -1909,8 +1901,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);
ttm_device_fini(&adev->mman.bdev);
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);
DRM_INFO("amdgpu: ttm finalized\n");
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-13 7:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-12 18:52 [PATCH] drm/amdgpu: cleanup ttm debug sdma vram access function Jonathan Kim
2022-01-12 19:20 ` Das, Nirmoy
2022-01-13 7:20 ` Christian König
-- strict thread matches above, loose matches on Subject: below --
2022-01-12 15:59 Jonathan Kim
2022-01-12 16:08 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.