drm/nouveau: fix earlier mistake when fixing merge conflict (625db6b7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/nouveau/nouveau_bios.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));