Commit 0f3b68b6 authored by Nicolas Boichat's avatar Nicolas Boichat Committed by Sam Ravnborg
Browse files

drm/dsi: Add _NO_ to MIPI_DSI_* flags disabling features 



Many of the DSI flags have names opposite to their actual effects,
e.g. MIPI_DSI_MODE_EOT_PACKET means that EoT packets will actually
be disabled. Fix this by including _NO_ in the flag names, e.g.
MIPI_DSI_MODE_NO_EOT_PACKET.

Signed-off-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@samsung.com>
Reviewed-by: Xin Ji <xji@analogixsemi.com> # anx7625.c
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org> # msm/dsi
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727094435.v3.1.I629b2366a6591410359c7fcf6d385b474b705ca2@changeid
parent 0937a7b3

drivers/gpu/drm/bridge/adv7511/adv7533.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ int adv7533_attach_dsi(struct adv7511 *adv) 
	dsi->lanes = adv->num_dsi_lanes;

	dsi->format = MIPI_DSI_FMT_RGB888;

	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |

			  MIPI_DSI_MODE_EOT_PACKET | MIPI_DSI_MODE_VIDEO_HSE;

			  MIPI_DSI_MODE_NO_EOT_PACKET | MIPI_DSI_MODE_VIDEO_HSE;



	ret = mipi_dsi_attach(dsi);

	if (ret < 0) {

drivers/gpu/drm/bridge/analogix/anx7625.c

+1 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ static int anx7625_attach_dsi(struct anx7625_data *ctx) 
	dsi->format = MIPI_DSI_FMT_RGB888;

	dsi->mode_flags = MIPI_DSI_MODE_VIDEO	|

		MIPI_DSI_MODE_VIDEO_SYNC_PULSE	|

		MIPI_DSI_MODE_EOT_PACKET	|

		MIPI_DSI_MODE_NO_EOT_PACKET	|

		MIPI_DSI_MODE_VIDEO_HSE;



	if (mipi_dsi_attach(dsi) < 0) {

drivers/gpu/drm/bridge/cdns-dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) 
	tmp = DIV_ROUND_UP(dsi_cfg.htotal, nlanes) -

	      DIV_ROUND_UP(dsi_cfg.hsa, nlanes);



	if (!(output->dev->mode_flags & MIPI_DSI_MODE_EOT_PACKET))

	if (!(output->dev->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET))

		tmp -= DIV_ROUND_UP(DSI_EOT_PKT_SIZE, nlanes);



	tx_byte_period = DIV_ROUND_DOWN_ULL((u64)NSEC_PER_SEC * 8,
@@ -902,7 +902,7 @@ static void cdns_dsi_bridge_enable(struct drm_bridge *bridge) 
	tmp = readl(dsi->regs + MCTL_MAIN_DATA_CTL);

	tmp &= ~(IF_VID_SELECT_MASK | HOST_EOT_GEN | IF_VID_MODE);



	if (!(output->dev->mode_flags & MIPI_DSI_MODE_EOT_PACKET))

	if (!(output->dev->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET))

		tmp |= HOST_EOT_GEN;



	if (output->dev->mode_flags & MIPI_DSI_MODE_VIDEO)

drivers/gpu/drm/bridge/lontium-lt8912b.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int lt8912_attach_dsi(struct lt8912 *lt) 
	dsi->mode_flags = MIPI_DSI_MODE_VIDEO |

			  MIPI_DSI_MODE_VIDEO_BURST |

			  MIPI_DSI_MODE_LPM |

			  MIPI_DSI_MODE_EOT_PACKET;

			  MIPI_DSI_MODE_NO_EOT_PACKET;



	ret = mipi_dsi_attach(dsi);

	if (ret < 0) {

drivers/gpu/drm/bridge/tc358768.c

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static void tc358768_bridge_pre_enable(struct drm_bridge *bridge) 
	if (!(dsi_dev->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS))

		val |= TC358768_DSI_CONTROL_HSCKMD;



	if (dsi_dev->mode_flags & MIPI_DSI_MODE_EOT_PACKET)

	if (dsi_dev->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET)

		val |= TC358768_DSI_CONTROL_EOTDIS;



	tc358768_write(priv, TC358768_DSI_CONFW, val);