mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

drm/vkms: Rename vkms_output.state_lock to crc_lock

Browse source 
Plus add a comment about what it actually protects. It's very little.

Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Tested-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190606222751.32567-4-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2019-06-07 00:27:44 +02:00 committed by Rodrigo Siqueira
parent a0e4e5754c
commit fb4155fa4c
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/vkms/vkms_crc.c
View file

@ -168,14 +168,14 @@ void vkms_crc_work_handle(struct work_struct *work)
u64 frame_start, frame_end;
bool crc_pending;
spin_lock_irq(&out->state_lock);
spin_lock_irq(&out->crc_lock);
frame_start = crtc_state->frame_start;
frame_end = crtc_state->frame_end;
crc_pending = crtc_state->crc_pending;
crtc_state->frame_start = 0;
crtc_state->frame_end = 0;
crtc_state->crc_pending = false;
spin_unlock_irq(&out->state_lock);
spin_unlock_irq(&out->crc_lock);
/*
* We raced with the vblank hrtimer and previous work already computed

6
drivers/gpu/drm/vkms/vkms_crtc.c
View file

@ -29,7 +29,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
/* update frame_start only if a queued vkms_crc_work_handle()
* has read the data
*/
spin_lock(&output->state_lock);
spin_lock(&output->crc_lock);
if (!state->crc_pending)
state->frame_start = frame;
else
@ -37,7 +37,7 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
state->frame_start, frame);
state->frame_end = frame;
state->crc_pending = true;
spin_unlock(&output->state_lock);
spin_unlock(&output->crc_lock);
ret = queue_work(output->crc_workq, &state->crc_work);
if (!ret)
@ -225,7 +225,7 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
spin_lock_init(&vkms_out->lock);
spin_lock_init(&vkms_out->state_lock);
spin_lock_init(&vkms_out->crc_lock);
vkms_out->crc_workq = alloc_ordered_workqueue("vkms_crc_workq", 0);
if (!vkms_out->crc_workq)

5
drivers/gpu/drm/vkms/vkms_drv.h
View file

@ -49,6 +49,7 @@ struct vkms_crtc_state {
struct drm_crtc_state base;
struct work_struct crc_work;
/* below three are protected by vkms_output.crc_lock */
bool crc_pending;
u64 frame_start;
u64 frame_end;
@ -66,8 +67,8 @@ struct vkms_output {
struct workqueue_struct *crc_workq;
/* protects concurrent access to crc_data */
spinlock_t lock;
/* protects concurrent access to crtc_state */
spinlock_t state_lock;
spinlock_t crc_lock;
};
struct vkms_device {