diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/video/pvr2fb.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/video/pvr2fb.c')
-rw-r--r-- | drivers/video/pvr2fb.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c index 167cfff..df07860 100644 --- a/drivers/video/pvr2fb.c +++ b/drivers/video/pvr2fb.c @@ -817,25 +817,24 @@ static int pvr2fb_common_init(void) rev = fb_readl(par->mmio_base + 0x04); - fb_info(fb_info, "%s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n", - fb_info->fix.id, (rev >> 4) & 0x0f, rev & 0x0f, - modememused >> 10, - (unsigned long)(fb_info->fix.smem_len >> 10)); - fb_info(fb_info, "Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", - fb_info->var.xres, fb_info->var.yres, - fb_info->var.bits_per_pixel, - get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel), - (char *)pvr2_get_param(cables, NULL, cable_type, 3), - (char *)pvr2_get_param(outputs, NULL, video_output, 3)); + printk("fb%d: %s (rev %ld.%ld) frame buffer device, using %ldk/%ldk of video memory\n", + fb_info->node, fb_info->fix.id, (rev >> 4) & 0x0f, rev & 0x0f, + modememused >> 10, (unsigned long)(fb_info->fix.smem_len >> 10)); + printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", + fb_info->node, fb_info->var.xres, fb_info->var.yres, + fb_info->var.bits_per_pixel, + get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel), + (char *)pvr2_get_param(cables, NULL, cable_type, 3), + (char *)pvr2_get_param(outputs, NULL, video_output, 3)); #ifdef CONFIG_SH_STORE_QUEUES - fb_notice(fb_info, "registering with SQ API\n"); + printk(KERN_NOTICE "fb%d: registering with SQ API\n", fb_info->node); pvr2fb_map = sq_remap(fb_info->fix.smem_start, fb_info->fix.smem_len, fb_info->fix.id, PAGE_SHARED); - fb_notice(fb_info, "Mapped video memory to SQ addr 0x%lx\n", - pvr2fb_map); + printk(KERN_NOTICE "fb%d: Mapped video memory to SQ addr 0x%lx\n", + fb_info->node, pvr2fb_map); #endif return 0; |