summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-02-02 00:08:14 +0100
committerBen Skeggs <bskeggs@redhat.com>2015-03-17 00:44:22 +0100
commit9fcaa149e7d264822f7ef748ca4a7af643d88ec9 (patch)
treedae26a2e794416c80083d590feed8a1a6c5fde7b /drivers/gpu
parentdrm/nouveau/gr/gf100: fix some accidental or'ing of buffer addresses (diff)
downloadlinux-9fcaa149e7d264822f7ef748ca4a7af643d88ec9.tar.xz
linux-9fcaa149e7d264822f7ef748ca4a7af643d88ec9.zip
drm/nouveau/device: post write to NV_PMC_BOOT_1 when flipping endian switch
fdo#88868 Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 29bd539af183..6efa8f38ff54 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -340,11 +340,13 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
/* switch mmio to cpu's native endianness */
#ifndef __BIG_ENDIAN
- if (ioread32_native(map + 0x000004) != 0x00000000)
+ if (ioread32_native(map + 0x000004) != 0x00000000) {
#else
- if (ioread32_native(map + 0x000004) == 0x00000000)
+ if (ioread32_native(map + 0x000004) == 0x00000000) {
#endif
iowrite32_native(0x01000001, map + 0x000004);
+ ioread32_native(map);
+ }
/* read boot0 and strapping information */
boot0 = ioread32_native(map + 0x000000);