drm/dsi: Add _NO_ to MIPI_DSI_* flags disabling features
authorNicolas Boichat <drinkcat@chromium.org>
Tue, 27 Jul 2021 01:45:21 +0000 (09:45 +0800)
committerSam Ravnborg <sam@ravnborg.org>
Tue, 27 Jul 2021 07:48:24 +0000 (09:48 +0200)
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: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Andrzej 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: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210727094435.v3.1.I629b2366a6591410359c7fcf6d385b474b705ca2@changeid
22 files changed:
drivers/gpu/drm/bridge/adv7511/adv7533.c
drivers/gpu/drm/bridge/analogix/anx7625.c
drivers/gpu/drm/bridge/cdns-dsi.c
drivers/gpu/drm/bridge/lontium-lt8912b.c
drivers/gpu/drm/bridge/tc358768.c
drivers/gpu/drm/exynos/exynos_drm_dsi.c
drivers/gpu/drm/mcde/mcde_dsi.c
drivers/gpu/drm/mediatek/mtk_dsi.c
drivers/gpu/drm/msm/dsi/dsi_host.c
drivers/gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c
drivers/gpu/drm/panel/panel-dsi-cm.c
drivers/gpu/drm/panel/panel-elida-kd35t133.c
drivers/gpu/drm/panel/panel-khadas-ts050.c
drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c
drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c
drivers/gpu/drm/panel/panel-simple.c
drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c
include/drm/drm_mipi_dsi.h

index aa19d5a..59d718b 100644 (file)
@@ -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) {
index a3d8237..be987c8 100644 (file)
@@ -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) {
index b31281f..e6e3310 100644 (file)
@@ -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)
index 76c720b..1b0c7ea 100644 (file)
@@ -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) {
index 8ed8302..320f95a 100644 (file)
@@ -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);
index 1d777d8..e39fac8 100644 (file)
@@ -809,15 +809,15 @@ static int exynos_dsi_init_link(struct exynos_dsi *dsi)
                        reg |= DSIM_AUTO_MODE;
                if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HSE)
                        reg |= DSIM_HSE_MODE;
-               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HFP))
+               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HFP))
                        reg |= DSIM_HFP_MODE;
-               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HBP))
+               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HBP))
                        reg |= DSIM_HBP_MODE;
-               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_HSA))
+               if (!(dsi->mode_flags & MIPI_DSI_MODE_VIDEO_NO_HSA))
                        reg |= DSIM_HSA_MODE;
        }
 
-       if (!(dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET))
+       if (!(dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET))
                reg |= DSIM_EOT_DISABLE;
 
        switch (dsi->format) {
index 5aade1d..16a513c 100644 (file)
@@ -760,7 +760,7 @@ static void mcde_dsi_start(struct mcde_dsi *d)
                DSI_MCTL_MAIN_DATA_CTL_BTA_EN |
                DSI_MCTL_MAIN_DATA_CTL_READ_EN |
                DSI_MCTL_MAIN_DATA_CTL_REG_TE_EN;
-       if (!(d->mdsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET))
+       if (!(d->mdsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET))
                val |= DSI_MCTL_MAIN_DATA_CTL_HOST_EOT_GEN;
        writel(val, d->regs + DSI_MCTL_MAIN_DATA_CTL);
 
index ae403c6..93b40c2 100644 (file)
@@ -404,7 +404,7 @@ static void mtk_dsi_rxtx_control(struct mtk_dsi *dsi)
        if (dsi->mode_flags & MIPI_DSI_CLOCK_NON_CONTINUOUS)
                tmp_reg |= HSTX_CKLP_EN;
 
-       if (!(dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET))
+       if (!(dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET))
                tmp_reg |= DIS_EOT;
 
        writel(tmp_reg, dsi->regs + DSI_TXRX_CTRL);
@@ -481,7 +481,7 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi)
                          timing->da_hs_zero + timing->da_hs_exit + 3;
 
        delta = dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST ? 18 : 12;
-       delta += dsi->mode_flags & MIPI_DSI_MODE_EOT_PACKET ? 2 : 0;
+       delta += dsi->mode_flags & MIPI_DSI_MODE_NO_EOT_PACKET ? 2 : 0;
 
        horizontal_frontporch_byte = vm->hfront_porch * dsi_tmp_buf_bpp;
        horizontal_front_back_byte = horizontal_frontporch_byte + horizontal_backporch_byte;
