mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-09 10:09:11 +00:00
drm/nouveau: have nv_mask return original register value
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
217275d03d
commit
2a7fdb2bc1
1 changed files with 3 additions and 4 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue