All of lore.kernel.org
 help / color / mirror / Atom feed
From: Algea Cao <algea.cao@rock-chips.com>
To: daniel.vetter@intel.com, jani.nikula@linux.intel.com,
	seanpaul@chromium.org, airlied@linux.ie,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	linux-rockchip@lists.infradead.org
Cc: kever.yang@rock-chips.com, mark.yao@rock-chips.com,
	yang.zheng@rock-chips.com, Algea Cao <algea.cao@rock-chips.com>
Subject: [PATCH v2 6/7] drm/rockchip: dw_hdmi: update dw-hdmi encoder enable
Date: Sat, 30 Sep 2017 09:45:51 +0800	[thread overview]
Message-ID: <1506735951-153728-1-git-send-email-algea.cao@rock-chips.com> (raw)
In-Reply-To: <1506735713-147081-0>

Writing grf register according to device type.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index e1a9941..b9087af 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -349,9 +349,26 @@ static void dw_hdmi_rockchip_encoder_mode_set(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;
+	struct drm_crtc *crtc = encoder->crtc;
+	u32 val, lcdsel_grf_reg, lcdsel_mask;
 	int ret;
 
+	if (WARN_ON(!crtc || !crtc->state))
+		return;
+
+	switch (hdmi->dev_type) {
+	case RK3288_HDMI:
+		lcdsel_grf_reg = RK3288_GRF_SOC_CON6;
+		lcdsel_mask = RK3288_HDMI_LCDC_SEL;
+		break;
+	case RK3399_HDMI:
+		lcdsel_grf_reg = RK3399_GRF_SOC_CON20;
+		lcdsel_mask = RK3399_HDMI_LCDC_SEL;
+		break;
+	default:
+		return;
+	}
+
 	ret = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder);
 	if (ret)
 		val = hdmi->chip_data->lcdsel_lit;
-- 
2.7.4

  parent reply	other threads:[~2017-09-30  1:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1506735713-147081-0>
2017-09-30  1:43 ` [PATCH v2 1/7] drm/rockchip: dw_hdmi: update dw_hdmi_rockchip_dt_ids Algea Cao
2017-09-30  1:43 ` [PATCH v2 2/7] drm/rockchip: dw_hdmi: add device type Algea Cao
2017-10-03  9:52   ` Neil Armstrong
2017-10-03  9:52     ` Neil Armstrong
2017-09-30  1:44 ` [PATCH v2 3/7] drm: bridge: dw-hdmi: change hdmi phy hpd read function to export Algea Cao
2017-09-30  1:44 ` [PATCH v2 4/7] drm/rockchip: dw_hdmi: add inno hdmi phy ops Algea Cao
2017-12-09 17:09   ` Heiko Stuebner
2017-12-09 17:09     ` Heiko Stuebner
2017-09-30  1:45 ` [PATCH v2 5/7] drm/rockchip: dw_hdmi: add hclk_vio Algea Cao
2017-12-10 17:08   ` Heiko Stuebner
2017-12-10 17:08     ` Heiko Stuebner
2017-09-30  1:45 ` Algea Cao [this message]
2017-09-30  1:46 ` [PATCH v2 7/7] drm: bridge: dw-hdmi: get phy ops by device type Algea Cao

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=1506735951-153728-1-git-send-email-algea.cao@rock-chips.com \
    --to=algea.cao@rock-chips.com \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=kever.yang@rock-chips.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.yao@rock-chips.com \
    --cc=seanpaul@chromium.org \
    --cc=yang.zheng@rock-chips.com \
    /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: link
Be 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.