Merge branch 'Plasma/5.9'

This commit is contained in:
Martin Gräßlin 2017-04-10 21:22:09 +02:00
commit fea1986ed9

View file

@ -61,6 +61,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DRM_CAP_CURSOR_HEIGHT 0x9 #define DRM_CAP_CURSOR_HEIGHT 0x9
#endif #endif
#define KWIN_DRM_EVENT_CONTEXT_VERSION 2
namespace KWin namespace KWin
{ {
@ -240,7 +242,7 @@ void DrmBackend::openDrm()
} }
drmEventContext e; drmEventContext e;
memset(&e, 0, sizeof e); memset(&e, 0, sizeof e);
e.version = DRM_EVENT_CONTEXT_VERSION; e.version = KWIN_DRM_EVENT_CONTEXT_VERSION;
e.page_flip_handler = pageFlipHandler; e.page_flip_handler = pageFlipHandler;
drmHandleEvent(m_fd, &e); drmHandleEvent(m_fd, &e);
} }