[PATCH libdrm 04/23] meson: don't enable libdrm_nouveau without atomic support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



In the 'auto' case, the `with_atomic` check was bypassed.

Signed-off-by: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
---
 meson.build | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 4bc088bacdd8120c1508..edcc7e8ddc39b1760868 100644
--- a/meson.build
+++ b/meson.build
@@ -104,11 +104,13 @@ endif
 
 with_nouveau = false
 _nouveau = get_option('nouveau')
-if _nouveau != 'false'
-  if _nouveau == 'true' and not with_atomics
-    error('libdrm_nouveau requires atomics.')
-  endif
-  with_nouveau = true
+if _nouveau == 'auto'
+  with_nouveau = with_atomics
+else
+  with_nouveau = _nouveau == 'true'
+endif
+if with_nouveau and not with_atomics
+  error('libdrm_nouveau requires atomics.')
 endif
 
 with_vmwgfx = false
-- 
Cheers,
  Eric

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux