|
@@ -822,25 +822,6 @@ tda998x_configure_audio(struct tda998x_priv *priv,
|
|
|
|
|
|
/* DRM encoder functions */
|
|
|
|
|
|
-static void tda998x_encoder_set_config(struct tda998x_priv *priv,
|
|
|
- const struct tda998x_encoder_params *p)
|
|
|
-{
|
|
|
- priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) |
|
|
|
- (p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) |
|
|
|
- VIP_CNTRL_0_SWAP_B(p->swap_b) |
|
|
|
- (p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0);
|
|
|
- priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) |
|
|
|
- (p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) |
|
|
|
- VIP_CNTRL_1_SWAP_D(p->swap_d) |
|
|
|
- (p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0);
|
|
|
- priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) |
|
|
|
- (p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) |
|
|
|
- VIP_CNTRL_2_SWAP_F(p->swap_f) |
|
|
|
- (p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0);
|
|
|
-
|
|
|
- priv->audio_params = p->audio_params;
|
|
|
-}
|
|
|
-
|
|
|
static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode)
|
|
|
{
|
|
|
struct tda998x_priv *priv = enc_to_tda998x_priv(encoder);
|
|
@@ -1636,6 +1617,25 @@ static const struct drm_connector_funcs tda998x_connector_funcs = {
|
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
|
};
|
|
|
|
|
|
+static void tda998x_set_config(struct tda998x_priv *priv,
|
|
|
+ const struct tda998x_encoder_params *p)
|
|
|
+{
|
|
|
+ priv->vip_cntrl_0 = VIP_CNTRL_0_SWAP_A(p->swap_a) |
|
|
|
+ (p->mirr_a ? VIP_CNTRL_0_MIRR_A : 0) |
|
|
|
+ VIP_CNTRL_0_SWAP_B(p->swap_b) |
|
|
|
+ (p->mirr_b ? VIP_CNTRL_0_MIRR_B : 0);
|
|
|
+ priv->vip_cntrl_1 = VIP_CNTRL_1_SWAP_C(p->swap_c) |
|
|
|
+ (p->mirr_c ? VIP_CNTRL_1_MIRR_C : 0) |
|
|
|
+ VIP_CNTRL_1_SWAP_D(p->swap_d) |
|
|
|
+ (p->mirr_d ? VIP_CNTRL_1_MIRR_D : 0);
|
|
|
+ priv->vip_cntrl_2 = VIP_CNTRL_2_SWAP_E(p->swap_e) |
|
|
|
+ (p->mirr_e ? VIP_CNTRL_2_MIRR_E : 0) |
|
|
|
+ VIP_CNTRL_2_SWAP_F(p->swap_f) |
|
|
|
+ (p->mirr_f ? VIP_CNTRL_2_MIRR_F : 0);
|
|
|
+
|
|
|
+ priv->audio_params = p->audio_params;
|
|
|
+}
|
|
|
+
|
|
|
static int tda998x_bind(struct device *dev, struct device *master, void *data)
|
|
|
{
|
|
|
struct tda998x_encoder_params *params = dev->platform_data;
|
|
@@ -1668,7 +1668,7 @@ static int tda998x_bind(struct device *dev, struct device *master, void *data)
|
|
|
return ret;
|
|
|
|
|
|
if (!dev->of_node && params)
|
|
|
- tda998x_encoder_set_config(priv, params);
|
|
|
+ tda998x_set_config(priv, params);
|
|
|
|
|
|
tda998x_encoder_set_polling(priv, &priv->connector);
|
|
|
|