diff --git a/_studio/mfx_lib/Android.mk b/_studio/mfx_lib/Android.mk
index a8c0f06e..74faa19d 100644
--- a/_studio/mfx_lib/Android.mk
+++ b/_studio/mfx_lib/Android.mk
@@ -335,7 +335,7 @@ LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
 LOCAL_CPPFLAGS += -std=c++14
 
 LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW)
-LOCAL_SHARED_LIBRARIES := libva liblog libcutils libdrm libva-android
+LOCAL_SHARED_LIBRARIES := libva liblog libcutils libdrm
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libmfx-gen
diff --git a/_studio/mfx_lib/shared/src/libmfxsw.cpp b/_studio/mfx_lib/shared/src/libmfxsw.cpp
index 1aead1cf..d3cff5f4 100644
--- a/_studio/mfx_lib/shared/src/libmfxsw.cpp
+++ b/_studio/mfx_lib/shared/src/libmfxsw.cpp
@@ -32,9 +32,6 @@
 #include <fcntl.h>
 #include <xf86drm.h>
 #include "va/drm/va_drm.h"
-#include <va/va_android.h>
-#include "va/va_backend.h"
-#include "va_drmcommon.h"
 
 #include "mediasdk_version.h"
 #include "libmfx_core_factory.h"
@@ -613,80 +610,82 @@ GetAdapterInfo(mfxU64 adapterId)
     return result;
 }
 
-#define MFX_VA_ANDROID_DISPLAY_ID 0x18c34078
-
 static bool QueryImplCaps(std::function < bool (VideoCORE&, mfxU32, mfxU32 , mfxU64, const std::vector<bool>& ) > QueryImpls)
 {
-    std::string path;
-
+    for (int i = 0; i < 64; ++i)
     {
-        mfxU32 vendorId = 0;
+        std::string path;
 
-        path = std::string("/sys/class/drm/renderD128/device/vendor");
-        FILE* file = fopen(path.c_str(), "r");
+        {
+            mfxU32 vendorId = 0;
 
-        if (!file)
-            return false;
+            path = std::string("/sys/class/drm/renderD") + std::to_string(128 + i) + "/device/vendor";
+            FILE* file = fopen(path.c_str(), "r");
 
-        int nread = fscanf(file, "%x", &vendorId);
-        fclose(file);
+            if (!file)
+                break;
 
-        if (nread != 1 || vendorId != 0x8086)
-            return false;
-    }
+            int nread = fscanf(file, "%x", &vendorId);
+            fclose(file);
 
-    mfxU32 deviceId = 0;
-    {
-        path = std::string("/sys/class/drm/renderD128/device/device");
+            if (nread != 1 || vendorId != 0x8086)
+                continue;
+        }
 
-        FILE* file = fopen(path.c_str(), "r");
-        if (!file)
-            return false;
+        mfxU32 deviceId = 0;
+        {
+            path = std::string("/sys/class/drm/renderD") + std::to_string(128 + i) + "/device/device";
 
-        int nread = fscanf(file, "%x", &deviceId);
-        fclose(file);
+            FILE* file = fopen(path.c_str(), "r");
+            if (!file)
+                break;
 
-        if (nread != 1)
-            return false;
-    }
+            int nread = fscanf(file, "%x", &deviceId);
+            fclose(file);
 
-    {
-        unsigned int displayId = MFX_VA_ANDROID_DISPLAY_ID;
-        VADisplay vaDisplay = vaGetDisplay(&displayId);
-        if (vaDisplay == nullptr)
-            return false;
+            if (nread != 1)
+                break;
+        }
 
-        VADisplayContextP ctx = (VADisplayContextP)vaDisplay;
-        drm_state* drm = (drm_state*)ctx->pDriverContext->drm_state;
-        int fd = drm->fd;
+        path = std::string("/dev/dri/renderD") + std::to_string(128 + i);
 
-        int vamajor = 0, vaminor = 0;
-        if (VA_STATUS_SUCCESS != vaInitialize(vaDisplay, &vamajor, &vaminor))
-            return false;
+        int fd = open(path.c_str(), O_RDWR);
+        if (fd < 0)
+            continue;
 
-        std::shared_ptr<VADisplay> closeVA(&vaDisplay, [vaDisplay](VADisplay*) { vaTerminate(vaDisplay); });
+        std::shared_ptr<int> closeFile(&fd, [fd](int*) { close(fd); });
 
-        VADisplayAttribute attr = {};
-        attr.type = VADisplayAttribSubDevice;
-        auto sts = vaGetDisplayAttributes(vaDisplay, &attr, 1);
-        std::ignore = MFX_STS_TRACE(sts);
+        {
+            auto displ = vaGetDisplayDRM(fd);
 
-        VADisplayAttribValSubDevice out = {};
-        out.value = attr.value;
+            int vamajor = 0, vaminor = 0;
+            if (VA_STATUS_SUCCESS != vaInitialize(displ, &vamajor, &vaminor))
+                continue;
 
-        std::vector<bool> subDevMask(VA_STATUS_SUCCESS == sts ? out.bits.sub_device_count : 0);
-        for (std::size_t id = 0; id < subDevMask.size(); ++id)
-        {
-            subDevMask[id] = !!((1 << id) & out.bits.sub_device_mask);
-        }
-        {
-            std::unique_ptr<VideoCORE> pCore(FactoryCORE::CreateCORE(MFX_HW_VAAPI, 0, {}, 0));
+            std::shared_ptr<VADisplay> closeVA(&displ, [displ](VADisplay*) { vaTerminate(displ); });
+
+            VADisplayAttribute attr = {};
+            attr.type = VADisplayAttribSubDevice;
+            auto sts = vaGetDisplayAttributes(displ, &attr, 1);
+            std::ignore = MFX_STS_TRACE(sts);
+
+            VADisplayAttribValSubDevice out = {};
+            out.value = attr.value;
 
-            if (pCore->SetHandle(MFX_HANDLE_VA_DISPLAY, (mfxHDL)vaDisplay))
-                return false;
+            std::vector<bool> subDevMask(VA_STATUS_SUCCESS == sts ? out.bits.sub_device_count : 0);
+            for (std::size_t id = 0; id < subDevMask.size(); ++id)
+            {
+                subDevMask[id] = !!((1 << id) & out.bits.sub_device_mask);
+            }
+            {
+                std::unique_ptr<VideoCORE> pCore(FactoryCORE::CreateCORE(MFX_HW_VAAPI, 0, {}, 0));
 
-            if (!QueryImpls(*pCore, deviceId, 0, fd, subDevMask))
-                return false;
+                if (pCore->SetHandle(MFX_HANDLE_VA_DISPLAY, (mfxHDL)displ))
+                    continue;
+
+                if (!QueryImpls(*pCore, deviceId, i, fd, subDevMask))
+                    return false;
+            }
         }
     }
     return true;