[PATCH] drm/amd/amdgpu: Cancel the hrtimer in sw_fini

[Christian König]

Am 06.04.21 um 14:21 schrieb Roy Sun:
> Move the process of cancelling hrtimer to sw_fini

They why you want to do this is missing here.

Apart from that looks a bit odd to cancel the timer this late.

>
> Signed-off-by: Roy Sun <Roy.Sun at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 12 +++++-------
>   1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 5c11144da051..33324427b555 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -421,6 +421,11 @@ static int dce_virtual_sw_init(void *handle)
>   static int dce_virtual_sw_fini(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> +	int i = 0;

BTW: Please don't initialize variables which don't need to be initialized.

Regards,
Christian.

> +
> +	for (i = 0; i < adev->mode_info.num_crtc; i++)
> +		if (adev->mode_info.crtcs[i])
> +			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
>   
>   	kfree(adev->mode_info.bios_hardcoded_edid);
>   
> @@ -480,13 +485,6 @@ static int dce_virtual_hw_init(void *handle)
>   
>   static int dce_virtual_hw_fini(void *handle)
>   {
> -	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> -	int i = 0;
> -
> -	for (i = 0; i<adev->mode_info.num_crtc; i++)
> -		if (adev->mode_info.crtcs[i])
> -			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
> -
>   	return 0;
>   }
>