commit 3933a57341a729a424fd6823af0c14fd104b95d1
author gitbuildkicker <android-build@google.com> Mon Jan 29 14:54:24 2018 -0800
committer gitbuildkicker <android-build@google.com> Mon Jan 29 14:54:24 2018 -0800
tree 623e93615f5d2adf0626fb4cd6701137e54d5b6e
parent f6abcc3334ccbf4c2a9441301f771432a36324ec
parent a3ef9cad8f032e8bbadebbce14b7bdb538198b63

merge in pi-release history after reset to master

xf86drm.c

diff --git a/xf86drm.c b/xf86drm.c
index 88f86ed..82fb0e2 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -751,8 +751,8 @@
  */
 int drmOpenWithType(const char *name, const char *busid, int type)
 {
-    if (!drmAvailable() && name != NULL && drm_server_info &&
-        drm_server_info->load_module) {
+    if (name != NULL && drm_server_info &&
+        drm_server_info->load_module && !drmAvailable()) {
         /* try to load the kernel module */
         if (!drm_server_info->load_module(name)) {
             drmMsg("[drm] failed to load kernel module \"%s\"\n", name);