diff options
| author | Karol Herbst <karolherbst@gmail.com> | 2016-09-18 12:21:56 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-09-22 17:32:41 +1000 |
| commit | a52b670131fd5a2cec77cf74025fa1a98267e34c (patch) | |
| tree | 61a4c9240ebcafe1b07ec9ee0a0ef5f125be6cd4 /lib | |
| parent | dc3d9029199217b55027c6fa7f6076dceaab604c (diff) | |
| download | nouveau-a52b670131fd5a2cec77cf74025fa1a98267e34c.tar.gz | |
Revert "bus: remove cpu_coherent flag"
This reverts commit 01bbcb69f80e1058395b737ae399c6f4ef48691b.
The commit caused fence timeouts within nvc0_screen_destroy and most likely
other places as well.
The most obvious effect is, that userspace processes take minutes to
actually quit.
Signed-off-by: Karol Herbst <karolherbst@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/include/nvif/os.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/include/nvif/os.h b/lib/include/nvif/os.h index c13db8d0f..c265ab446 100644 --- a/lib/include/nvif/os.h +++ b/lib/include/nvif/os.h @@ -124,6 +124,12 @@ typedef dma_addr_t resource_size_t; #define __printf(a,b) #define __user +#if defined(CONFIG_ARM) +#define IS_ENABLED_CONFIG_ARM 1 +#else +#define IS_ENABLED_CONFIG_ARM 0 +#endif + #if defined(CONFIG_IOMMU_API) #define IS_ENABLED_CONFIG_IOMMU_API 1 #else |