diff mbox series

[focal:linux-azure,1/1] Revert "video: hyperv_fb: Fix hibernation for the deferred IO feature"

Message ID 20200817192112.3183372-2-marcelo.cerri@canonical.com
State New
Headers show
Series LP:#1891931 - [linux-azure] Panic when triggering hibernation | expand

Commit Message

Marcelo Henrique Cerri Aug. 17, 2020, 7:21 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1891931

This reverts commit 0a14dbaa0736a6021c02e74d42cf3a7ca5438da6.

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 drivers/video/fbdev/hyperv_fb.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Thadeu Lima de Souza Cascardo Aug. 17, 2020, 7:26 p.m. UTC | #1
On Mon, Aug 17, 2020 at 04:21:12PM -0300, Marcelo Henrique Cerri wrote:
> BugLink: https://bugs.launchpad.net/bugs/1891931
> 
> This reverts commit 0a14dbaa0736a6021c02e74d42cf3a7ca5438da6.
> 

I would expect some explanation for the revert in the commit message. Can you
resent with some of the details from the cover letter? Or some description of
the issue that is seen and how this fixes it?

Cascardo.

> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> ---
>  drivers/video/fbdev/hyperv_fb.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
> index 5017b4b20781..fe4731f97df7 100644
> --- a/drivers/video/fbdev/hyperv_fb.c
> +++ b/drivers/video/fbdev/hyperv_fb.c
> @@ -891,7 +891,6 @@ static int hvfb_suspend(struct hv_device *hdev)
>  	fb_set_suspend(info, 1);
>  
>  	cancel_delayed_work_sync(&par->dwork);
> -	cancel_delayed_work_sync(&info->deferred_work);
>  
>  	par->update_saved = par->update;
>  	par->update = false;
> @@ -925,7 +924,6 @@ static int hvfb_resume(struct hv_device *hdev)
>  	par->fb_ready = true;
>  	par->update = par->update_saved;
>  
> -	schedule_delayed_work(&info->deferred_work, info->fbdefio->delay);
>  	schedule_delayed_work(&par->dwork, HVFB_UPDATE_DELAY);
>  
>  	/* 0 means do resume */
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Ian May Aug. 17, 2020, 7:29 p.m. UTC | #2
LGTM
Ian May <ian.may@canonical.com>

On 2020-08-17 16:21:12 , Marcelo Henrique Cerri wrote:
> BugLink: https://bugs.launchpad.net/bugs/1891931
> 
> This reverts commit 0a14dbaa0736a6021c02e74d42cf3a7ca5438da6.
> 
> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
> ---
>  drivers/video/fbdev/hyperv_fb.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
> index 5017b4b20781..fe4731f97df7 100644
> --- a/drivers/video/fbdev/hyperv_fb.c
> +++ b/drivers/video/fbdev/hyperv_fb.c
> @@ -891,7 +891,6 @@ static int hvfb_suspend(struct hv_device *hdev)
>  	fb_set_suspend(info, 1);
>  
>  	cancel_delayed_work_sync(&par->dwork);
> -	cancel_delayed_work_sync(&info->deferred_work);
>  
>  	par->update_saved = par->update;
>  	par->update = false;
> @@ -925,7 +924,6 @@ static int hvfb_resume(struct hv_device *hdev)
>  	par->fb_ready = true;
>  	par->update = par->update_saved;
>  
> -	schedule_delayed_work(&info->deferred_work, info->fbdefio->delay);
>  	schedule_delayed_work(&par->dwork, HVFB_UPDATE_DELAY);
>  
>  	/* 0 means do resume */
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff mbox series

Patch

diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 5017b4b20781..fe4731f97df7 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -891,7 +891,6 @@  static int hvfb_suspend(struct hv_device *hdev)
 	fb_set_suspend(info, 1);
 
 	cancel_delayed_work_sync(&par->dwork);
-	cancel_delayed_work_sync(&info->deferred_work);
 
 	par->update_saved = par->update;
 	par->update = false;
@@ -925,7 +924,6 @@  static int hvfb_resume(struct hv_device *hdev)
 	par->fb_ready = true;
 	par->update = par->update_saved;
 
-	schedule_delayed_work(&info->deferred_work, info->fbdefio->delay);
 	schedule_delayed_work(&par->dwork, HVFB_UPDATE_DELAY);
 
 	/* 0 means do resume */