Skip to content

Commit c4c11dd

Browse files
Russell Kingairlied
Russell King
authored andcommitted
drm/i2c: tda998x: add video and audio input configuration
This patch adds tda998x specific parameters to allow it to be configured for different boards using it. Also, this implements rudimentary audio support for S/PDIF attached controllers. Signed-off-by: Russell King <[email protected]> Signed-off-by: Sebastian Hesselbarth <[email protected]> Tested-by: Darren Etheridge <[email protected]> Tested-by: Russell King <[email protected]> Tested-by: Russell King <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
1 parent 5e74c22 commit c4c11dd

File tree

2 files changed

+290
-8
lines changed

2 files changed

+290
-8
lines changed

drivers/gpu/drm/i2c/tda998x_drv.c

Lines changed: 260 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <drm/drm_crtc_helper.h>
2424
#include <drm/drm_encoder_slave.h>
2525
#include <drm/drm_edid.h>
26-
26+
#include <drm/i2c/tda998x.h>
2727

2828
#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
2929

@@ -32,9 +32,11 @@ struct tda998x_priv {
3232
uint16_t rev;
3333
uint8_t current_page;
3434
int dpms;
35+
bool is_hdmi_sink;
3536
u8 vip_cntrl_0;
3637
u8 vip_cntrl_1;
3738
u8 vip_cntrl_2;
39+
struct tda998x_encoder_params params;
3840
};
3941

