---

yaml --- r: 13472 b: refs/heads/master c: dbcbfe1 h: refs/heads/master v: v3
git-mirror · Nov 9, 2005 · 5a6e9ce · 5a6e9ce
1 parent 0b31cc2
commit 5a6e9ce
Show file tree

Hide file tree

Showing 6 changed files with 434 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cc50e1c5b57180fd37a31282000f43859b0fe73
+refs/heads/master: dbcbfe1ea41e404d960a06fa2faf7da568909f33
diff --git a/trunk/drivers/video/console/Makefile b/trunk/drivers/video/console/Makefile
@@ -32,7 +32,7 @@ ifeq ($(CONFIG_FB_TILEBLITTING),y)
 obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += tileblit.o
 endif
 ifeq ($(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION),y)
-obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += fbcon_rotate.o
+obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += fbcon_rotate.o fbcon_cw.o
 endif
 
 obj-$(CONFIG_FB_STI)              += sticore.o font.o

diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
@@ -207,12 +207,25 @@ static irqreturn_t fb_vbl_detect(int irq, void *dummy, struct pt_regs *fp)
 }
 #endif
 
+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
+static inline void fbcon_set_rotation(struct fb_info *info, struct display *p)
+{
+	struct fbcon_ops *ops = info->fbcon_par;
+
+	if (!(info->flags & FBINFO_MISC_TILEBLITTING) &&
+	    p->con_rotate < 4)
+		ops->rotate = p->con_rotate;
+	else
+		ops->rotate = 0;
+}
+#else
 static inline void fbcon_set_rotation(struct fb_info *info, struct display *p)
 {
 	struct fbcon_ops *ops = info->fbcon_par;
 
 	ops->rotate = FB_ROTATE_UR;
 }
+#endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */
 
 static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
 {