Release xcp drm memory after unplug xcp device
Subsystems (2)
v2 cover Release xcp drm memory after unplug xcp device
From: limeng12 <[email protected]>
Fix xcp drm memory release after executing PCIe remove. Fix xcp drm memory alloc after executing PCIe insert.
limeng12 (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 | 63 ++++++++++++++++++--- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 56 insertions(+), 9 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/1 drm/amd/amdgpu: Release xcp drm memory after unplug
From: limeng12 <[email protected]>
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 | 63 ++++++++++++++++++--- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 56 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 +54 -9
96 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 V2 1/1] drm/amd/amdgpu: Release xcp drm memory after unplug
Quoted 6 lines · Meng Li
From: limeng12 <[email protected]>
Add a new API
amdgpu_xcp_drm_dev_free().
After unplug xcp device, need to release xcp drm memory etc.Signed-off-by Meng Li <[email protected]>
Suggest to keep Jiang Liu <[email protected]> as co-developer -
https://patchwork.freedesktop.org/patch/633450/
Also, please remove // comments.
Thanks,
Lijo
Quoted 132 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 63 ++++++++++++++++++--- drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.h | 1 + 3 files changed, 56 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 +54
-9@@ -45,18 +45,30 @@ 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); +//find a unused xcp_dev[] +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);@@ -72,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++;@@ -88,16 +100,49 @@ 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 =MAX_XCP_PLATFORM_DEVICE ; + +guard (mutex)(&xcp_mutex); + +//find the drm device +for (i =0 ; i <MAX_XCP_PLATFORM_DEVICE ; i++) { +if ((xcp_dev[i]) && (&xcp_dev[i]->drm == ddev)) { +//free +free_xcp_dev (i); +break ; + } + } +} +EXPORT_SYMBOL (amdgpu_xcp_drm_dev_free); + +void amdgpu_xcp_drv_release (void ) +{ +int8_t i =0 ; + +guard (mutex)(&xcp_mutex); + +if (pdev_num >0 ) { +for (i =0 ; i <MAX_XCP_PLATFORM_DEVICE ; i++) { +free_xcp_dev (i); +if (pdev_num ==0 ) +break ; + } } - 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_ */