From: Philipp Zabel <p.zabel@pengutronix.de>
To: dri-devel@lists.freedesktop.org
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, Paul Bolle <pebolle@tiscali.nl>,
YT Shen <yt.shen@mediatek.com>,
Jitao Shi <jitao.shi@mediatek.com>,
Jie Qiu <jie.qiu@mediatek.com>, Pawel Moll <pawel.moll@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Cawa Cheng <cawa.cheng@mediatek.com>,
Tomasz Figa <tfiga@chromium.org>,
Rob Herring <robh+dt@kernel.org>,
linux-mediatek@lists.infradead.org,
Kumar Gala <galak@codeaurora.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
kernel@pengutronix.de
Subject: [PATCH v7 07/14] drm/mediatek: enable hdmi output control bit
Date: Mon, 30 Nov 2015 22:07:49 +0100 [thread overview]
Message-ID: <1448917676-25584-8-git-send-email-p.zabel@pengutronix.de> (raw)
In-Reply-To: <1448917676-25584-1-git-send-email-p.zabel@pengutronix.de>
From: Jie Qiu <jie.qiu@mediatek.com>
MT8173 HDMI hardware has a output control bit to enable/disable HDMI
output. Because of security reason, so this bit can ONLY be controlled
in ARM supervisor mode. Now the only way to enter ARM supervisor is the
ARM trusted firmware. So atf provides a API for HDMI driver to call to
setup this HDMI control bit to enable HDMI output in supervisor mode.
Signed-off-by: Jie Qiu <jie.qiu@mediatek.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/gpu/drm/mediatek/mtk_hdmi_hw.c | 11 +++++++++++
drivers/gpu/drm/mediatek/mtk_hdmi_regs.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_hw.c b/drivers/gpu/drm/mediatek/mtk_hdmi_hw.c
index 7652266..8bee167 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi_hw.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_hw.c
@@ -19,8 +19,15 @@
#include <linux/delay.h>
#include <linux/hdmi.h>
#include <linux/io.h>
+#include <linux/psci.h>
#include <linux/regmap.h>
+static int (*invoke_psci_fn)(u64, u64, u64, u64);
+typedef int (*psci_initcall_t)(const struct device_node *);
+
+asmlinkage int __invoke_psci_fn_hvc(u64, u64, u64, u64);
+asmlinkage int __invoke_psci_fn_smc(u64, u64, u64, u64);
+
static u32 mtk_hdmi_read(struct mtk_hdmi *hdmi, u32 offset)
{
return readl(hdmi->regs + offset);
@@ -170,6 +177,10 @@ void mtk_hdmi_hw_vid_black(struct mtk_hdmi *hdmi,
void mtk_hdmi_hw_make_reg_writable(struct mtk_hdmi *hdmi, bool enable)
{
+ invoke_psci_fn = __invoke_psci_fn_smc;
+ invoke_psci_fn(MTK_SIP_SET_AUTHORIZED_SECURE_REG,
+ 0x14000904, 0x80000000, 0);
+
regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG20,
HDMI_PCLK_FREE_RUN, enable ? HDMI_PCLK_FREE_RUN : 0);
regmap_update_bits(hdmi->sys_regmap, hdmi->sys_offset + HDMI_SYS_CFG1C,
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h b/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
index de7ee22..8d7d60a 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi_regs.h
@@ -218,4 +218,5 @@
#define MHL_SYNC_AUTO_EN BIT(30)
#define HDMI_PCLK_FREE_RUN BIT(31)
+#define MTK_SIP_SET_AUTHORIZED_SECURE_REG 0x82000001
#endif
--
2.6.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-11-30 21:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-30 21:07 [PATCH v7 00/14] MT8173 DRM support Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 01/14] dt-bindings: drm/mediatek: Add Mediatek display subsystem dts binding Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 02/14] drm/mediatek: Add DRM Driver for Mediatek SoC MT8173 Philipp Zabel
[not found] ` <1448917676-25584-3-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-12-11 17:10 ` Matthias Brugger
[not found] ` <566B0378.7050809-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-12-11 17:23 ` Philipp Zabel
2015-12-14 18:57 ` Daniel Kurtz
[not found] ` <CAGS+omCeJU77tkjf4YGPiH9SZDo7aA4Cpbgih8RvvtSJVEKrnQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-12-16 9:52 ` Philipp Zabel
2015-12-16 16:10 ` Daniel Kurtz
2015-11-30 21:07 ` [PATCH v7 03/14] drm/mediatek: Add DSI sub driver Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 04/14] drm/mediatek: Add DPI " Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 05/14] dt-bindings: drm/mediatek: Add Mediatek HDMI dts binding Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 06/14] drm/mediatek: Add HDMI support Philipp Zabel
[not found] ` <1448917676-25584-7-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-12-29 8:49 ` Yingjoe Chen
2016-01-04 19:23 ` Philipp Zabel
2015-11-30 21:07 ` Philipp Zabel [this message]
2015-11-30 21:07 ` [PATCH v7 08/14] arm64: dts: mt8173: Add display subsystem related nodes Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 09/14] arm64: dts: mt8173: Add HDMI " Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 10/14] clk: mediatek: make dpi0_sel and hdmi_sel not propagate rate changes Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 11/14] clk: mediatek: Add hdmi_ref HDMI PHY PLL reference clock output Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 12/14] dt-bindings: hdmi-connector: add DDC I2C bus phandle documentation Philipp Zabel
2015-11-30 21:07 ` [PATCH v7 13/14] drm/atomic-helper: Export drm_atomic_helper_wait_for_fences Philipp Zabel
[not found] ` <1448917676-25584-1-git-send-email-p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-11-30 21:07 ` [PATCH v7 14/14] drm/mediatek: Add fence control, wait on GPU fence Philipp Zabel
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=1448917676-25584-8-git-send-email-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=cawa.cheng@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jie.qiu@mediatek.com \
--cc=jitao.shi@mediatek.com \
--cc=kernel@pengutronix.de \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=pawel.moll@arm.com \
--cc=pebolle@tiscali.nl \
--cc=robh+dt@kernel.org \
--cc=tfiga@chromium.org \
--cc=yt.shen@mediatek.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).