Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a307cfa5 authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] au8522: fix intermittent lockup of analog video decoder 



It turns up the autodetection for the video standard in the au8522 is
prone to hanging the chip until a reset is performed.  This condition is
trivial to reproduce simply by tuning to a station and then rapidly
unplugging/ replugging the coax feed.

Because we've never claimed to support anything other than NTSC-M, just
disable the video-standard autodetection logic and force it to always be
NTSC-M.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cf533735

drivers/media/dvb/frontends/au8522_decoder.c

+4 −2
Original line number Diff line number Diff line
@@ -257,9 +257,11 @@ static void setup_decoder_defaults(struct au8522_state *state, u8 input_mode) 
	au8522_writereg(state, AU8522_TVDED_DBG_MODE_REG060H,

			AU8522_TVDED_DBG_MODE_REG060H_CVBS);

	au8522_writereg(state, AU8522_TVDEC_FORMAT_CTRL1_REG061H,

			AU8522_TVDEC_FORMAT_CTRL1_REG061H_CVBS13);

			AU8522_TVDEC_FORMAT_CTRL1_REG061H_FIELD_LEN_525 |

			AU8522_TVDEC_FORMAT_CTRL1_REG061H_LINE_LEN_63_492 |

			AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_MN);

	au8522_writereg(state, AU8522_TVDEC_FORMAT_CTRL2_REG062H,

			AU8522_TVDEC_FORMAT_CTRL2_REG062H_CVBS13);

			AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_NTSC);

	au8522_writereg(state, AU8522_TVDEC_VCR_DET_LLIM_REG063H,

			AU8522_TVDEC_VCR_DET_LLIM_REG063H_CVBS);

	au8522_writereg(state, AU8522_TVDEC_VCR_DET_HLIM_REG064H,

drivers/media/dvb/frontends/au8522_priv.h

+25 −3
Original line number Diff line number Diff line
@@ -325,6 +325,31 @@ int au8522_led_ctrl(struct au8522_state *state, int led); 


/**************************************************************/



/* Format control 1 */



/* VCR Mode 7-6 */

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_VCR_MODE_YES		0x80

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_VCR_MODE_NO		0x40

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_VCR_MODE_AUTO		0x00

/* Field len 5-4 */

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_FIELD_LEN_625		0x20

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_FIELD_LEN_525		0x10

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_FIELD_LEN_AUTO	0x00

/* Line len (us) 3-2 */

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_LINE_LEN_64_000	0x0b

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_LINE_LEN_63_492	0x08

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_LINE_LEN_63_556	0x04

/* Subcarrier freq 1-0 */

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_AUTO	0x03

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_443	0x02

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_MN	0x01

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_SUBCARRIER_NTSC_50	0x00



/* Format control 2 */

#define AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_AUTODETECT	0x00

#define AU8522_TVDEC_FORMAT_CTRL2_REG062H_STD_NTSC		0x01





#define AU8522_INPUT_CONTROL_REG081H_ATSC               	0xC4

#define AU8522_INPUT_CONTROL_REG081H_ATVRF			0xC4

#define AU8522_INPUT_CONTROL_REG081H_ATVRF13			0xC4
@@ -385,9 +410,6 @@ int au8522_led_ctrl(struct au8522_state *state, int led); 
#define AU8522_TVDEC_COMB_MODE_REG015H_CVBS			0x00

#define AU8522_REG016H_CVBS					0x00

#define AU8522_TVDED_DBG_MODE_REG060H_CVBS			0x00

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_CVBS			0x0B

#define AU8522_TVDEC_FORMAT_CTRL1_REG061H_CVBS13		0x03

#define AU8522_TVDEC_FORMAT_CTRL2_REG062H_CVBS13		0x00

#define AU8522_TVDEC_VCR_DET_LLIM_REG063H_CVBS			0x19

#define AU8522_REG0F9H_AUDIO					0x20

#define AU8522_TVDEC_VCR_DET_HLIM_REG064H_CVBS			0xA7