projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
217275d
)
drm/nouveau: have nv_mask return original register value
author
Ben Skeggs
<bskeggs@redhat.com>
Mon, 30 Aug 2010 06:14:51 +0000
(16:14 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Fri, 24 Sep 2010 06:19:15 +0000
(16:19 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_drv.h
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drv.h
b/drivers/gpu/drm/nouveau/nouveau_drv.h
index b1be617373b63891dc05b09f2dc75807cd8b8472..c684686f6c0fb37bf2dbe5e4dc522732d1f00cbd 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_drv.h
@@
-1255,12
+1255,11
@@
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)
+static inline
u32
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);
+ nv_wr32(dev, reg, (tmp & ~mask) | val);
+ return tmp;
}
static inline u8 nv_rd08(struct drm_device *dev, unsigned reg)
This page took
0.026673 seconds
and
5
git commands to generate.