drm/panel: jdi-lt070me05000: Stop tracking prepared/enabled
authorDouglas Anderson <dianders@chromium.org>
Wed, 5 Jun 2024 00:22:57 +0000 (17:22 -0700)
committerNeil Armstrong <neil.armstrong@linaro.org>
Tue, 11 Jun 2024 07:58:44 +0000 (09:58 +0200)
As talked about in commit d2aacaf07395 ("drm/panel: Check for already
prepared/enabled in drm_panel"), we want to remove needless code from
panel drivers that was storing and double-checking the
prepared/enabled state. Even if someone was relying on the
double-check before, that double-check is now in the core and not
needed in individual drivers.

NOTE: as part of this, transition the panel's direct calls to its
disable function in shutdown/remove to call through DRM panel.

Cc: Vinay Simha BN <simhavcs@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240604172305.v3.11.I2e991044def6644c18ad8d7d686f4f3006f278de@changeid
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.11.I2e991044def6644c18ad8d7d686f4f3006f278de@changeid
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c

index f9a69f347068fce84a05da2b14620ba441109064..4ddddee6fa1edacd9d20c2ee884dd6317dfb5e1d 100644 (file)
@@ -37,9 +37,6 @@ struct jdi_panel {
        struct gpio_desc *dcdc_en_gpio;
        struct backlight_device *backlight;
 
-       bool prepared;
-       bool enabled;
-
        const struct drm_display_mode *mode;
 };
 
@@ -176,13 +173,8 @@ static int jdi_panel_disable(struct drm_panel *panel)
 {
        struct jdi_panel *jdi = to_jdi_panel(panel);
 
-       if (!jdi->enabled)
-               return 0;
-
        backlight_disable(jdi->backlight);
 
-       jdi->enabled = false;
-
        return 0;
 }
 
@@ -192,9 +184,6 @@ static int jdi_panel_unprepare(struct drm_panel *panel)
        struct device *dev = &jdi->dsi->dev;
        int ret;
 
-       if (!jdi->prepared)
-               return 0;
-
        jdi_panel_off(jdi);
 
        ret = regulator_bulk_disable(ARRAY_SIZE(jdi->supplies), jdi->supplies);
@@ -207,8 +196,6 @@ static int jdi_panel_unprepare(struct drm_panel *panel)
 
        gpiod_set_value(jdi->dcdc_en_gpio, 0);
 
-       jdi->prepared = false;
-
        return 0;
 }
 
@@ -218,9 +205,6 @@ static int jdi_panel_prepare(struct drm_panel *panel)
        struct device *dev = &jdi->dsi->dev;
        int ret;
 
-       if (jdi->prepared)
-               return 0;
-
        ret = regulator_bulk_enable(ARRAY_SIZE(jdi->supplies), jdi->supplies);
        if (ret < 0) {
                dev_err(dev, "regulator enable failed, %d\n", ret);
@@ -250,8 +234,6 @@ static int jdi_panel_prepare(struct drm_panel *panel)
                goto poweroff;
        }
 
-       jdi->prepared = true;
-
        return 0;
 
 poweroff:
@@ -272,13 +254,8 @@ static int jdi_panel_enable(struct drm_panel *panel)
 {
        struct jdi_panel *jdi = to_jdi_panel(panel);
 
-       if (jdi->enabled)
-               return 0;
-
        backlight_enable(jdi->backlight);
 
-       jdi->enabled = true;
-
        return 0;
 }
 
@@ -475,7 +452,7 @@ static void jdi_panel_remove(struct mipi_dsi_device *dsi)
        struct jdi_panel *jdi = mipi_dsi_get_drvdata(dsi);
        int ret;
 
-       ret = jdi_panel_disable(&jdi->base);
+       ret = drm_panel_disable(&jdi->base);
        if (ret < 0)
                dev_err(&dsi->dev, "failed to disable panel: %d\n", ret);
 
@@ -491,7 +468,7 @@ static void jdi_panel_shutdown(struct mipi_dsi_device *dsi)
 {
        struct jdi_panel *jdi = mipi_dsi_get_drvdata(dsi);
 
-       jdi_panel_disable(&jdi->base);
+       drm_panel_disable(&jdi->base);
 }
 
 static struct mipi_dsi_driver jdi_panel_driver = {