Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d8357e6 authored by Ryan Mallon's avatar Ryan Mallon Committed by Dave Airlie
Browse files

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: default avatarRyan Mallon <rmallon@gmail.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 24a7eb79

drivers/gpu/drm/gma500/framebuffer.c

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