commit 6ea26baa2798d218784b8b095b4ac02e02075b09
author John Bauman <jbauman@google.com> Mon May 09 18:06:05 2022 +0000
committer John Bauman <jbauman@google.com> Mon May 09 18:06:05 2022 +0000
tree 740bb794fd9a1a6dfa0c3ec31272c9d624a74e6d
parent 0b54da9bb79ca25b2b2091fe404454e71d57f1fb

Switch to magma_query

Bug: 97052
Change-Id: If21c81ac7e752d83bf6801cf7da341be66f3f8da

fuchsia/test/va-test.cc

diff --git a/fuchsia/test/va-test.cc b/fuchsia/test/va-test.cc
index 2b91e27..e8f7893 100644
--- a/fuchsia/test/va-test.cc
+++ b/fuchsia/test/va-test.cc
@@ -46,7 +46,7 @@
 
       {
         uint64_t vendor_id;
-        magma_status_t magma_status = magma_query2(device_, MAGMA_QUERY_VENDOR_ID, &vendor_id);
+        magma_status_t magma_status = magma_query(device_, MAGMA_QUERY_VENDOR_ID, nullptr, &vendor_id);
         if (magma_status == MAGMA_STATUS_OK && vendor_id == vendor_id_) {
           break;
         }

media_driver/linux/common/os/magma/mos_bufmgr_magma.cpp

diff --git a/media_driver/linux/common/os/magma/mos_bufmgr_magma.cpp b/media_driver/linux/common/os/magma/mos_bufmgr_magma.cpp
index b7e46c0..b8cac48 100644
--- a/media_driver/linux/common/os/magma/mos_bufmgr_magma.cpp
+++ b/media_driver/linux/common/os/magma/mos_bufmgr_magma.cpp
@@ -534,9 +534,9 @@
     uint32_t device_id;
     {
         uint64_t val;
-        magma_status_t status = magma_query2(unowned_device, MAGMA_QUERY_DEVICE_ID, &val);
+        magma_status_t status = magma_query(unowned_device, MAGMA_QUERY_DEVICE_ID, nullptr, &val);
         if (status != MAGMA_STATUS_OK) {
-            LOG_VERBOSE("magma_query2 failed: %d", status);
+            LOG_VERBOSE("magma_query failed: %d", status);
             return nullptr;
         }
         device_id = static_cast<uint32_t>(val);

media_driver/linux/common/os/magma_fd.cpp

diff --git a/media_driver/linux/common/os/magma_fd.cpp b/media_driver/linux/common/os/magma_fd.cpp
index 334bd03..a0866f2 100644
--- a/media_driver/linux/common/os/magma_fd.cpp
+++ b/media_driver/linux/common/os/magma_fd.cpp
@@ -94,7 +94,7 @@
       return true;
 
     case I915_PARAM_CHIPSET_ID:
-      status = magma_query2(device, MAGMA_QUERY_DEVICE_ID, &val64);
+      status = magma_query(device, MAGMA_QUERY_DEVICE_ID, nullptr, &val64);
       if (status != MAGMA_STATUS_OK)
         return false;
       *value_out = static_cast<uint32_t>(val64);