diff --git a/src/intel/vulkan/anv_magma.c b/src/intel/vulkan/anv_magma.c
index 11a6a57..1442205 100644
--- a/src/intel/vulkan/anv_magma.c
+++ b/src/intel/vulkan/anv_magma.c
@@ -7,7 +7,7 @@
 #include "msd_intel_gen_query.h"
 #include "magma_util/dlog.h"
 
-static magma_connection2_t magma_connection(struct anv_device* device)
+static magma_connection_t magma_connection(struct anv_device* device)
 {
    assert(device);
    assert(device->connection);
@@ -17,9 +17,10 @@
 
 int anv_gem_connect(struct anv_device* device)
 {
-   magma_connection2_t connection = magma_create_connection(device->fd, 0);
-   if (!connection) {
-      DLOG("magma_create_connection failed");
+   magma_connection_t connection;
+   magma_status_t status = magma_create_connection2(device->fd, &connection);
+   if (status != MAGMA_STATUS_OK || !connection) {
+      DLOG("magma_create_connection failed: %d", status);
       return -1;
    }
 
diff --git a/src/intel/vulkan/anv_magma.h b/src/intel/vulkan/anv_magma.h
index e0f8264..2c1c74b 100644
--- a/src/intel/vulkan/anv_magma.h
+++ b/src/intel/vulkan/anv_magma.h
@@ -10,10 +10,8 @@
 #include "i915_drm.h"
 #include "magma.h"
 
-typedef struct magma_connection* magma_connection2_t;
-
 struct anv_connection {
-   magma_connection2_t connection;
+   magma_connection_t connection;
 };
 
 #ifdef __cplusplus
@@ -21,7 +19,7 @@
 #endif
 
 // Transfer ownership of the |connection|.
-struct anv_connection* AnvMagmaCreateConnection(magma_connection2_t connection);
+struct anv_connection* AnvMagmaCreateConnection(magma_connection_t connection);
 
 void AnvMagmaReleaseConnection(struct anv_connection* connection);
 
diff --git a/src/intel/vulkan/anv_magma_connection.cc b/src/intel/vulkan/anv_magma_connection.cc
index 0209be7..804e291 100644
--- a/src/intel/vulkan/anv_magma_connection.cc
+++ b/src/intel/vulkan/anv_magma_connection.cc
@@ -10,7 +10,7 @@
 
 class Connection : public anv_connection {
 public:
-   Connection(magma_connection2_t magma_connection)
+   Connection(magma_connection_t magma_connection)
        : inflight_list_(magma_connection)
    {
       anv_connection::connection = magma_connection;
@@ -18,7 +18,7 @@
 
    ~Connection() { magma_release_connection(magma_connection()); }
 
-   magma_connection2_t magma_connection() { return anv_connection::connection; }
+   magma_connection_t magma_connection() { return anv_connection::connection; }
 
    magma::InflightList* inflight_list() { return &inflight_list_; }
 
@@ -28,7 +28,7 @@
    magma::InflightList inflight_list_;
 };
 
-anv_connection* AnvMagmaCreateConnection(magma_connection2_t connection)
+anv_connection* AnvMagmaCreateConnection(magma_connection_t connection)
 {
    return new Connection(connection);
 }
diff --git a/tests/unit_tests/test_drm_command_buffer.cc b/tests/unit_tests/test_drm_command_buffer.cc
index 6f7c115..2437bbb 100644
--- a/tests/unit_tests/test_drm_command_buffer.cc
+++ b/tests/unit_tests/test_drm_command_buffer.cc
@@ -4,11 +4,9 @@
 #include "gtest/gtest.h"
 #include <vector>
 
-typedef struct magma_connection* magma_connection2_t;
-
 class Buffer {
 public:
-   Buffer(magma_connection2_t connection, magma_buffer_t handle, uint64_t size)
+   Buffer(magma_connection_t connection, magma_buffer_t handle, uint64_t size)
        : connection_(connection), handle_(handle), size_(size)
    {
    }
@@ -19,7 +17,7 @@
    magma_buffer_t handle() { return handle_; }
 
 private:
-   magma_connection2_t connection_;
+   magma_connection_t connection_;
    magma_buffer_t handle_;
    uint64_t size_;
 };
@@ -194,7 +192,7 @@
    }
 
 private:
-   magma_connection2_t connection_;
+   magma_connection_t connection_;
 };
 
 TEST(DrmCommandBuffer, NoBuffers)