From: "H. Nikolaus Schaller" <hns@goldelico.com>
To: Andrzej Hajda <andrzej.hajda@intel.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Robert Foss <robert.foss@linaro.org>,
Paul Boddie <paul@boddie.org.uk>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Paul Cercueil <paul@crapouillou.net>,
Maxime Ripard <maxime@cerno.tech>,
Harry Wentland <harry.wentland@amd.com>,
"H. Nikolaus Schaller" <hns@goldelico.com>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-mips@vger.kernel.org, letux-kernel@openphoenux.org,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
Date: Sat, 12 Feb 2022 16:50:49 +0100 [thread overview]
Message-ID: <9d3a2000d2bb014f1afb0613537bdc523202135d.1644681054.git.hns@goldelico.com> (raw)
In-Reply-To: <cover.1644681054.git.hns@goldelico.com>
From: Paul Boddie <paul@boddie.org.uk>
We have to make sure that
- JZ_LCD_OSDC_ALPHAEN is set
- plane f0 is disabled and not seen from user-space
Tested on MIPS Creator CI20 board.
Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 7f10d6eed549d..dcf44cb00821f 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -65,8 +65,10 @@ struct ingenic_dma_hwdescs {
struct jz_soc_info {
bool needs_dev_clk;
bool has_osd;
+ bool has_alpha;
bool map_noncoherent;
bool use_extended_hwdesc;
+ bool plane_f0_not_working;
unsigned int max_width, max_height;
const u32 *formats_f0, *formats_f1;
unsigned int num_formats_f0, num_formats_f1;
@@ -453,7 +455,7 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,
if (!crtc)
return 0;
- if (plane == &priv->f0)
+ if (priv->soc_info->plane_f0_not_working && plane == &priv->f0)
return -EINVAL;
crtc_state = drm_atomic_get_existing_crtc_state(state,
@@ -1055,6 +1057,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
long parent_rate;
unsigned int i, clone_mask = 0;
int ret, irq;
+ u32 osdc = 0;
soc_info = of_device_get_match_data(dev);
if (!soc_info) {
@@ -1312,7 +1315,10 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
/* Enable OSD if available */
if (soc_info->has_osd)
- regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);
+ osdc |= JZ_LCD_OSDC_OSDEN;
+ if (soc_info->has_alpha)
+ osdc |= JZ_LCD_OSDC_ALPHAEN;
+ regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
mutex_init(&priv->clk_mutex);
priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;
@@ -1511,7 +1517,9 @@ static const struct jz_soc_info jz4770_soc_info = {
static const struct jz_soc_info jz4780_soc_info = {
.needs_dev_clk = true,
.has_osd = true,
+ .has_alpha = true,
.use_extended_hwdesc = true,
+ .plane_f0_not_working = true, /* REVISIT */
.max_width = 4096,
.max_height = 2048,
.formats_f1 = jz4770_formats_f1,
--
2.33.0
next prev parent reply other threads:[~2022-02-12 15:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2022-02-12 15:50 ` H. Nikolaus Schaller [this message]
2022-02-14 10:13 ` [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output Paul Cercueil
2022-02-14 10:19 ` H. Nikolaus Schaller
2022-02-14 12:29 ` Paul Cercueil
2022-02-14 12:33 ` H. Nikolaus Schaller
2022-02-14 12:36 ` Paul Cercueil
2022-02-14 13:10 ` H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
2022-02-14 10:24 ` Paul Cercueil
2022-02-14 11:02 ` H. Nikolaus Schaller
2022-02-14 11:30 ` Paul Cercueil
2022-02-12 15:50 ` [PATCH v15 3/7] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 H. Nikolaus Schaller
2022-02-21 8:11 ` Neil Armstrong
2022-02-26 17:12 ` H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 5/7] drm/bridge: dw-hdmi: introduce dw_hdmi_enable_poll() H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20 H. Nikolaus Schaller
2022-02-14 10:18 ` Paul Cercueil
2022-02-12 15:50 ` [PATCH v15 7/7] [RFC] drm/ingenic: add some more features specific to jz4780 H. Nikolaus Schaller
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=9d3a2000d2bb014f1afb0613537bdc523202135d.1644681054.git.hns@goldelico.com \
--to=hns@goldelico.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@linux.ie \
--cc=andrzej.hajda@intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=ezequiel@collabora.com \
--cc=harry.wentland@amd.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=letux-kernel@openphoenux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=maxime@cerno.tech \
--cc=narmstrong@baylibre.com \
--cc=paul@boddie.org.uk \
--cc=paul@crapouillou.net \
--cc=robert.foss@linaro.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: 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).