File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change 23
23
#include <video/uvesafb.h>
24
24
#ifdef CONFIG_X86
25
25
#include <video/vga.h>
26
+ #include <linux/pci.h>
26
27
#endif
27
28
#ifdef CONFIG_MTRR
28
29
#include <asm/mtrr.h>
@@ -815,8 +816,15 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
815
816
par -> pmi_setpal = pmi_setpal ;
816
817
par -> ypan = ypan ;
817
818
818
- if (par -> pmi_setpal || par -> ypan )
819
- uvesafb_vbe_getpmi (task , par );
819
+ if (par -> pmi_setpal || par -> ypan ) {
820
+ if (pcibios_enabled ) {
821
+ uvesafb_vbe_getpmi (task , par );
822
+ } else {
823
+ par -> pmi_setpal = par -> ypan = 0 ;
824
+ printk (KERN_WARNING "uvesafb: PCI BIOS area is NX."
825
+ "Can't use protected mode interface\n" );
826
+ }
827
+ }
820
828
#else
821
829
/* The protected mode interface is not available on non-x86. */
822
830
par -> pmi_setpal = par -> ypan = 0 ;
You can’t perform that action at this time.
0 commit comments