From: "H. Nikolaus Schaller" <hns@goldelico.com> To: Paul Cercueil <paul@crapouillou.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, "H. Nikolaus Schaller" <hns@goldelico.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Kees Cook <keescook@chromium.org>, "Eric W. Biederman" <ebiederm@xmission.com>, Miquel Raynal <miquel.raynal@bootlin.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Neil Armstrong <narmstrong@baylibre.com>, Robert Foss <robert.foss@linaro.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Jernej Skrabec <jernej.skrabec@gmail.com>, Harry Wentland <harry.wentland@amd.com>, Sam Ravnborg <sam@ravnborg.org>, Maxime Ripard <maxime@cerno.tech>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Paul Boddie <paul@boddie.org.uk>, Andrzej Hajda <andrzej.hajda@intel.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Cc: devicetree@vger.kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org, Jonas Karlman <jonas@kwiboo.se>, dri-devel@lists.freedesktop.org Subject: [PATCH v14 5/9] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 Date: Sat, 12 Feb 2022 15:19:23 +0100 [thread overview] Message-ID: <8703a3e48574c09e8756b79e8f69be7d84926fe9.1644675566.git.hns@goldelico.com> (raw) In-Reply-To: <cover.1644675566.git.hns@goldelico.com> Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks") introduced a new mechanism to negotiate bus formats between hdmi connector and the synopsys hdmi driver inside the jz4780. By this, the dw-hdmi is no longer the only bridge and sets up a list of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts(). This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only produces a black screen. This fix is based on the observation that max_bpc = 0 when running this function while info->bpc = 8. Since the formats checks before this always test for max_bpc >= info->pbc indirectly my assumption is that we must check it here as well. Adding the proposed patch makes the CI20/jz4780 panel work again in MEDIA_BUS_FMT_RGB888_1X24 mode. Fixes: 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks") Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index b0d8110dd412c..826a055a7a273 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30; } - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422) + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422) output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16; - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444) + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444) output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; /* Default 8bit RGB fallback */ -- 2.33.0
WARNING: multiple messages have this Message-ID (diff)
From: "H. Nikolaus Schaller" <hns@goldelico.com> To: Paul Cercueil <paul@crapouillou.net>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Thomas Bogendoerfer <tsbogend@alpha.franken.de>, "H. Nikolaus Schaller" <hns@goldelico.com>, Geert Uytterhoeven <geert+renesas@glider.be>, Kees Cook <keescook@chromium.org>, "Eric W. Biederman" <ebiederm@xmission.com>, Miquel Raynal <miquel.raynal@bootlin.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Neil Armstrong <narmstrong@baylibre.com>, Robert Foss <robert.foss@linaro.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Jernej Skrabec <jernej.skrabec@gmail.com>, Harry Wentland <harry.wentland@amd.com>, Sam Ravnborg <sam@ravnborg.org>, Maxime Ripard <maxime@cerno.tech>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Paul Boddie <paul@boddie.org.uk>, Andrzej Hajda <andrzej.hajda@intel.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Cc: devicetree@vger.kernel.org, Jonas Karlman <jonas@kwiboo.se>, linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org Subject: [PATCH v14 5/9] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 Date: Sat, 12 Feb 2022 15:19:23 +0100 [thread overview] Message-ID: <8703a3e48574c09e8756b79e8f69be7d84926fe9.1644675566.git.hns@goldelico.com> (raw) In-Reply-To: <cover.1644675566.git.hns@goldelico.com> Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks") introduced a new mechanism to negotiate bus formats between hdmi connector and the synopsys hdmi driver inside the jz4780. By this, the dw-hdmi is no longer the only bridge and sets up a list of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts(). This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only produces a black screen. This fix is based on the observation that max_bpc = 0 when running this function while info->bpc = 8. Since the formats checks before this always test for max_bpc >= info->pbc indirectly my assumption is that we must check it here as well. Adding the proposed patch makes the CI20/jz4780 panel work again in MEDIA_BUS_FMT_RGB888_1X24 mode. Fixes: 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks") Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index b0d8110dd412c..826a055a7a273 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30; } - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422) + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422) output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16; - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444) + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444) output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24; /* Default 8bit RGB fallback */ -- 2.33.0
next prev parent reply other threads:[~2022-02-12 14:20 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-12 14:19 [PATCH v14 0/9] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 1/9] drm/ingenic: Add support for JZ4780 and HDMI output H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:44 ` Paul Cercueil 2022-02-12 14:44 ` Paul Cercueil 2022-02-12 15:49 ` H. Nikolaus Schaller 2022-02-12 15:49 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 2/9] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 2/9] dt-bindings: display: Add ingenic, jz4780-dw-hdmi " H. Nikolaus Schaller 2022-02-12 14:53 ` [PATCH v14 2/9] dt-bindings: display: Add ingenic,jz4780-dw-hdmi " Paul Cercueil 2022-02-12 14:53 ` [PATCH v14 2/9] dt-bindings: display: Add ingenic, jz4780-dw-hdmi " Paul Cercueil 2022-02-12 14:19 ` [PATCH v14 3/9] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 4/9] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller [this message] 2022-02-12 14:19 ` [PATCH v14 5/9] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 H. Nikolaus Schaller 2022-02-12 15:06 ` Paul Cercueil 2022-02-12 15:06 ` Paul Cercueil 2022-02-12 15:50 ` H. Nikolaus Schaller 2022-02-12 15:50 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 6/9] drm/bridge: dw-hdmi: introduce dw_hdmi_enable_poll() H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 7/9] drm/ingenic: dw-hdmi: make hot plug detection work for CI20 H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 8/9] [already applied to mips-fixes] MIPS: DTS: CI20: fix how ddc power is enabled H. Nikolaus Schaller 2022-02-12 14:19 ` H. Nikolaus Schaller 2022-02-12 14:58 ` Paul Cercueil 2022-02-12 14:58 ` Paul Cercueil 2022-02-12 15:50 ` H. Nikolaus Schaller 2022-02-12 15:50 ` H. Nikolaus Schaller 2022-02-12 14:19 ` [PATCH v14 9/9] [RFC] drm/ingenic: add some more features specific to jz4780 H. Nikolaus Schaller 2022-02-12 14:19 ` 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=8703a3e48574c09e8756b79e8f69be7d84926fe9.1644675566.git.hns@goldelico.com \ --to=hns@goldelico.com \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=airlied@linux.ie \ --cc=andrzej.hajda@intel.com \ --cc=broonie@kernel.org \ --cc=daniel@ffwll.ch \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=ebiederm@xmission.com \ --cc=geert+renesas@glider.be \ --cc=harry.wentland@amd.com \ --cc=hverkuil-cisco@xs4all.nl \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=keescook@chromium.org \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=letux-kernel@openphoenux.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maxime@cerno.tech \ --cc=miquel.raynal@bootlin.com \ --cc=narmstrong@baylibre.com \ --cc=paul@boddie.org.uk \ --cc=paul@crapouillou.net \ --cc=robert.foss@linaro.org \ --cc=robh+dt@kernel.org \ --cc=sam@ravnborg.org \ --cc=tsbogend@alpha.franken.de \ /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.