index 8a10e43..6c3454f 100644 (file)
@@ -850,11 +850,11 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable,
        if (flags & MIPI_DSI_MODE_VIDEO) {
                if (flags & MIPI_DSI_MODE_VIDEO_HSE)
                        data |= DSI_VID_CFG0_PULSE_MODE_HSA_HE;
-               if (flags & MIPI_DSI_MODE_VIDEO_HFP)
+               if (flags & MIPI_DSI_MODE_VIDEO_NO_HFP)
                        data |= DSI_VID_CFG0_HFP_POWER_STOP;
-               if (flags & MIPI_DSI_MODE_VIDEO_HBP)
+               if (flags & MIPI_DSI_MODE_VIDEO_NO_HBP)
                        data |= DSI_VID_CFG0_HBP_POWER_STOP;
-               if (flags & MIPI_DSI_MODE_VIDEO_HSA)
+               if (flags & MIPI_DSI_MODE_VIDEO_NO_HSA)
                        data |= DSI_VID_CFG0_HSA_POWER_STOP;
                /* Always set low power stop mode for BLLP
                 * to let command engine send packets
@@ -909,7 +909,7 @@ static void dsi_ctrl_config(struct msm_dsi_host *msm_host, bool enable,
                          DSI_T_CLK_PRE_EXTEND_INC_BY_2_BYTECLK);
 
        data = 0;
-       if (!(flags & MIPI_DSI_MODE_EOT_PACKET))
+       if (!(flags & MIPI_DSI_MODE_NO_EOT_PACKET))
                data |= DSI_EOT_PACKET_CTRL_TX_EOT_APPEND;
        dsi_write(msm_host, REG_DSI_EOT_PACKET_CTRL, data);
 
index e95bc9f..44674eb 100644 (file)
@@ -302,7 +302,7 @@ static int tm5p5_nt35596_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_EOT_PACKET |
+                         MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_NO_EOT_PACKET |
                          MIPI_DSI_CLOCK_NON_CONTINUOUS | MIPI_DSI_MODE_LPM;
 
        drm_panel_init(&ctx->panel, dev, &tm5p5_nt35596_panel_funcs,
index 5fbfb71..da4a690 100644 (file)
@@ -574,7 +574,7 @@ static int dsicm_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 2;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_CLOCK_NON_CONTINUOUS |
-                         MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_NO_EOT_PACKET;
        dsi->hs_rate = ddata->panel_data->max_hs_rate;
        dsi->lp_rate = ddata->panel_data->max_lp_rate;
 
index 4787f08..8022761 100644 (file)
@@ -273,7 +273,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 1;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET |
+                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET |
                          MIPI_DSI_CLOCK_NON_CONTINUOUS;
 
        drm_panel_init(&ctx->panel, &dsi->dev, &kd35t133_funcs,
index 8f6ac1a..a3ec4cb 100644 (file)
@@ -809,7 +809,7 @@ static int khadas_ts050_panel_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET;
 
        khadas_ts050 = devm_kzalloc(&dsi->dev, sizeof(*khadas_ts050),
                                    GFP_KERNEL);
index ed0d5f9..a5a4149 100644 (file)
@@ -593,7 +593,7 @@ static int ltk050h3146w_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET;
 
        drm_panel_init(&ctx->panel, &dsi->dev, &ltk050h3146w_funcs,
                       DRM_MODE_CONNECTOR_DSI);
index 3c00e4f..21e4892 100644 (file)
@@ -442,7 +442,7 @@ static int ltk500hd1829_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET;
 
        drm_panel_init(&ctx->panel, &dsi->dev, &ltk500hd1829_funcs,
                       DRM_MODE_CONNECTOR_DSI);
index 45b975d..198493a 100644 (file)
@@ -184,7 +184,7 @@ static int osd101t2587_panel_probe(struct mipi_dsi_device *dsi)
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO |
                          MIPI_DSI_MODE_VIDEO_BURST |
                          MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
-                         MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_NO_EOT_PACKET;
 
        osd101t2587 = devm_kzalloc(&dsi->dev, sizeof(*osd101t2587), GFP_KERNEL);
        if (!osd101t2587)
index b962c81..ccc8ed6 100644 (file)
@@ -446,7 +446,7 @@ static int s6e63j0x03_probe(struct mipi_dsi_device *dsi)
 
        dsi->lanes = 1;
        dsi->format = MIPI_DSI_FMT_RGB888;
-       dsi->mode_flags = MIPI_DSI_MODE_EOT_PACKET;
+       dsi->mode_flags = MIPI_DSI_MODE_NO_EOT_PACKET;
 
        ctx->supplies[0].supply = "vdd3";
        ctx->supplies[1].supply = "vci";
index 5273711..9b3599d 100644 (file)
@@ -990,8 +990,8 @@ static int s6e8aa0_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST
-               | MIPI_DSI_MODE_VIDEO_HFP | MIPI_DSI_MODE_VIDEO_HBP
-               | MIPI_DSI_MODE_VIDEO_HSA | MIPI_DSI_MODE_EOT_PACKET
+               | MIPI_DSI_MODE_VIDEO_NO_HFP | MIPI_DSI_MODE_VIDEO_NO_HBP
+               | MIPI_DSI_MODE_VIDEO_NO_HSA | MIPI_DSI_MODE_NO_EOT_PACKET
                | MIPI_DSI_MODE_VSYNC_FLUSH | MIPI_DSI_MODE_VIDEO_AUTO_VERT;
 
        ret = s6e8aa0_parse_dt(ctx);
index 16dbf0f..b937e24 100644 (file)
@@ -282,7 +282,7 @@ static int sharp_nt_panel_probe(struct mipi_dsi_device *dsi)
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO |
                        MIPI_DSI_MODE_VIDEO_HSE |
                        MIPI_DSI_CLOCK_NON_CONTINUOUS |
-                       MIPI_DSI_MODE_EOT_PACKET;
+                       MIPI_DSI_MODE_NO_EOT_PACKET;
 
        sharp_nt = devm_kzalloc(&dsi->dev, sizeof(*sharp_nt), GFP_KERNEL);
        if (!sharp_nt)
index 4dee8b7..dff3ded 100644 (file)
@@ -5072,7 +5072,7 @@ static const struct panel_desc_dsi osd101t2045_53ts = {
        },
        .flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
                 MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
-                MIPI_DSI_MODE_EOT_PACKET,
+                MIPI_DSI_MODE_NO_EOT_PACKET,
        .format = MIPI_DSI_FMT_RGB888,
        .lanes = 4,
 };
index 55172d6..d17aae8 100644 (file)
@@ -311,7 +311,7 @@ static int xpp055c272_probe(struct mipi_dsi_device *dsi)
        dsi->lanes = 4;
        dsi->format = MIPI_DSI_FMT_RGB888;
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
-                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET;
+                         MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET;
 
        drm_panel_init(&ctx->panel, &dsi->dev, &xpp055c272_funcs,
                       DRM_MODE_CONNECTOR_DSI);
index 849d302..af7ba80 100644 (file)
@@ -124,15 +124,15 @@ struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node);
 /* enable hsync-end packets in vsync-pulse and v-porch area */
 #define MIPI_DSI_MODE_VIDEO_HSE                BIT(4)
 /* disable hfront-porch area */
-#define MIPI_DSI_MODE_VIDEO_HFP                BIT(5)
+#define MIPI_DSI_MODE_VIDEO_NO_HFP     BIT(5)
 /* disable hback-porch area */
-#define MIPI_DSI_MODE_VIDEO_HBP                BIT(6)
+#define MIPI_DSI_MODE_VIDEO_NO_HBP     BIT(6)
 /* disable hsync-active area */
-#define MIPI_DSI_MODE_VIDEO_HSA                BIT(7)
+#define MIPI_DSI_MODE_VIDEO_NO_HSA     BIT(7)
 /* flush display FIFO on vsync pulse */
 #define MIPI_DSI_MODE_VSYNC_FLUSH      BIT(8)
 /* disable EoT packets in HS mode */
-#define MIPI_DSI_MODE_EOT_PACKET       BIT(9)
+#define MIPI_DSI_MODE_NO_EOT_PACKET    BIT(9)
 /* device supports non-continuous clock behavior (DSI spec 5.6.1) */
 #define MIPI_DSI_CLOCK_NON_CONTINUOUS  BIT(10)
 /* transmit data in low power */