projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b515f3a
)
drm/nouveau: fix earlier mistake when fixing merge conflict
author
Ben Skeggs
<bskeggs@redhat.com>
Tue, 17 Aug 2010 02:02:43 +0000
(12:02 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 17 Aug 2010 02:02:43 +0000
(12:02 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_bios.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bios.c
b/drivers/gpu/drm/nouveau/nouveau_bios.c
index
e144f7a
..
e4f33a4
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bios.c
@@
-2166,7
+2166,7
@@
peek_fb(struct drm_device *dev, struct io_mapping *fb,
uint32_t val = 0;
if (off < pci_resource_len(dev->pdev, 1)) {
- uint
32
_t __iomem *p =
+ uint
8
_t __iomem *p =
io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
val = ioread32(p + (off & ~PAGE_MASK));
@@
-2182,7
+2182,7
@@
poke_fb(struct drm_device *dev, struct io_mapping *fb,
uint32_t off, uint32_t val)
{
if (off < pci_resource_len(dev->pdev, 1)) {
- uint
32
_t __iomem *p =
+ uint
8
_t __iomem *p =
io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
iowrite32(val, p + (off & ~PAGE_MASK));