4042
#define to_tda998x_priv(x) ((struct tda998x_priv *)to_encoder_slave(x)->slave_priv)
@@ -71,10 +73,13 @@ struct tda998x_priv {
7173
# define I2C_MASTER_DIS_MM (1 << 0)
7274
# define I2C_MASTER_DIS_FILT (1 << 1)
7375
# define I2C_MASTER_APP_STRT_LAT (1 << 2)
76+
#define REG_FEAT_POWERDOWN REG(0x00, 0x0e) /* read/write */
77+
# define FEAT_POWERDOWN_SPDIF (1 << 3)
7478
#define REG_INT_FLAGS_0 REG(0x00, 0x0f) /* read/write */
7579
#define REG_INT_FLAGS_1 REG(0x00, 0x10) /* read/write */
7680
#define REG_INT_FLAGS_2 REG(0x00, 0x11) /* read/write */
7781
# define INT_FLAGS_2_EDID_BLK_RD (1 << 1)
82+
#define REG_ENA_ACLK REG(0x00, 0x16) /* read/write */
7883
#define REG_ENA_VP_0 REG(0x00, 0x18) /* read/write */
7984
#define REG_ENA_VP_1 REG(0x00, 0x19) /* read/write */
8085
#define REG_ENA_VP_2 REG(0x00, 0x1a) /* read/write */
@@ -113,6 +118,7 @@ struct tda998x_priv {
113118
#define REG_VIP_CNTRL_5 REG(0x00, 0x25) /* write */
114119
# define VIP_CNTRL_5_CKCASE (1 << 0)
115120
# define VIP_CNTRL_5_SP_CNT(x) (((x) & 3) << 1)
121+
#define REG_MUX_AP REG(0x00, 0x26) /* read/write */
116122
#define REG_MUX_VP_VIP_OUT REG(0x00, 0x27) /* read/write */
117123
#define REG_MAT_CONTRL REG(0x00, 0x80) /* write */
118124
# define MAT_CONTRL_MAT_SC(x) (((x) & 3) << 0)
@@ -175,6 +181,12 @@ struct tda998x_priv {
175181
# define HVF_CNTRL_1_PAD(x) (((x) & 3) << 4)
176182
# define HVF_CNTRL_1_SEMI_PLANAR (1 << 6)
177183
#define REG_RPT_CNTRL REG(0x00, 0xf0) /* write */
184+
#define REG_I2S_FORMAT REG(0x00, 0xfc) /* read/write */
185+
# define I2S_FORMAT(x) (((x) & 3) << 0)
186+
#define REG_AIP_CLKSEL REG(0x00, 0xfd) /* write */
187+
# define AIP_CLKSEL_FS(x) (((x) & 3) << 0)
188+
# define AIP_CLKSEL_CLK_POL(x) (((x) & 1) << 2)
189+
# define AIP_CLKSEL_AIP(x) (((x) & 7) << 3)
178190

179191

180192
/* Page 02h: PLL settings */
@@ -198,6 +210,12 @@ struct tda998x_priv {
198210
#define REG_PLL_SCGR1 REG(0x02, 0x09) /* read/write */
199211
#define REG_PLL_SCGR2 REG(0x02, 0x0a) /* read/write */
200212
#define REG_AUDIO_DIV REG(0x02, 0x0e) /* read/write */
213+
# define AUDIO_DIV_SERCLK_1 0
214+
# define AUDIO_DIV_SERCLK_2 1
215+
# define AUDIO_DIV_SERCLK_4 2
216+
# define AUDIO_DIV_SERCLK_8 3
217+
# define AUDIO_DIV_SERCLK_16 4
218+
# define AUDIO_DIV_SERCLK_32 5
201219
#define REG_SEL_CLK REG(0x02, 0x11) /* read/write */
202220
# define SEL_CLK_SEL_CLK1 (1 << 0)
203221
# define SEL_CLK_SEL_VRF_CLK(x) (((x) & 3) << 1)
@@ -216,6 +234,11 @@ struct tda998x_priv {
216234

217235

218236
/* Page 10h: information frames and packets */
237+
#define REG_IF1_HB0 REG(0x10, 0x20) /* read/write */
238+
#define REG_IF2_HB0 REG(0x10, 0x40) /* read/write */
239+
#define REG_IF3_HB0 REG(0x10, 0x60) /* read/write */
240+
#define REG_IF4_HB0 REG(0x10, 0x80) /* read/write */
241+
#define REG_IF5_HB0 REG(0x10, 0xa0) /* read/write */
219242

220243

221244
/* Page 11h: audio settings and content info packets */
@@ -225,10 +248,33 @@ struct tda998x_priv {
225248
# define AIP_CNTRL_0_LAYOUT (1 << 2)
226249
# define AIP_CNTRL_0_ACR_MAN (1 << 5)
227250
# define AIP_CNTRL_0_RST_CTS (1 << 6)
251+
#define REG_CA_I2S REG(0x11, 0x01) /* read/write */
252+
# define CA_I2S_CA_I2S(x) (((x) & 31) << 0)
253+
# define CA_I2S_HBR_CHSTAT (1 << 6)
254+
#define REG_LATENCY_RD REG(0x11, 0x04) /* read/write */
255+
#define REG_ACR_CTS_0 REG(0x11, 0x05) /* read/write */
256+
#define REG_ACR_CTS_1 REG(0x11, 0x06) /* read/write */
257+
#define REG_ACR_CTS_2 REG(0x11, 0x07) /* read/write */
258+
#define REG_ACR_N_0 REG(0x11, 0x08) /* read/write */
259+
#define REG_ACR_N_1 REG(0x11, 0x09) /* read/write */
260+
#define REG_ACR_N_2 REG(0x11, 0x0a) /* read/write */
261+
#define REG_CTS_N REG(0x11, 0x0c) /* read/write */
262+
# define CTS_N_K(x) (((x) & 7) << 0)
263+
# define CTS_N_M(x) (((x) & 3) << 4)
228264
#define REG_ENC_CNTRL REG(0x11, 0x0d) /* read/write */
229265
# define ENC_CNTRL_RST_ENC (1 << 0)
230266
# define ENC_CNTRL_RST_SEL (1 << 1)
231267
# define ENC_CNTRL_CTL_CODE(x) (((x) & 3) << 2)
268+
#define REG_DIP_FLAGS REG(0x11, 0x0e) /* read/write */
269+
# define DIP_FLAGS_ACR (1 << 0)
270+
# define DIP_FLAGS_GC (1 << 1)
271+
#define REG_DIP_IF_FLAGS REG(0x11, 0x0f) /* read/write */
272+
# define DIP_IF_FLAGS_IF1 (1 << 1)
273+
# define DIP_IF_FLAGS_IF2 (1 << 2)
274+
# define DIP_IF_FLAGS_IF3 (1 << 3)
275+
# define DIP_IF_FLAGS_IF4 (1 << 4)
276+
# define DIP_IF_FLAGS_IF5 (1 << 5)
277+
#define REG_CH_STAT_B(x) REG(0x11, 0x14 + (x)) /* read/write */
232278

233279

234280
/* Page 12h: HDCP and OTP */
@@ -344,6 +390,23 @@ reg_read_range(struct drm_encoder *encoder, uint16_t reg, char *buf, int cnt)
344390
return ret;
345391
}
346392

393+
static void
394+
reg_write_range(struct drm_encoder *encoder, uint16_t reg, uint8_t *p, int cnt)
395+
{
396+
struct i2c_client *client = drm_i2c_encoder_get_client(encoder);
397+
uint8_t buf[cnt+1];
398+
int ret;
399+
400+
buf[0] = REG2ADDR(reg);
401+
memcpy(&buf[1], p, cnt);
402+
403+
set_page(encoder, reg);
404+
405+
ret = i2c_master_send(client, buf, cnt + 1);
406+
if (ret < 0)
407+
dev_err(&client->dev, "Error %d writing to 0x%x\n", ret, reg);
408+
}
409+
347410
static uint8_t
348411
reg_read(struct drm_encoder *encoder, uint16_t reg)
349412
{
@@ -412,7 +475,7 @@ tda998x_reset(struct drm_encoder *encoder)
412475
reg_write(encoder, REG_SERIALIZER, 0x00);
413476
reg_write(encoder, REG_BUFFER_OUT, 0x00);
414477
reg_write(encoder, REG_PLL_SCG1, 0x00);
415-
reg_write(encoder, REG_AUDIO_DIV, 0x03);
478+
reg_write(encoder, REG_AUDIO_DIV, AUDIO_DIV_SERCLK_8);
416479
reg_write(encoder, REG_SEL_CLK, SEL_CLK_SEL_CLK1 | SEL_CLK_ENA_SC_CLK);
417480
reg_write(encoder, REG_PLL_SCGN1, 0xfa);
418481
reg_write(encoder, REG_PLL_SCGN2, 0x00);
@@ -424,11 +487,184 @@ tda998x_reset(struct drm_encoder *encoder)
424487
reg_write(encoder, REG_MUX_VP_VIP_OUT, 0x24);
425488
}
426489

490+
static uint8_t tda998x_cksum(uint8_t *buf, size_t bytes)
491+
{
492+
uint8_t sum = 0;
493+
494+
while (bytes--)
495+
sum += *buf++;
496+
return (255 - sum) + 1;
497+
}
498+
499+
#define HB(x) (x)
500+
#define PB(x) (HB(2) + 1 + (x))
501+
502+
static void
503+
tda998x_write_if(struct drm_encoder *encoder, uint8_t bit, uint16_t addr,
504+
uint8_t *buf, size_t size)
505+
{
506+
buf[PB(0)] = tda998x_cksum(buf, size);
507+
508+
reg_clear(encoder, REG_DIP_IF_FLAGS, bit);
509+
reg_write_range(encoder, addr, buf, size);
510+
reg_set(encoder, REG_DIP_IF_FLAGS, bit);
511+
}
512+
513+
static void
514+
tda998x_write_aif(struct drm_encoder *encoder, struct tda998x_encoder_params *p)
515+
{
516+
uint8_t buf[PB(5) + 1];
517+
518+
buf[HB(0)] = 0x84;
519+
buf[HB(1)] = 0x01;
520+
buf[HB(2)] = 10;
521+
buf[PB(0)] = 0;
522+
buf[PB(1)] = p->audio_frame[1] & 0x07; /* CC */
523+
buf[PB(2)] = p->audio_frame[2] & 0x1c; /* SF */
524+
buf[PB(4)] = p->audio_frame[4];
525+
buf[PB(5)] = p->audio_frame[5] & 0xf8; /* DM_INH + LSV */
526+
527+
tda998x_write_if(encoder, DIP_IF_FLAGS_IF4, REG_IF4_HB0, buf,
528+
sizeof(buf));
529+
}
530+
531+
static void
532+
tda998x_write_avi(struct drm_encoder *encoder, struct drm_display_mode *mode)
533+
{
534+
uint8_t buf[PB(13) + 1];
535+
536+
memset(buf, 0, sizeof(buf));
537+
buf[HB(0)] = 0x82;
538+
buf[HB(1)] = 0x02;
539+
buf[HB(2)] = 13;
540+
buf[PB(4)] = drm_match_cea_mode(mode);
541+
542+
tda998x_write_if(encoder, DIP_IF_FLAGS_IF2, REG_IF2_HB0, buf,
543+
sizeof(buf));
544+
}
545+
546+
static void tda998x_audio_mute(struct drm_encoder *encoder, bool on)
547+
{
548+
if (on) {
549+
reg_set(encoder, REG_SOFTRESET, SOFTRESET_AUDIO);
550+
reg_clear(encoder, REG_SOFTRESET, SOFTRESET_AUDIO);
551+
reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO);
552+
} else {
553+
reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO);
554+
}
555+
}
556+
557+
static void
558+
tda998x_configure_audio(struct drm_encoder *encoder,
559+
struct drm_display_mode *mode, struct tda998x_encoder_params *p)
560+
{
561+
uint8_t buf[6], clksel_aip, clksel_fs, ca_i2s, cts_n, adiv;
562+
uint32_t n;
563+
564+
/* Enable audio ports */
565+
reg_write(encoder, REG_ENA_AP, p->audio_cfg);
566+
reg_write(encoder, REG_ENA_ACLK, p->audio_clk_cfg);
567+
568+
/* Set audio input source */
569+
switch (p->audio_format) {
570+
case AFMT_SPDIF:
571+
reg_write(encoder, REG_MUX_AP, 0x40);
572+
clksel_aip = AIP_CLKSEL_AIP(0);
573+
/* FS64SPDIF */
574+
clksel_fs = AIP_CLKSEL_FS(2);
575+
cts_n = CTS_N_M(3) | CTS_N_K(3);
576+
ca_i2s = 0;
577+
break;
578+
579+
case AFMT_I2S:
580+
reg_write(encoder, REG_MUX_AP, 0x64);
581+
clksel_aip = AIP_CLKSEL_AIP(1);
582+
/* ACLK */
583+
clksel_fs = AIP_CLKSEL_FS(0);
584+
cts_n = CTS_N_M(3) | CTS_N_K(3);
585+
ca_i2s = CA_I2S_CA_I2S(0);
586+
break;
587+
}
588+
589+
reg_write(encoder, REG_AIP_CLKSEL, clksel_aip);
590+
reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_LAYOUT);
591+
592+
/* Enable automatic CTS generation */
593+
reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_ACR_MAN);
594+
reg_write(encoder, REG_CTS_N, cts_n);
595+
596+
/*
597+
* Audio input somehow depends on HDMI line rate which is
598+
* related to pixclk. Testing showed that modes with pixclk
599+
* >100MHz need a larger divider while <40MHz need the default.
600+
* There is no detailed info in the datasheet, so we just
601+
* assume 100MHz requires larger divider.
602+
*/
603+
if (mode->clock > 100000)
604+
adiv = AUDIO_DIV_SERCLK_16;
605+
else
606+
adiv = AUDIO_DIV_SERCLK_8;
607+
reg_write(encoder, REG_AUDIO_DIV, adiv);
608+
609+
/*
610+
* This is the approximate value of N, which happens to be
611+
* the recommended values for non-coherent clocks.
612+
*/
613+
n = 128 * p->audio_sample_rate / 1000;
614+
615+
/* Write the CTS and N values */
616+
buf[0] = 0x44;
617+
buf[1] = 0x42;
618+
buf[2] = 0x01;
619+
buf[3] = n;
620+
buf[4] = n >> 8;
621+
buf[5] = n >> 16;
622+
reg_write_range(encoder, REG_ACR_CTS_0, buf, 6);
623+
624+
/* Set CTS clock reference */
625+
reg_write(encoder, REG_AIP_CLKSEL, clksel_aip | clksel_fs);
626+
627+
/* Reset CTS generator */
628+
reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS);
629+
reg_clear(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_CTS);
630+
631+
/* Write the channel status */
632+
buf[0] = 0x04;
633+
buf[1] = 0x00;
634+
buf[2] = 0x00;
635+
buf[3] = 0xf1;
636+
reg_write_range(encoder, REG_CH_STAT_B(0), buf, 4);
637+
638+
tda998x_audio_mute(encoder, true);
639+
mdelay(20);
640+
tda998x_audio_mute(encoder, false);
641+
642+
/* Write the audio information packet */
643+
tda998x_write_aif(encoder, p);
644+
}
645+
427646
/* DRM encoder functions */
428647

