Skip to contentSkip to conversation

gma500: Fix suspend/resume functions

RFC PATCH In review Ryan Mallon 2 participants 2 messages Jan 27, 2012

Subsystems (3)
DRM drivers DRM misc DRM drivers for GMA500 (Poulsbo, Moorestown and derivative chipsets)
lore
Share & tools
lore

Ryan Mallon

author
#0 lore raw

RFC PATCH 1/1 gma500: Fix suspend/resume functions

Both the suspend and resume functions incorrectly set psbfb = to_psb_fb(NULL) outside of the loop over all of the framebuffers. Fix this by moving the assignment of psbfb inside the loop and removing the initialisation of fb.

Signed-off-by Ryan Mallon <[email protected]>

---

drivers/gpu/drm/gma500/framebuffer.c +4 -4
index 791c0ef..830dfdd 100644
@@ -113,12 +113,12 @@ static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info)
 
 void psbfb_suspend(struct drm_device *dev)
 {
-	struct drm_framebuffer *fb = 0;
-	struct psb_framebuffer *psbfb = to_psb_fb(fb);
+	struct drm_framebuffer *fb;
 
 	console_lock();
 	mutex_lock(&dev->mode_config.mutex);
 	list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+		struct psb_framebuffer *psbfb = to_psb_fb(fb);
 		struct fb_info *info = psbfb->fbdev;
 		fb_set_suspend(info, 1);
 		drm_fb_helper_blank(FB_BLANK_POWERDOWN, info);

@@ -129,12 +129,12 @@ void psbfb_suspend(struct drm_device *dev)
 
 void psbfb_resume(struct drm_device *dev)
 {
-	struct drm_framebuffer *fb = 0;
-	struct psb_framebuffer *psbfb = to_psb_fb(fb);
+	struct drm_framebuffer *fb;
 
 	console_lock();
 	mutex_lock(&dev->mode_config.mutex);
 	list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+		struct psb_framebuffer *psbfb = to_psb_fb(fb);
 		struct fb_info *info = psbfb->fbdev;
 		fb_set_suspend(info, 0);
 		drm_fb_helper_blank(FB_BLANK_UNBLANK, info);
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Fri, 27 Jan 2012 17:28:24 +1100 Ryan Mallon <[email protected]> wrote:

Both the suspend and resume functions incorrectly set psbfb = to_psb_fb(NULL) outside of the loop over all of the framebuffers. Fix this by moving the assignment of psbfb inside the loop and removing the initialisation of fb.

Signed-off-by Ryan Mallon <[email protected]>

Yes that wants fixing

Acked-by Alan Cox <[email protected]>