|
@@ -195,12 +195,15 @@ static void dw_hdmi_rockchip_encoder_mode_set(struct drm_encoder *encoder,
|
|
|
{
|
|
|
}
|
|
|
|
|
|
-static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder)
|
|
|
+static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder)
|
|
|
{
|
|
|
struct rockchip_hdmi *hdmi = to_rockchip_hdmi(encoder);
|
|
|
u32 val;
|
|
|
int mux;
|
|
|
|
|
|
+ rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,
|
|
|
+ ROCKCHIP_OUT_MODE_AAAA);
|
|
|
+
|
|
|
mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder);
|
|
|
if (mux)
|
|
|
val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16);
|
|
@@ -212,17 +215,10 @@ static void dw_hdmi_rockchip_encoder_commit(struct drm_encoder *encoder)
|
|
|
(mux) ? "LIT" : "BIG");
|
|
|
}
|
|
|
|
|
|
-static void dw_hdmi_rockchip_encoder_prepare(struct drm_encoder *encoder)
|
|
|
-{
|
|
|
- rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,
|
|
|
- ROCKCHIP_OUT_MODE_AAAA);
|
|
|
-}
|
|
|
-
|
|
|
static const struct drm_encoder_helper_funcs dw_hdmi_rockchip_encoder_helper_funcs = {
|
|
|
.mode_fixup = dw_hdmi_rockchip_encoder_mode_fixup,
|
|
|
.mode_set = dw_hdmi_rockchip_encoder_mode_set,
|
|
|
- .prepare = dw_hdmi_rockchip_encoder_prepare,
|
|
|
- .commit = dw_hdmi_rockchip_encoder_commit,
|
|
|
+ .enable = dw_hdmi_rockchip_encoder_enable,
|
|
|
.disable = dw_hdmi_rockchip_encoder_disable,
|
|
|
};
|
|
|
|