diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-08-17 12:02:43 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-08-17 12:02:43 +1000 |
| commit | 625db6b7e34580b750a13fd36a211a4366f6c3e2 (patch) | |
| tree | 68ad1ead3c606c22bd872d22eec861dc3eb4e9de /drivers/gpu/drm/nouveau/nouveau_bios.c | |
| parent | b515f3a2d8f8543aa189ac8d10195f923b64245b (diff) | |
| download | kernel_samsung_smdk4412-625db6b7e34580b750a13fd36a211a4366f6c3e2.zip kernel_samsung_smdk4412-625db6b7e34580b750a13fd36a211a4366f6c3e2.tar.gz kernel_samsung_smdk4412-625db6b7e34580b750a13fd36a211a4366f6c3e2.tar.bz2 | |
drm/nouveau: fix earlier mistake when fixing merge conflict
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index e144f7a..e4f33a4 100644 --- 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)) { - uint32_t __iomem *p = + uint8_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)) { - uint32_t __iomem *p = + uint8_t __iomem *p = io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0); iowrite32(val, p + (off & ~PAGE_MASK)); |