In preparation for state tracking in drm_panel, move the panel functions into drm_panel.c so we beef them up in later patches.

Signed-off-by: Sean Paul seanpaul@chromium.org --- New in v3

drivers/gpu/drm/drm_panel.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_panel.h | 78 +++------------------------------------------ 2 files changed, 82 insertions(+), 73 deletions(-)

diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index 308d442a531b..6f28598a5d0e 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -126,6 +126,83 @@ int drm_panel_detach(struct drm_panel *panel) } EXPORT_SYMBOL(drm_panel_detach);

+/** + * drm_panel_unprepare - power off a panel + * @panel: DRM panel + * + * Calling this function will completely power off a panel (assert the panel's + * reset, turn off power supplies, ...). After this function has completed, it + * is usually no longer possible to communicate with the panel until another + * call to drm_panel_prepare(). + * + * Return: 0 on success or a negative error code on failure. + */ +int drm_panel_unprepare(struct drm_panel *panel) +{ + if (panel && panel->funcs && panel->funcs->unprepare) + return panel->funcs->unprepare(panel); + + return panel ? -ENOSYS : -EINVAL; +} +EXPORT_SYMBOL(drm_panel_unprepare); + +/** + * drm_panel_disable - disable a panel + * @panel: DRM panel + * + * This will typically turn off the panel's backlight or disable the display + * drivers. For smart panels it should still be possible to communicate with + * the integrated circuitry via any command bus after this call. + * + * Return: 0 on success or a negative error code on failure. + */ +int drm_panel_disable(struct drm_panel *panel) +{ + if (panel && panel->funcs && panel->funcs->disable) + return panel->funcs->disable(panel); + + return panel ? -ENOSYS : -EINVAL; +} +EXPORT_SYMBOL(drm_panel_disable); + +/** + * drm_panel_prepare - power on a panel + * @panel: DRM panel + * + * Calling this function will enable power and deassert any reset signals to + * the panel. After this has completed it is possible to communicate with any + * integrated circuitry via a command bus. + * + * Return: 0 on success or a negative error code on failure. + */ +int drm_panel_prepare(struct drm_panel *panel) +{ + if (panel && panel->funcs && panel->funcs->prepare) + return panel->funcs->prepare(panel); + + return panel ? -ENOSYS : -EINVAL; +} +EXPORT_SYMBOL(drm_panel_prepare); + +/** + * drm_panel_enable - enable a panel + * @panel: DRM panel + * + * Calling this function will cause the panel display drivers to be turned on + * and the backlight to be enabled. Content will be visible on screen after + * this call completes. + * + * Return: 0 on success or a negative error code on failure. + */ +int drm_panel_enable(struct drm_panel *panel) +{ + if (panel && panel->funcs && panel->funcs->enable) + return panel->funcs->enable(panel); + + return panel ? -ENOSYS : -EINVAL; +} +EXPORT_SYMBOL(drm_panel_enable); + #ifdef CONFIG_OF /** * of_drm_find_panel - look up a panel using a device tree node diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index ab59d71a24c3..0a9442069d3c 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -95,79 +95,6 @@ struct drm_panel { struct list_head list; };