429648
static void
430649
tda998x_encoder_set_config(struct drm_encoder *encoder, void *params)
431650
{
651+
struct tda998x_priv *priv = to_tda998x_priv(encoder);
652+
struct tda998x_encoder_params *p = params;
653+
654+
priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) |
655+
(p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) |
656+
VIP_CNTRL_0_SWAP_B(p->swap_b) |
657+
(p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0);
658+
priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) |
659+
(p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) |
660+
VIP_CNTRL_1_SWAP_D(p->swap_d) |
661+
(p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0);
662+
priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) |
663+
(p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) |
664+
VIP_CNTRL_2_SWAP_F(p->swap_f) |
665+
(p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0);
666+
667+
priv->params = *p;
432668
}
433669

434670
static void
@@ -445,8 +681,7 @@ tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
445681

446682
switch (mode) {
447683
case DRM_MODE_DPMS_ON:
448-
/* enable audio and video ports */
449-
reg_write(encoder, REG_ENA_AP, 0xff);
684+
/* enable video ports, audio will be enabled later */
450685
reg_write(encoder, REG_ENA_VP_0, 0xff);
451686
reg_write(encoder, REG_ENA_VP_1, 0xff);
452687
reg_write(encoder, REG_ENA_VP_2, 0xff);
@@ -608,17 +843,32 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder,
608843
reg_write16(encoder, REG_REFPIX_MSB, ref_pix);
609844
reg_write16(encoder, REG_REFLINE_MSB, ref_line);
610845

611-
reg = TBG_CNTRL_1_VHX_EXT_DE |
612-
TBG_CNTRL_1_VHX_EXT_HS |
613-
TBG_CNTRL_1_VHX_EXT_VS |
614-
TBG_CNTRL_1_DWIN_DIS | /* HDCP off */
846+
reg = TBG_CNTRL_1_DWIN_DIS | /* HDCP off */
615847
TBG_CNTRL_1_VH_TGL_2;
848+
/*
849+
* It is questionable whether this is correct - the nxp driver
850+
* does not set VH_TGL_2 and the below for all display modes.
851+
*/
616852
if (mode->flags & (DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC))
617853
reg |= TBG_CNTRL_1_VH_TGL_0;
618854
reg_set(encoder, REG_TBG_CNTRL_1, reg);
619855

620856
/* must be last register set: */
621857
reg_clear(encoder, REG_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_ONCE);
858+
859+
/* Only setup the info frames if the sink is HDMI */
860+
if (priv->is_hdmi_sink) {
861+
/* We need to turn HDMI HDCP stuff on to get audio through */
862+
reg_clear(encoder, REG_TBG_CNTRL_1, TBG_CNTRL_1_DWIN_DIS);
863+
reg_write(encoder, REG_ENC_CNTRL, ENC_CNTRL_CTL_CODE(1));
864+
reg_set(encoder, REG_TX33, TX33_HDMI);
865+
866+
tda998x_write_avi(encoder, adjusted_mode);
867+
868+
if (priv->params.audio_cfg)
869+
tda998x_configure_audio(encoder, adjusted_mode,
870+
&priv->params);
871+
}
622872
}
623873

624874
static enum drm_connector_status
@@ -744,12 +994,14 @@ static int
744994
tda998x_encoder_get_modes(struct drm_encoder *encoder,
745995
struct drm_connector *connector)
746996
{
997+
struct tda998x_priv *priv = to_tda998x_priv(encoder);
747998
struct edid *edid = (struct edid *)do_get_edid(encoder);
748999
int n = 0;
7491000

7501001
if (edid) {
7511002
drm_mode_connector_update_edid_property(connector, edid);
7521003
n = drm_add_edid_modes(connector, edid);
1004+
priv->is_hdmi_sink = drm_detect_hdmi_monitor(edid);
7531005
kfree(edid);
7541006
}
7551007

0 commit comments

Comments
 (0)