|
@@ -124,6 +124,7 @@ static int goldfish_fb_check_var(struct fb_var_screeninfo *var,
|
|
|
static int goldfish_fb_set_par(struct fb_info *info)
|
|
|
{
|
|
|
struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb);
|
|
|
+
|
|
|
if (fb->rotation != fb->fb.var.rotate) {
|
|
|
info->fix.line_length = info->var.xres * 2;
|
|
|
fb->rotation = fb->fb.var.rotate;
|
|
@@ -148,13 +149,14 @@ static int goldfish_fb_pan_display(struct fb_var_screeninfo *var,
|
|
|
wait_event_timeout(fb->wait,
|
|
|
fb->base_update_count != base_update_count, HZ / 15);
|
|
|
if (fb->base_update_count == base_update_count)
|
|
|
- pr_err("goldfish_fb_pan_display: timeout waiting for base update\n");
|
|
|
+ pr_err("%s: timeout waiting for base update\n", __func__);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
static int goldfish_fb_blank(int blank, struct fb_info *info)
|
|
|
{
|
|
|
struct goldfish_fb *fb = container_of(info, struct goldfish_fb, fb);
|
|
|
+
|
|
|
switch (blank) {
|
|
|
case FB_BLANK_NORMAL:
|
|
|
writel(1, fb->reg_base + FB_SET_BLANK);
|