summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2016-03-03 16:03:02 +0900
committerBen Skeggs <bskeggs@redhat.com>2016-03-14 10:13:33 +1000
commit1733a2ad36741b1812cf8b3f3037c28d0af53f50 (patch)
tree1b082ef2fa244905e5c3deed9143571ff5cbacd2
parentf2014cd02cdd54f5f286221925b13c3d19addd52 (diff)
downloadop-kernel-dev-1733a2ad36741b1812cf8b3f3037c28d0af53f50.zip
op-kernel-dev-1733a2ad36741b1812cf8b3f3037c28d0af53f50.tar.gz
drm/nouveau/device/pci: set as non-CPU-coherent on ARM64
Without this buffer inconsistencies may appear between the CPU and GPU when using a PCI GPU on an ARM64 board. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 62ad030..18fab397 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -1614,7 +1614,7 @@ nvkm_device_pci_func = {
.fini = nvkm_device_pci_fini,
.resource_addr = nvkm_device_pci_resource_addr,
.resource_size = nvkm_device_pci_resource_size,
- .cpu_coherent = !IS_ENABLED(CONFIG_ARM),
+ .cpu_coherent = !IS_ENABLED(CONFIG_ARM) && !IS_ENABLED(CONFIG_ARM64),
};
int
OpenPOWER on IntegriCloud