diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
index 414397e..f35526d 100644
--- a/project/cmake/CMakeLists.txt
+++ b/project/cmake/CMakeLists.txt
@@ -205,8 +205,8 @@ if(NOT WIN32)
     else()
       core_optional_dep(X ENABLE_X11)
       core_optional_dep(XRandR ENABLE_X11)
-      core_optional_dep(LibDRM ENABLE_X11)
     endif()
+    core_optional_dep(LibDRM ENABLE_X11)
   else()
     core_optional_dep(OpenGLES)
     if(OPENGLES_FOUND)
@@ -214,8 +214,8 @@ if(NOT WIN32)
         core_require_dep(Mir ENABLE_MIR)
       else()
         core_optional_dep(X ENABLE_X11)
-        core_optional_dep(LibDRM ENABLE_X11)
       endif()
+      core_optional_dep(LibDRM ENABLE_X11)
     endif()
   endif()
   if(NOT APPLE)
@@ -475,6 +475,7 @@ foreach(msg ${final_message})
   message(STATUS ${msg})
 endforeach()
 
+
 if(VERBOSE)
   message(STATUS "\n#--------------- Internal Variables -------------#")
   message(STATUS "DEPLIBS: ${DEPLIBS}")
diff --git a/project/cmake/scripts/linux/ArchSetup.cmake b/project/cmake/scripts/linux/ArchSetup.cmake
index 51a7152..cae0bb8 100644
--- a/project/cmake/scripts/linux/ArchSetup.cmake
+++ b/project/cmake/scripts/linux/ArchSetup.cmake
@@ -39,10 +39,3 @@ if(CMAKE_BUILD_TYPE STREQUAL Coverage)
   set(COVERAGE_DEPENDS "\${APP_NAME_LC}" "\${APP_NAME_LC}-test")
   set(COVERAGE_EXCLUDES */test/* lib/* */lib/*)
 endif()
-
-# Missing mir support in these libraries
-if(ENABLE_MIR)
-  set(ENABLE_VAAPI OFF CACHE BOOL "Disabling VAAPI since no Mir support" FORCE)
-  set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU since no Mir support" FORCE)
-  message(STATUS "Hardware video acceleration disabled due to no support in Mir")
-endif()
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index ed27cbb..4d47b65 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -32,7 +32,7 @@
 #include "guilib/GraphicContext.h"
 #include "settings/MediaSettings.h"
 #include "settings/AdvancedSettings.h"
-#include <va/va_x11.h>
+#include <va/va_drm.h>
 #include <va/va_drmcommon.h>
 #include <drm_fourcc.h>
 #include "linux/XTimeUtils.h"
@@ -46,16 +46,41 @@ extern "C" {
 }
 
 #include <va/va_vpp.h>
+#include <xf86drm.h>
 
 using namespace VAAPI;
 #define NUM_RENDER_PICS 7
 
+Fd::Fd(int fd) :
+  fd(fd)
+{
+}
+
+Fd& Fd::operator=(Fd&& other)
+{
+  fd = std::move(other.fd);
+  other.fd = invalid;
+  return *this;
+}
+
+Fd::operator int() const
+{
+  return fd;
+}
+
+Fd::~Fd()
+{
+  if (fd > invalid)
+  {
+    close(fd);
+  }
+}
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 CVAAPIContext *CVAAPIContext::m_context = 0;
 CCriticalSection CVAAPIContext::m_section;
-Display *CVAAPIContext::m_X11dpy = 0;
 
 CVAAPIContext::CVAAPIContext()
 {
@@ -125,12 +150,15 @@ bool CVAAPIContext::EnsureContext(CVAAPIContext **ctx, CDecoder *decoder)
 
 bool CVAAPIContext::CreateContext()
 {
-  { CSingleLock lock(g_graphicsContext);
-    if (!m_X11dpy)
-      m_X11dpy = XOpenDisplay(NULL);
+  // FIXME Talk with the OS to figure out the correct render node
+  drm_fd = Fd(open("/dev/dri/renderD128", O_RDWR));
+  if (drm_fd < 0)
+  {
+    m_display = NULL;
+    return false;
   }
 
-  m_display = vaGetDisplay(m_X11dpy);
+  m_display = vaGetDisplayDRM(drm_fd);
 
   int major_version, minor_version;
   if (!CheckSuccess(vaInitialize(m_display, &major_version, &minor_version)))
@@ -250,11 +278,6 @@ VADisplay CVAAPIContext::GetDisplay()
   return m_display;
 }
 
-Display *CVAAPIContext::GetX11Display()
-{
-  return m_X11dpy;
-}
-
 bool CVAAPIContext::IsValidDecoder(CDecoder *decoder)
 {
   auto it = find(m_decoders.begin(), m_decoders.end(), decoder);
@@ -1011,7 +1034,6 @@ bool CDecoder::ConfigVAAPI()
   memset(&m_hwContext, 0, sizeof(vaapi_context));
 
   m_vaapiConfig.dpy = m_vaapiConfig.context->GetDisplay();
-  m_vaapiConfig.x11dsp = m_vaapiConfig.context->GetX11Display();
   m_vaapiConfig.attrib = m_vaapiConfig.context->GetAttrib(m_vaapiConfig.profile);
   if ((m_vaapiConfig.attrib.value & VA_RT_FORMAT_YUV420) == 0)
   {
@@ -2397,7 +2419,6 @@ bool COutput::CheckSuccess(VAStatus status)
 
 bool COutput::CreateEGLContext()
 {
-  m_Display = g_Windowing.GetDisplay();
   EGLDisplay eglDisplay = g_Windowing.GetEGLDisplay();
   EGLContext eglMainContext = g_Windowing.GetEGLContext();
   EGLConfig eglMainConfig = g_Windowing.GetEGLConfig();
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
index cbaf4a6..56210ba 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
@@ -125,7 +125,6 @@ struct CVaapiConfig
   VADisplay dpy;
   VAProfile profile;
   VAConfigAttrib attrib;
-  Display *x11dsp;
   CProcessInfo *processInfo;
 };
 
@@ -368,6 +367,22 @@ protected:
   CCriticalSection m_section;
 };
 
+// Takes ownership of an FD
+class Fd
+{
+public:
+  Fd() = default;
+  explicit Fd(int fd);
+  Fd& operator=(Fd&& other);
+  ~Fd();
+
+  operator int() const;
+
+private:
+  static const int invalid{-1};
+  int fd{invalid};
+};
+
 //-----------------------------------------------------------------------------
 // VAAPI decoder
 //-----------------------------------------------------------------------------
@@ -378,7 +393,6 @@ public:
   static bool EnsureContext(CVAAPIContext **ctx, CDecoder *decoder);
   void Release(CDecoder *decoder);
   VADisplay GetDisplay();
-  Display* GetX11Display();
   bool SupportsProfile(VAProfile profile);
   VAConfigAttrib GetAttrib(VAProfile profile);
   VAConfigID CreateConfig(VAProfile profile, VAConfigAttrib attrib);
@@ -401,6 +415,7 @@ private:
   int m_profileCount;
   VAProfile *m_profiles;
   std::vector<CDecoder*> m_decoders;
+  Fd drm_fd;
 };
 
 /**
diff --git a/xbmc/windowing/mir/WinSystemMirGLContext.cpp b/xbmc/windowing/mir/WinSystemMirGLContext.cpp
index d157eb8..9d83e5c 100644
--- a/xbmc/windowing/mir/WinSystemMirGLContext.cpp
+++ b/xbmc/windowing/mir/WinSystemMirGLContext.cpp
@@ -84,4 +84,20 @@ bool CWinSystemMirGLContext::IsExtSupported(const char* extension)
   return false;
 }
 
+
+EGLDisplay CWinSystemMirGLContext::GetEGLDisplay() const
+{
+    return m_pGLContext.m_eglDisplay;
+}
+
+EGLContext CWinSystemMirGLContext::GetEGLContext() const
+{
+    return m_pGLContext.m_eglContext;
+}
+
+EGLConfig CWinSystemMirGLContext::GetEGLConfig() const
+{
+    return m_pGLContext.m_eglConfig;
+}
+
 #endif
diff --git a/xbmc/windowing/mir/WinSystemMirGLContext.h b/xbmc/windowing/mir/WinSystemMirGLContext.h
index d65bcd6..4e27406 100644
--- a/xbmc/windowing/mir/WinSystemMirGLContext.h
+++ b/xbmc/windowing/mir/WinSystemMirGLContext.h
@@ -42,6 +42,9 @@ public:
 
   bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
   bool IsExtSupported(const char* extension) override;
+  EGLDisplay GetEGLDisplay() const;
+  EGLContext GetEGLContext() const;
+  EGLConfig GetEGLConfig() const;
 
 protected:
   void SetVSyncImpl(bool enable) override;
diff --git a/xbmc/windowing/mir/WinSystemMirGLESContext.cpp b/xbmc/windowing/mir/WinSystemMirGLESContext.cpp
index 29cd3ea..2d40cb6 100644
--- a/xbmc/windowing/mir/WinSystemMirGLESContext.cpp
+++ b/xbmc/windowing/mir/WinSystemMirGLESContext.cpp
@@ -85,4 +85,19 @@ bool CWinSystemMirGLESContext::IsExtSupported(const char* extension)
   return false;
 }
 
+EGLDisplay CWinSystemMirGLESContext::GetEGLDisplay() const
+{
+    return m_pGLContext.m_eglDisplay;
+}
+
+EGLContext CWinSystemMirGLESContext::GetEGLContext() const
+{
+    return m_pGLContext.m_eglContext;
+}
+
+EGLConfig CWinSystemMirGLESContext::GetEGLConfig() const
+{
+    return m_pGLContext.m_eglConfig;
+}
+
 #endif
diff --git a/xbmc/windowing/mir/WinSystemMirGLESContext.h b/xbmc/windowing/mir/WinSystemMirGLESContext.h
index 5f07ce0..a345253 100644
--- a/xbmc/windowing/mir/WinSystemMirGLESContext.h
+++ b/xbmc/windowing/mir/WinSystemMirGLESContext.h
@@ -21,6 +21,9 @@ public:
 
   bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
   bool IsExtSupported(const char* extension) override;
+  EGLDisplay GetEGLDisplay() const;
+  EGLContext GetEGLContext() const;
+  EGLConfig GetEGLConfig() const;
 
 protected:
   void SetVSyncImpl(bool enable) override;