1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
From b719011b7c015e2d6f0108c9d0709b98d21d6a89 Mon Sep 17 00:00:00 2001
From: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
Date: Mon, 21 Mar 2022 12:37:18 +0100
Subject: [PATCH] g2d-renderer: Add vsync to cloned displays.
When using g2d clone mode allocates additional surfaces according to
FB_MULTI_BUFFER for each cloned display. The g2d blit from the main screen
to the cloned displays is done using inactive surface. The FBIOPAN_DISPLAY
ioctl to the surface is done afterwards.
Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
---
libweston/renderer-g2d/g2d-renderer.c | 33 +++++++++++++++++++++------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c
index 34a077b7..3e6395d6 100644
--- a/libweston/renderer-g2d/g2d-renderer.c
+++ b/libweston/renderer-g2d/g2d-renderer.c
@@ -525,6 +525,7 @@ g2d_blit_surface(void *handle, struct g2d_surfaceEx * srcG2dSurface, struct g2d_
static void
g2d_flip_surface(struct weston_output *output)
{
+ int i;
struct g2d_output_state *go = get_output_state(output);
go->fb_info.varinfo.yoffset = go->activebuffer * go->fb_info.y_resolution;
@@ -532,6 +533,16 @@ g2d_flip_surface(struct weston_output *output)
{
weston_log("FBIOPAN_DISPLAY Failed\n");
}
+
+ for (i = 0; i < go->clone_display_num; i++)
+ {
+ go->mirror_fb_info[i].varinfo.yoffset = go->activebuffer * go->mirror_fb_info[i].y_resolution;
+ if(ioctl(go->mirror_fb_info[i].fb_fd, FBIOPAN_DISPLAY, &(go->mirror_fb_info[i].varinfo)) < 0)
+ {
+ weston_log("FBIOPAN_DISPLAY clone %d Failed\n", i);
+ }
+ }
+
go->activebuffer = (go->activebuffer + 1) % go->nNumBuffers;
}
@@ -571,17 +582,18 @@ copy_to_framebuffer(struct weston_output *output, pixman_region32_t* output_dama
int i = 0;
for(i = 0; i < go->clone_display_num; i++)
{
+ int idx = i * go->nNumBuffers + go->activebuffer;
g2dRECT srcRect = {0, 0, go->renderSurf[go->activebuffer].base.width, go->renderSurf[go->activebuffer].base.height};
- g2dRECT dstrect = {0, 0, go->mirrorSurf[i].base.width, go->mirrorSurf[i].base.height};
+ g2dRECT dstrect = {0, 0, go->mirrorSurf[idx].base.width, go->mirrorSurf[idx].base.height};
if(go->directBlit || go->nNumBuffers > 1)
{
g2d_blit_surface(gr->handle, &go->renderSurf[go->activebuffer],
- &go->mirrorSurf[i], &srcRect, &dstrect);
+ &go->mirrorSurf[idx], &srcRect, &dstrect);
}
else
{
g2d_blit_surface(gr->handle, &go->offscreenSurface,
- &go->mirrorSurf[i], &srcRect, &dstrect);
+ &go->mirrorSurf[idx], &srcRect, &dstrect);
}
}
}
@@ -2113,6 +2125,7 @@ g2d_fbdev_renderer_output_create(struct weston_output *output,
int clone_display_num = 0;
int count = 0;
int k=0, dispCount = 0;
+ int offset = 0;
char displays[5][32];
weston_log("g2d_renderer_output_create device=%s\n", device);
count = strlen(device);
@@ -2166,7 +2179,7 @@ g2d_fbdev_renderer_output_create(struct weston_output *output,
if(go->clone_display_num)
{
- go->mirrorSurf = zalloc(sizeof(struct g2d_surfaceEx) * clone_display_num);
+ go->mirrorSurf = zalloc(sizeof(struct g2d_surfaceEx) * clone_display_num * go->nNumBuffers);
go->mirror_fb_info = zalloc(sizeof(struct fb_screeninfo) * clone_display_num);
if(go->mirrorSurf == NULL || go->mirror_fb_info == NULL)
return -1;
@@ -2178,9 +2191,15 @@ g2d_fbdev_renderer_output_create(struct weston_output *output,
weston_log("Open frame buffer failed.\n");
return -1;
}
- get_G2dSurface_from_screeninfo(&go->mirror_fb_info[i], &go->mirrorSurf[i]);
- go->mirrorSurf[i].base.planes[0] = go->mirror_fb_info[i].physical;
- g2d_clear(gr->handle, &go->mirrorSurf[i].base);
+
+ offset = go->mirror_fb_info[i].stride_bytes * go->mirror_fb_info[i].y_resolution;
+ for(k = 0; k < go->nNumBuffers; k++)
+ {
+ int idx = i * go->nNumBuffers + k;
+ get_G2dSurface_from_screeninfo(&go->mirror_fb_info[i], &go->mirrorSurf[idx]);
+ go->mirrorSurf[idx].base.planes[0] = go->mirror_fb_info[i].physical + (offset * k);
+ g2d_clear(gr->handle, &go->mirrorSurf[idx].base);
+ }
}
}
g2d_finish(gr->handle);
|