-/** - * drm_panel_unprepare - power off a panel - * @panel: DRM panel - * - * Calling this function will completely power off a panel (assert the panel's - * reset, turn off power supplies, ...). After this function has completed, it - * is usually no longer possible to communicate with the panel until another - * call to drm_panel_prepare(). - * - * Return: 0 on success or a negative error code on failure. - */ -static inline int drm_panel_unprepare(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->unprepare) - return panel->funcs->unprepare(panel); - - return panel ? -ENOSYS : -EINVAL; -} - -/** - * drm_panel_disable - disable a panel - * @panel: DRM panel - * - * This will typically turn off the panel's backlight or disable the display - * drivers. For smart panels it should still be possible to communicate with - * the integrated circuitry via any command bus after this call. - * - * Return: 0 on success or a negative error code on failure. - */ -static inline int drm_panel_disable(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->disable) - return panel->funcs->disable(panel); - - return panel ? -ENOSYS : -EINVAL; -} - -/** - * drm_panel_prepare - power on a panel - * @panel: DRM panel - * - * Calling this function will enable power and deassert any reset signals to - * the panel. After this has completed it is possible to communicate with any - * integrated circuitry via a command bus. - * - * Return: 0 on success or a negative error code on failure. - */ -static inline int drm_panel_prepare(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->prepare) - return panel->funcs->prepare(panel); - - return panel ? -ENOSYS : -EINVAL; -} - -/** - * drm_panel_enable - enable a panel - * @panel: DRM panel - * - * Calling this function will cause the panel display drivers to be turned on - * and the backlight to be enabled. Content will be visible on screen after - * this call completes. - * - * Return: 0 on success or a negative error code on failure. - */ -static inline int drm_panel_enable(struct drm_panel *panel) -{ - if (panel && panel->funcs && panel->funcs->enable) - return panel->funcs->enable(panel); - - return panel ? -ENOSYS : -EINVAL; -} - /** * drm_panel_get_modes - probe the available display modes of a panel * @panel: DRM panel @@ -194,6 +121,11 @@ void drm_panel_remove(struct drm_panel *panel); int drm_panel_attach(struct drm_panel *panel, struct drm_connector *connector); int drm_panel_detach(struct drm_panel *panel);

+int drm_panel_unprepare(struct drm_panel *panel); +int drm_panel_disable(struct drm_panel *panel); +int drm_panel_prepare(struct drm_panel *panel); +int drm_panel_enable(struct drm_panel *panel); + #if defined(CONFIG_OF) && defined(CONFIG_DRM_PANEL) struct drm_panel *of_drm_find_panel(const struct device_node *np); #else

This patch adds state tracking to the drm_panel functions which keep track of enabled and prepared. If the calls are unbalanced, a WARNING is issued.

The motivation for this change is that a number of panel drivers (including panel-simple) all do this to protect their regulator refcounts. The atomic framework ensures the calls are balanced, and there aren't any panel drivers being used by legacy drivers. As such, these checks are useless, but let's add a WARNING just in case something crazy happens (like a legacy driver using a panel).

Less code == better.

Changes in v2: - Reduced enabled/prepared bools to one enum (Andrzej) - Don't update state if the operation fails (Andrzej) - Issue warning even if operation is not implemented

Changes in v3: - Functions no longer static inline (Daniel) - Added a helper function to share state change code (Andrzej) - Only warn when a panel is present (Daniel) - Update state if function is not implemented (Andrzej)

Cc: Andrzej Hajda a.hajda@samsung.com Cc: Daniel Vetter daniel.vetter@ffwll.ch Signed-off-by: Sean Paul seanpaul@chromium.org --- drivers/gpu/drm/drm_panel.c | 63 ++++++++++++++++++++++++++++++++++++--------- include/drm/drm_panel.h | 15 +++++++++++ 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index 6f28598a5d0e..6547850b5e80 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */

+#include <linux/bug.h> #include <linux/err.h> #include <linux/module.h>

@@ -48,6 +49,7 @@ static LIST_HEAD(panel_list); void drm_panel_init(struct drm_panel *panel) { INIT_LIST_HEAD(&panel->list); + panel->state = DRM_PANEL_POWER_OFF; } EXPORT_SYMBOL(drm_panel_init);

@@ -126,6 +128,23 @@ int drm_panel_detach(struct drm_panel *panel) } EXPORT_SYMBOL(drm_panel_detach);

+static int drm_panel_change_state(struct drm_panel *panel, + enum drm_panel_state cur_state, + enum drm_panel_state new_state, + int (*hook)(struct drm_panel *panel)) +{ + int ret; + + WARN_ON(panel->state != cur_state); + if (hook) + ret = hook(panel); + else + ret = -ENOSYS; + + panel->state = new_state; + return ret; +} + /** * drm_panel_unprepare - power off a panel * @panel: DRM panel @@ -135,14 +154,19 @@ EXPORT_SYMBOL(drm_panel_detach); * is usually no longer possible to communicate with the panel until another * call to drm_panel_prepare(). * + * Atomic framework will ensure that prepare/unprepare are properly balanced. + * If this is not the case, a WARNING will be issued. + * * Return: 0 on success or a negative error code on failure. */ int drm_panel_unprepare(struct drm_panel *panel) { - if (panel && panel->funcs && panel->funcs->unprepare) - return panel->funcs->unprepare(panel); + if (!panel) + return -EINVAL;

- return panel ? -ENOSYS : -EINVAL; + return drm_panel_change_state(panel, DRM_PANEL_POWER_PREPARED, + DRM_PANEL_POWER_OFF, + panel->funcs ? panel->funcs->unprepare : NULL); } EXPORT_SYMBOL(drm_panel_unprepare);

