Skip to content

Commit 6c234fe

Browse files
haneensaatseanpaul
authored andcommitted
drm/vkms: Implement CRC debugfs API
This patch implement the necessary functions to compute and add CRCs entries: - Implement the set_crc_source() callback. - Compute CRC using crc32 on the visible part of the framebuffer. - Use ordered workqueue per output to compute and add CRC at the end of a vblank. - Use appropriate synchronization methods since the CRC computation must be atomic wrt the generated vblank event for a given atomic update, by using spinlock across atomic_begin/atomic_flush to wrap the event handling code completely and match the flip event with the CRC. Since vkms_crc_work_handle() can sleep, spinlock can't be acquired while accessing vkms_output->primary_crc to compute CRC. To make sure the data is updated and released without conflict with the vkms_crc_work_handle(), the work_struct is flushed @crtc_destroy and the data is updated before scheduling the work handle again, as follow: * CRC data update: 1- store vkms_crc_data {fb, src} per plane_state 2- @plane_duplicate_state -> allocate vkms_crc_data 3- during atomic commit (@atomic_update) -> a) copy {fb, src} to plane_state->crc_data b) get reference to fb, 3- @plane_destroy_state -> a) if (fb refcount) remove reference to fb b) deallocate crc_data * Atomic Commit: 1- vkms_plane_atomic_check 2- vkms_prepare_fb -> vmap vkms_gem_obj->vaddr 3- atomic_begin -> hold crc spinlock 4- atomic_plane_update -> a) update vkms_output->primary_crc b) get reference to fb 5- atomic_flush -> a) send vblank event while holding event_lock b) release crc spinlock * hrtimer regular callback: 1- hold crc spinlock 2- drm_crtc_handle_vblank() 3- queue vkms_crc_work_handle 4- release crc spinlock * cleanup: 1- @cleanup_fb ->vunmap vkms_gem_obj->vaddr 2- @crtc_destroy -> flush work struct 3- @plane_destroy -> a) if (fb refcount) remove reference to fb b) deallocate crc_data Signed-off-by: Haneen Mohammed <[email protected]> [seanpaul fixed typo in vkms_crtc s/vblamk/vblank/] Signed-off-by: Sean Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/b948327f48c3e70ab232b4a0848ee6d033b26484.1533171495.git.hamohammed.sa@gmail.com
1 parent 3e77c4d commit 6c234fe

File tree

6 files changed

+196
-9
lines changed

6 files changed

+196
-9
lines changed

drivers/gpu/drm/vkms/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
vkms-y := vkms_drv.o vkms_plane.o vkms_output.o vkms_crtc.o vkms_gem.o
1+
vkms-y := vkms_drv.o vkms_plane.o vkms_output.o vkms_crtc.o vkms_gem.o vkms_crc.o
22

33
obj-$(CONFIG_DRM_VKMS) += vkms.o

