Skip to contentSkip to conversation

drm/amdgpu: use adev_to_drm macro for consistency (v2)

PATCH In review Guchun Chen 3 participants 3 messages Jun 10, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: use adev_to_drm macro for consistency (v2)

Use adev_to_drm() to get to the drm_device pointer.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
index 016815b7a773..fb6bcc386de1 100644
@@ -639,7 +639,7 @@ kfd_mem_attach_dmabuf(struct amdgpu_device *adev, struct kgd_mem *mem,
 		}
 	}
 
-	gobj = amdgpu_gem_prime_import(&adev->ddev, mem->dmabuf);
+	gobj = amdgpu_gem_prime_import(adev_to_drm(adev), mem->dmabuf);
 	if (IS_ERR(gobj))
 		return PTR_ERR(gobj);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
index ec936cde2726..bfbcb9ff2453 100644
@@ -2122,7 +2122,7 @@ static void amdgpu_ras_counte_dw(struct work_struct *work)
 	struct amdgpu_ras *con = container_of(work, struct amdgpu_ras,
 					      ras_counte_delay_work.work);
 	struct amdgpu_device *adev = con->adev;
-	struct drm_device *dev = &adev->ddev;
+	struct drm_device *dev = adev_to_drm(adev->ddev);
 	unsigned long ce_count, ue_count;
 	int res;
 
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer Reviewed-by on v1 1/1
#1 lore raw

Am 2021-06-09 um 10:47 p.m. schrieb Guchun Chen:

Quoted 5 lines

Use adev_to_drm() to get to the drm_device pointer.

Quoted 23 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
index 016815b7a773..fb6bcc386de1 100644
@@ -639,7 +639,7 @@ kfd_mem_attach_dmabuf(struct amdgpu_device *adev, struct kgd_mem *mem,
 		}
 	}
 
-	gobj = amdgpu_gem_prime_import(&adev->ddev, mem->dmabuf);
+	gobj = amdgpu_gem_prime_import(adev_to_drm(adev), mem->dmabuf);
 	if (IS_ERR(gobj))
 		return PTR_ERR(gobj);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -0
index ec936cde2726..bfbcb9ff2453 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c static void amdgpu_ras_counte_dw(struct work_struct *work) · line 2128

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
@@ -2122,7 +2122,7 @@ static void amdgpu_ras_counte_dw(struct work_struct *work)
 	struct amdgpu_ras *con = container_of(work, struct amdgpu_ras,
 					      ras_counte_delay_work.work);
 	struct amdgpu_device *adev = con->adev;
-	struct drm_device *dev = &adev->ddev;
+	struct drm_device *dev = adev_to_drm(adev->ddev);
 	unsigned long ce_count, ue_count;
 	int res;
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Guchun Chen

Am 10.06.21 um 04:47 schrieb Guchun Chen:

Quoted 5 lines

Use adev_to_drm() to get to the drm_device pointer.

Quoted 23 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c          | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
index 016815b7a773..fb6bcc386de1 100644
@@ -639,7 +639,7 @@ kfd_mem_attach_dmabuf(struct amdgpu_device *adev, struct kgd_mem *mem,
  		}
  	}
 
-	gobj = amdgpu_gem_prime_import(&adev->ddev, mem->dmabuf);
+	gobj = amdgpu_gem_prime_import(adev_to_drm(adev), mem->dmabuf);
  	if (IS_ERR(gobj))
  		return PTR_ERR(gobj);
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0 -0
index ec936cde2726..bfbcb9ff2453 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c static void amdgpu_ras_counte_dw(struct work_struct *work) · line 2128

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
@@ -2122,7 +2122,7 @@ static void amdgpu_ras_counte_dw(struct work_struct *work)
  	struct amdgpu_ras *con = container_of(work, struct amdgpu_ras,
  					      ras_counte_delay_work.work);
  	struct amdgpu_device *adev = con->adev;
-	struct drm_device *dev = &adev->ddev;
+	struct drm_device *dev = adev_to_drm(adev->ddev);
  	unsigned long ce_count, ue_count;
  	int res;
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx