1
=== modified file 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
2
--- src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-04-28 03:49:54 +0000
3
+++ src/platforms/mesa/server/kms/kms_page_flipper.cpp	2017-05-03 08:07:02 +0000
4
@@ -26,6 +26,7 @@
5
26
#include <xf86drm.h>
26
#include <xf86drm.h>
6
27
#include <xf86drmMode.h>
27
#include <xf86drmMode.h>
7
28
#include <chrono>
28
#include <chrono>
8
29
#include <cstring>
9
29
30
10
30
namespace mg = mir::graphics;
31
namespace mg = mir::graphics;
11
31
namespace mgm = mir::graphics::mesa;
32
namespace mgm = mir::graphics::mesa;
12
@@ -89,12 +90,11 @@
13
89
90
14
90
mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
91
mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
15
91
{
92
{
22
92
    static drmEventContext evctx =
93
    drmEventContext evctx;
23
93
    {
94
    memset(&evctx, 0, sizeof evctx);
24
94
        DRM_EVENT_CONTEXT_VERSION,  /* .version */
95
    evctx.version = 2;  // We only support the old v2 page_flip_handler
25
95
        0,  /* .vblank_handler */
96
    evctx.page_flip_handler = &page_flip_handler;
26
96
        page_flip_handler  /* .page_flip_handler */
97
21
97
    };
27
98
    static std::thread::id const invalid_tid;
98
    static std::thread::id const invalid_tid;
28
99
99
29
100
    {
100
    {
Status:	Merged
Approved by:	Gerry Boland on 2017-05-03
Approved revision:	no longer in the source branch.
Merged at revision:	4164
Proposed branch:	lp:~vanvugt/mir/build-on-artful
Merge into:	lp:mir
Diff against target:	29 lines (+6/-6) 1 file modified src/platforms/mesa/server/kms/kms_page_flipper.cpp (+6/-6)
To merge this branch:	bzr merge lp:~vanvugt/mir/build-on-artful
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2017-05-03	Approve on 2017-05-03
Mir CI Bot	continuous-integration		Approve on 2017-05-03
Review via email: mp+323540@code.launchpad.net
1	=== modified file 'src/platforms/mesa/server/kms/kms_page_flipper.cpp'
2	--- src/platforms/mesa/server/kms/kms_page_flipper.cpp 2017-04-28 03:49:54 +0000
3	+++ src/platforms/mesa/server/kms/kms_page_flipper.cpp 2017-05-03 08:07:02 +0000
4	@@ -26,6 +26,7 @@
5	26	#include <xf86drm.h>	26	#include <xf86drm.h>
6	27	#include <xf86drmMode.h>	27	#include <xf86drmMode.h>
7	28	#include <chrono>	28	#include <chrono>
8			29	#include <cstring>
9	29		30
10	30	namespace mg = mir::graphics;	31	namespace mg = mir::graphics;
11	31	namespace mgm = mir::graphics::mesa;	32	namespace mgm = mir::graphics::mesa;
12	@@ -89,12 +90,11 @@
13	89		90
14	90	mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)	91	mg::Frame mgm::KMSPageFlipper::wait_for_flip(uint32_t crtc_id)
15	91	{	92	{
22	92	static drmEventContext evctx =	93	drmEventContext evctx;
23	93	{	94	memset(&evctx, 0, sizeof evctx);
24	94	DRM_EVENT_CONTEXT_VERSION, /* .version */	95	evctx.version = 2; // We only support the old v2 page_flip_handler
25	95	0, /* .vblank_handler */	96	evctx.page_flip_handler = &page_flip_handler;
26	96	page_flip_handler /* .page_flip_handler */	97
21	97	};
27	98	static std::thread::id const invalid_tid;	98	static std::thread::id const invalid_tid;
28	99		99
29	100	{	100	{