* [PATCH v3 01/12] drm/panel: Fix typo in drm_panel_unprepare docs
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 02/12] drm/panel: Move [un]prepare and [dis|en]able functions Sean Paul
` (10 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding, Daniel Vetter
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
New in v3
include/drm/drm_panel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h
index 14ac240a1f64..ab59d71a24c3 100644
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
@@ -96,7 +96,7 @@ struct drm_panel {
};
/**
- * drm_disable_unprepare - power off a panel
+ * drm_panel_unprepare - power off a panel
* @panel: DRM panel
*
* Calling this function will completely power off a panel (assert the panel's
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 02/12] drm/panel: Move [un]prepare and [dis|en]able functions
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
2017-10-17 21:13 ` [PATCH v3 01/12] drm/panel: Fix typo in drm_panel_unprepare docs Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-18 8:16 ` Daniel Vetter
2017-10-17 21:13 ` [PATCH v3 03/12] drm/panel: Keep track of enabled/prepared Sean Paul
` (9 subsequent siblings)
11 siblings, 1 reply; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding, Daniel Vetter
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
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v3 02/12] drm/panel: Move [un]prepare and [dis|en]able functions
2017-10-17 21:13 ` [PATCH v3 02/12] drm/panel: Move [un]prepare and [dis|en]able functions Sean Paul
@ 2017-10-18 8:16 ` Daniel Vetter
0 siblings, 0 replies; 15+ messages in thread
From: Daniel Vetter @ 2017-10-18 8:16 UTC (permalink / raw)
To: Sean Paul; +Cc: dri-devel, thierry.reding, Daniel Vetter
On Tue, Oct 17, 2017 at 05:13:05PM -0400, Sean Paul wrote:
> 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>
I'll take the easy ones, on patches 1&2:
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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
> --
> 2.15.0.rc1.287.g2b38de12cc-goog
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 03/12] drm/panel: Keep track of enabled/prepared
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
2017-10-17 21:13 ` [PATCH v3 01/12] drm/panel: Fix typo in drm_panel_unprepare docs Sean Paul
2017-10-17 21:13 ` [PATCH v3 02/12] drm/panel: Move [un]prepare and [dis|en]able functions Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-18 7:54 ` Andrzej Hajda
2017-10-17 21:13 ` [PATCH v3 04/12] drm/panel: vvx10f034n00: Remove enabled/prepared state Sean Paul
` (8 subsequent siblings)
11 siblings, 1 reply; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: Daniel Vetter, thierry.reding, Daniel Vetter
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;
};
/**
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v3 03/12] drm/panel: Keep track of enabled/prepared
2017-10-17 21:13 ` [PATCH v3 03/12] drm/panel: Keep track of enabled/prepared Sean Paul
@ 2017-10-18 7:54 ` Andrzej Hajda
0 siblings, 0 replies; 15+ messages in thread
From: Andrzej Hajda @ 2017-10-18 7:54 UTC (permalink / raw)
To: Sean Paul, dri-devel; +Cc: Daniel Vetter, thierry.reding, Daniel Vetter
On 17.10.2017 23:13, Sean Paul wrote:
> 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;
You have missed my 2 comments:
- do not change state on callback error,
- return 0 in case there is no callback.
Regards
Andrzej
> +
> + 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;
> };
>
> /**
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3 04/12] drm/panel: vvx10f034n00: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (2 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 03/12] drm/panel: Keep track of enabled/prepared Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 05/12] drm/panel: lt070me05000: " Sean Paul
` (7 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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;
}
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 05/12] drm/panel: lt070me05000: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (3 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 04/12] drm/panel: vvx10f034n00: Remove enabled/prepared state Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 06/12] drm/panel: lq101r1sx01: " Sean Paul
` (6 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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-jdi-lt070me05000.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
index 5b2340ef74ed..2f2455650258 100644
--- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
+++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
@@ -50,9 +50,6 @@ struct jdi_panel {
struct gpio_desc *dcdc_en_gpio;
struct backlight_device *backlight;
- bool prepared;
- bool enabled;
-
const struct drm_display_mode *mode;
};
@@ -189,14 +186,9 @@ static int jdi_panel_disable(struct drm_panel *panel)
{
struct jdi_panel *jdi = to_jdi_panel(panel);
- if (!jdi->enabled)
- return 0;
-
jdi->backlight->props.power = FB_BLANK_POWERDOWN;
backlight_update_status(jdi->backlight);
- jdi->enabled = false;
-
return 0;
}
@@ -206,9 +198,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);
@@ -221,8 +210,6 @@ static int jdi_panel_unprepare(struct drm_panel *panel)
gpiod_set_value(jdi->dcdc_en_gpio, 0);
- jdi->prepared = false;
-
return 0;
}
@@ -232,9 +219,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);
@@ -264,8 +248,6 @@ static int jdi_panel_prepare(struct drm_panel *panel)
goto poweroff;
}
- jdi->prepared = true;
-
return 0;
poweroff:
@@ -286,14 +268,9 @@ static int jdi_panel_enable(struct drm_panel *panel)
{
struct jdi_panel *jdi = to_jdi_panel(panel);
- if (jdi->enabled)
- return 0;
-
jdi->backlight->props.power = FB_BLANK_UNBLANK;
backlight_update_status(jdi->backlight);
- jdi->enabled = true;
-
return 0;
}
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 06/12] drm/panel: lq101r1sx01: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (4 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 05/12] drm/panel: lt070me05000: " Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 07/12] drm/panel: otm8009a: Remove enabled state Sean Paul
` (5 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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;
}
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 07/12] drm/panel: otm8009a: Remove enabled state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (5 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 06/12] drm/panel: lq101r1sx01: " Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 08/12] drm/panel: otm8009a: Properly sequence [un]prepare with backlight Sean Paul
` (4 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
It's 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-orisetech-otm8009a.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
index c189cd6329c8..0a5898fd4502 100644
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
@@ -63,7 +63,6 @@ struct otm8009a {
struct backlight_device *bl_dev;
struct gpio_desc *reset_gpio;
bool prepared;
- bool enabled;
};
static const struct drm_display_mode default_mode = {
@@ -243,9 +242,6 @@ static int otm8009a_disable(struct drm_panel *panel)
struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
int ret;
- if (!ctx->enabled)
- return 0; /* This is not an issue so we return 0 here */
-
/* Power off the backlight. Note: end-user still controls brightness */
ctx->bl_dev->props.power = FB_BLANK_POWERDOWN;
ret = backlight_update_status(ctx->bl_dev);
@@ -262,8 +258,6 @@ static int otm8009a_disable(struct drm_panel *panel)
msleep(120);
- ctx->enabled = false;
-
return 0;
}
@@ -316,15 +310,6 @@ static int otm8009a_prepare(struct drm_panel *panel)
return 0;
}
-static int otm8009a_enable(struct drm_panel *panel)
-{
- struct otm8009a *ctx = panel_to_otm8009a(panel);
-
- ctx->enabled = true;
-
- return 0;
-}
-
static int otm8009a_get_modes(struct drm_panel *panel)
{
struct drm_display_mode *mode;
@@ -352,7 +337,6 @@ static const struct drm_panel_funcs otm8009a_drm_funcs = {
.disable = otm8009a_disable,
.unprepare = otm8009a_unprepare,
.prepare = otm8009a_prepare,
- .enable = otm8009a_enable,
.get_modes = otm8009a_get_modes,
};
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 08/12] drm/panel: otm8009a: Properly sequence [un]prepare with backlight
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (6 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 07/12] drm/panel: otm8009a: Remove enabled state Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 09/12] drm/panel: 43wvf1g: Remove enabled/prepared state Sean Paul
` (3 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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;
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 09/12] drm/panel: 43wvf1g: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (7 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 08/12] drm/panel: otm8009a: Properly sequence [un]prepare with backlight Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 10/12] drm/panel: simple: " Sean Paul
` (2 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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-seiko-43wvf1g.c | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
index 71c09ed436ae..51785774efd1 100644
--- a/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
+++ b/drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
@@ -44,8 +44,6 @@ struct seiko_panel_desc {
struct seiko_panel {
struct drm_panel base;
- bool prepared;
- bool enabled;
const struct seiko_panel_desc *desc;
struct backlight_device *backlight;
struct regulator *dvdd;
@@ -126,17 +124,12 @@ static int seiko_panel_disable(struct drm_panel *panel)
{
struct seiko_panel *p = to_seiko_panel(panel);
- if (!p->enabled)
- return 0;
-
if (p->backlight) {
p->backlight->props.power = FB_BLANK_POWERDOWN;
p->backlight->props.state |= BL_CORE_FBBLANK;
backlight_update_status(p->backlight);
}
- p->enabled = false;
-
return 0;
}
@@ -144,9 +137,6 @@ static int seiko_panel_unprepare(struct drm_panel *panel)
{
struct seiko_panel *p = to_seiko_panel(panel);
- if (!p->prepared)
- return 0;
-
regulator_disable(p->avdd);
/* Add a 100ms delay as per the panel datasheet */
@@ -154,8 +144,6 @@ static int seiko_panel_unprepare(struct drm_panel *panel)
regulator_disable(p->dvdd);
- p->prepared = false;
-
return 0;
}
@@ -164,9 +152,6 @@ static int seiko_panel_prepare(struct drm_panel *panel)
struct seiko_panel *p = to_seiko_panel(panel);
int err;
- if (p->prepared)
- return 0;
-
err = regulator_enable(p->dvdd);
if (err < 0) {
dev_err(panel->dev, "failed to enable dvdd: %d\n", err);
@@ -182,8 +167,6 @@ static int seiko_panel_prepare(struct drm_panel *panel)
goto disable_dvdd;
}
- p->prepared = true;
-
return 0;
disable_dvdd:
@@ -195,17 +178,12 @@ static int seiko_panel_enable(struct drm_panel *panel)
{
struct seiko_panel *p = to_seiko_panel(panel);
- if (p->enabled)
- return 0;
-
if (p->backlight) {
p->backlight->props.state &= ~BL_CORE_FBBLANK;
p->backlight->props.power = FB_BLANK_UNBLANK;
backlight_update_status(p->backlight);
}
- p->enabled = true;
-
return 0;
}
@@ -254,8 +232,6 @@ static int seiko_panel_probe(struct device *dev,
if (!panel)
return -ENOMEM;
- panel->enabled = false;
- panel->prepared = false;
panel->desc = desc;
panel->dvdd = devm_regulator_get(dev, "dvdd");
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 10/12] drm/panel: simple: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (8 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 09/12] drm/panel: 43wvf1g: Remove enabled/prepared state Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 11/12] drm/panel: p079zca: " Sean Paul
2017-10-17 21:13 ` [PATCH v3 12/12] drm/panel: ls043t1le01: " Sean Paul
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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");
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 11/12] drm/panel: p079zca: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (9 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 10/12] drm/panel: simple: " Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
2017-10-17 21:13 ` [PATCH v3 12/12] drm/panel: ls043t1le01: " Sean Paul
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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-innolux-p079zca.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-innolux-p079zca.c b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
index 6ba93449fcfb..38b19c8de9e1 100644
--- a/drivers/gpu/drm/panel/panel-innolux-p079zca.c
+++ b/drivers/gpu/drm/panel/panel-innolux-p079zca.c
@@ -27,9 +27,6 @@ struct innolux_panel {
struct backlight_device *backlight;
struct regulator *supply;
struct gpio_desc *enable_gpio;
-
- bool prepared;
- bool enabled;
};
static inline struct innolux_panel *to_innolux_panel(struct drm_panel *panel)
@@ -42,9 +39,6 @@ static int innolux_panel_disable(struct drm_panel *panel)
struct innolux_panel *innolux = to_innolux_panel(panel);
int err;
- if (!innolux->enabled)
- return 0;
-
innolux->backlight->props.power = FB_BLANK_POWERDOWN;
backlight_update_status(innolux->backlight);
@@ -53,8 +47,6 @@ static int innolux_panel_disable(struct drm_panel *panel)
DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",
err);
- innolux->enabled = false;
-
return 0;
}
@@ -63,9 +55,6 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
struct innolux_panel *innolux = to_innolux_panel(panel);
int err;
- if (!innolux->prepared)
- return 0;
-
err = mipi_dsi_dcs_enter_sleep_mode(innolux->link);
if (err < 0) {
DRM_DEV_ERROR(panel->dev, "failed to enter sleep mode: %d\n",
@@ -82,8 +71,6 @@ static int innolux_panel_unprepare(struct drm_panel *panel)
if (err < 0)
return err;
- innolux->prepared = false;
-
return 0;
}
@@ -92,9 +79,6 @@ static int innolux_panel_prepare(struct drm_panel *panel)
struct innolux_panel *innolux = to_innolux_panel(panel);
int err, regulator_err;
- if (innolux->prepared)
- return 0;
-
gpiod_set_value_cansleep(innolux->enable_gpio, 0);
err = regulator_enable(innolux->supply);
@@ -129,8 +113,6 @@ static int innolux_panel_prepare(struct drm_panel *panel)
/* T7: 5ms */
usleep_range(5000, 6000);
- innolux->prepared = true;
-
return 0;
poweroff:
@@ -148,9 +130,6 @@ static int innolux_panel_enable(struct drm_panel *panel)
struct innolux_panel *innolux = to_innolux_panel(panel);
int ret;
- if (innolux->enabled)
- return 0;
-
innolux->backlight->props.power = FB_BLANK_UNBLANK;
ret = backlight_update_status(innolux->backlight);
if (ret) {
@@ -159,8 +138,6 @@ static int innolux_panel_enable(struct drm_panel *panel)
return ret;
}
- innolux->enabled = true;
-
return 0;
}
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v3 12/12] drm/panel: ls043t1le01: Remove enabled/prepared state
2017-10-17 21:13 [PATCH v3 00/12] drm/panel: Remove unnecessary enabled/prepared state Sean Paul
` (10 preceding siblings ...)
2017-10-17 21:13 ` [PATCH v3 11/12] drm/panel: p079zca: " Sean Paul
@ 2017-10-17 21:13 ` Sean Paul
11 siblings, 0 replies; 15+ messages in thread
From: Sean Paul @ 2017-10-17 21:13 UTC (permalink / raw)
To: dri-devel; +Cc: thierry.reding
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;
}
--
2.15.0.rc1.287.g2b38de12cc-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 15+ messages in thread