Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a1c0cad352520206305b1a3c2658097721454855

Authored by Linus Torvalds
2 parents 659e45d8a0 b78f29ca05
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Merge tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6 

Pull fbdev fixes from Florian Tobias Schandinat:
 - a compile fix for au1*fb
 - a fix to make kyrofb usable on x86_64
 - a fix for uvesafb to prevent an oops due to NX-protection

 "The fix for kyrofb is a bit large but it's just replacing "unsigned
  long" by "u32" for 64 bit compatibility."

* tag 'fbdev-fixes-for-3.4-1' of git://github.com/schandinat/linux-2.6:
  video:uvesafb: Fix oops that uvesafb try to execute NX-protected page
  fbdev: fix au1*fb builds
  kyrofb: fix on x86_64

Showing 4 changed files Side-by-side Diff

drivers/video/au1100fb.c
Diff comments   View file @ a1c0cad
... ... @@ -499,7 +499,8 @@
499 499 au1100fb_fix.mmio_start = regs_res->start;
500 500 au1100fb_fix.mmio_len = resource_size(regs_res);
501 501  
502   - if (!devm_request_mem_region(au1100fb_fix.mmio_start,
  502 + if (!devm_request_mem_region(&dev->dev,
  503 + au1100fb_fix.mmio_start,
503 504 au1100fb_fix.mmio_len,
504 505 DRIVER_NAME)) {
505 506 print_err("fail to lock memory region at 0x%08lx",
... ... @@ -516,7 +517,7 @@
516 517 fbdev->fb_len = fbdev->panel->xres * fbdev->panel->yres *
517 518 (fbdev->panel->bpp >> 3) * AU1100FB_NBR_VIDEO_BUFFERS;
518 519  
519   - fbdev->fb_mem = dmam_alloc_coherent(&dev->dev, &dev->dev,
  520 + fbdev->fb_mem = dmam_alloc_coherent(&dev->dev,
520 521 PAGE_ALIGN(fbdev->fb_len),
521 522 &fbdev->fb_phys, GFP_KERNEL);
522 523 if (!fbdev->fb_mem) {
drivers/video/au1200fb.c
Diff comments   View file @ a1c0cad
... ... @@ -1724,7 +1724,7 @@
1724 1724 /* Allocate the framebuffer to the maximum screen size */
1725 1725 fbdev->fb_len = (win->w[plane].xres * win->w[plane].yres * bpp) / 8;
1726 1726  
1727   - fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev, &dev->dev,
  1727 + fbdev->fb_mem = dmam_alloc_noncoherent(&dev->dev,
1728 1728 PAGE_ALIGN(fbdev->fb_len),
1729 1729 &fbdev->fb_phys, GFP_KERNEL);
1730 1730 if (!fbdev->fb_mem) {
drivers/video/kyro/STG4000Reg.h
Diff comments   View file @ a1c0cad
... ... @@ -73,210 +73,210 @@
73 73 /* Register Table */
74 74 typedef struct {
75 75 /* 0h */
76   - volatile unsigned long Thread0Enable; /* 0x0000 */
77   - volatile unsigned long Thread1Enable; /* 0x0004 */
78   - volatile unsigned long Thread0Recover; /* 0x0008 */
79   - volatile unsigned long Thread1Recover; /* 0x000C */
80   - volatile unsigned long Thread0Step; /* 0x0010 */
81   - volatile unsigned long Thread1Step; /* 0x0014 */
82   - volatile unsigned long VideoInStatus; /* 0x0018 */
83   - volatile unsigned long Core2InSignStart; /* 0x001C */
84   - volatile unsigned long Core1ResetVector; /* 0x0020 */
85   - volatile unsigned long Core1ROMOffset; /* 0x0024 */
86   - volatile unsigned long Core1ArbiterPriority; /* 0x0028 */
87   - volatile unsigned long VideoInControl; /* 0x002C */
88   - volatile unsigned long VideoInReg0CtrlA; /* 0x0030 */
89   - volatile unsigned long VideoInReg0CtrlB; /* 0x0034 */
90   - volatile unsigned long VideoInReg1CtrlA; /* 0x0038 */
91   - volatile unsigned long VideoInReg1CtrlB; /* 0x003C */
92   - volatile unsigned long Thread0Kicker; /* 0x0040 */
93   - volatile unsigned long Core2InputSign; /* 0x0044 */
94   - volatile unsigned long Thread0ProgCtr; /* 0x0048 */
95   - volatile unsigned long Thread1ProgCtr; /* 0x004C */
96   - volatile unsigned long Thread1Kicker; /* 0x0050 */
97   - volatile unsigned long GPRegister1; /* 0x0054 */
98   - volatile unsigned long GPRegister2; /* 0x0058 */
99   - volatile unsigned long GPRegister3; /* 0x005C */
100   - volatile unsigned long GPRegister4; /* 0x0060 */
101   - volatile unsigned long SerialIntA; /* 0x0064 */
  76 + volatile u32 Thread0Enable; /* 0x0000 */
  77 + volatile u32 Thread1Enable; /* 0x0004 */
  78 + volatile u32 Thread0Recover; /* 0x0008 */
  79 + volatile u32 Thread1Recover; /* 0x000C */
  80 + volatile u32 Thread0Step; /* 0x0010 */
  81 + volatile u32 Thread1Step; /* 0x0014 */
  82 + volatile u32 VideoInStatus; /* 0x0018 */
  83 + volatile u32 Core2InSignStart; /* 0x001C */
  84 + volatile u32 Core1ResetVector; /* 0x0020 */
  85 + volatile u32 Core1ROMOffset; /* 0x0024 */
  86 + volatile u32 Core1ArbiterPriority; /* 0x0028 */
  87 + volatile u32 VideoInControl; /* 0x002C */
  88 + volatile u32 VideoInReg0CtrlA; /* 0x0030 */
  89 + volatile u32 VideoInReg0CtrlB; /* 0x0034 */
  90 + volatile u32 VideoInReg1CtrlA; /* 0x0038 */
  91 + volatile u32 VideoInReg1CtrlB; /* 0x003C */
  92 + volatile u32 Thread0Kicker; /* 0x0040 */
  93 + volatile u32 Core2InputSign; /* 0x0044 */
  94 + volatile u32 Thread0ProgCtr; /* 0x0048 */
  95 + volatile u32 Thread1ProgCtr; /* 0x004C */
  96 + volatile u32 Thread1Kicker; /* 0x0050 */
  97 + volatile u32 GPRegister1; /* 0x0054 */
  98 + volatile u32 GPRegister2; /* 0x0058 */
  99 + volatile u32 GPRegister3; /* 0x005C */
  100 + volatile u32 GPRegister4; /* 0x0060 */
  101 + volatile u32 SerialIntA; /* 0x0064 */
102 102  
103   - volatile unsigned long Fill0[6]; /* GAP 0x0068 - 0x007C */
  103 + volatile u32 Fill0[6]; /* GAP 0x0068 - 0x007C */
104 104  
105   - volatile unsigned long SoftwareReset; /* 0x0080 */
106   - volatile unsigned long SerialIntB; /* 0x0084 */
  105 + volatile u32 SoftwareReset; /* 0x0080 */
  106 + volatile u32 SerialIntB; /* 0x0084 */
107 107  
108   - volatile unsigned long Fill1[37]; /* GAP 0x0088 - 0x011C */
  108 + volatile u32 Fill1[37]; /* GAP 0x0088 - 0x011C */
109 109  
110   - volatile unsigned long ROMELQV; /* 0x011C */
111   - volatile unsigned long WLWH; /* 0x0120 */
112   - volatile unsigned long ROMELWL; /* 0x0124 */
  110 + volatile u32 ROMELQV; /* 0x011C */
  111 + volatile u32 WLWH; /* 0x0120 */
  112 + volatile u32 ROMELWL; /* 0x0124 */
113 113  
114   - volatile unsigned long dwFill_1; /* GAP 0x0128 */
  114 + volatile u32 dwFill_1; /* GAP 0x0128 */
115 115  
116   - volatile unsigned long IntStatus; /* 0x012C */
117   - volatile unsigned long IntMask; /* 0x0130 */
118   - volatile unsigned long IntClear; /* 0x0134 */
  116 + volatile u32 IntStatus; /* 0x012C */
  117 + volatile u32 IntMask; /* 0x0130 */
  118 + volatile u32 IntClear; /* 0x0134 */
119 119  
120   - volatile unsigned long Fill2[6]; /* GAP 0x0138 - 0x014C */
  120 + volatile u32 Fill2[6]; /* GAP 0x0138 - 0x014C */
121 121  
122   - volatile unsigned long ROMGPIOA; /* 0x0150 */
123   - volatile unsigned long ROMGPIOB; /* 0x0154 */
124   - volatile unsigned long ROMGPIOC; /* 0x0158 */
125   - volatile unsigned long ROMGPIOD; /* 0x015C */
  122 + volatile u32 ROMGPIOA; /* 0x0150 */
  123 + volatile u32 ROMGPIOB; /* 0x0154 */
  124 + volatile u32 ROMGPIOC; /* 0x0158 */
  125 + volatile u32 ROMGPIOD; /* 0x015C */
126 126  
127   - volatile unsigned long Fill3[2]; /* GAP 0x0160 - 0x0168 */
  127 + volatile u32 Fill3[2]; /* GAP 0x0160 - 0x0168 */
128 128  
129   - volatile unsigned long AGPIntID; /* 0x0168 */
130   - volatile unsigned long AGPIntClassCode; /* 0x016C */
131   - volatile unsigned long AGPIntBIST; /* 0x0170 */
132   - volatile unsigned long AGPIntSSID; /* 0x0174 */
133   - volatile unsigned long AGPIntPMCSR; /* 0x0178 */
134   - volatile unsigned long VGAFrameBufBase; /* 0x017C */
135   - volatile unsigned long VGANotify; /* 0x0180 */
136   - volatile unsigned long DACPLLMode; /* 0x0184 */
137   - volatile unsigned long Core1VideoClockDiv; /* 0x0188 */
138   - volatile unsigned long AGPIntStat; /* 0x018C */
  129 + volatile u32 AGPIntID; /* 0x0168 */
  130 + volatile u32 AGPIntClassCode; /* 0x016C */
  131 + volatile u32 AGPIntBIST; /* 0x0170 */
  132 + volatile u32 AGPIntSSID; /* 0x0174 */
  133 + volatile u32 AGPIntPMCSR; /* 0x0178 */
  134 + volatile u32 VGAFrameBufBase; /* 0x017C */
  135 + volatile u32 VGANotify; /* 0x0180 */
  136 + volatile u32 DACPLLMode; /* 0x0184 */
  137 + volatile u32 Core1VideoClockDiv; /* 0x0188 */
  138 + volatile u32 AGPIntStat; /* 0x018C */
139 139  
140 140 /*
141   - volatile unsigned long Fill4[0x0400/4 - 0x0190/4]; //GAP 0x0190 - 0x0400
142   - volatile unsigned long Fill5[0x05FC/4 - 0x0400/4]; //GAP 0x0400 - 0x05FC Fog Table
143   - volatile unsigned long Fill6[0x0604/4 - 0x0600/4]; //GAP 0x0600 - 0x0604
144   - volatile unsigned long Fill7[0x0680/4 - 0x0608/4]; //GAP 0x0608 - 0x0680
145   - volatile unsigned long Fill8[0x07FC/4 - 0x0684/4]; //GAP 0x0684 - 0x07FC
  141 + volatile u32 Fill4[0x0400/4 - 0x0190/4]; //GAP 0x0190 - 0x0400
  142 + volatile u32 Fill5[0x05FC/4 - 0x0400/4]; //GAP 0x0400 - 0x05FC Fog Table
  143 + volatile u32 Fill6[0x0604/4 - 0x0600/4]; //GAP 0x0600 - 0x0604
  144 + volatile u32 Fill7[0x0680/4 - 0x0608/4]; //GAP 0x0608 - 0x0680
  145 + volatile u32 Fill8[0x07FC/4 - 0x0684/4]; //GAP 0x0684 - 0x07FC
146 146 */
147   - volatile unsigned long Fill4[412]; /* 0x0190 - 0x07FC */
  147 + volatile u32 Fill4[412]; /* 0x0190 - 0x07FC */
148 148  
149   - volatile unsigned long TACtrlStreamBase; /* 0x0800 */
150   - volatile unsigned long TAObjDataBase; /* 0x0804 */
151   - volatile unsigned long TAPtrDataBase; /* 0x0808 */
152   - volatile unsigned long TARegionDataBase; /* 0x080C */
153   - volatile unsigned long TATailPtrBase; /* 0x0810 */
154   - volatile unsigned long TAPtrRegionSize; /* 0x0814 */
155   - volatile unsigned long TAConfiguration; /* 0x0818 */
156   - volatile unsigned long TAObjDataStartAddr; /* 0x081C */
157   - volatile unsigned long TAObjDataEndAddr; /* 0x0820 */
158   - volatile unsigned long TAXScreenClip; /* 0x0824 */
159   - volatile unsigned long TAYScreenClip; /* 0x0828 */
160   - volatile unsigned long TARHWClamp; /* 0x082C */
161   - volatile unsigned long TARHWCompare; /* 0x0830 */
162   - volatile unsigned long TAStart; /* 0x0834 */
163   - volatile unsigned long TAObjReStart; /* 0x0838 */
164   - volatile unsigned long TAPtrReStart; /* 0x083C */
165   - volatile unsigned long TAStatus1; /* 0x0840 */
166   - volatile unsigned long TAStatus2; /* 0x0844 */
167   - volatile unsigned long TAIntStatus; /* 0x0848 */
168   - volatile unsigned long TAIntMask; /* 0x084C */
  149 + volatile u32 TACtrlStreamBase; /* 0x0800 */
  150 + volatile u32 TAObjDataBase; /* 0x0804 */
  151 + volatile u32 TAPtrDataBase; /* 0x0808 */
  152 + volatile u32 TARegionDataBase; /* 0x080C */
  153 + volatile u32 TATailPtrBase; /* 0x0810 */
  154 + volatile u32 TAPtrRegionSize; /* 0x0814 */
  155 + volatile u32 TAConfiguration; /* 0x0818 */
  156 + volatile u32 TAObjDataStartAddr; /* 0x081C */
  157 + volatile u32 TAObjDataEndAddr; /* 0x0820 */
  158 + volatile u32 TAXScreenClip; /* 0x0824 */
  159 + volatile u32 TAYScreenClip; /* 0x0828 */
  160 + volatile u32 TARHWClamp; /* 0x082C */
  161 + volatile u32 TARHWCompare; /* 0x0830 */
  162 + volatile u32 TAStart; /* 0x0834 */
  163 + volatile u32 TAObjReStart; /* 0x0838 */
  164 + volatile u32 TAPtrReStart; /* 0x083C */
  165 + volatile u32 TAStatus1; /* 0x0840 */
  166 + volatile u32 TAStatus2; /* 0x0844 */
  167 + volatile u32 TAIntStatus; /* 0x0848 */
  168 + volatile u32 TAIntMask; /* 0x084C */
169 169  
170   - volatile unsigned long Fill5[235]; /* GAP 0x0850 - 0x0BF8 */
  170 + volatile u32 Fill5[235]; /* GAP 0x0850 - 0x0BF8 */
171 171  
172   - volatile unsigned long TextureAddrThresh; /* 0x0BFC */
173   - volatile unsigned long Core1Translation; /* 0x0C00 */
174   - volatile unsigned long TextureAddrReMap; /* 0x0C04 */
175   - volatile unsigned long RenderOutAGPRemap; /* 0x0C08 */
176   - volatile unsigned long _3DRegionReadTrans; /* 0x0C0C */
177   - volatile unsigned long _3DPtrReadTrans; /* 0x0C10 */
178   - volatile unsigned long _3DParamReadTrans; /* 0x0C14 */
179   - volatile unsigned long _3DRegionReadThresh; /* 0x0C18 */
180   - volatile unsigned long _3DPtrReadThresh; /* 0x0C1C */
181   - volatile unsigned long _3DParamReadThresh; /* 0x0C20 */
182   - volatile unsigned long _3DRegionReadAGPRemap; /* 0x0C24 */
183   - volatile unsigned long _3DPtrReadAGPRemap; /* 0x0C28 */
184   - volatile unsigned long _3DParamReadAGPRemap; /* 0x0C2C */
185   - volatile unsigned long ZBufferAGPRemap; /* 0x0C30 */
186   - volatile unsigned long TAIndexAGPRemap; /* 0x0C34 */
187   - volatile unsigned long TAVertexAGPRemap; /* 0x0C38 */
188   - volatile unsigned long TAUVAddrTrans; /* 0x0C3C */
189   - volatile unsigned long TATailPtrCacheTrans; /* 0x0C40 */
190   - volatile unsigned long TAParamWriteTrans; /* 0x0C44 */
191   - volatile unsigned long TAPtrWriteTrans; /* 0x0C48 */
192   - volatile unsigned long TAParamWriteThresh; /* 0x0C4C */
193   - volatile unsigned long TAPtrWriteThresh; /* 0x0C50 */
194   - volatile unsigned long TATailPtrCacheAGPRe; /* 0x0C54 */
195   - volatile unsigned long TAParamWriteAGPRe; /* 0x0C58 */
196   - volatile unsigned long TAPtrWriteAGPRe; /* 0x0C5C */
197   - volatile unsigned long SDRAMArbiterConf; /* 0x0C60 */
198   - volatile unsigned long SDRAMConf0; /* 0x0C64 */
199   - volatile unsigned long SDRAMConf1; /* 0x0C68 */
200   - volatile unsigned long SDRAMConf2; /* 0x0C6C */
201   - volatile unsigned long SDRAMRefresh; /* 0x0C70 */
202   - volatile unsigned long SDRAMPowerStat; /* 0x0C74 */
  172 + volatile u32 TextureAddrThresh; /* 0x0BFC */
  173 + volatile u32 Core1Translation; /* 0x0C00 */
  174 + volatile u32 TextureAddrReMap; /* 0x0C04 */
  175 + volatile u32 RenderOutAGPRemap; /* 0x0C08 */
  176 + volatile u32 _3DRegionReadTrans; /* 0x0C0C */
  177 + volatile u32 _3DPtrReadTrans; /* 0x0C10 */
  178 + volatile u32 _3DParamReadTrans; /* 0x0C14 */
  179 + volatile u32 _3DRegionReadThresh; /* 0x0C18 */
  180 + volatile u32 _3DPtrReadThresh; /* 0x0C1C */
  181 + volatile u32 _3DParamReadThresh; /* 0x0C20 */
  182 + volatile u32 _3DRegionReadAGPRemap; /* 0x0C24 */
  183 + volatile u32 _3DPtrReadAGPRemap; /* 0x0C28 */
  184 + volatile u32 _3DParamReadAGPRemap; /* 0x0C2C */
  185 + volatile u32 ZBufferAGPRemap; /* 0x0C30 */
  186 + volatile u32 TAIndexAGPRemap; /* 0x0C34 */
  187 + volatile u32 TAVertexAGPRemap; /* 0x0C38 */
  188 + volatile u32 TAUVAddrTrans; /* 0x0C3C */
  189 + volatile u32 TATailPtrCacheTrans; /* 0x0C40 */
  190 + volatile u32 TAParamWriteTrans; /* 0x0C44 */
  191 + volatile u32 TAPtrWriteTrans; /* 0x0C48 */
  192 + volatile u32 TAParamWriteThresh; /* 0x0C4C */
  193 + volatile u32 TAPtrWriteThresh; /* 0x0C50 */
  194 + volatile u32 TATailPtrCacheAGPRe; /* 0x0C54 */
  195 + volatile u32 TAParamWriteAGPRe; /* 0x0C58 */
  196 + volatile u32 TAPtrWriteAGPRe; /* 0x0C5C */
  197 + volatile u32 SDRAMArbiterConf; /* 0x0C60 */
  198 + volatile u32 SDRAMConf0; /* 0x0C64 */
  199 + volatile u32 SDRAMConf1; /* 0x0C68 */
  200 + volatile u32 SDRAMConf2; /* 0x0C6C */
  201 + volatile u32 SDRAMRefresh; /* 0x0C70 */
  202 + volatile u32 SDRAMPowerStat; /* 0x0C74 */
203 203  
204   - volatile unsigned long Fill6[2]; /* GAP 0x0C78 - 0x0C7C */
  204 + volatile u32 Fill6[2]; /* GAP 0x0C78 - 0x0C7C */
205 205  
206   - volatile unsigned long RAMBistData; /* 0x0C80 */
207   - volatile unsigned long RAMBistCtrl; /* 0x0C84 */
208   - volatile unsigned long FIFOBistKey; /* 0x0C88 */
209   - volatile unsigned long RAMBistResult; /* 0x0C8C */
210   - volatile unsigned long FIFOBistResult; /* 0x0C90 */
  206 + volatile u32 RAMBistData; /* 0x0C80 */
  207 + volatile u32 RAMBistCtrl; /* 0x0C84 */
  208 + volatile u32 FIFOBistKey; /* 0x0C88 */
  209 + volatile u32 RAMBistResult; /* 0x0C8C */
  210 + volatile u32 FIFOBistResult; /* 0x0C90 */
211 211  
212 212 /*
213   - volatile unsigned long Fill11[0x0CBC/4 - 0x0C94/4]; //GAP 0x0C94 - 0x0CBC
214   - volatile unsigned long Fill12[0x0CD0/4 - 0x0CC0/4]; //GAP 0x0CC0 - 0x0CD0 3DRegisters
  213 + volatile u32 Fill11[0x0CBC/4 - 0x0C94/4]; //GAP 0x0C94 - 0x0CBC
  214 + volatile u32 Fill12[0x0CD0/4 - 0x0CC0/4]; //GAP 0x0CC0 - 0x0CD0 3DRegisters
215 215 */
216 216  
217   - volatile unsigned long Fill7[16]; /* 0x0c94 - 0x0cd0 */
  217 + volatile u32 Fill7[16]; /* 0x0c94 - 0x0cd0 */
218 218  
219   - volatile unsigned long SDRAMAddrSign; /* 0x0CD4 */
220   - volatile unsigned long SDRAMDataSign; /* 0x0CD8 */
221   - volatile unsigned long SDRAMSignConf; /* 0x0CDC */
  219 + volatile u32 SDRAMAddrSign; /* 0x0CD4 */
  220 + volatile u32 SDRAMDataSign; /* 0x0CD8 */
  221 + volatile u32 SDRAMSignConf; /* 0x0CDC */
222 222  
223 223 /* DWFILL; //GAP 0x0CE0 */
224   - volatile unsigned long dwFill_2;
  224 + volatile u32 dwFill_2;
225 225  
226   - volatile unsigned long ISPSignature; /* 0x0CE4 */
  226 + volatile u32 ISPSignature; /* 0x0CE4 */
227 227  
228   - volatile unsigned long Fill8[454]; /*GAP 0x0CE8 - 0x13FC */
  228 + volatile u32 Fill8[454]; /*GAP 0x0CE8 - 0x13FC */
229 229  
230   - volatile unsigned long DACPrimAddress; /* 0x1400 */
231   - volatile unsigned long DACPrimSize; /* 0x1404 */
232   - volatile unsigned long DACCursorAddr; /* 0x1408 */
233   - volatile unsigned long DACCursorCtrl; /* 0x140C */
234   - volatile unsigned long DACOverlayAddr; /* 0x1410 */
235   - volatile unsigned long DACOverlayUAddr; /* 0x1414 */
236   - volatile unsigned long DACOverlayVAddr; /* 0x1418 */
237   - volatile unsigned long DACOverlaySize; /* 0x141C */
238   - volatile unsigned long DACOverlayVtDec; /* 0x1420 */
  230 + volatile u32 DACPrimAddress; /* 0x1400 */
  231 + volatile u32 DACPrimSize; /* 0x1404 */
  232 + volatile u32 DACCursorAddr; /* 0x1408 */
  233 + volatile u32 DACCursorCtrl; /* 0x140C */
  234 + volatile u32 DACOverlayAddr; /* 0x1410 */
  235 + volatile u32 DACOverlayUAddr; /* 0x1414 */
  236 + volatile u32 DACOverlayVAddr; /* 0x1418 */
  237 + volatile u32 DACOverlaySize; /* 0x141C */
  238 + volatile u32 DACOverlayVtDec; /* 0x1420 */
239 239  
240   - volatile unsigned long Fill9[9]; /* GAP 0x1424 - 0x1444 */
  240 + volatile u32 Fill9[9]; /* GAP 0x1424 - 0x1444 */
241 241  
242   - volatile unsigned long DACVerticalScal; /* 0x1448 */
243   - volatile unsigned long DACPixelFormat; /* 0x144C */
244   - volatile unsigned long DACHorizontalScal; /* 0x1450 */
245   - volatile unsigned long DACVidWinStart; /* 0x1454 */
246   - volatile unsigned long DACVidWinEnd; /* 0x1458 */
247   - volatile unsigned long DACBlendCtrl; /* 0x145C */
248   - volatile unsigned long DACHorTim1; /* 0x1460 */
249   - volatile unsigned long DACHorTim2; /* 0x1464 */
250   - volatile unsigned long DACHorTim3; /* 0x1468 */
251   - volatile unsigned long DACVerTim1; /* 0x146C */
252   - volatile unsigned long DACVerTim2; /* 0x1470 */
253   - volatile unsigned long DACVerTim3; /* 0x1474 */
254   - volatile unsigned long DACBorderColor; /* 0x1478 */
255   - volatile unsigned long DACSyncCtrl; /* 0x147C */
256   - volatile unsigned long DACStreamCtrl; /* 0x1480 */
257   - volatile unsigned long DACLUTAddress; /* 0x1484 */
258   - volatile unsigned long DACLUTData; /* 0x1488 */
259   - volatile unsigned long DACBurstCtrl; /* 0x148C */
260   - volatile unsigned long DACCrcTrigger; /* 0x1490 */
261   - volatile unsigned long DACCrcDone; /* 0x1494 */
262   - volatile unsigned long DACCrcResult1; /* 0x1498 */
263   - volatile unsigned long DACCrcResult2; /* 0x149C */
264   - volatile unsigned long DACLinecount; /* 0x14A0 */
  242 + volatile u32 DACVerticalScal; /* 0x1448 */
  243 + volatile u32 DACPixelFormat; /* 0x144C */
  244 + volatile u32 DACHorizontalScal; /* 0x1450 */
  245 + volatile u32 DACVidWinStart; /* 0x1454 */
  246 + volatile u32 DACVidWinEnd; /* 0x1458 */
  247 + volatile u32 DACBlendCtrl; /* 0x145C */
  248 + volatile u32 DACHorTim1; /* 0x1460 */
  249 + volatile u32 DACHorTim2; /* 0x1464 */
  250 + volatile u32 DACHorTim3; /* 0x1468 */
  251 + volatile u32 DACVerTim1; /* 0x146C */
  252 + volatile u32 DACVerTim2; /* 0x1470 */
  253 + volatile u32 DACVerTim3; /* 0x1474 */
  254 + volatile u32 DACBorderColor; /* 0x1478 */
  255 + volatile u32 DACSyncCtrl; /* 0x147C */
  256 + volatile u32 DACStreamCtrl; /* 0x1480 */
  257 + volatile u32 DACLUTAddress; /* 0x1484 */
  258 + volatile u32 DACLUTData; /* 0x1488 */
  259 + volatile u32 DACBurstCtrl; /* 0x148C */
  260 + volatile u32 DACCrcTrigger; /* 0x1490 */
  261 + volatile u32 DACCrcDone; /* 0x1494 */
  262 + volatile u32 DACCrcResult1; /* 0x1498 */
  263 + volatile u32 DACCrcResult2; /* 0x149C */
  264 + volatile u32 DACLinecount; /* 0x14A0 */
265 265  
266   - volatile unsigned long Fill10[151]; /*GAP 0x14A4 - 0x16FC */
  266 + volatile u32 Fill10[151]; /*GAP 0x14A4 - 0x16FC */
267 267  
268   - volatile unsigned long DigVidPortCtrl; /* 0x1700 */
269   - volatile unsigned long DigVidPortStat; /* 0x1704 */
  268 + volatile u32 DigVidPortCtrl; /* 0x1700 */
  269 + volatile u32 DigVidPortStat; /* 0x1704 */
270 270  
271 271 /*
272   - volatile unsigned long Fill11[0x1FFC/4 - 0x1708/4]; //GAP 0x1708 - 0x1FFC
273   - volatile unsigned long Fill17[0x3000/4 - 0x2FFC/4]; //GAP 0x2000 - 0x2FFC ALUT
  272 + volatile u32 Fill11[0x1FFC/4 - 0x1708/4]; //GAP 0x1708 - 0x1FFC
  273 + volatile u32 Fill17[0x3000/4 - 0x2FFC/4]; //GAP 0x2000 - 0x2FFC ALUT
274 274 */
275 275  
276   - volatile unsigned long Fill11[1598];
  276 + volatile u32 Fill11[1598];
277 277  
278 278 /* DWFILL; //GAP 0x3000 ALUT 256MB offset */
279   - volatile unsigned long Fill_3;
  279 + volatile u32 Fill_3;
280 280  
281 281 } STG4000REG;
282 282  
drivers/video/uvesafb.c
Diff comments   View file @ a1c0cad
... ... @@ -815,8 +815,15 @@
815 815 par->pmi_setpal = pmi_setpal;
816 816 par->ypan = ypan;
817 817  
818   - if (par->pmi_setpal || par->ypan)
819   - uvesafb_vbe_getpmi(task, par);
  818 + if (par->pmi_setpal || par->ypan) {
  819 + if (__supported_pte_mask & _PAGE_NX) {
  820 + par->pmi_setpal = par->ypan = 0;
  821 + printk(KERN_WARNING "uvesafb: NX protection is actively."
  822 + "We have better not to use the PMI.\n");
  823 + } else {
  824 + uvesafb_vbe_getpmi(task, par);
  825 + }
  826 + }
820 827 #else
821 828 /* The protected mode interface is not available on non-x86. */
822 829 par->pmi_setpal = par->ypan = 0;