Skip to contentSkip to conversation

FB: OMAP: Make omapfb_blank use the FB_BLANK_* defines.

PATCH New Jonathan McDowell 1 participant 1 message May 30, 2006 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 FB: OMAP: Make omapfb_blank use the FB_BLANK_* defines.

The current OMAP FB driver used the VESA_ defines for blanking, but the rest of the FB drivers in the tree now use FB_BLANK_*. This patch updates the OMAP FB driver to use these as well.

-----

drivers/video/omap/omapfb_main.c +7 -4
diff -rupN -X linux-2.6.16-e3-00/Documentation/dontdiff linux-2.6.16-e3-07/drivers/video/omap/omapfb_main.c linux-2.6.16-e3-08/drivers/video/omap/omapfb_main.c
@@ -325,7 +325,7 @@ static int omapfb_blank(int blank, struc
 
 	omapfb_rqueue_lock(fbdev);
 	switch (blank) {
-	case VESA_NO_BLANKING:
+	case FB_BLANK_UNBLANK:
 		if (fbdev->state == OMAPFB_SUSPENDED) {
 			if (fbdev->ctrl->resume)
 				fbdev->ctrl->resume();
@@ -336,7 +336,10 @@ static int omapfb_blank(int blank, struc
 				do_update = 1;
 		}
 		break;
-	case VESA_POWERDOWN:
+	case FB_BLANK_NORMAL:
+	case FB_BLANK_HSYNC_SUSPEND:
+	case FB_BLANK_VSYNC_SUSPEND:
+	case FB_BLANK_POWERDOWN:
 		if (fbdev->state == OMAPFB_ACTIVE) {
 			fbdev->panel->disable();
 			if (fbdev->ctrl->suspend)
@@ -1437,7 +1440,7 @@ static int omapfb_suspend(struct platfor
 
 	DBGENTER(1);
 
-	omapfb_blank(VESA_POWERDOWN, fbdev->fb_info);
+	omapfb_blank(FB_BLANK_POWERDOWN, fbdev->fb_info);
 
 	DBGLEAVE(1);
 
@@ -1451,7 +1454,7 @@ static int omapfb_resume(struct platform
 
 	DBGENTER(1);
 
-	omapfb_blank(VESA_NO_BLANKING, fbdev->fb_info);
+	omapfb_blank(FB_BLANK_UNBLANK, fbdev->fb_info);
 
 	DBGLEAVE(1);
 	return 0;

-----

J.

Signature · 1 line
 [           If I could, I would, but I can't, so I won't.            ]