diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-05 13:04:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-05 13:04:31 -0700 |
| commit | c1c8626fcebed467184ffd8de0ab5c9f9d9c3594 (patch) | |
| tree | 2c661fee934f4a7985e4f8e29cd1ba63a330a5e4 /drivers/media/platform/vsp1/vsp1_drm.c | |
| parent | d89d41556141a527030a15233135ba622ba3350d (diff) | |
| parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Lots of overlapping changes, mostly trivial in nature.
The mlxsw conflict was resolving using the example
resolution at:
https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/platform/vsp1/vsp1_drm.c')
| -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); |