drivers/gpu/drm/vkms/vkms_crc.c

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
#include "vkms_drv.h"
3+
#include <linux/crc32.h>
4+
#include <drm/drm_gem_framebuffer_helper.h>
5+
6+
static uint32_t _vkms_get_crc(struct vkms_crc_data *crc_data)
7+
{
8+
struct drm_framebuffer *fb = &crc_data->fb;
9+
struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0);
10+
struct vkms_gem_object *vkms_obj = drm_gem_to_vkms_gem(gem_obj);
11+
u32 crc = 0;
12+
int i = 0;
13+
unsigned int x = crc_data->src.x1 >> 16;
14+
unsigned int y = crc_data->src.y1 >> 16;
15+
unsigned int height = drm_rect_height(&crc_data->src) >> 16;
16+
unsigned int width = drm_rect_width(&crc_data->src) >> 16;
17+
unsigned int cpp = fb->format->cpp[0];
18+
unsigned int src_offset;
19+
unsigned int size_byte = width * cpp;
20+
void *vaddr;
21+
22+
mutex_lock(&vkms_obj->pages_lock);
23+
vaddr = vkms_obj->vaddr;
24+
if (WARN_ON(!vaddr))
25+
return crc;
26+
27+
for (i = y; i < y + height; i++) {
28+
src_offset = fb->offsets[0] + (i * fb->pitches[0]) + (x * cpp);
29+
crc = crc32_le(crc, vaddr + src_offset, size_byte);
30+
}
31+
mutex_unlock(&vkms_obj->pages_lock);
32+
33+
return crc;
34+
}
35+
36+
void vkms_crc_work_handle(struct work_struct *work)
37+
{
38+
struct vkms_crtc_state *crtc_state = container_of(work,
39+
struct vkms_crtc_state,
40+
crc_work);
41+
struct drm_crtc *crtc = crtc_state->base.crtc;
42+
struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
43+
struct vkms_device *vdev = container_of(out, struct vkms_device,
44+
output);
45+
struct vkms_crc_data *primary_crc = NULL;
46+
struct drm_plane *plane;
47+
48+
u32 crc32 = 0;
49+
50+
drm_for_each_plane(plane, &vdev->drm) {
51+
struct vkms_plane_state *vplane_state;
52+
struct vkms_crc_data *crc_data;
53+
54+
vplane_state = to_vkms_plane_state(plane->state);
55+
crc_data = vplane_state->crc_data;
56+
57+
if (drm_framebuffer_read_refcount(&crc_data->fb) == 0)
58+
continue;
59+
60+
if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
61+
primary_crc = crc_data;
62+
break;
63+
}
64+
}
65+
66+
if (primary_crc)
67+
crc32 = _vkms_get_crc(primary_crc);
68+
69+
drm_crtc_add_crc_entry(crtc, true, crtc_state->n_frame, &crc32);
70+
}
71+
72+
int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name,
73+
size_t *values_cnt)
74+
{
75+
struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
76+
bool enabled = false;
77+
unsigned long flags;
78+
int ret = 0;
79+
80+
if (src_name && strcmp(src_name, "auto") == 0)
81+
enabled = true;
82+
else if (src_name)
83+
ret = -EINVAL;
84+
85+
*values_cnt = 1;
86+
87+
/* make sure nothing is scheduled on crtc workq */
88+
flush_workqueue(out->crc_workq);
89+
90+
spin_lock_irqsave(&out->lock, flags);
91+
out->crc_enabled = enabled;
92+
spin_unlock_irqrestore(&out->lock, flags);
93+
94+
return ret;
95+
}

drivers/gpu/drm/vkms/vkms_crtc.c

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,33 @@
1010
#include <drm/drm_atomic_helper.h>
1111
#include <drm/drm_crtc_helper.h>
1212

13-
static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
13+
static void _vblank_handle(struct vkms_output *output)
1414
{
15-
struct vkms_output *output = container_of(timer, struct vkms_output,
16-
vblank_hrtimer);
1715
struct drm_crtc *crtc = &output->crtc;
18-
int ret_overrun;
16+
struct vkms_crtc_state *state = to_vkms_crtc_state(crtc->state);
1917
bool ret;
2018

19+
spin_lock(&output->lock);
2120
ret = drm_crtc_handle_vblank(crtc);
2221
if (!ret)
2322
DRM_ERROR("vkms failure on handling vblank");
2423

24+
if (state && output->crc_enabled) {
25+
state->n_frame = drm_crtc_accurate_vblank_count(crtc);
26+
queue_work(output->crc_workq, &state->crc_work);
27+
}
28+
29+
spin_unlock(&output->lock);
30+
}
31+
32+
static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
33+
{
34+
struct vkms_output *output = container_of(timer, struct vkms_output,
35+
vblank_hrtimer);
36+
int ret_overrun;
37+
38+
_vblank_handle(output);
39+
2540
ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer,
2641
output->period_ns);
2742

@@ -97,18 +112,22 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc)
97112

