Commit 30c1e391 authored by Flora Cui's avatar Flora Cui Committed by Alex Deucher
Browse files

drm/amdgpu: free vkms_output after use 



Signed-off-by: default avatarFlora Cui <flora.cui@amd.com>
Reviewed-by: default avatarLeslie Shi <Yuliang.Shi@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f7ed3f90

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

+9 −7
Original line number Diff line number Diff line
@@ -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;

}