[PATCH 2/2] drm/amdgpu: free vkms_output after use

[Deucher, Alexander]

[Public]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Flora Cui <flora.cui at amd.com>
Sent: Monday, December 6, 2021 1:34 AM
To: =guchun.chen at amd.com <=guchun.chen at amd.com>; Yuan, Perry <Perry.Yuan at amd.com>; Shi, Leslie <Yuliang.Shi at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Shi, Leslie <Yuliang.Shi at amd.com>; Cui, Flora <Flora.Cui at amd.com>
Subject: [PATCH 2/2] drm/amdgpu: free vkms_output after use

Signed-off-by: Flora Cui <flora.cui at amd.com>
Reviewed-by: Leslie Shi <Yuliang.Shi at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index acc2d31ea93f..af3a2f8c12b4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -480,6 +480,11 @@ static int amdgpu_vkms_sw_init(void *handle)
         int r, i;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;

+       adev->amdgpu_vkms_output = kcalloc(adev->mode_info.num_crtc,
+               sizeof(struct amdgpu_vkms_output), GFP_KERNEL);
+       if (!adev->amdgpu_vkms_output)
+               return -ENOMEM;
+
         adev_to_drm(adev)->max_vblank_count = 0;

         adev_to_drm(adev)->mode_config.funcs = &amdgpu_vkms_mode_funcs;
@@ -496,10 +501,6 @@ static int amdgpu_vkms_sw_init(void *handle)
         if (r)
                 return r;

-       adev->amdgpu_vkms_output = kcalloc(adev->mode_info.num_crtc, sizeof(struct amdgpu_vkms_output), GFP_KERNEL);
-       if (!adev->amdgpu_vkms_output)
-               return -ENOMEM;
-
         /* allocate crtcs, encoders, connectors */
         for (i = 0; i < adev->mode_info.num_crtc; i++) {
                 r = amdgpu_vkms_output_init(adev_to_drm(adev), &adev->amdgpu_vkms_output[i], i);
@@ -522,12 +523,13 @@ static int amdgpu_vkms_sw_fini(void *handle)
                 if (adev->mode_info.crtcs[i])
                         hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);

-       kfree(adev->mode_info.bios_hardcoded_edid);
-       kfree(adev->amdgpu_vkms_output);
-
         drm_kms_helper_poll_fini(adev_to_drm(adev));
+       drm_mode_config_cleanup(adev_to_drm(adev));

         adev->mode_info.mode_config_initialized = false;
+
+       kfree(adev->mode_info.bios_hardcoded_edid);
+       kfree(adev->amdgpu_vkms_output);
         return 0;
 }

--
2.25.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20211206/a0fcc4d1/attachment.htm>