From: Mark Yao <mark.yao@rock-chips.com> To: David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Mark Yao <mark.yao@rock-chips.com> Subject: [PATCH v3 8/8] drm/rockchip: dw_hdmi: use encoder enable function Date: Thu, 17 Dec 2015 11:13:12 +0800 [thread overview] Message-ID: <1450321992-31671-1-git-send-email-mark.yao@rock-chips.com> (raw) In-Reply-To: <1450321275-31154-1-git-send-email-mark.yao@rock-chips.com> encoder.enable is more compatible to atomic api than encoder.prepare/commit Signed-off-by: Mark Yao <mark.yao@rock-chips.com> --- Changes in v3: None Changes in v2: None drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 525b5a8..8e1605c 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -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 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, }; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: mark.yao@rock-chips.com (Mark Yao) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 8/8] drm/rockchip: dw_hdmi: use encoder enable function Date: Thu, 17 Dec 2015 11:13:12 +0800 [thread overview] Message-ID: <1450321992-31671-1-git-send-email-mark.yao@rock-chips.com> (raw) In-Reply-To: <1450321275-31154-1-git-send-email-mark.yao@rock-chips.com> encoder.enable is more compatible to atomic api than encoder.prepare/commit Signed-off-by: Mark Yao <mark.yao@rock-chips.com> --- Changes in v3: None Changes in v2: None drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 525b5a8..8e1605c 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -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 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, }; -- 1.7.9.5
next prev parent reply other threads:[~2015-12-17 3:14 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-17 3:01 [PATCH v3 0/8] drm/rockchip: covert to support atomic API Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` [PATCH v3 1/8] drm/rockchip: Use new vblank api drm_crtc_vblank_* Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` [PATCH v3 2/8] drm/rockchip: vop: replace dpms with enable/disable Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` [PATCH v3 3/8] drm/rockchip: Convert to support atomic API Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` [PATCH v3 4/8] drm/rockchip: Optimization vop mode set Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:01 ` Mark Yao 2015-12-17 3:06 ` [PATCH v3 5/8] drm/rockchip: support atomic asynchronous commit Mark Yao 2015-12-17 3:06 ` Mark Yao 2015-12-17 3:06 ` Mark Yao 2015-12-17 3:08 ` [PATCH v3 6/8] drm/rockchip: direct config connecter gate and out_mode Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:08 ` [PATCH v3 7/8] drm: bridge/dw_hdmi: add atomic API support Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:15 ` Mark yao 2015-12-17 3:15 ` Mark yao 2015-12-17 3:15 ` Mark yao 2015-12-17 3:08 ` [PATCH 8/8] drm/rockchip: dw_hdmi: use encoder enable function Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:08 ` Mark Yao 2015-12-17 3:16 ` Mark yao 2015-12-17 3:16 ` Mark yao 2015-12-17 3:16 ` Mark yao 2015-12-17 3:11 ` [PATCH v3 7/8] drm: bridge/dw_hdmi: add atomic API support Mark Yao 2015-12-17 3:11 ` Mark Yao 2015-12-17 3:11 ` Mark Yao 2015-12-17 3:13 ` Mark Yao [this message] 2015-12-17 3:13 ` [PATCH v3 8/8] drm/rockchip: dw_hdmi: use encoder enable function Mark Yao 2015-12-17 10:00 ` [PATCH v3 0/8] drm/rockchip: covert to support atomic API Heiko Stübner 2015-12-17 10:00 ` Heiko Stübner 2015-12-17 10:00 ` Heiko Stübner 2015-12-17 10:32 ` Mark yao 2015-12-17 10:32 ` Mark yao 2015-12-17 10:32 ` Mark yao 2015-12-17 12:03 ` Heiko Stübner 2015-12-17 12:03 ` Heiko Stübner 2015-12-17 12:03 ` Heiko Stübner 2015-12-17 14:27 ` Daniel Vetter 2015-12-17 14:27 ` Daniel Vetter 2015-12-17 14:27 ` Daniel Vetter 2015-12-21 2:28 ` Mark yao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1450321992-31671-1-git-send-email-mark.yao@rock-chips.com \ --to=mark.yao@rock-chips.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.