drm/amd: Use drm_*() macros instead of DRM_*() for amdgpu_cs
Subsystems (2)
PATCH v2 1/1 drm/amd: Use drm_*() macros instead of DRM_*() for amdgpu_cs
From: Mario Limonciello <[email protected]>
Some of the IOCTL messages can be called for different GPUs and it might not be obvious which one called them from a problem. Using the drm_*() macros the correct device will be shown in the messages.
---
v2:
* use adev_to_drm (Lijo)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +10 -10
@@ -395,7 +395,7 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p, chunk_ib->ib_bytes : 0, AMDGPU_IB_POOL_DELAYED, ib);if (r) { -DRM_ERROR ("Failed to get ib !\n" ); +drm_err (adev_to_drm (p->adev),"Failed to get ib !\n" );return r; }
@@ -467,7 +467,7 @@ static int amdgpu_syncobj_lookup_and_add(struct amdgpu_cs_parser *p, r =drm_syncobj_find_fence (p->filp, handle, point, flags, &fence);if (r) { -DRM_ERROR ("syncobj %u failed to find fence @ %llu (%d)!\n" , +drm_err (adev_to_drm (p->adev),"syncobj %u failed to find fence @ %llu (%d)!\n" , handle, point, r);return r; }
@@ -901,7 +901,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,sizeof (struct page *), GFP_KERNEL);if (!e->user_pages) { -DRM_ERROR ("kvmalloc_array failure\n" ); +drm_err (adev_to_drm (p->adev),"kvmalloc_array failure\n" ); r = -ENOMEM ; goto out_free_user_pages; }
@@ -982,7 +982,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, r =amdgpu_vm_validate (p->adev, &fpriv->vm,NULL , amdgpu_cs_bo_validate, p);if (r) { -DRM_ERROR ("amdgpu_vm_validate() failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_vm_validate() failed.\n" ); goto out_free_user_pages; }
@@ -1060,13 +1060,13 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p, va_start = ib->gpu_addr &AMDGPU_GMC_HOLE_MASK ; r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m);if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start is invalid\n" );return r; }if ((va_start + ib->length_dw *4 ) > (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start+ib_bytes is invalid\n" );return -EINVAL ; }
@@ -1234,7 +1234,7 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) r =amdgpu_ctx_wait_prev_fence (p->ctx, p->entities[p->gang_leader_idx]);if (r) {if (r != -ERESTARTSYS ) -DRM_ERROR ("amdgpu_ctx_wait_prev_fence failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_ctx_wait_prev_fence failed.\n" );return r; }
@@ -1447,7 +1447,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_init (&parser, adev, filp, data);if (r) { -DRM_ERROR_RATELIMITED ("Failed to initialize parser %d!\n" , r); +drm_err_ratelimited (dev,"Failed to initialize parser %d!\n" , r);return r; }
@@ -1462,9 +1462,9 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_bos (&parser, data);if (r) {if (r == -ENOMEM ) -DRM_ERROR ("Not enough memory for command submission!\n" ); +drm_err (dev,"Not enough memory for command submission!\n" );else if (r != -ERESTARTSYS && r != -EAGAIN ) -DRM_DEBUG ("Failed to process the buffer list %d!\n" , r); +drm_dbg (dev,"Failed to process the buffer list %d!\n" , r); goto error_fini; }
Signature · 1 line
2.49.0
Quoted 7 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
Some of the IOCTL messages can be called for different GPUs and it might not be obvious which one called them from a problem. Using the drm_*() macros the correct device will be shown in the messages.
Signed-off-by Mario Limonciello <[email protected]>
ping?
Quoted 93 lines
---
v2:
* useadev_to_drm(Lijo)--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +10
-10@@ -395,7 +395,7 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p, chunk_ib->ib_bytes : 0, AMDGPU_IB_POOL_DELAYED, ib);if (r) { -DRM_ERROR ("Failed to get ib !\n" ); +drm_err (adev_to_drm (p->adev),"Failed to get ib !\n" );return r; }@@ -467,7 +467,7 @@ static int amdgpu_syncobj_lookup_and_add(struct amdgpu_cs_parser *p, r =drm_syncobj_find_fence (p->filp, handle, point, flags, &fence);if (r) { -DRM_ERROR ("syncobj %u failed to find fence @ %llu (%d)!\n" , +drm_err (adev_to_drm (p->adev),"syncobj %u failed to find fence @ %llu (%d)!\n" , handle, point, r);return r; }@@ -901,7 +901,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,sizeof (struct page *), GFP_KERNEL);if (!e->user_pages) { -DRM_ERROR ("kvmalloc_array failure\n" ); +drm_err (adev_to_drm (p->adev),"kvmalloc_array failure\n" ); r = -ENOMEM ; goto out_free_user_pages; }@@ -982,7 +982,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, r =amdgpu_vm_validate (p->adev, &fpriv->vm,NULL , amdgpu_cs_bo_validate, p);if (r) { -DRM_ERROR ("amdgpu_vm_validate() failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_vm_validate() failed.\n" ); goto out_free_user_pages; }@@ -1060,13 +1060,13 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p, va_start = ib->gpu_addr &AMDGPU_GMC_HOLE_MASK ; r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m);if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start is invalid\n" );return r; }if ((va_start + ib->length_dw *4 ) > (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start+ib_bytes is invalid\n" );return -EINVAL ; }@@ -1234,7 +1234,7 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) r =amdgpu_ctx_wait_prev_fence (p->ctx, p->entities[p->gang_leader_idx]);if (r) {if (r != -ERESTARTSYS ) -DRM_ERROR ("amdgpu_ctx_wait_prev_fence failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_ctx_wait_prev_fence failed.\n" );return r; }@@ -1447,7 +1447,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_init (&parser, adev, filp, data);if (r) { -DRM_ERROR_RATELIMITED ("Failed to initialize parser %d!\n" , r); +drm_err_ratelimited (dev,"Failed to initialize parser %d!\n" , r);return r; }@@ -1462,9 +1462,9 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_bos (&parser, data);if (r) {if (r == -ENOMEM ) -DRM_ERROR ("Not enough memory for command submission!\n" ); +drm_err (dev,"Not enough memory for command submission!\n" );else if (r != -ERESTARTSYS && r != -EAGAIN ) -DRM_DEBUG ("Failed to process the buffer list %d!\n" , r); +drm_dbg (dev,"Failed to process the buffer list %d!\n" , r); goto error_fini; }
Quoted 8 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
Some of the IOCTL messages can be called for different GPUs and it might not be obvious which one called them from a problem. Using the drm_*() macros the correct device will be shown in the messages.
Signed-off-by Mario Limonciello <[email protected]>
Quoted 96 lines
---
v2:
* useadev_to_drm(Lijo)--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +10
-11@@ -395,7 +395,7 @@ static int amdgpu_cs_p2_ib(struct amdgpu_cs_parser *p, chunk_ib->ib_bytes : 0, AMDGPU_IB_POOL_DELAYED, ib);if (r) { -DRM_ERROR ("Failed to get ib !\n" ); +drm_err (adev_to_drm (p->adev),"Failed to get ib !\n" );return r; }@@ -467,7 +467,7 @@ static int amdgpu_syncobj_lookup_and_add(struct amdgpu_cs_parser *p, r =drm_syncobj_find_fence (p->filp, handle, point, flags, &fence);if (r) { -DRM_ERROR ("syncobj %u failed to find fence @ %llu (%d)!\n" , +drm_err (adev_to_drm (p->adev),"syncobj %u failed to find fence @ %llu (%d)!\n" , handle, point, r);return r; }@@ -901,7 +901,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,sizeof (struct page *), GFP_KERNEL);if (!e->user_pages) { -DRM_ERROR ("kvmalloc_array failure\n" ); +drm_err (adev_to_drm (p->adev),"kvmalloc_array failure\n" ); r = -ENOMEM ; goto out_free_user_pages; }@@ -982,7 +982,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, r =amdgpu_vm_validate (p->adev, &fpriv->vm,NULL , amdgpu_cs_bo_validate, p);if (r) { -DRM_ERROR ("amdgpu_vm_validate() failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_vm_validate() failed.\n" ); goto out_free_user_pages; }@@ -1060,13 +1060,13 @@ static int amdgpu_cs_patch_ibs(struct amdgpu_cs_parser *p, va_start = ib->gpu_addr &AMDGPU_GMC_HOLE_MASK ; r =amdgpu_cs_find_mapping (p, va_start, &aobj, &m);if (r) { -DRM_ERROR ("IB va_start is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start is invalid\n" );return r; }if ((va_start + ib->length_dw *4 ) > (m->last +1 ) *AMDGPU_GPU_PAGE_SIZE ) { -DRM_ERROR ("IB va_start+ib_bytes is invalid\n" ); +drm_err (adev_to_drm (p->adev),"IB va_start+ib_bytes is invalid\n" );return -EINVAL ; }@@ -1234,7 +1234,7 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) r =amdgpu_ctx_wait_prev_fence (p->ctx, p->entities[p->gang_leader_idx]);if (r) {if (r != -ERESTARTSYS ) -DRM_ERROR ("amdgpu_ctx_wait_prev_fence failed.\n" ); +drm_err (adev_to_drm (p->adev),"amdgpu_ctx_wait_prev_fence failed.\n" );return r; }@@ -1447,7 +1447,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_init (&parser, adev, filp, data);if (r) { -DRM_ERROR_RATELIMITED ("Failed to initialize parser %d!\n" , r); +drm_err_ratelimited (dev,"Failed to initialize parser %d!\n" , r);return r; }@@ -1462,9 +1462,9 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) r =amdgpu_cs_parser_bos (&parser, data);if (r) {if (r == -ENOMEM ) -DRM_ERROR ("Not enough memory for command submission!\n" ); +drm_err (dev,"Not enough memory for command submission!\n" );else if (r != -ERESTARTSYS && r != -EAGAIN ) -DRM_DEBUG ("Failed to process the buffer list %d!\n" , r); +drm_dbg (dev,"Failed to process the buffer list %d!\n" , r); goto error_fini; } --2.49.0