diff options
| author | Prabhanjan Kandula | 2018-01-25 17:46:52 -0600 |
|---|---|---|
| committer | android-build-merger | 2018-01-25 17:46:52 -0600 |
| commit | 07ee0cb4eb852673dffad4e7878c52ea0670511e (patch) | |
| tree | 623e93615f5d2adf0626fb4cd6701137e54d5b6e | |
| parent | 1bd90c59bb0b2603668569646c049f853c166f51 (diff) | |
| parent | 2e11de7a20b384c3f2c808831826f05914801e34 (diff) | |
| download | external-libdrm-07ee0cb4eb852673dffad4e7878c52ea0670511e.tar.gz external-libdrm-07ee0cb4eb852673dffad4e7878c52ea0670511e.tar.xz external-libdrm-07ee0cb4eb852673dffad4e7878c52ea0670511e.zip | |
libdrm: Avoid additional drm open close am: 2f9aea0661
am: 2e11de7a20
Change-Id: Id2442c505db7f451d8660ba791d9120a502ce2ca
| -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); |