Skip to contentSkip to conversation

drm/amdgpu: Need to free discovery memory

PATCH In review Emily Deng 3 participants 4 messages Nov 4, 2019 3 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Emily Deng

author
#0 lore raw

PATCH v2 1/1 drm/amdgpu: Need to free discovery memory

When unloading driver, need to free discovery memory.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
index 28b09f6..7cbe6d9 100644
@@ -2106,9 +2106,6 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev)
 	void *stolen_vga_buf;
 	/* return the VGA stolen memory (if any) back to VRAM */
 	amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
-
-	/* return the IP Discovery TMR memory back to VRAM */
-	amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
 }
 
 /**
@@ -2121,7 +2118,10 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
 	amdgpu_ttm_debugfs_fini(adev);
 	amdgpu_ttm_training_reserve_vram_fini(adev);
+	/* return the IP Discovery TMR memory back to VRAM */
+	amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
 	amdgpu_ttm_fw_reserve_vram_fini(adev);
+
 	if (adev->mman.aper_base_kaddr)
 		iounmap(adev->mman.aper_base_kaddr);
 	adev->mman.aper_base_kaddr = NULL;
Signature · 6 lines
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): 1572836597-31265-1-git-send-email-Emily.Deng-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Please use 'drm/amdgpu/discovery: ' prefix in commit message to let us easily track all discovery-releated changes. Other than this, patch is Reviewed-by: Xiaojie Yuan <[email protected]>

BR,
Xiaojie

________________________________________
From: amd-gfx <[email protected]> on behalf of Emily Deng <[email protected]>
Sent: Monday, November 4, 2019 11:03 AM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH v2] drm/amdgpu: Need to free discovery memory

When unloading driver, need to free discovery memory.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -3
index 28b09f6..7cbe6d9 100644
@@ -2106,9 +2106,6 @@ void amdgpu_ttm_late_init(struct amdgpu_device *adev)
        void *stolen_vga_buf;
        /* return the VGA stolen memory (if any) back to VRAM */
        amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
-
-       /* return the IP Discovery TMR memory back to VRAM */
-       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
 }
 
 /**
@@ -2121,7 +2118,10 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 
        amdgpu_ttm_debugfs_fini(adev);
        amdgpu_ttm_training_reserve_vram_fini(adev);
+       /* return the IP Discovery TMR memory back to VRAM */
+       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
        amdgpu_ttm_fw_reserve_vram_fini(adev);
+
        if (adev->mman.aper_base_kaddr)
                iounmap(adev->mman.aper_base_kaddr);
        adev->mman.aper_base_kaddr = NULL;

--
2.7.4

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

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB3087E540D23C1A98B8269239897F0-rweVpJHSKTpSqPH+ASrJYAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#4 lore raw

Thanks, done.

Best wishes
Emily Deng

Quoted 57 lines

-----Original Message-----
From: Yuan, Xiaojie <[email protected]>
Sent: Monday, November 4, 2019 11:41 AM
To: Deng, Emily <[email protected]>; [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Need to free discovery memory

Please use 'drm/amdgpu/discovery: ' prefix in commit message to let us easily track all discovery-releated changes.
Other than this, patch is Reviewed-by: Xiaojie Yuan <[email protected]>

BR,
Xiaojie

________________________________________
From: amd-gfx <[email protected]> on behalf of Emily Deng <[email protected]>
Sent: Monday, November 4, 2019 11:03 AM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH v2] drm/amdgpu: Need to free discovery memory

When unloading driver, need to free discovery memory.

---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -3
index 28b09f6..7cbe6d9 100644
@@ -2106,9 +2106,6 @@ void amdgpu_ttm_late_init(struct amdgpu_device
 *adev)
       void *stolen_vga_buf;
       /* return the VGA stolen memory (if any) back to VRAM */
       amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL,
 &stolen_vga_buf);
-
-       /* return the IP Discovery TMR memory back to VRAM */
-       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
 }

/**

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -0
@@ -2121,7 +2118,10 @@ void amdgpu_ttm_fini(struct amdgpu_device
 *adev)
 
       amdgpu_ttm_debugfs_fini(adev);
       amdgpu_ttm_training_reserve_vram_fini(adev);
+       /* return the IP Discovery TMR memory back to VRAM */
+       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
       amdgpu_ttm_fw_reserve_vram_fini(adev);
+
       if (adev->mman.aper_base_kaddr)
               iounmap(adev->mman.aper_base_kaddr);
       adev->mman.aper_base_kaddr = NULL;
Quoted 7 lines

--
2.7.4

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

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

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB29751F7D33E9D6398FEF7D508F7F0-rweVpJHSKToFlvJWC7EAqwdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#6 lore raw
Quoted 2 lines

Please use 'drm/amdgpu/discovery: ' prefix in commit message to let us easily track all discovery-releated changes.

Actually please don't. The prefix is to denote which driver/code base is changed.

IP discovery is just a feature and not limited to a certain code base inside the driver.

Mentioning "discovery memory" in the commit message should be fine already.

Regards,
Christian.

Am 04.11.19 um 05:45 schrieb Deng, Emily:

Quoted 67 lines

Thanks, done.

Best wishes
Emily Deng

Quoted 60 lines

-----Original Message-----
From: Yuan, Xiaojie <[email protected]>
Sent: Monday, November 4, 2019 11:41 AM
To: Deng, Emily <[email protected]>; [email protected]
Subject: Re: [PATCH v2] drm/amdgpu: Need to free discovery memory

Please use 'drm/amdgpu/discovery: ' prefix in commit message to let us easily track all discovery-releated changes.
Other than this, patch is Reviewed-by: Xiaojie Yuan <[email protected]>

BR,
Xiaojie

________________________________________
From: amd-gfx <[email protected]> on behalf of Emily Deng <[email protected]>
Sent: Monday, November 4, 2019 11:03 AM
To: [email protected]
Cc: Deng, Emily
Subject: [PATCH v2] drm/amdgpu: Need to free discovery memory

When unloading driver, need to free discovery memory.

---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -3
index 28b09f6..7cbe6d9 100644
@@ -2106,9 +2106,6 @@ void amdgpu_ttm_late_init(struct amdgpu_device
 *adev)
        void *stolen_vga_buf;
        /* return the VGA stolen memory (if any) back to VRAM */
        amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL,
 &stolen_vga_buf);
-
-       /* return the IP Discovery TMR memory back to VRAM */
-       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
 }

/**

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -0
@@ -2121,7 +2118,10 @@ void amdgpu_ttm_fini(struct amdgpu_device
 *adev)
 
        amdgpu_ttm_debugfs_fini(adev);
        amdgpu_ttm_training_reserve_vram_fini(adev);
+       /* return the IP Discovery TMR memory back to VRAM */
+       amdgpu_bo_free_kernel(&adev->discovery_memory, NULL, NULL);
        amdgpu_ttm_fw_reserve_vram_fini(adev);
+
        if (adev->mman.aper_base_kaddr)
                iounmap(adev->mman.aper_base_kaddr);
        adev->mman.aper_base_kaddr = NULL;

--
2.7.4

Quoted 8 lines
Quoted 4 lines

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

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

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