diff options
| author | android-build-team Robot | 2018-01-28 02:27:49 -0600 |
|---|---|---|
| committer | android-build-team Robot | 2018-01-28 02:27:49 -0600 |
| commit | f6abcc3334ccbf4c2a9441301f771432a36324ec (patch) | |
| tree | 623e93615f5d2adf0626fb4cd6701137e54d5b6e | |
| parent | 892de02a1639f1858aa5982baf248dbb56ec4f1e (diff) | |
| parent | 8965152a5b26a0063c9070d42f95769ddc5b97c3 (diff) | |
| download | external-libdrm-f6abcc3334ccbf4c2a9441301f771432a36324ec.tar.gz external-libdrm-f6abcc3334ccbf4c2a9441301f771432a36324ec.tar.xz external-libdrm-f6abcc3334ccbf4c2a9441301f771432a36324ec.zip | |
Snap for 4571561 from 8965152a5b26a0063c9070d42f95769ddc5b97c3 to pi-release
Change-Id: Ia7986efd912d54011fa674740659b1d99df20ca9
| -rw-r--r-- | xf86drm.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -751,8 +751,8 @@ int drmOpen(const char *name, const char *busid) | |||
| 751 | */ | 751 | */ |
| 752 | int drmOpenWithType(const char *name, const char *busid, int type) | 752 | int drmOpenWithType(const char *name, const char *busid, int type) |
| 753 | { | 753 | { |
| 754 | if (!drmAvailable() && name != NULL && drm_server_info && | 754 | if (name != NULL && drm_server_info && |
| 755 | drm_server_info->load_module) { | 755 | drm_server_info->load_module && !drmAvailable()) { |
| 756 | /* try to load the kernel module */ | 756 | /* try to load the kernel module */ |
| 757 | if (!drm_server_info->load_module(name)) { | 757 | if (!drm_server_info->load_module(name)) { |
| 758 | drmMsg("[drm] failed to load kernel module \"%s\"\n", name); | 758 | drmMsg("[drm] failed to load kernel module \"%s\"\n", name); |