Skip to content

L
linux
Commit 2a7fdb2b authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau: have nv_mask return original register value 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 217275d0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @ 2a7fdb2b
...@@ -1255,12 +1255,11 @@ static inline void nv_wr32(struct drm_device *dev, unsigned reg, u32 val) ...@@ -1255,12 +1255,11 @@ static inline void nv_wr32(struct drm_device *dev, unsigned reg, u32 val)
iowrite32_native(val, dev_priv->mmio + reg); iowrite32_native(val, dev_priv->mmio + reg);
} }
static inline void nv_mask(struct drm_device *dev, u32 reg, u32 mask, u32 val) static inline u32 nv_mask(struct drm_device *dev, u32 reg, u32 mask, u32 val)
{ {
u32 tmp = nv_rd32(dev, reg); u32 tmp = nv_rd32(dev, reg);
tmp &= ~mask; nv_wr32(dev, reg, (tmp & ~mask) | val);
tmp |= val; return tmp;
nv_wr32(dev, reg, tmp);
} }
static inline u8 nv_rd08(struct drm_device *dev, unsigned reg) static inline u8 nv_rd08(struct drm_device *dev, unsigned reg)
......
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