Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -1101,6 +1101,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
var = &info->var;
|
||||
|
||||
fb->sti = sti;
|
||||
dev_name = sti->sti_data->inq_outptr.dev_name;
|
||||
/* store upper 32bits of the graphics id */
|
||||
fb->id = fb->sti->graphics_id[0];
|
||||
|
||||
@@ -1114,11 +1115,11 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
Since this driver only supports standard mode, we check
|
||||
if the device name contains the string "DX" and tell the
|
||||
user how to reconfigure the card. */
|
||||
if (strstr(sti->outptr.dev_name, "DX")) {
|
||||
if (strstr(dev_name, "DX")) {
|
||||
printk(KERN_WARNING
|
||||
"WARNING: stifb framebuffer driver does not support '%s' in double-buffer mode.\n"
|
||||
"WARNING: Please disable the double-buffer mode in IPL menu (the PARISC-BIOS).\n",
|
||||
sti->outptr.dev_name);
|
||||
dev_name);
|
||||
goto out_err0;
|
||||
}
|
||||
/* fall though */
|
||||
@@ -1130,7 +1131,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
break;
|
||||
default:
|
||||
printk(KERN_WARNING "stifb: '%s' (id: 0x%08x) not supported.\n",
|
||||
sti->outptr.dev_name, fb->id);
|
||||
dev_name, fb->id);
|
||||
goto out_err0;
|
||||
}
|
||||
|
||||
@@ -1154,7 +1155,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
fb->id = S9000_ID_A1659A;
|
||||
break;
|
||||
case S9000_ID_TIMBER: /* HP9000/710 Any (may be a grayscale device) */
|
||||
dev_name = fb->sti->outptr.dev_name;
|
||||
if (strstr(dev_name, "GRAYSCALE") ||
|
||||
strstr(dev_name, "Grayscale") ||
|
||||
strstr(dev_name, "grayscale"))
|
||||
@@ -1290,7 +1290,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
|
||||
var->xres,
|
||||
var->yres,
|
||||
var->bits_per_pixel,
|
||||
sti->outptr.dev_name,
|
||||
dev_name,
|
||||
fb->id,
|
||||
fix->mmio_start);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user