@@ -154,14 +178,19 @@ EXPORT_SYMBOL(drm_panel_unprepare); * drivers. For smart panels it should still be possible to communicate with * the integrated circuitry via any command bus after this call. * + * Atomic framework will ensure that enable/disable are properly balanced. + * If this is not the case, a WARNING will be issued. + * * Return: 0 on success or a negative error code on failure. */ int drm_panel_disable(struct drm_panel *panel) { - if (panel && panel->funcs && panel->funcs->disable) - return panel->funcs->disable(panel); + if (!panel) + return -EINVAL;

- return panel ? -ENOSYS : -EINVAL; + return drm_panel_change_state(panel, DRM_PANEL_POWER_ENABLED, + DRM_PANEL_POWER_PREPARED, + panel->funcs ? panel->funcs->disable : NULL); } EXPORT_SYMBOL(drm_panel_disable);

@@ -173,14 +202,19 @@ EXPORT_SYMBOL(drm_panel_disable); * the panel. After this has completed it is possible to communicate with any * integrated circuitry via a command bus. * + * Atomic framework will ensure that prepare/unprepare are properly balanced. + * If this is not the case, a WARNING will be issued. + * * Return: 0 on success or a negative error code on failure. */ int drm_panel_prepare(struct drm_panel *panel) { - if (panel && panel->funcs && panel->funcs->prepare) - return panel->funcs->prepare(panel); + if (!panel) + return -EINVAL;

- return panel ? -ENOSYS : -EINVAL; + return drm_panel_change_state(panel, DRM_PANEL_POWER_OFF, + DRM_PANEL_POWER_PREPARED, + panel->funcs ? panel->funcs->prepare: NULL); } EXPORT_SYMBOL(drm_panel_prepare);

@@ -192,14 +226,19 @@ EXPORT_SYMBOL(drm_panel_prepare); * and the backlight to be enabled. Content will be visible on screen after * this call completes. * + * Atomic framework will ensure that enable/disable are properly balanced. + * If this is not the case, a WARNING will be issued. + * * Return: 0 on success or a negative error code on failure. */ int drm_panel_enable(struct drm_panel *panel) { - if (panel && panel->funcs && panel->funcs->enable) - return panel->funcs->enable(panel); + if (!panel) + return -EINVAL;

- return panel ? -ENOSYS : -EINVAL; + return drm_panel_change_state(panel, DRM_PANEL_POWER_PREPARED, + DRM_PANEL_POWER_ENABLED, + panel->funcs ? panel->funcs->enable: NULL); } EXPORT_SYMBOL(drm_panel_enable);

diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 0a9442069d3c..7e6a552005d7 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -77,6 +77,18 @@ struct drm_panel_funcs { struct display_timing *timings); };

