| Message ID | 20200309201833.41648-1-marex@denx.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dbd1d67d9201ee1eeb770a4fa4459fa76018192f |
| Headers | show |
| Series | [V2] drm/imx: parallel-display: Adjust bus_flags handling | expand |
Hi Marek, On Mon, 2020-03-09 at 21:18 +0100, Marek Vasut wrote: > The bus_flags handling logic does not seem to cover all potential > usecases. Specifically, this seems to fail with an "edt,etm0700g0edh6" > display attached to an 24bit display interface, with interface-pix-fmt > = "rgb24" set in DT. > > This patch fixes the problem by overriding the imx_crtc_state->bus_flags > from the imxpd->bus_flags only if the DT property "interface-pix-fmt" is > present or if the DI provides no formats. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: David Airlie <airlied@linux.ie> > Cc: Fabio Estevam <festevam@gmail.com> > Cc: NXP Linux Team <linux-imx@nxp.com> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > To: dri-devel@lists.freedesktop.org > --- > V2: Rebase on next, update description Thank you for the update, I've applied this patch to imx-drm/next. regards Philipp
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 08fafa4bf8c2..e411179cba1f 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -216,7 +216,7 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge, if (next_bridge_state) bus_flags = next_bridge_state->input_bus_cfg.flags; - else if (!imxpd->bus_format && di->num_bus_formats) + else if (di->num_bus_formats) bus_flags = di->bus_flags; else bus_flags = imxpd->bus_flags;
The bus_flags handling logic does not seem to cover all potential usecases. Specifically, this seems to fail with an "edt,etm0700g0edh6" display attached to an 24bit display interface, with interface-pix-fmt = "rgb24" set in DT. This patch fixes the problem by overriding the imx_crtc_state->bus_flags from the imxpd->bus_flags only if the DT property "interface-pix-fmt" is present or if the DI provides no formats. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@linux.ie> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Cc: linux-arm-kernel@lists.infradead.org To: dri-devel@lists.freedesktop.org --- V2: Rebase on next, update description --- drivers/gpu/drm/imx/parallel-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)