From: Martin Kepplinger <martin.kepplinger@puri.sm>
To: marex@denx.de, stefan@agner.ch, airlied@linux.ie,
daniel@ffwll.ch, shawnguo@kernel.org
Cc: kernel@pengutronix.de, linux-imx@nxp.com,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Martin Kepplinger <martin.kepplinger@puri.sm>
Subject: [PATCH] drm: mxsfb: Add interconnect path request
Date: Tue, 1 Dec 2020 11:37:57 +0100 [thread overview]
Message-ID: <20201201103757.32165-1-martin.kepplinger@puri.sm> (raw)
Add interconnect support to mxsfb so that it is able to request enough
bandwidth to DDR for display output to work.
Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
---
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 33 +++++++++++++++++++++++++++++++
drivers/gpu/drm/mxsfb/mxsfb_drv.h | 2 ++
drivers/gpu/drm/mxsfb/mxsfb_kms.c | 13 ++++++++++++
3 files changed, 48 insertions(+)
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 6faf17b6408d..b05e8e5f1e38 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -15,6 +15,7 @@
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/interconnect.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h>
@@ -311,6 +312,34 @@ static const struct of_device_id mxsfb_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, mxsfb_dt_ids);
+
+static int mxsfb_init_icc(struct platform_device *pdev)
+{
+ struct drm_device *drm = platform_get_drvdata(pdev);
+ struct mxsfb_drm_private *mxsfb = drm->dev_private;
+ int ret;
+
+ /* Optional interconnect request */
+ mxsfb->icc_path = devm_of_icc_get(&pdev->dev, "lcdif-dram");
+ if (IS_ERR(mxsfb->icc_path)) {
+ ret = PTR_ERR(mxsfb->icc_path);
+ if (ret == -EPROBE_DEFER)
+ return ret;
+
+ mxsfb->icc_path = NULL;
+ dev_dbg(drm->dev,
+ "No interconnect may cause display underflows!\n");
+ }
+
+ ret = icc_set_bw(mxsfb->icc_path, 0, MBps_to_icc(700));
+ if (ret) {
+ dev_err(drm->dev, "%s: icc_set_bw failed: %d\n", __func__, ret);
+ return ret;
+ }
+
+ return 0;
+}
+
static int mxsfb_probe(struct platform_device *pdev)
{
struct drm_device *drm;
@@ -329,6 +358,10 @@ static int mxsfb_probe(struct platform_device *pdev)
if (ret)
goto err_free;
+ ret = mxsfb_init_icc(pdev);
+ if (ret)
+ goto err_free;
+
ret = drm_dev_register(drm, 0);
if (ret)
goto err_unload;
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.h b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
index 399d23e91ed1..d74ff4818e62 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.h
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
@@ -41,6 +41,8 @@ struct mxsfb_drm_private {
struct drm_encoder encoder;
struct drm_connector *connector;
struct drm_bridge *bridge;
+
+ struct icc_path *icc_path;
};
static inline struct mxsfb_drm_private *
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
index 3e1bb0aefb87..8925ee7deeaa 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c
@@ -13,6 +13,7 @@
#include <linux/iopoll.h>
#include <linux/pm_runtime.h>
#include <linux/spinlock.h>
+#include <linux/interconnect.h>
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
@@ -310,6 +311,12 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
struct drm_device *drm = mxsfb->drm;
dma_addr_t paddr;
+ int ret;
+
+ ret = icc_enable(mxsfb->icc_path);
+ if (ret)
+ dev_err_ratelimited(drm->dev, "%s: icc_enable failed: %d\n",
+ __func__, ret);
pm_runtime_get_sync(drm->dev);
mxsfb_enable_axi_clk(mxsfb);
@@ -334,6 +341,7 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
struct drm_device *drm = mxsfb->drm;
struct drm_pending_vblank_event *event;
+ int ret;
mxsfb_disable_controller(mxsfb);
@@ -349,6 +357,11 @@ static void mxsfb_crtc_atomic_disable(struct drm_crtc *crtc,
mxsfb_disable_axi_clk(mxsfb);
pm_runtime_put_sync(drm->dev);
+
+ ret = icc_disable(mxsfb->icc_path);
+ if (ret)
+ dev_err_ratelimited(drm->dev, "%s: icc_disable failed: %d\n",
+ __func__, ret);
}
static int mxsfb_crtc_enable_vblank(struct drm_crtc *crtc)
--
2.20.1
next reply other threads:[~2020-12-01 10:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 10:37 Martin Kepplinger [this message]
2020-12-01 11:20 ` [PATCH] drm: mxsfb: Add interconnect path request Lucas Stach
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=20201201103757.32165-1-martin.kepplinger@puri.sm \
--to=martin.kepplinger@puri.sm \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=shawnguo@kernel.org \
--cc=stefan@agner.ch \
/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).