Release xcp drm memory after unplug xcp device
Subsystems (2)
v4 cover Release xcp drm memory after unplug xcp device
Fix xcp drm memory release after executing PCIe remove. Fix xcp drm memory alloc after executing PCIe insert.
Changes from V3->V4:
- amdgpu:
- - Remove redundant initialization for "i".
- - Simplify checks.
Changes from V2->V3:
- amdgpu:
- - Add Gerry as a Signed-off.
- - Unified commit author.
Changes from V1->V2:
- cover-letter:
- - Revise title version number.
- amdgpu:
- - Remove // comments.
- - Add Gerry as a co-developr.
Meng Li (1):
drm/amd/amdgpu: Release xcp drm memory after unplug
drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 58 +++++++++++++++++---- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 51 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
PATCH v4 1/1 drm/amd/amdgpu: Release xcp drm memory after unplug
Add a new API amdgpu_xcp_drm_dev_free().
After unplug xcp device, need to release xcp drm memory etc.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 58 +++++++++++++++++---- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 51 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c +1 -0
@@ -394,6 +394,7 @@ void amdgpu_xcp_dev_unplug(struct amdgpu_device *adev) p_ddev->primary->dev = adev->xcp_mgr->xcp[i].pdev; p_ddev->driver = adev->xcp_mgr->xcp[i].driver; p_ddev->vma_offset_manager = adev->xcp_mgr->xcp[i].vma_offset_manager; +amdgpu_xcp_drm_dev_free (p_ddev); } }
drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c +49 -9
91 lines not on this page · raw message
drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h +1 -0
@@ -25,5 +25,6 @@#define _AMDGPU_XCP_DRV_H_int amdgpu_xcp_drm_dev_alloc (struct drm_device **ddev); +void amdgpu_xcp_drm_dev_free (struct drm_device *ddev);void amdgpu_xcp_drv_release (void );#endif /* _AMDGPU_XCP_DRV_H_ */
Signature · 1 line
2.43.0
Re: [PATCH V4 1/1] drm/amd/amdgpu: Release xcp drm memory after unplug
Quoted 109 lines · Meng Li
Add a new API
amdgpu_xcp_drm_dev_free().
After unplug xcp device, need to release xcp drm memory etc.Co-developed-by Jiang Liu <[email protected]>Signed-off-by Jiang Liu <[email protected]>Signed-off-by Meng Li <[email protected]>Acked-by Alex Deucher <[email protected]>Reviewed-by Lijo Lazar <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 58 +++++++++++++++++---- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 51 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c +1
-0@@ -394,6 +394,7 @@ void amdgpu_xcp_dev_unplug(struct amdgpu_device *adev) p_ddev->primary->dev = adev->xcp_mgr->xcp[i].pdev; p_ddev->driver = adev->xcp_mgr->xcp[i].driver; p_ddev->vma_offset_manager = adev->xcp_mgr->xcp[i].vma_offset_manager; +amdgpu_xcp_drm_dev_free (p_ddev); } }drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c +39
-8@@ -46,18 +46,29 @@ static const struct drm_driver amdgpu_xcp_driver = {static int8_t pdev_num;static struct xcp_device *xcp_dev[MAX_XCP_PLATFORM_DEVICE ]; +static DEFINE_MUTEX (xcp_mutex);int amdgpu_xcp_drm_dev_alloc (struct drm_device **ddev) {struct platform_device *pdev;struct xcp_device *pxcp_dev;char dev_name[20 ]; -int ret; +int ret, i; + +guard (mutex)(&xcp_mutex);if (pdev_num >=MAX_XCP_PLATFORM_DEVICE )return -ENODEV ; -snprintf (dev_name,sizeof (dev_name),"amdgpu_xcp_%d" , pdev_num); +for (i =0 ; i <MAX_XCP_PLATFORM_DEVICE ; i++) { +if (!xcp_dev[i]) +break ; + } + +if (i >=MAX_XCP_PLATFORM_DEVICE ) +return -ENODEV ; + +snprintf (dev_name,sizeof (dev_name),"amdgpu_xcp_%d" , i); pdev =platform_device_register_simple (dev_name,-1 ,NULL ,0 );if (IS_ERR (pdev))return PTR_ERR (pdev);@@ -73,8 +84,8 @@ int amdgpu_xcp_drm_dev_alloc(struct drm_device **ddev) goto out_devres; } - xcp_dev[pdev_num] = pxcp_dev; - xcp_dev[pdev_num]->pdev = pdev; + xcp_dev[i] = pxcp_dev; + xcp_dev[i]->pdev = pdev; *ddev = &pxcp_dev->drm; pdev_num++;@@ -89,16 +100,45 @@ int amdgpu_xcp_drm_dev_alloc(struct drm_device **ddev) }EXPORT_SYMBOL (amdgpu_xcp_drm_dev_alloc); -void amdgpu_xcp_drv_release (void ) +static void free_xcp_dev (int8_t index) { -for (--pdev_num; pdev_num >=0 ; --pdev_num) { -struct platform_device *pdev = xcp_dev[pdev_num]->pdev; +if ((index <MAX_XCP_PLATFORM_DEVICE ) && (xcp_dev[index])) { +struct platform_device *pdev = xcp_dev[index]->pdev;devres_release_group (&pdev->dev,NULL );platform_device_unregister (pdev); - xcp_dev[pdev_num] =NULL ; + + xcp_dev[index] =NULL ; + pdev_num--; + } +} + +void amdgpu_xcp_drm_dev_free (struct drm_device *ddev) +{ +int8_t i; + +guard (mutex)(&xcp_mutex); + +for (i =0 ; i <MAX_XCP_PLATFORM_DEVICE ; i++) { +if ((xcp_dev[i]) && (&xcp_dev[i]->drm == ddev)) { +free_xcp_dev (i); +break ; + } + } +} +EXPORT_SYMBOL (amdgpu_xcp_drm_dev_free); +
drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c int amdgpu_xcp_drm_dev_alloc(struct drm_device **ddev) · line 140
Quoted 10 lines
drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c +10
-0+void amdgpu_xcp_drv_release (void ) +{ +int8_t i; + +guard (mutex)(&xcp_mutex); + +for (i =0 ; pdev_num && i <MAX_XCP_PLATFORM_DEVICE ; i++) { +free_xcp_dev (i); +if (pdev_num ==0 ) +break ;
This if check is not required. It's already covered in loop exit condition.
Thanks,
Lijo
Quoted 16 lines
drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c +0
-1} - pdev_num =0 ; }EXPORT_SYMBOL (amdgpu_xcp_drv_release);drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h +1
-0@@ -25,5 +25,6 @@#define _AMDGPU_XCP_DRV_H_int amdgpu_xcp_drm_dev_alloc (struct drm_device **ddev); +void amdgpu_xcp_drm_dev_free (struct drm_device *ddev);void amdgpu_xcp_drv_release (void );#endif /* _AMDGPU_XCP_DRV_H_ */