merge in pi-release history after reset to master
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);