+/** + * enum drm_panel_state - describes the state of a panel + * @DRM_PANEL_POWER_OFF: panel is currently off (accessible from PREPARED) + * @DRM_PANEL_POWER_PREPARED: panel is prepared (accessible from OFF || ENABLED) + * @DRM_PANEL_POWER_ENABLED: panel is enabled (accessible from PREPARED) + */ +enum drm_panel_state { + DRM_PANEL_POWER_OFF, + DRM_PANEL_POWER_PREPARED, + DRM_PANEL_POWER_ENABLED +}; + /** * struct drm_panel - DRM panel object * @drm: DRM device owning the panel @@ -84,6 +96,7 @@ struct drm_panel_funcs { * @dev: parent device of the panel * @funcs: operations that can be performed on the panel * @list: panel entry in registry + * @state: keeps track of the panel power status */ struct drm_panel { struct drm_device *drm; @@ -93,6 +106,8 @@ struct drm_panel { const struct drm_panel_funcs *funcs;

struct list_head list; + + enum drm_panel_state state; };

/**

They're not necessary for atomic drivers, and drm_panel will WARN if the calls are unbalanced.

Signed-off-by: Sean Paul seanpaul@chromium.org --- No changes since v1

.../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 22 ---------------------- 1 file changed, 22 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c index 7f915f706fa6..e7efa097151c 100644 --- a/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +++ b/drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c @@ -44,9 +44,6 @@ struct wuxga_nt_panel { struct backlight_device *backlight; struct regulator *supply;

- bool prepared; - bool enabled; - ktime_t earliest_wake;

const struct drm_display_mode *mode; @@ -73,9 +70,6 @@ static int wuxga_nt_panel_disable(struct drm_panel *panel) { struct wuxga_nt_panel *wuxga_nt = to_wuxga_nt_panel(panel);

- if (!wuxga_nt->enabled) - return 0; - mipi_dsi_shutdown_peripheral(wuxga_nt->dsi);

if (wuxga_nt->backlight) { @@ -84,8 +78,6 @@ static int wuxga_nt_panel_disable(struct drm_panel *panel) backlight_update_status(wuxga_nt->backlight); }

- wuxga_nt->enabled = false; - return 0; }

@@ -93,12 +85,8 @@ 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; } @@ -109,9 +97,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 @@ -141,8 +126,6 @@ static int wuxga_nt_panel_prepare(struct drm_panel *panel) goto poweroff; }

- wuxga_nt->prepared = true; - return 0;

poweroff: @@ -155,17 +138,12 @@ 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; - if (wuxga_nt->backlight) { wuxga_nt->backlight->props.power = FB_BLANK_UNBLANK; wuxga_nt->backlight->props.state &= ~BL_CORE_FBBLANK; backlight_update_status(wuxga_nt->backlight); }

- wuxga_nt->enabled = true; - return 0; }

They're not necessary for atomic drivers, and drm_panel will WARN if the calls are unbalanced.

Signed-off-by: Sean Paul seanpaul@chromium.org --- No changes since v1

drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 23 ----------------------- 1 file changed, 23 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c index 3cce3ca19601..9b447b0bfcd0 100644 --- a/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +++ b/drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c @@ -28,9 +28,6 @@ struct sharp_panel { struct backlight_device *backlight; struct regulator *supply;

- bool prepared; - bool enabled; - const struct drm_display_mode *mode; };

@@ -93,16 +90,11 @@ static int sharp_panel_disable(struct drm_panel *panel) { struct sharp_panel *sharp = to_sharp_panel(panel);

- if (!sharp->enabled) - return 0; - if (sharp->backlight) { sharp->backlight->props.power = FB_BLANK_POWERDOWN; backlight_update_status(sharp->backlight); }

- sharp->enabled = false; - return 0; }

@@ -111,9 +103,6 @@ static int sharp_panel_unprepare(struct drm_panel *panel) struct sharp_panel *sharp = to_sharp_panel(panel); int err;

- if (!sharp->prepared) - return 0; - sharp_wait_frames(sharp, 4);

err = mipi_dsi_dcs_set_display_off(sharp->link1); @@ -128,8 +117,6 @@ static int sharp_panel_unprepare(struct drm_panel *panel)

regulator_disable(sharp->supply);

- sharp->prepared = false; - return 0; }

@@ -173,9 +160,6 @@ static int sharp_panel_prepare(struct drm_panel *panel) u8 format = MIPI_DCS_PIXEL_FMT_24BIT; int err;

- if (sharp->prepared) - return 0; - err = regulator_enable(sharp->supply); if (err < 0) return err; @@ -244,8 +228,6 @@ static int sharp_panel_prepare(struct drm_panel *panel) goto poweroff; }

- sharp->prepared = true; - /* wait for 6 frames before continuing */ sharp_wait_frames(sharp, 6);

@@ -260,16 +242,11 @@ static int sharp_panel_enable(struct drm_panel *panel) { struct sharp_panel *sharp = to_sharp_panel(panel);

- if (sharp->enabled) - return 0; - if (sharp->backlight) { sharp->backlight->props.power = FB_BLANK_UNBLANK; backlight_update_status(sharp->backlight); }

- sharp->enabled = true; - return 0; }

I noticed while removing the enabled flag that backlight update checks prepared in such a way that could race with hardware turning on/off. This patch adds a mutex to ensure these races don't happen.

In addition to the lock, this patch also renames prepared to initialized to better reflect what it means when used in the backlight hook.

Signed-off-by: Sean Paul seanpaul@chromium.org --- No changes since v1

drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 43 ++++++++++++++++-------- 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c index 0a5898fd4502..d099af3c91df 100644 --- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c @@ -11,6 +11,7 @@ #include <drm/drm_panel.h> #include <linux/backlight.h> #include <linux/gpio/consumer.h> +#include <linux/mutex.h> #include <video/mipi_display.h>

#define DRV_NAME "orisetech_otm8009a" @@ -62,7 +63,9 @@ struct otm8009a { struct drm_panel panel; struct backlight_device *bl_dev; struct gpio_desc *reset_gpio; - bool prepared; + + struct mutex lock; + bool initialized; };

static const struct drm_display_mode default_mode = { @@ -265,26 +268,30 @@ static int otm8009a_unprepare(struct drm_panel *panel) { struct otm8009a *ctx = panel_to_otm8009a(panel);

- if (!ctx->prepared) - return 0; + mutex_lock(&ctx->lock); + if (!ctx->initialized) + goto out;

if (ctx->reset_gpio) { gpiod_set_value_cansleep(ctx->reset_gpio, 1); msleep(20); }

- ctx->prepared = false; + ctx->initialized = false;

+out: + mutex_unlock(&ctx->lock); return 0; }

static int otm8009a_prepare(struct drm_panel *panel) { struct otm8009a *ctx = panel_to_otm8009a(panel); - int ret; + int ret = 0;

- if (ctx->prepared) - return 0; + mutex_lock(&ctx->lock); + if (ctx->initialized) + goto out;

if (ctx->reset_gpio) { gpiod_set_value_cansleep(ctx->reset_gpio, 0); @@ -296,18 +303,20 @@ static int otm8009a_prepare(struct drm_panel *panel)

ret = otm8009a_init_sequence(ctx); if (ret) - return ret; + goto out;

- ctx->prepared = true; + ctx->initialized = true;

/* * Power on the backlight. Note: end-user still controls brightness - * Note: ctx->prepared must be true before updating the backlight. + * Note: ctx->initialized must be true before updating the backlight. */ ctx->bl_dev->props.power = FB_BLANK_UNBLANK; backlight_update_status(ctx->bl_dev);

- return 0; +out: + mutex_unlock(&ctx->lock); + return ret; }

static int otm8009a_get_modes(struct drm_panel *panel) @@ -348,10 +357,13 @@ static int otm8009a_backlight_update_status(struct backlight_device *bd) { struct otm8009a *ctx = bl_get_data(bd); u8 data[2]; + int ret = 0;

- if (!ctx->prepared) { + mutex_lock(&ctx->lock); + if (!ctx->initialized) { DRM_DEBUG("lcd not ready yet for setting its backlight!\n"); - return -ENXIO; + ret = -ENXIO; + goto out; }

if (bd->props.power <= FB_BLANK_NORMAL) { @@ -375,7 +387,9 @@ static int otm8009a_backlight_update_status(struct backlight_device *bd) data[0] = MIPI_DCS_WRITE_CONTROL_DISPLAY; otm8009a_dcs_write_buf(ctx, data, ARRAY_SIZE(data));

- return 0; +out: + mutex_unlock(&ctx->lock); + return ret; }

static const struct backlight_ops otm8009a_backlight_ops = { @@ -401,6 +415,7 @@ static int otm8009a_probe(struct mipi_dsi_device *dsi) mipi_dsi_set_drvdata(dsi, ctx);

ctx->dev = dev; + mutex_init(&ctx->lock);

dsi->lanes = 2; dsi->format = MIPI_DSI_FMT_RGB888;

They're not necessary for atomic drivers, and drm_panel will WARN if the calls are unbalanced

Signed-off-by: Sean Paul seanpaul@chromium.org --- No changes since v1

drivers/gpu/drm/panel/panel-simple.c | 24 ------------------------ 1 file changed, 24 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index a3c96d2ea41c..0e1fbca811a0 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -77,8 +77,6 @@ struct panel_desc {

struct panel_simple { struct drm_panel base; - bool prepared; - bool enabled;

const struct panel_desc *desc;

@@ -163,9 +161,6 @@ static int panel_simple_disable(struct drm_panel *panel) { struct panel_simple *p = to_panel_simple(panel);

- if (!p->enabled) - return 0; - if (p->backlight) { p->backlight->props.power = FB_BLANK_POWERDOWN; p->backlight->props.state |= BL_CORE_FBBLANK; @@ -175,8 +170,6 @@ static int panel_simple_disable(struct drm_panel *panel) if (p->desc->delay.disable) msleep(p->desc->delay.disable);

- p->enabled = false; - return 0; }

@@ -184,9 +177,6 @@ static int panel_simple_unprepare(struct drm_panel *panel) { struct panel_simple *p = to_panel_simple(panel);

- if (!p->prepared) - return 0; - gpiod_set_value_cansleep(p->enable_gpio, 0);

regulator_disable(p->supply); @@ -194,8 +184,6 @@ static int panel_simple_unprepare(struct drm_panel *panel) if (p->desc->delay.unprepare) msleep(p->desc->delay.unprepare);

- p->prepared = false; - return 0; }

@@ -204,9 +192,6 @@ static int panel_simple_prepare(struct drm_panel *panel) struct panel_simple *p = to_panel_simple(panel); int err;

- if (p->prepared) - return 0; - err = regulator_enable(p->supply); if (err < 0) { dev_err(panel->dev, "failed to enable supply: %d\n", err); @@ -218,8 +203,6 @@ static int panel_simple_prepare(struct drm_panel *panel) if (p->desc->delay.prepare) msleep(p->desc->delay.prepare);

- p->prepared = true; - return 0; }

@@ -227,9 +210,6 @@ static int panel_simple_enable(struct drm_panel *panel) { struct panel_simple *p = to_panel_simple(panel);

- if (p->enabled) - return 0; - if (p->desc->delay.enable) msleep(p->desc->delay.enable);

@@ -239,8 +219,6 @@ static int panel_simple_enable(struct drm_panel *panel) backlight_update_status(p->backlight); }

- p->enabled = true; - return 0; }

@@ -301,8 +279,6 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) if (!panel) return -ENOMEM;

- panel->enabled = false; - panel->prepared = false; panel->desc = desc;

panel->supply = devm_regulator_get(dev, "power");

They're not necessary for atomic drivers, and drm_panel will WARN if the calls are unbalanced

Signed-off-by: Sean Paul seanpaul@chromium.org --- No changes since v1

drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 23 ----------------------- 1 file changed, 23 deletions(-)

diff --git a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c index 3aeb0bda4947..8d7843248556 100644 --- a/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +++ b/drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c @@ -39,9 +39,6 @@ struct sharp_nt_panel { struct regulator *supply; struct gpio_desc *reset_gpio;

- bool prepared; - bool enabled; - const struct drm_display_mode *mode; };

@@ -114,16 +111,11 @@ static int sharp_nt_panel_disable(struct drm_panel *panel) { struct sharp_nt_panel *sharp_nt = to_sharp_nt_panel(panel);

- if (!sharp_nt->enabled) - return 0; - if (sharp_nt->backlight) { sharp_nt->backlight->props.power = FB_BLANK_POWERDOWN; backlight_update_status(sharp_nt->backlight); }

- sharp_nt->enabled = false; - return 0; }

@@ -132,9 +124,6 @@ static int sharp_nt_panel_unprepare(struct drm_panel *panel) struct sharp_nt_panel *sharp_nt = to_sharp_nt_panel(panel); int ret;

- if (!sharp_nt->prepared) - return 0; - ret = sharp_nt_panel_off(sharp_nt); if (ret < 0) { dev_err(panel->dev, "failed to set panel off: %d\n", ret); @@ -145,8 +134,6 @@ static int sharp_nt_panel_unprepare(struct drm_panel *panel) if (sharp_nt->reset_gpio) gpiod_set_value(sharp_nt->reset_gpio, 0);

- sharp_nt->prepared = false; - return 0; }

@@ -155,9 +142,6 @@ static int sharp_nt_panel_prepare(struct drm_panel *panel) struct sharp_nt_panel *sharp_nt = to_sharp_nt_panel(panel); int ret;

- if (sharp_nt->prepared) - return 0; - ret = regulator_enable(sharp_nt->supply); if (ret < 0) return ret; @@ -185,8 +169,6 @@ static int sharp_nt_panel_prepare(struct drm_panel *panel) goto poweroff; }

- sharp_nt->prepared = true; - return 0;

poweroff: @@ -200,16 +182,11 @@ static int sharp_nt_panel_enable(struct drm_panel *panel) { struct sharp_nt_panel *sharp_nt = to_sharp_nt_panel(panel);

- if (sharp_nt->enabled) - return 0; - if (sharp_nt->backlight) { sharp_nt->backlight->props.power = FB_BLANK_UNBLANK; backlight_update_status(sharp_nt->backlight); }

- sharp_nt->enabled = true; - return 0; }