On Sat, 20 Jul 2019 at 09:46, Sam Ravnborg <[email protected]> wrote: > > The DRM_READ, DRM_WRITE macros comes from the deprecated drm_os_linux.h > header file. Remove their use to remove this dependency. > > Replace the use of the macros with open coded variants. > > Signed-off-by: Sam Ravnborg <[email protected]> > Cc: Kevin Brace <[email protected]> > Cc: Thomas Hellstrom <[email protected]> > Cc: "Gustavo A. R. Silva" <[email protected]> > Cc: Mike Marshall <[email protected]> > Cc: Ira Weiny <[email protected]> > Cc: Daniel Vetter <[email protected]> > Cc: Emil Velikov <[email protected]> > Cc: Michel Dänzer <[email protected]> > --- > drivers/gpu/drm/via/via_drv.h | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h > index 6d1ae834484c..d5a2b1ffd8c1 100644 > --- a/drivers/gpu/drm/via/via_drv.h > +++ b/drivers/gpu/drm/via/via_drv.h > @@ -115,10 +115,17 @@ enum via_family { > /* VIA MMIO register access */ > #define VIA_BASE ((dev_priv->mmio)) > > -#define VIA_READ(reg) DRM_READ32(VIA_BASE, reg) > -#define VIA_WRITE(reg, val) DRM_WRITE32(VIA_BASE, reg, val) > -#define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg) > -#define VIA_WRITE8(reg, val) DRM_WRITE8(VIA_BASE, reg, val) > +#define VIA_READ(reg) \ > + readl(((void __iomem *)VIA_BASE->handle) + (reg)) > + > +#define VIA_WRITE(reg, val) \ > + writel(val, ((void __iomem *)VIA_BASE->handle) + (reg)) > + > +#define VIA_READ8(reg) \ > + readb(((void __iomem *)VIA_BASE->handle) + (reg)) > + > +#define VIA_WRITE8(reg, val) \ > + writeb(val, ((void __iomem *)VIA_BASE->handle) + (reg)) > IMHO a far better idea is to expand these macros as static inline functions. The extra bonus here is that the pseudo-magical VIA_BASE will also disappear.
Since all the VIA_READ8 are used for masking, one might as well drop them in favour of via_mask(). WDYT? -Emil _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
