diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-04-16 20:35:27 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-08-14 15:02:29 +0200 |
| commit | 8ba70e0a7405005c079eb72f94999245c992aa91 (patch) | |
| tree | 6d8d02a418f7c3b2229e97eb1503c82b4be04f12 /src/gallium/drivers/radeon/r600_buffer_common.c | |
| parent | e7fc664b91a5d886c2709d05a498f6a1dfbaf136 (diff) | |
| download | external_mesa3d-8ba70e0a7405005c079eb72f94999245c992aa91.zip external_mesa3d-8ba70e0a7405005c079eb72f94999245c992aa91.tar.gz external_mesa3d-8ba70e0a7405005c079eb72f94999245c992aa91.tar.bz2 | |
radeonsi: fix DRM version checks for amdgpu DRM 3.0.0
Diffstat (limited to 'src/gallium/drivers/radeon/r600_buffer_common.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 0f788b7..cb9809f 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -121,7 +121,8 @@ bool r600_init_resource(struct r600_common_screen *rscreen, /* Older kernels didn't always flush the HDP cache before * CS execution */ - if (rscreen->info.drm_minor < 40) { + if (rscreen->info.drm_major == 2 && + rscreen->info.drm_minor < 40) { res->domains = RADEON_DOMAIN_GTT; flags |= RADEON_FLAG_GTT_WC; break; @@ -147,7 +148,8 @@ bool r600_init_resource(struct r600_common_screen *rscreen, * Write-combined CPU mappings are fine, the kernel ensures all CPU * writes finish before the GPU executes a command stream. */ - if (rscreen->info.drm_minor < 40) + if (rscreen->info.drm_major == 2 && + rscreen->info.drm_minor < 40) res->domains = RADEON_DOMAIN_GTT; else if (res->domains & RADEON_DOMAIN_VRAM) flags |= RADEON_FLAG_CPU_ACCESS; |