Radeon: do not blank screen during suspend

Radeon: do not blank screen during suspend

[Pavel Machek]

Hi!

This stops ugly flashing from radeon during suspend/resume, please
apply,

								Pavel

--- clean-mm/drivers/video/aty/radeon_pm.c	2004-08-24 09:03:18.000000000 +0200
+++ linux-mm/drivers/video/aty/radeon_pm.c	2004-09-15 13:00:51.000000000 +0200
@@ -871,7 +871,8 @@
 	agp_enable(0);
 #endif
 
-	fb_set_suspend(info, 1);
+	if (system_state != SYSTEM_SNAPSHOT)
+		fb_set_suspend(info, 1);
 
 	if (!(info->flags & FBINFO_HWACCEL_DISABLED)) {
 		/* Make sure engine is reset */
@@ -880,12 +881,14 @@
 		radeon_engine_idle();
 	}
 
-	/* Blank display and LCD */
-	radeonfb_blank(VESA_POWERDOWN, info);
-
-	/* Sleep */
-	rinfo->asleep = 1;
-	rinfo->lock_blank = 1;
+	if (system_state != SYSTEM_SNAPSHOT) {
+		/* Blank display and LCD */
+		radeonfb_blank(VESA_POWERDOWN, info);
+
+		/* Sleep */
+		rinfo->asleep = 1;
+		rinfo->lock_blank = 1;
+	}
 
 	/* Suspend the chip to D2 state when supported
 	 */

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!

Re: Radeon: do not blank screen during suspend

[Benjamin Herrenschmidt]

On Wed, 2004-09-15 at 21:26, Pavel Machek wrote:
> Hi!
> 
> This stops ugly flashing from radeon during suspend/resume, please
> apply,

Shoud be fine.

BTW. What is the status with Patrick merge of pmdisk & swsusp ? Has it
been merged at all ? (No time to check at the moment). I still hope I'll
find some time to do real work on it (& cleanup the ppc support that I
had working experimentally at OLS) sooner or later...

Ben.
							Pavel
> 
> --- clean-mm/drivers/video/aty/radeon_pm.c	2004-08-24 09:03:18.000000000 +0200
> +++ linux-mm/drivers/video/aty/radeon_pm.c	2004-09-15 13:00:51.000000000 +0200
> @@ -871,7 +871,8 @@
>  	agp_enable(0);
>  #endif
>  
> -	fb_set_suspend(info, 1);
> +	if (system_state != SYSTEM_SNAPSHOT)
> +		fb_set_suspend(info, 1);
>  
>  	if (!(info->flags & FBINFO_HWACCEL_DISABLED)) {
>  		/* Make sure engine is reset */
> @@ -880,12 +881,14 @@
>  		radeon_engine_idle();
>  	}
>  
> -	/* Blank display and LCD */
> -	radeonfb_blank(VESA_POWERDOWN, info);
> -
> -	/* Sleep */
> -	rinfo->asleep = 1;
> -	rinfo->lock_blank = 1;
> +	if (system_state != SYSTEM_SNAPSHOT) {
> +		/* Blank display and LCD */
> +		radeonfb_blank(VESA_POWERDOWN, info);
> +
> +		/* Sleep */
> +		rinfo->asleep = 1;
> +		rinfo->lock_blank = 1;
> +	}
>  
>  	/* Suspend the chip to D2 state when supported
>  	 */
-- 
Benjamin Herrenschmidt <benh@kernel.crashing.org>

Re: Radeon: do not blank screen during suspend

[Pavel Machek]

Hi!

> > This stops ugly flashing from radeon during suspend/resume, please
> > apply,
> 
> Shoud be fine.
> 
> BTW. What is the status with Patrick merge of pmdisk & swsusp ? Has it
> been merged at all ? (No time to check at the moment). I still hope I'll
> find some time to do real work on it (& cleanup the ppc support that I
> had working experimentally at OLS) sooner or later...

It was merged to Andrew, then to Patrick and now it is waiting on
Linus to pull it from patrick, if I understand it correctly.

								Pavel
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!