diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-02 16:55:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-02 16:55:42 -0700 |
| commit | 0585df468e8f4481b78256a2bf09449290bfcbf3 (patch) | |
| tree | 11ef60d0771ceb6c50c170e1d6e9be3014de8f35 /drivers/media/platform/vsp1 | |
| parent | ed0093d9760cc492ae7bff1b8b5bdc7a5875fc53 (diff) | |
| parent | 8eb0e6421958e9777db98448a4030d8ae940c9a0 (diff) | |
| download | linux-0585df468e8f4481b78256a2bf09449290bfcbf3.tar.bz2 | |
Merge tag 'media/v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- a deadlock regression at vsp1 driver
- some Remote Controller fixes related to the new BPF filter logic
added on it for Kernel 4.18.
* tag 'media/v4.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines
media: rc: read out of bounds if bpf reports high protocol number
media: bpf: ensure bpf program is freed on detach
media: rc: be less noisy when driver misbehaves
Diffstat (limited to 'drivers/media/platform/vsp1')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c index edb35a5c57ea..a99fc0ced7a7 100644 --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@ -728,9 +728,6 @@ EXPORT_SYMBOL_GPL(vsp1_du_setup_lif); */ void vsp1_du_atomic_begin(struct device *dev, unsigned int pipe_index) { - struct vsp1_device *vsp1 = dev_get_drvdata(dev); - - mutex_lock(&vsp1->drm->lock); } EXPORT_SYMBOL_GPL(vsp1_du_atomic_begin); @@ -846,6 +843,7 @@ void vsp1_du_atomic_flush(struct device *dev, unsigned int pipe_index, drm_pipe->crc = cfg->crc; + mutex_lock(&vsp1->drm->lock); vsp1_du_pipeline_setup_inputs(vsp1, pipe); vsp1_du_pipeline_configure(pipe); mutex_unlock(&vsp1->drm->lock); |