Skip to content

L
linux
Commit 091685be authored by Antonino Daplas's avatar Antonino Daplas Committed by Linus Torvalds
Browse files
Options

[PATCH] fbdev: Fix IO access in rivafb 

Fix IO access in rivafb:
- change NV_RD*/WR* macros to use read*/write* family
- use NV_RD*/WR* to access IO memory
- add __iomem annotations
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7de05a30
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 395 additions and 340 deletions
drivers/video/riva/fbdev.c
View file @ 091685be
...@@ -717,7 +717,7 @@ static void riva_load_video_mode(struct fb_info *info) ...@@ -717,7 +717,7 @@ static void riva_load_video_mode(struct fb_info *info)
newmode.ext.interlace = 0xff; /* interlace off */ newmode.ext.interlace = 0xff; /* interlace off */
if (par->riva.Architecture >= NV_ARCH_10) if (par->riva.Architecture >= NV_ARCH_10)
par->riva.CURSOR = (U032 *)(info->screen_base + par->riva.CursorStart); par->riva.CURSOR = (U032 __iomem *)(info->screen_base + par->riva.CursorStart);
if (info->var.sync & FB_SYNC_HOR_HIGH_ACT) if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
newmode.misc_output &= ~0x40; newmode.misc_output &= ~0x40;
...@@ -731,22 +731,27 @@ static void riva_load_video_mode(struct fb_info *info) ...@@ -731,22 +731,27 @@ static void riva_load_video_mode(struct fb_info *info)
par->riva.CalcStateExt(&par->riva, &newmode.ext, bpp, width, par->riva.CalcStateExt(&par->riva, &newmode.ext, bpp, width,
hDisplaySize, height, dotClock); hDisplaySize, height, dotClock);
newmode.ext.scale = par->riva.PRAMDAC[0x00000848/4] & 0xfff000ff; newmode.ext.scale = NV_RD32(par->riva.PRAMDAC, 0x00000848) &
0xfff000ff;
if (par->FlatPanel == 1) { if (par->FlatPanel == 1) {
newmode.ext.pixel |= (1 << 7); newmode.ext.pixel |= (1 << 7);
newmode.ext.scale |= (1 << 8); newmode.ext.scale |= (1 << 8);
} }
if (par->SecondCRTC) { if (par->SecondCRTC) {
newmode.ext.head = par->riva.PCRTC0[0x00000860/4] & ~0x00001000; newmode.ext.head = NV_RD32(par->riva.PCRTC0, 0x00000860) &
newmode.ext.head2 = par->riva.PCRTC0[0x00002860/4] | 0x00001000; ~0x00001000;
newmode.ext.head2 = NV_RD32(par->riva.PCRTC0, 0x00002860) |
0x00001000;
newmode.ext.crtcOwner = 3; newmode.ext.crtcOwner = 3;
newmode.ext.pllsel |= 0x20000800; newmode.ext.pllsel |= 0x20000800;
newmode.ext.vpll2 = newmode.ext.vpll; newmode.ext.vpll2 = newmode.ext.vpll;
} else if (par->riva.twoHeads) { } else if (par->riva.twoHeads) {
newmode.ext.head = par->riva.PCRTC0[0x00000860/4] | 0x00001000; newmode.ext.head = NV_RD32(par->riva.PCRTC0, 0x00000860) |
newmode.ext.head2 = par->riva.PCRTC0[0x00002860/4] & ~0x00001000; 0x00001000;
newmode.ext.head2 = NV_RD32(par->riva.PCRTC0, 0x00002860) &
~0x00001000;
newmode.ext.crtcOwner = 0; newmode.ext.crtcOwner = 0;
newmode.ext.vpll2 = par->riva.PRAMDAC0[0x00000520/4]; newmode.ext.vpll2 = NV_RD32(par->riva.PRAMDAC0, 0x00000520);
} }
if (par->FlatPanel == 1) { if (par->FlatPanel == 1) {
newmode.ext.pixel |= (1 << 7); newmode.ext.pixel |= (1 << 7);
...@@ -887,10 +892,10 @@ static void ...@@ -887,10 +892,10 @@ static void
riva_set_pattern(struct riva_par *par, int clr0, int clr1, int pat0, int pat1) riva_set_pattern(struct riva_par *par, int clr0, int clr1, int pat0, int pat1)
{ {
RIVA_FIFO_FREE(par->riva, Patt, 4); RIVA_FIFO_FREE(par->riva, Patt, 4);
par->riva.Patt->Color0 = clr0; NV_WR32(&par->riva.Patt->Color0, 0, clr0);
par->riva.Patt->Color1 = clr1; NV_WR32(&par->riva.Patt->Color1, 0, clr1);
par->riva.Patt->Monochrome[0] = pat0; NV_WR32(par->riva.Patt->Monochrome, 0, pat0);
par->riva.Patt->Monochrome[1] = pat1; NV_WR32(par->riva.Patt->Monochrome, 4, pat1);
} }
/* acceleration routines */ /* acceleration routines */
...@@ -907,7 +912,7 @@ riva_set_rop_solid(struct riva_par *par, int rop) ...@@ -907,7 +912,7 @@ riva_set_rop_solid(struct riva_par *par, int rop)
{ {
riva_set_pattern(par, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF); riva_set_pattern(par, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF);
RIVA_FIFO_FREE(par->riva, Rop, 1); RIVA_FIFO_FREE(par->riva, Rop, 1);
par->riva.Rop->Rop3 = rop; NV_WR32(&par->riva.Rop->Rop3, 0, rop);
} }
...@@ -916,9 +921,10 @@ void riva_setup_accel(struct fb_info *info) ...@@ -916,9 +921,10 @@ void riva_setup_accel(struct fb_info *info)
struct riva_par *par = (struct riva_par *) info->par; struct riva_par *par = (struct riva_par *) info->par;
RIVA_FIFO_FREE(par->riva, Clip, 2); RIVA_FIFO_FREE(par->riva, Clip, 2);
par->riva.Clip->TopLeft = 0x0; NV_WR32(&par->riva.Clip->TopLeft, 0, 0x0);
par->riva.Clip->WidthHeight = (info->var.xres_virtual & 0xffff) | NV_WR32(&par->riva.Clip->WidthHeight, 0,
(info->var.yres_virtual << 16); (info->var.xres_virtual & 0xffff) |
(info->var.yres_virtual << 16));
riva_set_rop_solid(par, 0xcc); riva_set_rop_solid(par, 0xcc);
wait_for_idle(par); wait_for_idle(par);
} }
...@@ -1405,14 +1411,14 @@ static void rivafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect ...@@ -1405,14 +1411,14 @@ static void rivafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect
riva_set_rop_solid(par, rop); riva_set_rop_solid(par, rop);
RIVA_FIFO_FREE(par->riva, Bitmap, 1); RIVA_FIFO_FREE(par->riva, Bitmap, 1);
par->riva.Bitmap->Color1A = color; NV_WR32(&par->riva.Bitmap->Color1A, 0, color);
RIVA_FIFO_FREE(par->riva, Bitmap, 2); RIVA_FIFO_FREE(par->riva, Bitmap, 2);
par->riva.Bitmap->UnclippedRectangle[0].TopLeft = NV_WR32(&par->riva.Bitmap->UnclippedRectangle[0].TopLeft, 0,
(rect->dx << 16) | rect->dy; (rect->dx << 16) | rect->dy);
mb(); mb();
par->riva.Bitmap->UnclippedRectangle[0].WidthHeight = NV_WR32(&par->riva.Bitmap->UnclippedRectangle[0].WidthHeight, 0,
(rect->width << 16) | rect->height; (rect->width << 16) | rect->height);
mb(); mb();
riva_set_rop_solid(par, 0xcc); riva_set_rop_solid(par, 0xcc);
...@@ -1439,10 +1445,13 @@ static void rivafb_copyarea(struct fb_info *info, const struct fb_copyarea *regi ...@@ -1439,10 +1445,13 @@ static void rivafb_copyarea(struct fb_info *info, const struct fb_copyarea *regi
} }
RIVA_FIFO_FREE(par->riva, Blt, 3); RIVA_FIFO_FREE(par->riva, Blt, 3);
par->riva.Blt->TopLeftSrc = (region->sy << 16) | region->sx; NV_WR32(&par->riva.Blt->TopLeftSrc, 0,
par->riva.Blt->TopLeftDst = (region->dy << 16) | region->dx; (region->sy << 16) | region->sx);
NV_WR32(&par->riva.Blt->TopLeftDst, 0,
(region->dy << 16) | region->dx);
mb(); mb();
par->riva.Blt->WidthHeight = (region->height << 16) | region->width; NV_WR32(&par->riva.Blt->WidthHeight, 0,
(region->height << 16) | region->width);
mb(); mb();
} }
...@@ -1477,7 +1486,7 @@ static void rivafb_imageblit(struct fb_info *info, ...@@ -1477,7 +1486,7 @@ static void rivafb_imageblit(struct fb_info *info,
struct riva_par *par = (struct riva_par *) info->par; struct riva_par *par = (struct riva_par *) info->par;
u32 fgx = 0, bgx = 0, width, tmp; u32 fgx = 0, bgx = 0, width, tmp;
u8 *cdat = (u8 *) image->data; u8 *cdat = (u8 *) image->data;
volatile u32 *d; volatile u32 __iomem *d;
int i, size; int i, size;
if ((info->flags & FBINFO_HWACCEL_DISABLED) || image->depth != 1) { if ((info->flags & FBINFO_HWACCEL_DISABLED) || image->depth != 1) {
...@@ -1505,19 +1514,19 @@ static void rivafb_imageblit(struct fb_info *info, ...@@ -1505,19 +1514,19 @@ static void rivafb_imageblit(struct fb_info *info,
} }
RIVA_FIFO_FREE(par->riva, Bitmap, 7); RIVA_FIFO_FREE(par->riva, Bitmap, 7);
par->riva.Bitmap->ClipE.TopLeft = NV_WR32(&par->riva.Bitmap->ClipE.TopLeft, 0,
(image->dy << 16) | (image->dx & 0xFFFF); (image->dy << 16) | (image->dx & 0xFFFF));
par->riva.Bitmap->ClipE.BottomRight = NV_WR32(&par->riva.Bitmap->ClipE.BottomRight, 0,
(((image->dy + image->height) << 16) | (((image->dy + image->height) << 16) |
((image->dx + image->width) & 0xffff)); ((image->dx + image->width) & 0xffff)));
par->riva.Bitmap->Color0E = bgx; NV_WR32(&par->riva.Bitmap->Color0E, 0, bgx);
par->riva.Bitmap->Color1E = fgx; NV_WR32(&par->riva.Bitmap->Color1E, 0, fgx);
par->riva.Bitmap->WidthHeightInE = NV_WR32(&par->riva.Bitmap->WidthHeightInE, 0,
(image->height << 16) | ((image->width + 31) & ~31); (image->height << 16) | ((image->width + 31) & ~31));
par->riva.Bitmap->WidthHeightOutE = NV_WR32(&par->riva.Bitmap->WidthHeightOutE, 0,
(image->height << 16) | ((image->width + 31) & ~31); (image->height << 16) | ((image->width + 31) & ~31));
par->riva.Bitmap->PointE = NV_WR32(&par->riva.Bitmap->PointE, 0,
(image->dy << 16) | (image->dx & 0xFFFF); (image->dy << 16) | (image->dx & 0xFFFF));
d = &par->riva.Bitmap->MonochromeData01E; d = &par->riva.Bitmap->MonochromeData01E;
...@@ -1529,7 +1538,7 @@ static void rivafb_imageblit(struct fb_info *info, ...@@ -1529,7 +1538,7 @@ static void rivafb_imageblit(struct fb_info *info,
tmp = *((u32 *)cdat); tmp = *((u32 *)cdat);
cdat = (u8 *)((u32 *)cdat + 1); cdat = (u8 *)((u32 *)cdat + 1);
reverse_order(&tmp); reverse_order(&tmp);
d[i] = tmp; NV_WR32(d, i*4, tmp);
} }
size -= 16; size -= 16;
} }
...@@ -1539,7 +1548,7 @@ static void rivafb_imageblit(struct fb_info *info, ...@@ -1539,7 +1548,7 @@ static void rivafb_imageblit(struct fb_info *info,
tmp = *((u32 *) cdat); tmp = *((u32 *) cdat);
cdat = (u8 *)((u32 *)cdat + 1); cdat = (u8 *)((u32 *)cdat + 1);
reverse_order(&tmp); reverse_order(&tmp);
d[i] = tmp; NV_WR32(d, i*4, tmp);
} }
} }
} }
...@@ -1582,7 +1591,7 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1582,7 +1591,7 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
temp = xx & 0xFFFF; temp = xx & 0xFFFF;
temp |= yy << 16; temp |= yy << 16;
par->riva.PRAMDAC[0x0000300/4] = temp; NV_WR32(par->riva.PRAMDAC, 0x0000300, temp);
} }
...@@ -1960,8 +1969,10 @@ static int __devinit rivafb_probe(struct pci_dev *pd, ...@@ -1960,8 +1969,10 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
case NV_ARCH_10: case NV_ARCH_10:
case NV_ARCH_20: case NV_ARCH_20:
case NV_ARCH_30: case NV_ARCH_30:
default_par->riva.PCRTC0 = (unsigned *)(default_par->ctrl_base + 0x00600000); default_par->riva.PCRTC0 =
default_par->riva.PRAMIN = (unsigned *)(default_par->ctrl_base + 0x00710000); (u32 __iomem *)(default_par->ctrl_base + 0x00600000);
default_par->riva.PRAMIN =
(u32 __iomem *)(default_par->ctrl_base + 0x00710000);
break; break;
} }
riva_common_setup(default_par); riva_common_setup(default_par);
...@@ -2037,7 +2048,7 @@ static int __devinit rivafb_probe(struct pci_dev *pd, ...@@ -2037,7 +2048,7 @@ static int __devinit rivafb_probe(struct pci_dev *pd,
iounmap(info->screen_base); iounmap(info->screen_base);
err_out_free_base1: err_out_free_base1:
if (default_par->riva.Architecture == NV_ARCH_03) if (default_par->riva.Architecture == NV_ARCH_03)
iounmap((caddr_t)default_par->riva.PRAMIN); iounmap(default_par->riva.PRAMIN);
err_out_free_nv3_pramin: err_out_free_nv3_pramin:
iounmap(default_par->ctrl_base); iounmap(default_par->ctrl_base);
err_out_free_base0: err_out_free_base0:
...@@ -2077,7 +2088,7 @@ static void __exit rivafb_remove(struct pci_dev *pd) ...@@ -2077,7 +2088,7 @@ static void __exit rivafb_remove(struct pci_dev *pd)
iounmap(par->ctrl_base); iounmap(par->ctrl_base);
iounmap(info->screen_base); iounmap(info->screen_base);
if (par->riva.Architecture == NV_ARCH_03) if (par->riva.Architecture == NV_ARCH_03)
iounmap((caddr_t)par->riva.PRAMIN); iounmap(par->riva.PRAMIN);
pci_release_regions(pd); pci_release_regions(pd);
pci_disable_device(pd); pci_disable_device(pd);
kfree(info->pixmap.addr); kfree(info->pixmap.addr);
......
drivers/video/riva/riva_hw.c
View file @ 091685be
This diff is collapsed.
drivers/video/riva/riva_hw.h
View file @ 091685be
...@@ -78,13 +78,13 @@ typedef unsigned int U032; ...@@ -78,13 +78,13 @@ typedef unsigned int U032;
#define NV_WR08(p,i,d) out_8(p+i, d) #define NV_WR08(p,i,d) out_8(p+i, d)
#define NV_RD08(p,i) in_8(p+i) #define NV_RD08(p,i) in_8(p+i)
#else #else
#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) #define NV_WR08(p,i,d) (writeb((d), (u8 __iomem *)(p) + (i)))
#define NV_RD08(p,i) (((U008 *)(p))[i]) #define NV_RD08(p,i) (readb((u8 __iomem *)(p) + (i)))
#endif #endif
#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) #define NV_WR16(p,i,d) (writew((d), (u16 __iomem *)(p) + (i)/2))
#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) #define NV_RD16(p,i) (readw((u16 __iomem *)(p) + (i)/2))
#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) #define NV_WR32(p,i,d) (writel((d), (u32 __iomem *)(p) + (i)/4))
#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) #define NV_RD32(p,i) (readl((u32 __iomem *)(p) + (i)/4))
#define VGA_WR08(p,i,d) NV_WR08(p,i,d) #define VGA_WR08(p,i,d) NV_WR08(p,i,d)
#define VGA_RD08(p,i) NV_RD08(p,i) #define VGA_RD08(p,i) NV_RD08(p,i)
...@@ -444,24 +444,24 @@ typedef struct _riva_hw_inst ...@@ -444,24 +444,24 @@ typedef struct _riva_hw_inst
/* /*
* Non-FIFO registers. * Non-FIFO registers.
*/ */
volatile U032 *PCRTC0; volatile U032 __iomem *PCRTC0;
volatile U032 *PCRTC; volatile U032 __iomem *PCRTC;
volatile U032 *PRAMDAC0; volatile U032 __iomem *PRAMDAC0;
volatile U032 *PFB; volatile U032 __iomem *PFB;
volatile U032 *PFIFO; volatile U032 __iomem *PFIFO;
volatile U032 *PGRAPH; volatile U032 __iomem *PGRAPH;
volatile U032 *PEXTDEV; volatile U032 __iomem *PEXTDEV;
volatile U032 *PTIMER; volatile U032 __iomem *PTIMER;
volatile U032 *PMC; volatile U032 __iomem *PMC;
volatile U032 *PRAMIN; volatile U032 __iomem *PRAMIN;
volatile U032 *FIFO; volatile U032 __iomem *FIFO;
volatile U032 *CURSOR; volatile U032 __iomem *CURSOR;
volatile U008 *PCIO0; volatile U008 __iomem *PCIO0;
volatile U008 *PCIO; volatile U008 __iomem *PCIO;
volatile U008 *PVIO; volatile U008 __iomem *PVIO;
volatile U008 *PDIO0; volatile U008 __iomem *PDIO0;
volatile U008 *PDIO; volatile U008 __iomem *PDIO;
volatile U032 *PRAMDAC; volatile U032 __iomem *PRAMDAC;
/* /*
* Common chip functions. * Common chip functions.
*/ */
...@@ -481,15 +481,15 @@ typedef struct _riva_hw_inst ...@@ -481,15 +481,15 @@ typedef struct _riva_hw_inst
/* /*
* FIFO registers. * FIFO registers.
*/ */
RivaRop *Rop; RivaRop __iomem *Rop;
RivaPattern *Patt; RivaPattern __iomem *Patt;
RivaClip *Clip; RivaClip __iomem *Clip;
RivaPixmap *Pixmap; RivaPixmap __iomem *Pixmap;
RivaScreenBlt *Blt; RivaScreenBlt __iomem *Blt;
RivaBitmap *Bitmap; RivaBitmap __iomem *Bitmap;
RivaLine *Line; RivaLine __iomem *Line;
RivaTexturedTriangle03 *Tri03; RivaTexturedTriangle03 __iomem *Tri03;
RivaTexturedTriangle05 *Tri05; RivaTexturedTriangle05 __iomem *Tri05;
} RIVA_HW_INST; } RIVA_HW_INST;
/* /*
* Extended mode state information. * Extended mode state information.
...@@ -543,7 +543,7 @@ int RivaGetConfig(RIVA_HW_INST *, unsigned int); ...@@ -543,7 +543,7 @@ int RivaGetConfig(RIVA_HW_INST *, unsigned int);
{ \ { \
while ((hwinst).FifoFreeCount < (cnt)) { \ while ((hwinst).FifoFreeCount < (cnt)) { \
mb();mb(); \ mb();mb(); \
(hwinst).FifoFreeCount = (hwinst).hwptr->FifoFree >> 2; \ (hwinst).FifoFreeCount = NV_RD32(&(hwinst).hwptr->FifoFree, 0) >> 2; \
} \ } \
(hwinst).FifoFreeCount -= (cnt); \ (hwinst).FifoFreeCount -= (cnt); \
} }
......
drivers/video/riva/rivafb.h
View file @ 091685be
...@@ -46,7 +46,7 @@ struct riva_par { ...@@ -46,7 +46,7 @@ struct riva_par {
RIVA_HW_INST riva; /* interface to riva_hw.c */ RIVA_HW_INST riva; /* interface to riva_hw.c */
u32 pseudo_palette[16]; /* default palette */ u32 pseudo_palette[16]; /* default palette */
u32 palette[16]; /* for Riva128 */ u32 palette[16]; /* for Riva128 */
caddr_t ctrl_base; /* virtual control register base addr */ u8 __iomem *ctrl_base; /* virtual control register base addr */
unsigned dclk_max; /* max DCLK */ unsigned dclk_max; /* max DCLK */
struct riva_regs initial_state; /* initial startup video mode */ struct riva_regs initial_state; /* initial startup video mode */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7