From: Antonino A. D. <ad...@ho...> - 2004-11-08 08:33:21
|
On Monday 08 November 2004 13:57, Benjamin Herrenschmidt wrote: > > diff -Nru a/drivers/video/riva/riva_hw.h b/drivers/video/riva/riva_hw.h > > --- a/drivers/video/riva/riva_hw.h 2004-11-07 21:21:47 -08:00 > > +++ b/drivers/video/riva/riva_hw.h 2004-11-07 21:21:47 -08:00 > > @@ -78,13 +78,13 @@ > > #define NV_WR08(p,i,d) out_8(p+i, d) > > #define NV_RD08(p,i) in_8(p+i) > > #else > > -#define NV_WR08(p,i,d) (((U008 *)(p))[i]=(d)) > > -#define NV_RD08(p,i) (((U008 *)(p))[i]) > > +#define NV_WR08(p,i,d) (writeb((d), (u8 __iomem *)(p) + (i))) > > +#define NV_RD08(p,i) (readb((u8 __iomem *)(p) + (i))) > > #endif > > -#define NV_WR16(p,i,d) (((U016 *)(p))[(i)/2]=(d)) > > -#define NV_RD16(p,i) (((U016 *)(p))[(i)/2]) > > -#define NV_WR32(p,i,d) (((U032 *)(p))[(i)/4]=(d)) > > -#define NV_RD32(p,i) (((U032 *)(p))[(i)/4]) > > +#define NV_WR16(p,i,d) (writew((d), (u16 __iomem *)(p) + (i)/2)) > > +#define NV_RD16(p,i) (readw((u16 __iomem *)(p) + (i)/2)) > > +#define NV_WR32(p,i,d) (writel((d), (u32 __iomem *)(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_RD08(p,i) NV_RD08(p,i) > > You probably broke ppc versions here. The driver enables "big endian" > register access, but readw/writew/l functions do byteswap, which will > lead to incorrect results. > > The fix would be to probably just remove the code that puts the chip > registers into big endian mode, this isn't necessary nor a very good > idea actually. > > I don't have an nVidia card on ppc to test any more unfortunately. Hmm, I'll ask Guido Guenther if he can test the changes. I think a different set of access macros for PPC might be a more preferrable solution. Tony |