diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-07-13 20:16:19 +0200 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-07-13 20:27:40 +0200 |
| commit | ed0fd2f2823917a5dfefa3d3af774d4cdb40f958 (patch) | |
| tree | c3ce130c80098f13d4f5224be0765ee0a8129fec | |
| parent | 1388a1592cdab7cc8217546fb1e97da293e70393 (diff) | |
Revert "Revert "vmware/vmwgfx: Support multiple dri driver names""
This reverts commit ea94dc570846655bbb8a7c75bf465907e454bef9.
Temporarily revert this for internal testing.
| -rw-r--r-- | vmwgfx/vmwgfx_dri2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c index bb66aef..621012a 100644 --- a/vmwgfx/vmwgfx_dri2.c +++ b/vmwgfx/vmwgfx_dri2.c @@ -415,6 +415,9 @@ xorg_dri2_init(ScreenPtr pScreen) int major, minor; char fdPath[VMWGFX_FD_PATH_LEN]; ssize_t numChar; + static const char driverName[] = "vmwgfx"; + static const char *const driverNames[] = { + driverName, driverName}; memset(&dri2info, 0, sizeof(dri2info)); @@ -426,9 +429,11 @@ xorg_dri2_init(ScreenPtr pScreen) minor = 0; } - dri2info.version = min(DRI2INFOREC_VERSION, 3); + dri2info.version = min(DRI2INFOREC_VERSION, 4); dri2info.fd = ms->fd; - dri2info.driverName = "vmwgfx"; + dri2info.driverName = NULL; + dri2info.numDrivers = 2; + dri2info.driverNames = driverNames; /* * This way of obtaining the DRM device name is a bit |