瀏覽代碼

drm/nouveau: fix earlier mistake when fixing merge conflict

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Ben Skeggs 15 年之前
父節點
當前提交
625db6b7e3
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/gpu/drm/nouveau/nouveau_bios.c

+ 2 - 2
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;
 	uint32_t val = 0;
 
 
 	if (off < pci_resource_len(dev->pdev, 1)) {
 	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);
 			io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
 
 
 		val = ioread32(p + (off & ~PAGE_MASK));
 		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)
 	uint32_t off, uint32_t val)
 {
 {
 	if (off < pci_resource_len(dev->pdev, 1)) {
 	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);
 			io_mapping_map_atomic_wc(fb, off & PAGE_MASK, KM_USER0);
 
 
 		iowrite32(val, p + (off & ~PAGE_MASK));
 		iowrite32(val, p + (off & ~PAGE_MASK));