]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/panel: panasonic-vvx10f034n00: Stop tracking prepared/enabled
authorDouglas Anderson <dianders@chromium.org>
Wed, 5 Jun 2024 00:22:59 +0000 (17:22 -0700)
committerNeil Armstrong <neil.armstrong@linaro.org>
Tue, 11 Jun 2024 07:58:45 +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.

Cc: Werner Johansson <werner.johansson@sonymobile.com>
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.13.I7278e956ffd1cf686e737834578d4bb3ea527c7f@changeid
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240604172305.v3.13.I7278e956ffd1cf686e737834578d4bb3ea527c7f@changeid
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c

index 8ba6d82879381e9669e5669a09ea611c15adf590..822ca2f971eb2cd0baf49025cf9c5f4ffda64012 100644 (file)
@@ -32,9 +32,6 @@ struct wuxga_nt_panel {
 
        struct regulator *supply;
 
-       bool prepared;
-       bool enabled;
-
        ktime_t earliest_wake;
 
        const struct drm_display_mode *mode;
@@ -53,28 +50,16 @@ static int wuxga_nt_panel_on(struct wuxga_nt_panel *wuxga_nt)
 static int wuxga_nt_panel_disable(struct drm_panel *panel)
 {
        struct wuxga_nt_panel *wuxga_nt = to_wuxga_nt_panel(panel);
-       int mipi_ret, bl_ret = 0;
-
-       if (!wuxga_nt->enabled)
-               return 0;
-
-       mipi_ret = mipi_dsi_shutdown_peripheral(wuxga_nt->dsi);
-
-       wuxga_nt->enabled = false;
 
-       return mipi_ret ? mipi_ret : bl_ret;
+       return mipi_dsi_shutdown_peripheral(wuxga_nt->dsi);
 }
 
 static int wuxga_nt_panel_unprepare(struct drm_panel *panel)
 {
        struct wuxga_nt_panel *wuxga_nt = to_wuxga_nt_panel(panel);
 
-       if (!wuxga_nt->prepared)
-               return 0;
-
        regulator_disable(wuxga_nt->supply);
        wuxga_nt->earliest_wake = ktime_add_ms(ktime_get_real(), MIN_POFF_MS);
-       wuxga_nt->prepared = false;
 
        return 0;
 }
@@ -85,9 +70,6 @@ static int wuxga_nt_panel_prepare(struct drm_panel *panel)
        int ret;
        s64 enablewait;
 
-       if (wuxga_nt->prepared)
-               return 0;
-
        /*
         * If the user re-enabled the panel before the required off-time then
         * we need to wait the remaining period before re-enabling regulator
@@ -117,8 +99,6 @@ static int wuxga_nt_panel_prepare(struct drm_panel *panel)
                goto poweroff;
        }
 
-       wuxga_nt->prepared = true;
-
        return 0;
 
 poweroff:
@@ -127,18 +107,6 @@ poweroff:
        return ret;
 }
 
-static int wuxga_nt_panel_enable(struct drm_panel *panel)
-{
-       struct wuxga_nt_panel *wuxga_nt = to_wuxga_nt_panel(panel);
-
-       if (wuxga_nt->enabled)
-               return 0;
-
-       wuxga_nt->enabled = true;
-
-       return 0;
-}
-
 static const struct drm_display_mode default_mode = {
        .clock = 164402,
        .hdisplay = 1920,
@@ -178,7 +146,6 @@ static const struct drm_panel_funcs wuxga_nt_panel_funcs = {
        .disable = wuxga_nt_panel_disable,
        .unprepare = wuxga_nt_panel_unprepare,
        .prepare = wuxga_nt_panel_prepare,
-       .enable = wuxga_nt_panel_enable,
        .get_modes = wuxga_nt_panel_get_modes,
 };