98113
__drm_atomic_helper_crtc_duplicate_state(crtc, &vkms_state->base);
99114

115+
INIT_WORK(&vkms_state->crc_work, vkms_crc_work_handle);
116+
100117
return &vkms_state->base;
101118
}
102119

103120
static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc,
104121
struct drm_crtc_state *state)
105122
{
106-
struct vkms_crtc_state *vkms_state;
107-
108-
vkms_state = to_vkms_crtc_state(state);
123+
struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(state);
109124

110125
__drm_atomic_helper_crtc_destroy_state(state);
111-
kfree(vkms_state);
126+
127+
if (vkms_state) {
128+
flush_work(&vkms_state->crc_work);
129+
kfree(vkms_state);
130+
}
112131
}
113132

114133
static const struct drm_crtc_funcs vkms_crtc_funcs = {
@@ -120,6 +139,7 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {
120139
.atomic_destroy_state = vkms_atomic_crtc_destroy_state,
121140
.enable_vblank = vkms_enable_vblank,
122141
.disable_vblank = vkms_disable_vblank,
142+
.set_crc_source = vkms_set_crc_source,
123143
};
124144

125145
static void vkms_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -134,9 +154,21 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
134154
drm_crtc_vblank_off(crtc);
135155
}
136156

157+
static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
158+
struct drm_crtc_state *old_crtc_state)
159+
{
160+
struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
161+
162+
/* This lock is held across the atomic commit to block vblank timer
163+
* from scheduling vkms_crc_work_handle until the crc_data is updated
164+
*/
165+
spin_lock_irq(&vkms_output->lock);
166+
}
167+
137168
static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
138169
struct drm_crtc_state *old_crtc_state)
139170
{
171+
struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
140172
unsigned long flags;
141173

142174
if (crtc->state->event) {
@@ -151,9 +183,12 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
151183

152184
crtc->state->event = NULL;
153185
}
186+
187+
spin_unlock_irq(&vkms_output->lock);
154188
}
155189

156190
static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
191+
.atomic_begin = vkms_crtc_atomic_begin,
157192
.atomic_flush = vkms_crtc_atomic_flush,
158193
.atomic_enable = vkms_crtc_atomic_enable,
159194
.atomic_disable = vkms_crtc_atomic_disable,
@@ -162,6 +197,7 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
162197
int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
163198
struct drm_plane *primary, struct drm_plane *cursor)
164199
{
200+
struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc);
165201
int ret;
166202

167203
ret = drm_crtc_init_with_planes(dev, crtc, primary, cursor,
@@ -173,5 +209,9 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
173209

174210
drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
175211

212+
spin_lock_init(&vkms_out->lock);
213+
214+
vkms_out->crc_workq = alloc_ordered_workqueue("vkms_crc_workq", 0);
215+
176216
return ret;
177217
}

drivers/gpu/drm/vkms/vkms_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static void vkms_release(struct drm_device *dev)
4646
platform_device_unregister(vkms->platform);
4747
drm_mode_config_cleanup(&vkms->drm);
4848
drm_dev_fini(&vkms->drm);
49+
destroy_workqueue(vkms->output.crc_workq);
4950
}
5051

