From ae66baa23455df9f7593b98c5c2f02818dbaf41b Mon Sep 17 00:00:00 2001 From: James Hughes Date: Wed, 11 Sep 2019 14:57:18 +0100 Subject: [PATCH] drm/vc4: Fix for margins in composite/SDTV mode (#3223) Margins were incorrectly assumed to be setup in SDTV mode, but were not actually done, so this make the setup non-conditional on mode. Signed-off-by: James Hughes --- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -1612,14 +1612,9 @@ vc4_fkms_connector_init(struct drm_devic connector->interlace_allowed = 0; } - /* Create and attach TV margin props to this connector. - * Already done for SDTV outputs. - */ - if (fkms_connector->display_type != DRM_MODE_ENCODER_TVDAC) { - ret = drm_mode_create_tv_margin_properties(dev); - if (ret) - goto fail; - } + ret = drm_mode_create_tv_margin_properties(dev); + if (ret) + goto fail; drm_connector_attach_tv_margin_properties(connector); /option> upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
blob: 74abba4ac92f7804fd88018ce4335164679061ff (plain)
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
From 37e9677654a48cfa748c1d22fbf782920ab2cb23 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Wed, 29 Apr 2020 22:05:09 +0100
Subject: [PATCH] media: bcm2835-unicam: Do not stop streaming in
 unicam_release

unicam_release calls _vb2_fop_release, which will call stop_streaming
if that particular node was streaming. Calling it unconditionally (as
the code was) means that if a second handle was opened eg to alter
a setting, on closing that connection it also stopped Unicam.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
 drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 ---
 1 file changed, 3 deletions(-)

--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
@@ -2204,9 +2204,6 @@ static int unicam_release(struct file *f
 	if (fh_singular)
 		v4l2_subdev_call(sd, core, s_power, 0);
 
-	if (node->streaming)
-		unicam_stop_streaming(&node->buffer_queue);
-
 	node->open--;
 	mutex_unlock(&node->lock);