From: Ben Skeggs Date: Fri, 23 Jul 2010 01:17:57 +0000 (+1000) Subject: drm/nouveau: add nv_mask register accessor X-Git-Tag: v3.0~3480^2~78^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49eed80ad0cfa5d5d02992e8088463cbf1a5ff85;p=platform%2Fkernel%2Flinux-amlogic.git drm/nouveau: add nv_mask register accessor Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 11c0778..9d53f3d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -1186,6 +1186,14 @@ static inline void nv_wr32(struct drm_device *dev, unsigned reg, u32 val) iowrite32_native(val, dev_priv->mmio + reg); } +static inline void nv_mask(struct drm_device *dev, u32 reg, u32 mask, u32 val) +{ + u32 tmp = nv_rd32(dev, reg); + tmp &= ~mask; + tmp |= val; + nv_wr32(dev, reg, tmp); +} + static inline u8 nv_rd08(struct drm_device *dev, unsigned reg) { struct drm_nouveau_private *dev_priv = dev->dev_private;