5152
static struct drm_driver vkms_driver = {

drivers/gpu/drm/vkms/vkms_drv.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,31 @@ static const u32 vkms_formats[] = {
2020
DRM_FORMAT_XRGB8888,
2121
};
2222

23+
struct vkms_crc_data {
24+
struct drm_rect src;
25+
struct drm_framebuffer fb;
26+
};
27+
2328
/**
2429
* vkms_plane_state - Driver specific plane state
2530
* @base: base plane state
31+
* @crc_data: data required for CRC computation
2632
*/
2733
struct vkms_plane_state {
2834
struct drm_plane_state base;
35+
struct vkms_crc_data *crc_data;
2936
};
3037

3138
/**
3239
* vkms_crtc_state - Driver specific CRTC state
3340
* @base: base CRTC state
41+
* @crc_work: work struct to compute and add CRC entries
42+
* @n_frame: frame number for computed CRC
3443
*/
3544
struct vkms_crtc_state {
3645
struct drm_crtc_state base;
46+
struct work_struct crc_work;
47+
unsigned int n_frame;
3748
};
3849

3950
struct vkms_output {
@@ -43,6 +54,11 @@ struct vkms_output {
4354
struct hrtimer vblank_hrtimer;
4455
ktime_t period_ns;
4556
struct drm_pending_vblank_event *event;
57+
bool crc_enabled;
58+
/* ordered wq for crc_work */
59+
struct workqueue_struct *crc_workq;
60+
/* protects concurrent access to crc_data */
61+
spinlock_t lock;
4662
};
4763

4864
struct vkms_device {
@@ -106,4 +122,9 @@ int vkms_gem_vmap(struct drm_gem_object *obj);
106122

107123
void vkms_gem_vunmap(struct drm_gem_object *obj);
108124

125+
/* CRC Support */
126+
int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name,
127+
size_t *values_cnt);
128+
void vkms_crc_work_handle(struct work_struct *work);
129+
109130
#endif /* _VKMS_DRV_H_ */

drivers/gpu/drm/vkms/vkms_plane.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@ static struct drm_plane_state *
1616
vkms_plane_duplicate_state(struct drm_plane *plane)
1717
{
1818
struct vkms_plane_state *vkms_state;
19+
struct vkms_crc_data *crc_data;
1920

2021
vkms_state = kzalloc(sizeof(*vkms_state), GFP_KERNEL);
2122
if (!vkms_state)
2223
return NULL;
2324

25+
crc_data = kzalloc(sizeof(*crc_data), GFP_KERNEL);
26+
if (WARN_ON(!crc_data))
27+
DRM_INFO("Couldn't allocate crc_data");
28+
29+
vkms_state->crc_data = crc_data;
30+
2431
__drm_atomic_helper_plane_duplicate_state(plane,
2532
&vkms_state->base);
2633

@@ -31,6 +38,18 @@ static void vkms_plane_destroy_state(struct drm_plane *plane,
3138
struct drm_plane_state *old_state)
3239
{
3340
struct vkms_plane_state *vkms_state = to_vkms_plane_state(old_state);
41+
struct drm_crtc *crtc = vkms_state->base.crtc;
42+
43+
if (crtc) {
44+
/* dropping the reference we acquired in
45+
* vkms_primary_plane_update()
46+
*/
47+
if (drm_framebuffer_read_refcount(&vkms_state->crc_data->fb))
48+
drm_framebuffer_put(&vkms_state->crc_data->fb);
49+
}
50+
51+
kfree(vkms_state->crc_data);
52+
vkms_state->crc_data = NULL;
3453

3554
__drm_atomic_helper_plane_destroy_state(old_state);
3655
kfree(vkms_state);
@@ -65,6 +84,17 @@ static const struct drm_plane_funcs vkms_plane_funcs = {
6584
static void vkms_primary_plane_update(struct drm_plane *plane,
6685
struct drm_plane_state *old_state)
6786
{
87+
struct vkms_plane_state *vkms_plane_state;
88+
struct vkms_crc_data *crc_data;
89+
90+
if (!plane->state->crtc || !plane->state->fb)
91+
return;
92+
93+
vkms_plane_state = to_vkms_plane_state(plane->state);
94+
crc_data = vkms_plane_state->crc_data;
95+
memcpy(&crc_data->src, &plane->state->src, sizeof(struct drm_rect));
96+
memcpy(&crc_data->fb, plane->state->fb, sizeof(struct drm_framebuffer));
97+
drm_framebuffer_get(&crc_data->fb);
6898
}
6999

70100
static int vkms_plane_atomic_check(struct drm_plane *plane,

0 commit comments

Comments
 (0)