drm/panel infrastructure + backlight update
Subsystems (32)
v2 cover drm/panel infrastructure + backlight update
This patchset include a couple of different
things - all related to panels.
- The callbacks are optional - so drop error if
callback is not present.
- Add support for backlight in drm_panel.
This allows us to make much simpler backlight
support to most panels.
The patchset include conversion of most of the
trivial cases.
- Drop drm_connector from drm_panel.
This change required many changes to most
panels and many bridges and display drivers. This is by far the most invasive change in this patchset.
With this patchset drm_panel_(attach|detach) are nop's but they are kept for now.
A few of these patches has been sent out before - but versioning started again from v1 - as the most patches are new.
I have tested the panel-simple changes, and thus some of the infrastructure changes.
The testing was done on an earlier iteration - and I ended up submitting this as Laurent and others started to depend on it.
v2:
This is mostly addressing comments from Laurent.
- drop get_timings removal, we should start using it
- do not fail in drm_panel_of_backlight() if DT is not enabled
- updated changelogs and code comments in many places (thanks Laurent!)
- get_modes is a mandatory callback - return -EOPNOTSUPP if not specified
- log if backlight update fails
- added a-b/r-bs
o thanks to Laurent and Linus for the prompt reviews!
When "drm/panel: add backlight support" is reviewed I plan to apply the full series to drm-misc-next.
Sam
Sam Ravnborg (25):
drm/drm_panel: no error when no callback
drm/panel: add backlight support
drm/panel: simple: use drm_panel backlight support
drm: get drm_bridge_panel connector via helper drm/panel: add drm_connector argument to get_modes() drm/panel: decouple connector from drm_panel
drm/panel: drop drm_device from drm_panel
drm/panel: feiyang-fy07024di26a30d: use drm_panel backlight support drm/panel: ilitek-ili9881c: use drm_panel backlight support drm/panel: innolux-p079zca: use drm_panel backlight support drm/panel: kingdisplay-kd097d04: use drm_panel backlight support drm/panel: lvds: use drm_panel backlight support drm/panel: olimex-lcd-olinuxino: use drm_panel backlight support drm/panel: osd-osd101t2587-53ts: use drm_panel backlight support drm/panel: panasonic-vvx10f034n00: use drm_panel backlight support drm/panel: raydium-rm68200: use drm_panel backlight support drm/panel: rocktech-jh057n00900: use drm_panel backlight support drm/panel: ronbo-rb070d30: use drm_panel backlight support drm/panel: seiko-43wvf1g: use drm_panel backlight support drm/panel: sharp-lq101r1sx01: use drm_panel backlight support drm/panel: sharp-ls043t1le01: use drm_panel backlight support drm/panel: sitronix-st7701: use drm_panel backlight support drm/panel: sitronix-st7789v: use drm_panel backlight support drm/panel: tpo-td028ttec1: use drm_panel backlight support drm/panel: tpo-tpg110: use drm_panel backlight support
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- drivers/gpu/drm/bridge/panel.c | 19 +++- drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- drivers/gpu/drm/bridge/tc358764.c | 2 +- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- drivers/gpu/drm/drm_panel.c | 107 +++++++++++++++++---- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/imx/parallel-display.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- .../gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 3 +- drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 16 ++- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 19 ++-- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 29 ++---- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 45 +++------ drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 11 ++- drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 43 +++------ drivers/gpu/drm/panel/panel-lg-lb035q02.c | 6 +- drivers/gpu/drm/panel/panel-lg-lg4573.c | 12 +-- drivers/gpu/drm/panel/panel-lvds.c | 46 ++------- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 6 +- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 6 +- drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 27 ++---- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 ++- drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 37 +++---- .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 58 +++-------- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 9 +- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 8 +- drivers/gpu/drm/panel/panel-raydium-rm68200.c | 26 +++-- drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 35 +++---- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 31 ++---- drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 6 +- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 6 +- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 6 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 6 +- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 54 +++-------- drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 34 +++---- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 6 +- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 33 +++---- drivers/gpu/drm/panel/panel-simple.c | 92 ++++++------------ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 23 ++--- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 49 ++-------- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 6 +- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 20 ++-- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 6 +- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 26 ++--- drivers/gpu/drm/panel/panel-truly-nt35597.c | 4 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- drivers/gpu/drm/tegra/output.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- include/drm/drm_bridge.h | 1 + include/drm/drm_panel.h | 61 ++++++++---- 68 files changed, 491 insertions(+), 620 deletions(-)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/25 drm/drm_panel: no error when no callback
The callbacks in drm_panel_funcs are optional, so do not return an error just because no callback is assigned.
v2:
- Document what functions in drm_panel_funcs are optional (Laurent)
- Return -EOPNOTSUPP if get_modes() is not assigned (Laurent) (Sam: -EOPNOTSUPP seems to best error code in this situation)
--- drivers/gpu/drm/drm_panel.c | 35 +++++++++++++++++++++++++---------- include/drm/drm_panel.h | 18 ++++++++++++++++-- 2 files changed, 41 insertions(+), 12 deletions(-)
drivers/gpu/drm/drm_panel.c +25 -10
@@ -151,10 +151,13 @@ EXPORT_SYMBOL(drm_panel_detach);*/ int drm_panel_prepare (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->prepare) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->prepare)return panel->funcs->prepare (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_prepare);
@@ -171,10 +174,13 @@ EXPORT_SYMBOL(drm_panel_prepare);*/ int drm_panel_unprepare (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->unprepare) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->unprepare)return panel->funcs->unprepare (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_unprepare);
@@ -190,10 +196,13 @@ EXPORT_SYMBOL(drm_panel_unprepare);*/ int drm_panel_enable (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->enable) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->enable)return panel->funcs->enable (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_enable);
@@ -209,10 +218,13 @@ EXPORT_SYMBOL(drm_panel_enable);*/ int drm_panel_disable (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->disable) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->disable)return panel->funcs->disable (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_disable);
@@ -228,10 +240,13 @@ EXPORT_SYMBOL(drm_panel_disable);*/ int drm_panel_get_modes (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->get_modes) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->get_modes)return panel->funcs->get_modes (panel); -return panel ? -ENOSYS : -EINVAL ; +return -EOPNOTSUPP ; }EXPORT_SYMBOL (drm_panel_get_modes);
include/drm/drm_panel.h +16 -2
@@ -65,6 +65,8 @@ struct drm_panel_funcs {* @prepare: * * Turn on panel and perform set up. +* +* This function is optional. */ int (*prepare)(struct drm_panel *panel);
@@ -72,6 +74,8 @@ struct drm_panel_funcs {* @enable: * * Enable panel (turn on back light, etc.). +* +* This function is optional. */ int (*enable)(struct drm_panel *panel);
@@ -79,6 +83,8 @@ struct drm_panel_funcs {* @disable: * * Disable panel (turn off back light, etc.). +* +* This function is optional. */ int (*disable)(struct drm_panel *panel);
@@ -86,14 +92,20 @@ struct drm_panel_funcs {* @unprepare: * * Turn off panel. +* +* This function is optional. */ int (*unprepare)(struct drm_panel *panel);/** * @get_modes: * -* Add modes to the connector that the panel is attached to and -* return the number of modes added. +* Add modes to the connector that the panel is attached to. +* +* This function is mandatory. +* +* Returns the number of modes added, -EOPNOTSUPP if callback +* is missing, -EINVAL if panel is NULL. */ int (*get_modes)(struct drm_panel *panel);
@@ -102,6 +114,8 @@ struct drm_panel_funcs {* * Copy display timings into the provided array and return * the number of display timings available. +* +* This function is optional. */ int (*get_timings)(struct drm_panel *panel,unsigned int num_timings,struct display_timing *timings);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 01/25] drm/drm_panel: no error when no callback
Quoted 2 lines · Sam Ravnborg
The callbacks in
drm_panel_funcsare optional, so do not return an error just because no callback is assigned.
[...]
Quoted 4 lines
drivers/gpu/drm/drm_panel.c +0
-0
[...]
Quoted 20 lines
drivers/gpu/drm/drm_panel.c +5
-2@@ -228,10 +240,13 @@ EXPORT_SYMBOL(drm_panel_disable);*/ int drm_panel_get_modes (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->get_modes) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->get_modes)return panel->funcs->get_modes (panel); -return panel ? -ENOSYS : -EINVAL ; +return -EOPNOTSUPP ; }EXPORT_SYMBOL (drm_panel_get_modes);include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +0
-0
[...]
Quoted 4 lines
include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +0
-0/** * @get_modes: *
include/drm/drm_panel.ha
Quoted 10 lines
include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +6
-2- * Add modes to the connector that the panel is attached to and - * return the number of modes added. + * Add modes to the connector that the panel is attached to. + * + * This function is mandatory. + * + * Returns the number of modes added, -EOPNOTSUPP if callback + * is missing, -EINVAL if panel is NULL. */ int (*get_modes)(struct drm_panel *panel);
Hi!
If .get_modes is mandatory, then panel->func != NULL checks can be removed if panel->func and .get_modes presence gets checked at panel probe time.
Best Regards,
Michał Mirosław
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 01/25] drm/drm_panel: no error when no callback
Hi Michał
Quoted 22 lines
Quoted 4 lines
include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +0
-0[...]
Quoted 4 lines
include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +0
-0/** * @get_modes: *include/drm/drm_panel.ha
Quoted 10 lines
include/drm/drm_panel.ha renamed from include/drm/drm_panel.h +6
-2- * Add modes to the connector that the panel is attached to and - * return the number of modes added. + * Add modes to the connector that the panel is attached to. + * + * This function is mandatory. + * + * Returns the number of modes added, -EOPNOTSUPP if callback + * is missing, -EINVAL if panel is NULL. */ int (*get_modes)(struct drm_panel *panel);Hi!
Quoted 2 lines
If .get_modes is mandatory, then
panel->func!= NULL checks can be removed ifpanel->funcand .get_modes presence gets checked at panel probe time.
drivers are supposed to use drm_panel_init() to set up panel-func, so that would be a good time to verify that preconditions are met. But as we have no control if any drivers does wrong things later the checks for consistency still makes sense.
I have a few other small changes pending and will include checks in drm_panel_init().
Thanks,
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Laurent Pinchart
maintainerRe: [PATCH v2 01/25] drm/drm_panel: no error when no callback
In reply to Sam RavnborgHi Sam,
Thank you for the patch.
Quoted 146 lines · Sam Ravnborg
The callbacks in
drm_panel_funcsare optional, so do not return an error just because no callback is assigned.v2:
- Document what functions indrm_panel_funcsare optional (Laurent)
- Return-EOPNOTSUPPifget_modes()is not assigned (Laurent) (Sam:-EOPNOTSUPPseems to best error code in this situation)Signed-off-by Sam Ravnborg <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Thierry Reding <[email protected]>Cc Sam Ravnborg <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_panel.c | 35 +++++++++++++++++++++++++---------- include/drm/drm_panel.h | 18 ++++++++++++++++-- 2 files changed, 41 insertions(+), 12 deletions(-)drivers/gpu/drm/drm_panel.c +25
-10@@ -151,10 +151,13 @@ EXPORT_SYMBOL(drm_panel_detach);*/ int drm_panel_prepare (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->prepare) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->prepare)return panel->funcs->prepare (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_prepare);@@ -171,10 +174,13 @@ EXPORT_SYMBOL(drm_panel_prepare);*/ int drm_panel_unprepare (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->unprepare) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->unprepare)return panel->funcs->unprepare (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_unprepare);@@ -190,10 +196,13 @@ EXPORT_SYMBOL(drm_panel_unprepare);*/ int drm_panel_enable (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->enable) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->enable)return panel->funcs->enable (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_enable);@@ -209,10 +218,13 @@ EXPORT_SYMBOL(drm_panel_enable);*/ int drm_panel_disable (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->disable) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->disable)return panel->funcs->disable (panel); -return panel ? -ENOSYS : -EINVAL ; +return 0 ; }EXPORT_SYMBOL (drm_panel_disable);@@ -228,10 +240,13 @@ EXPORT_SYMBOL(drm_panel_disable);*/ int drm_panel_get_modes (struct drm_panel *panel) { -if (panel && panel->funcs && panel->funcs->get_modes) +if (!panel) +return -EINVAL ; + +if (panel->funcs && panel->funcs->get_modes)return panel->funcs->get_modes (panel); -return panel ? -ENOSYS : -EINVAL ; +return -EOPNOTSUPP ; }EXPORT_SYMBOL (drm_panel_get_modes);include/drm/drm_panel.h +8
-0@@ -65,6 +65,8 @@ struct drm_panel_funcs {* @prepare: * * Turn on panel and perform set up. +* +* This function is optional. */ int (*prepare)(struct drm_panel *panel);@@ -72,6 +74,8 @@ struct drm_panel_funcs {* @enable: * * Enable panel (turn on back light, etc.). +* +* This function is optional. */ int (*enable)(struct drm_panel *panel);@@ -79,6 +83,8 @@ struct drm_panel_funcs {* @disable: * * Disable panel (turn off back light, etc.). +* +* This function is optional. */ int (*disable)(struct drm_panel *panel);@@ -86,14 +92,20 @@ struct drm_panel_funcs {* @unprepare: * * Turn off panel. +* +* This function is optional. */ int (*unprepare)(struct drm_panel *panel);/**
include/drm/drm_panel.h struct drm_panel_funcs { · line 108
Quoted 10 lines
include/drm/drm_panel.h +6
-2* @get_modes: * -* Add modes to the connector that the panel is attached to and -* return the number of modes added. +* Add modes to the connector that the panel is attached to. +* +* This function is mandatory. +* +* Returns the number of modes added, -EOPNOTSUPP if callback +* is missing, -EINVAL if panel is NULL.
This applies to drm_panel_get_modes, not &drm_panel_funcs.get_modes. Here you should just have
*
* Add modes to the connector that the panel is attached to and
* return the number of modes added.
+ *
+ * This function is mandatory.
*/
int (*get_modes)(struct drm_panel *panel);
Quoted 12 lines
include/drm/drm_panel.h +2
-0*/ int (*get_modes)(struct drm_panel *panel);@@ -102,6 +114,8 @@ struct drm_panel_funcs {* * Copy display timings into the provided array and return * the number of display timings available. +* +* This function is optional. */ int (*get_timings)(struct drm_panel *panel,unsigned int num_timings,struct display_timing *timings);
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/25 drm/panel: add backlight support
In reply to Sam RavnborgPanels often supports backlight as specified in a device tree. Update the drm_panel infrastructure to support this to simplify the drivers.
With this the panel driver just needs to add the following to the probe() function:
err = drm_panel_of_backlight(panel);
if (err)
return err;Then drm_panel will handle all the rest.
There is one caveat with the backlight support.
If drm_panel_(enable|disable) are called multiple times
in row then backlight_(enable|disable) will be called multiple times.
The above will happen when a panel drivers unconditionally calls drm_panel_disable() in their shutdown() function, whan the panel is already disabled and then shutdown() is called.
Reading the backlight code it seems safe to call the backlight_(enable|disable) several times.
v3:
- Improve comments, fix grammar (Laurent)
- Do not fail in drm_panel_of_backlight() if no DT support (Laurent)
- Log if backlight_(enable|disable) fails (Laurent)
- Improve drm_panel_of_backlight() docs
- Updated changelog with backlight analysis (triggered by Laurent)
v2:
- Drop test of CONFIG_DRM_PANEL in header-file (Laurent)
- do not enable backlight if ->enable() returns an error
--- drivers/gpu/drm/drm_panel.c | 58 ++++++++++++++++++++++++++++++++++++- include/drm/drm_panel.h | 25 ++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_panel.c +57 -1
@@ -21,11 +21,13 @@* DEALINGS IN THE SOFTWARE. */ +#include <linux/backlight.h> #include <linux/err.h> #include <linux/module.h> #include <drm/drm_crtc.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> static DEFINE_MUTEX (panel_lock);static LIST_HEAD (panel_list);
@@ -196,11 +198,20 @@ EXPORT_SYMBOL(drm_panel_unprepare);*/ int drm_panel_enable (struct drm_panel *panel) { +int ret =0 ; +if (!panel)return -EINVAL ;if (panel->funcs && panel->funcs->enable) -return panel->funcs->enable (panel); + ret = panel->funcs->enable (panel); + +if (ret <0 ) +return ret; + + ret =backlight_enable (panel->backlight); +if (ret <0 ) +DRM_DEV_INFO (panel->dev,"failed to enable backlight: %d\n" , ret);return 0 ; }
@@ -218,9 +229,15 @@ EXPORT_SYMBOL(drm_panel_enable);*/ int drm_panel_disable (struct drm_panel *panel) { +int ret; +if (!panel)return -EINVAL ; + ret =backlight_disable (panel->backlight); +if (ret <0 ) +DRM_DEV_INFO (panel->dev,"failed to disable backlight: %d\n" , ret); +if (panel->funcs && panel->funcs->disable)return panel->funcs->disable (panel);
@@ -289,6 +306,45 @@ struct drm_panel *of_drm_find_panel(const struct device_node *np)EXPORT_SYMBOL (of_drm_find_panel);#endif +#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE +/** +* drm_panel_of_backlight - use backlight device node for backlight +* @panel: DRM panel +* +* Use this function to enable backlight handling if your panel +* uses device tree and has a backlight phandle. +* +* When the panel is enabled backlight will be enabled after a +* successfull call to &drm_panel_funcs.enable() +* +* When the panel is disabled backlight will be disabled before the +* call to &drm_panel_funcs.disable(). +* +* A typical implementation for a panel driver supporting device tree +* will call this function at probe time. Backlight will then be handled +* transparently without requiring any intervention from the driver. +* drm_panel_of_backlight() must be called after the call to drm_panel_init(). +* +* Return: 0 on success or a negative error code on failure. +*/ +int drm_panel_of_backlight (struct drm_panel *panel) +{ +struct backlight_device *backlight; + +if (!panel || !panel->dev) +return -EINVAL ; + + backlight =devm_of_find_backlight (panel->dev); + +if (IS_ERR (backlight)) +return PTR_ERR (backlight); + + panel->backlight = backlight; +return 0 ; +} +EXPORT_SYMBOL (drm_panel_of_backlight); +#endif +MODULE_AUTHOR ("Thierry Reding <[email protected]>" );MODULE_DESCRIPTION ("DRM panel infrastructure" );MODULE_LICENSE ("GPL and additional rights" );
include/drm/drm_panel.h +25 -0
@@ -28,6 +28,7 @@#include <linux/errno.h> #include <linux/list.h> +struct backlight_device ;struct device_node ;struct drm_connector ;struct drm_device ;
@@ -59,6 +60,10 @@ struct display_timing;* * To save power when no video data is transmitted, a driver can power down * the panel. This is the job of the .unprepare() function. +* +* Backlight can be handled automatically if configured using +* drm_panel_of_backlight(). Then the driver does not need to implement the +* functionality to enable/disable backlight. */ struct drm_panel_funcs {/**
@@ -146,6 +151,17 @@ struct drm_panel {*/ struct device *dev; +/** +* @backlight: +* +* Backlight device, used to turn on backlight after the call +* to enable(), and to turn off backlight before the call to +* disable(). +* backlight is set by drm_panel_of_backlight() and drivers +* shall not assign it. +*/ +struct backlight_device *backlight; +/** * @funcs: *
@@ -197,4 +213,13 @@ static inline struct drm_panel *of_drm_find_panel(const struct device_node *np) }#endif +#if IS_ENABLED (CONFIG_BACKLIGHT_CLASS_DEVICE ) +int drm_panel_of_backlight (struct drm_panel *panel); +#else +static inline int drm_panel_of_backlight (struct drm_panel *panel) +{ +return 0 ; +} +#endif +#endif
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 02/25] drm/panel: add backlight support
Hi Sam,
Thank you for the patch.
Quoted 1 line · Sam Ravnborg
Panels often supports backlight as specified in a device tree.
s/supports/support/
Quoted 10 lines
Update the
drm_panelinfrastructure to support this to simplify the drivers.With this the panel driver just needs to add the following to the
probe()function:err = drm_panel_of_backlight(panel); if (err) return err;
Quoted 5 lines
Then
drm_panelwill handle all the rest.There is one caveat with the backlight support.
Ifdrm_panel_(enable|disable)are called multiple times
in row thenbacklight_(enable|disable)will be called multiple times.
s/in row/in a row/
Quoted 54 lines
The above will happen when a panel drivers unconditionally calls
drm_panel_disable()in theirshutdown()function, whan the panel is already disabled and thenshutdown()is called.Reading the backlight code it seems safe to call the
backlight_(enable|disable)several times.v3:
- Improve comments, fix grammar (Laurent)
- Do not fail indrm_panel_of_backlight()if no DT support (Laurent)
- Log ifbacklight_(enable|disable)fails (Laurent)
- Improvedrm_panel_of_backlight()docs
- Updated changelog with backlight analysis (triggered by Laurent)v2:
- Drop test ofCONFIG_DRM_PANELin header-file (Laurent)
- do not enable backlight if ->enable() returns an errorSigned-off-by Sam Ravnborg <[email protected]>Cc Thierry Reding <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Maarten Lankhorst <[email protected]>Cc Maxime Ripard <[email protected]>Cc Sean Paul <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_panel.c | 58 ++++++++++++++++++++++++++++++++++++- include/drm/drm_panel.h | 25 ++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_panel.c +3
-0@@ -21,11 +21,13 @@* DEALINGS IN THE SOFTWARE. */ +#include <linux/backlight.h> #include <linux/err.h> #include <linux/module.h> #include <drm/drm_crtc.h> #include <drm/drm_panel.h> +#include <drm/drm_print.h> static DEFINE_MUTEX (panel_lock);static LIST_HEAD (panel_list);@@ -196,11 +198,20 @@ EXPORT_SYMBOL(drm_panel_unprepare);*/ int drm_panel_enable (struct drm_panel *panel) { +int ret =0 ;
drivers/gpu/drm/drm_panel.c EXPORT_SYMBOL(drm_panel_unprepare); · line 210
Quoted 10 lines
drivers/gpu/drm/drm_panel.c +5
-1+if (!panel)return -EINVAL ;if (panel->funcs && panel->funcs->enable) -return panel->funcs->enable (panel); + ret = panel->funcs->enable (panel); + +if (ret <0 ) +return ret;
You can move this within the above if () block and avoid initializing ret to 0:
if (panel->funcs && panel->funcs->enable) {
ret = panel->funcs->enable(panel);
if (ret < 0)
return ret;
}With these small issues addressed,
Quoted 123 lines
drivers/gpu/drm/drm_panel.c +48
-0+ ret =backlight_enable (panel->backlight); +if (ret <0 ) +DRM_DEV_INFO (panel->dev,"failed to enable backlight: %d\n" , ret);return 0 ; }@@ -218,9 +229,15 @@ EXPORT_SYMBOL(drm_panel_enable);*/ int drm_panel_disable (struct drm_panel *panel) { +int ret; +if (!panel)return -EINVAL ; + ret =backlight_disable (panel->backlight); +if (ret <0 ) +DRM_DEV_INFO (panel->dev,"failed to disable backlight: %d\n" , ret); +if (panel->funcs && panel->funcs->disable)return panel->funcs->disable (panel);@@ -289,6 +306,45 @@ struct drm_panel *of_drm_find_panel(const struct device_node *np)EXPORT_SYMBOL (of_drm_find_panel);#endif +#ifdef CONFIG_BACKLIGHT_CLASS_DEVICE +/** +* drm_panel_of_backlight - use backlight device node for backlight +* @panel: DRM panel +* +* Use this function to enable backlight handling if your panel +* uses device tree and has a backlight phandle. +* +* When the panel is enabled backlight will be enabled after a +* successfull call to &drm_panel_funcs.enable() +* +* When the panel is disabled backlight will be disabled before the +* call to &drm_panel_funcs.disable(). +* +* A typical implementation for a panel driver supporting device tree +* will call this function at probe time. Backlight will then be handled +* transparently without requiring any intervention from the driver. +* drm_panel_of_backlight() must be called after the call to drm_panel_init(). +* +* Return: 0 on success or a negative error code on failure. +*/ +int drm_panel_of_backlight (struct drm_panel *panel) +{ +struct backlight_device *backlight; + +if (!panel || !panel->dev) +return -EINVAL ; + + backlight =devm_of_find_backlight (panel->dev); + +if (IS_ERR (backlight)) +return PTR_ERR (backlight); + + panel->backlight = backlight; +return 0 ; +} +EXPORT_SYMBOL (drm_panel_of_backlight); +#endif +MODULE_AUTHOR ("Thierry Reding <[email protected]>" );MODULE_DESCRIPTION ("DRM panel infrastructure" );MODULE_LICENSE ("GPL and additional rights" );include/drm/drm_panel.h +25
-0@@ -28,6 +28,7 @@#include <linux/errno.h> #include <linux/list.h> +struct backlight_device ;struct device_node ;struct drm_connector ;struct drm_device ;@@ -59,6 +60,10 @@ struct display_timing;* * To save power when no video data is transmitted, a driver can power down * the panel. This is the job of the .unprepare() function. +* +* Backlight can be handled automatically if configured using +* drm_panel_of_backlight(). Then the driver does not need to implement the +* functionality to enable/disable backlight. */ struct drm_panel_funcs {/** @@ -146,6 +151,17 @@ struct drm_panel {*/ struct device *dev; +/** +* @backlight: +* +* Backlight device, used to turn on backlight after the call +* to enable(), and to turn off backlight before the call to +* disable(). +* backlight is set by drm_panel_of_backlight() and drivers +* shall not assign it. +*/ +struct backlight_device *backlight; +/** * @funcs: * @@ -197,4 +213,13 @@ static inline struct drm_panel *of_drm_find_panel(const struct device_node *np) }#endif +#if IS_ENABLED (CONFIG_BACKLIGHT_CLASS_DEVICE ) +int drm_panel_of_backlight (struct drm_panel *panel); +#else +static inline int drm_panel_of_backlight (struct drm_panel *panel) +{ +return 0 ; +} +#endif +#endif
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 02/25] drm/panel: add backlight support
In reply to Sam RavnborgQuoted 17 lines · Sam Ravnborg
Panels often supports backlight as specified in a device tree. Update the
drm_panelinfrastructure to support this to simplify the drivers.With this the panel driver just needs to add the following to the
probe()function:err = drm_panel_of_backlight(panel); if (err) return err;Then
drm_panelwill handle all the rest.There is one caveat with the backlight support.
Ifdrm_panel_(enable|disable)are called multiple times
in row thenbacklight_(enable|disable)will be called multiple times.
Quoted 8 lines
The above will happen when a panel drivers unconditionally calls
drm_panel_disable()in theirshutdown()function, whan the panel is already disabled and thenshutdown()is called.Reading the backlight code it seems safe to call
thebacklight_(enable|disable)several times.v3:
v3 looks good to me +/- Laurent's comments:
Yours,
Linus Walleij
PATCH v2 3/25 drm/panel: simple: use drm_panel backlight support
In reply to Sam RavnborgUse drm_panel infrastructure for backlight.
Replace direct calls with drm_panel_*() calls
to utilize the drm_panel support.
--- drivers/gpu/drm/panel/panel-simple.c | 50 ++++++---------------------- 1 file changed, 11 insertions(+), 39 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +11 -39
@@ -21,7 +21,6 @@* DEALINGS IN THE SOFTWARE. */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -105,7 +104,6 @@ struct panel_simple {const struct panel_desc *desc; -struct backlight_device *backlight;struct regulator *supply;struct i2c_adapter *ddc;
@@ -236,12 +234,6 @@ static int panel_simple_disable(struct drm_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); - } -if (p->desc->delay.disable)msleep (p->desc->delay.disable);
@@ -307,12 +299,6 @@ static int panel_simple_enable(struct drm_panel *panel)if (p->desc->delay.enable)msleep (p->desc->delay.enable); -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 ;
@@ -414,9 +400,9 @@ static void panel_simple_parse_panel_timing_node(struct device *dev,static int panel_simple_probe (struct device *dev,const struct panel_desc *desc) { -struct device_node *backlight, *ddc;struct panel_simple *panel;struct display_timing dt; +struct device_node *ddc;int err; panel =devm_kzalloc (dev,sizeof (*panel),GFP_KERNEL );
@@ -442,24 +428,13 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)return err; } - backlight =of_parse_phandle (dev->of_node,"backlight" ,0 ); -if (backlight) { - panel->backlight =of_find_backlight_by_node (backlight); -of_node_put (backlight); - -if (!panel->backlight) -return -EPROBE_DEFER ; - } - ddc =of_parse_phandle (dev->of_node,"ddc-i2c-bus" ,0 );if (ddc) { panel->ddc =of_find_i2c_adapter_by_node (ddc);of_node_put (ddc); -if (!panel->ddc) { - err = -EPROBE_DEFER ; - goto free_backlight; - } +if (!panel->ddc) +return -EPROBE_DEFER ; }if (!of_get_display_timing (dev->of_node,"panel-timing" , &dt))
@@ -468,6 +443,10 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)drm_panel_init (&panel->base, dev, &panel_simple_funcs, desc->connector_type); + err =drm_panel_of_backlight (&panel->base); +if (err) + goto free_ddc; + err =drm_panel_add (&panel->base);if (err <0 ) goto free_ddc;
@@ -479,9 +458,6 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc) free_ddc:if (panel->ddc)put_device (&panel->ddc->dev); -free_backlight: -if (panel->backlight) -put_device (&panel->backlight->dev);return err; }
@@ -491,16 +467,12 @@ static int panel_simple_remove(struct device *dev)struct panel_simple *panel =dev_get_drvdata (dev);drm_panel_remove (&panel->base); - -panel_simple_disable (&panel->base); -panel_simple_unprepare (&panel->base); +drm_panel_disable (&panel->base); +drm_panel_unprepare (&panel->base);if (panel->ddc)put_device (&panel->ddc->dev); -if (panel->backlight) -put_device (&panel->backlight->dev); -return 0 ; }
@@ -508,8 +480,8 @@ static void panel_simple_shutdown(struct device *dev) {struct panel_simple *panel =dev_get_drvdata (dev); -panel_simple_disable (&panel->base); -panel_simple_unprepare (&panel->base); +drm_panel_disable (&panel->base); +drm_panel_unprepare (&panel->base); }static const struct drm_display_mode ampire_am_480272h3tmqw_t01h_mode = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/25 drm: get drm_bridge_panel connector via helper
In reply to Sam RavnborgThe drm_connector created by drm_panel_bridge was accessed via drm_panel.connector.
Avoid the detour around drm_panel by providing a simple get method. This avoids direct access to the connector field in drm_panel in the two users.
The change is done in preparation for removal of drm_panel.connector.
Update pl111 and tve200 to use the new helper.
--- drivers/gpu/drm/bridge/panel.c | 17 +++++++++++++++++ drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- include/drm/drm_bridge.h | 1 + 4 files changed, 20 insertions(+), 2 deletions(-)
drivers/gpu/drm/bridge/panel.c +17 -0
@@ -289,3 +289,20 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,return bridge; }EXPORT_SYMBOL (devm_drm_panel_bridge_add_typed); + +/** +* drm_panel_bridge_connector - return the connector for the panel bridge +* +* drm_panel_bridge creates the connector. +* This function gives external access to the connector. +* +* Returns: Pointer to drm_connector +*/ +struct drm_connector *drm_panel_bridge_connector (struct drm_bridge *bridge) +{ +struct panel_bridge *panel_bridge; + + panel_bridge =drm_bridge_to_panel_bridge (bridge); + +return &panel_bridge->connector; +}
drivers/gpu/drm/pl111/pl111_drv.c +1 -1
@@ -166,7 +166,7 @@ static int pl111_modeset_init(struct drm_device *dev) priv->bridge = bridge;if (panel) { priv->panel = panel; - priv->connector = panel->connector; + priv->connector =drm_panel_bridge_connector (bridge); } ret =pl111_display_init (dev);
drivers/gpu/drm/tve200/tve200_drv.c +1 -1
@@ -110,7 +110,7 @@ static int tve200_modeset_init(struct drm_device *dev) } priv->panel = panel; - priv->connector = panel->connector; + priv->connector =drm_panel_bridge_connector (bridge); priv->bridge = bridge; dev_info(dev->dev, "attached to panel %s\n",
include/drm/drm_bridge.h +1 -0
@@ -438,6 +438,7 @@ struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev,struct drm_bridge *devm_drm_panel_bridge_add_typed (struct device *dev,struct drm_panel *panel,u32 connector_type); +struct drm_connector *drm_panel_bridge_connector (struct drm_bridge *bridge);#endif #endif
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/1 drm/bridge: panel: export drm_panel_bridge_connector
The function was unexported and was causing link failures for pl111 (and probably the other user tve200) in a module build.
--- drivers/gpu/drm/bridge/panel.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/panel.c +1 -0
@@ -306,3 +306,4 @@ struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge)return &panel_bridge->connector; } +EXPORT_SYMBOL (drm_panel_bridge_connector);
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH] drm/bridge: panel: export drm_panel_bridge_connector
Hi Mihail,
Thank you for the patch.
Quoted 8 lines · Mihail Atanassov
The function was unexported and was causing link failures for pl111 (and probably the other user tve200) in a module build.
Fixes d383fb5f8add ("drm: get drm_bridge_panel connector via helper")Cc Sam Ravnborg <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Linux Walleij <[email protected]>Signed-off-by Mihail Atanassov <[email protected]>
Quoted 13 lines
--- drivers/gpu/drm/bridge/panel.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/bridge/panel.c +1
-0@@ -306,3 +306,4 @@ struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge)return &panel_bridge->connector; } +EXPORT_SYMBOL (drm_panel_bridge_connector);
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Mihail Atanassov
AppliedRe: [PATCH] drm/bridge: panel: export drm_panel_bridge_connector
Quoted 8 lines · On Tuesday, 10 December 2019 16:26:47 GMT Laurent Pinchart wrote:
Hi Mihail,
Thank you for the patch.
Quoted 3 lines · Mihail Atanassov
The function was unexported and was causing link failures for pl111 (and probably the other user tve200) in a module build.
Quoted 8 lines
Quoted 5 lines
Fixes d383fb5f8add ("drm: get drm_bridge_panel connector via helper")Cc Sam Ravnborg <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Linux Walleij <[email protected]>Signed-off-by Mihail Atanassov <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>
Thanks, applied to drm-misc-next.
Quoted 19 lines
Quoted 13 lines
--- drivers/gpu/drm/bridge/panel.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/bridge/panel.c +1
-0@@ -306,3 +306,4 @@ struct drm_connector *drm_panel_bridge_connector(struct drm_bridge *bridge)return &panel_bridge->connector; } +EXPORT_SYMBOL (drm_panel_bridge_connector);Signature · 3 lines
Regards, Laurent Pinchart
Signature · 8 lines
Mihail _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 5/25 drm/panel: add drm_connector argument to get_modes()
In reply to Sam RavnborgToday the bridge creates the drm_connector, but that is planned to be moved to the display drivers.
To facilitate this, update drm_panel_funcs.get_modes() to take drm_connector as an argument.
All panel drivers implementing get_modes() are updated.
v2:
- drop accidental change (Laurent)
- update docs for get_modes (Laurent)
--- drivers/gpu/drm/drm_panel.c | 2 +- drivers/gpu/drm/panel/panel-arm-versatile.c | 4 +-- .../drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +-- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +-- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 8 +++--- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 13 +++++---- .../gpu/drm/panel/panel-jdi-lt070me05000.c | 9 ++++--- .../drm/panel/panel-kingdisplay-kd097d04.c | 11 ++++---- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +-- drivers/gpu/drm/panel/panel-lg-lg4573.c | 8 +++--- drivers/gpu/drm/panel/panel-lvds.c | 4 +-- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +-- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +-- .../drm/panel/panel-olimex-lcd-olinuxino.c | 4 +-- .../gpu/drm/panel/panel-orisetech-otm8009a.c | 9 ++++--- .../drm/panel/panel-osd-osd101t2587-53ts.c | 9 ++++--- .../drm/panel/panel-panasonic-vvx10f034n00.c | 9 ++++--- .../drm/panel/panel-raspberrypi-touchscreen.c | 4 +-- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 6 ++--- drivers/gpu/drm/panel/panel-raydium-rm68200.c | 9 ++++--- .../drm/panel/panel-rocktech-jh057n00900.c | 9 ++++--- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 10 +++---- drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +-- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 4 +-- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +-- .../gpu/drm/panel/panel-samsung-s6e63j0x03.c | 4 +-- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 4 +-- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 4 +-- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 9 ++++--- .../gpu/drm/panel/panel-sharp-lq101r1sx01.c | 9 ++++--- .../gpu/drm/panel/panel-sharp-ls037v7dw01.c | 4 +-- .../gpu/drm/panel/panel-sharp-ls043t1le01.c | 9 ++++--- drivers/gpu/drm/panel/panel-simple.c | 27 ++++++++++--------- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 9 ++++--- .../gpu/drm/panel/panel-sitronix-st7789v.c | 8 +++--- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +-- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +-- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +-- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 4 +-- drivers/gpu/drm/panel/panel-truly-nt35597.c | 4 +-- include/drm/drm_panel.h | 6 +++-- 41 files changed, 143 insertions(+), 130 deletions(-)
drivers/gpu/drm/drm_panel.c +1 -1
@@ -261,7 +261,7 @@ int drm_panel_get_modes(struct drm_panel *panel)return -EINVAL ;if (panel->funcs && panel->funcs->get_modes) -return panel->funcs->get_modes (panel); +return panel->funcs->get_modes (panel, panel->connector);return -EOPNOTSUPP ; }
drivers/gpu/drm/panel/panel-arm-versatile.c +2 -2
@@ -260,9 +260,9 @@ static int versatile_panel_enable(struct drm_panel *panel)return 0 ; } -static int versatile_panel_get_modes (struct drm_panel *panel) +static int versatile_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct versatile_panel *vpanel =to_versatile_panel (panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +2 -2
@@ -162,9 +162,9 @@ static const struct drm_display_mode feiyang_default_mode = { .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, }; -static int feiyang_get_modes (struct drm_panel *panel) +static int feiyang_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct feiyang *ctx =panel_to_feiyang (panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-ilitek-ili9322.c +2 -2
@@ -641,9 +641,9 @@ static const struct drm_display_mode itu_r_bt_656_720_mode = { .flags = 0, }; -static int ili9322_get_modes (struct drm_panel *panel) +static int ili9322_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct ili9322 *ili =panel_to_ili9322 (panel);struct drm_display_mode *mode;struct drm_display_info *info;
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +4 -4
@@ -387,9 +387,9 @@ static const struct drm_display_mode bananapi_default_mode = { .vtotal = 1280 + 10 + 10 + 20, }; -static int ili9881c_get_modes (struct drm_panel *panel) +static int ili9881c_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct ili9881c *ctx =panel_to_ili9881c (panel);struct drm_display_mode *mode;
@@ -407,8 +407,8 @@ static int ili9881c_get_modes(struct drm_panel *panel) mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =62 ; - panel->connector->display_info.height_mm =110 ; + connector->display_info.width_mm =62 ; + connector->display_info.height_mm =110 ;return 1 ; }
drivers/gpu/drm/panel/panel-innolux-p079zca.c +6 -7
@@ -403,7 +403,8 @@ static const struct panel_desc innolux_p097pfg_panel_desc = { .sleep_mode_delay = 100, /* T15 */ }; -static int innolux_panel_get_modes (struct drm_panel *panel) +static int innolux_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct innolux_panel *innolux =to_innolux_panel (panel);const struct drm_display_mode *m = innolux->desc->mode;
@@ -418,13 +419,11 @@ static int innolux_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm = - innolux->desc->size.width; - panel->connector->display_info.height_mm = - innolux->desc->size.height; - panel->connector->display_info.bpc = innolux->desc->bpc; + connector->display_info.width_mm = innolux->desc->size.width; + connector->display_info.height_mm = innolux->desc->size.height; + connector->display_info.bpc = innolux->desc->bpc;return 1 ; }
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +5 -4
@@ -300,7 +300,8 @@ static const struct drm_display_mode default_mode = { .flags = 0, }; -static int jdi_panel_get_modes (struct drm_panel *panel) +static int jdi_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;struct jdi_panel *jdi =to_jdi_panel (panel);
@@ -316,10 +317,10 @@ static int jdi_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =95 ; - panel->connector->display_info.height_mm =151 ; + connector->display_info.width_mm =95 ; + connector->display_info.height_mm =151 ;return 1 ; }
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c +6 -5
@@ -333,7 +333,8 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int kingdisplay_panel_get_modes (struct drm_panel *panel) +static int kingdisplay_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -347,11 +348,11 @@ static int kingdisplay_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =147 ; - panel->connector->display_info.height_mm =196 ; - panel->connector->display_info.bpc =8 ; + connector->display_info.width_mm =147 ; + connector->display_info.height_mm =196 ; + connector->display_info.bpc =8 ;return 1 ; }
drivers/gpu/drm/panel/panel-lg-lb035q02.c +2 -2
@@ -141,9 +141,9 @@ static const struct drm_display_mode lb035q02_mode = { .height_mm = 53, }; -static int lb035q02_get_modes (struct drm_panel *panel) +static int lb035q02_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &lb035q02_mode);
drivers/gpu/drm/panel/panel-lg-lg4573.c +4 -4
@@ -209,9 +209,9 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int lg4573_get_modes (struct drm_panel *panel) +static int lg4573_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &default_mode);
@@ -227,8 +227,8 @@ static int lg4573_get_modes(struct drm_panel *panel) mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =61 ; - panel->connector->display_info.height_mm =103 ; + connector->display_info.width_mm =61 ; + connector->display_info.height_mm =103 ;return 1 ; }
drivers/gpu/drm/panel/panel-lvds.c +2 -2
@@ -106,10 +106,10 @@ static int panel_lvds_enable(struct drm_panel *panel)return 0 ; } -static int panel_lvds_get_modes (struct drm_panel *panel) +static int panel_lvds_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct panel_lvds *lvds =to_panel_lvds (panel); -struct drm_connector *connector = lvds->panel.connector;struct drm_display_mode *mode; mode =drm_mode_create (lvds->panel.drm);
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +2 -2
@@ -123,9 +123,9 @@ static const struct drm_display_mode nl8048_mode = { .height_mm = 53, }; -static int nl8048_get_modes (struct drm_panel *panel) +static int nl8048_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &nl8048_mode);
drivers/gpu/drm/panel/panel-novatek-nt39016.c +2 -2
@@ -206,11 +206,11 @@ static int nt39016_disable(struct drm_panel *drm_panel)return 0 ; } -static int nt39016_get_modes (struct drm_panel *drm_panel) +static int nt39016_get_modes (struct drm_panel *drm_panel, +struct drm_connector *connector) {struct nt39016 *panel =to_nt39016 (drm_panel);const struct nt39016_panel_info *panel_info = panel->panel_info; -struct drm_connector *connector = drm_panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (drm_panel->drm, &panel_info->display_mode);
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c +2 -2
@@ -141,10 +141,10 @@ static int lcd_olinuxino_enable(struct drm_panel *panel)return 0 ; } -static int lcd_olinuxino_get_modes (struct drm_panel *panel) +static int lcd_olinuxino_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct lcd_olinuxino *lcd =to_lcd_olinuxino (panel); -struct drm_connector *connector = lcd->panel.connector;struct lcd_olinuxino_info *lcd_info = &lcd->eeprom.info;struct drm_device *drm = lcd->panel.drm;struct lcd_olinuxino_mode *lcd_mode;
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +5 -4
@@ -349,7 +349,8 @@ static int otm8009a_enable(struct drm_panel *panel)return 0 ; } -static int otm8009a_get_modes (struct drm_panel *panel) +static int otm8009a_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -364,10 +365,10 @@ static int otm8009a_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ; -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm = mode->width_mm; - panel->connector->display_info.height_mm = mode->height_mm; + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm;return 1 ; }
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c +5 -4
@@ -112,7 +112,8 @@ static const struct drm_display_mode default_mode_osd101t2587 = { .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; -static int osd101t2587_panel_get_modes (struct drm_panel *panel) +static int osd101t2587_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct osd101t2587_panel *osd101t2587 =ti_osd_panel (panel);struct drm_display_mode *mode;
@@ -128,10 +129,10 @@ static int osd101t2587_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =217 ; - panel->connector->display_info.height_mm =136 ; + connector->display_info.width_mm =217 ; + connector->display_info.height_mm =136 ;return 1 ; }
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +5 -4
@@ -166,7 +166,8 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int wuxga_nt_panel_get_modes (struct drm_panel *panel) +static int wuxga_nt_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -180,10 +181,10 @@ static int wuxga_nt_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =217 ; - panel->connector->display_info.height_mm =136 ; + connector->display_info.width_mm =217 ; + connector->display_info.height_mm =136 ;return 1 ; }
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +2 -2
@@ -309,9 +309,9 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)return 0 ; } -static int rpi_touchscreen_get_modes (struct drm_panel *panel) +static int rpi_touchscreen_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_device *drm = panel->drm;unsigned int i, num =0 ;static const u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ;
drivers/gpu/drm/panel/panel-raydium-rm67191.c +3 -3
@@ -436,9 +436,9 @@ static int rad_panel_disable(struct drm_panel *panel)return 0 ; } -static int rad_panel_get_modes (struct drm_panel *panel) +static int rad_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &default_mode);
@@ -451,7 +451,7 @@ static int rad_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ; -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); connector->display_info.width_mm = mode->width_mm; connector->display_info.height_mm = mode->height_mm;
drivers/gpu/drm/panel/panel-raydium-rm68200.c +5 -4
@@ -335,7 +335,8 @@ static int rm68200_enable(struct drm_panel *panel)return 0 ; } -static int rm68200_get_modes (struct drm_panel *panel) +static int rm68200_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -350,10 +351,10 @@ static int rm68200_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ; -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm = mode->width_mm; - panel->connector->display_info.height_mm = mode->height_mm; + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm;return 1 ; }
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +5 -4
@@ -230,7 +230,8 @@ static const struct drm_display_mode default_mode = { .height_mm = 130, }; -static int jh057n_get_modes (struct drm_panel *panel) +static int jh057n_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct jh057n *ctx =panel_to_jh057n (panel);struct drm_display_mode *mode;
@@ -246,9 +247,9 @@ static int jh057n_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ; - panel->connector->display_info.width_mm = mode->width_mm; - panel->connector->display_info.height_mm = mode->height_mm; -drm_mode_probed_add (panel->connector, mode); + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm; +drm_mode_probed_add (connector, mode);return 1 ; }
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c +5 -5
@@ -120,9 +120,9 @@ static const struct drm_display_mode default_mode = { .height_mm = 85, }; -static int rb070d30_panel_get_modes (struct drm_panel *panel) +static int rb070d30_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct rb070d30_panel *ctx =panel_to_rb070d30_panel (panel);struct drm_display_mode *mode;static const u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ;
@@ -140,9 +140,9 @@ static int rb070d30_panel_get_modes(struct drm_panel *panel) mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;drm_mode_probed_add (connector, mode); - panel->connector->display_info.bpc =8 ; - panel->connector->display_info.width_mm = mode->width_mm; - panel->connector->display_info.height_mm = mode->height_mm; + connector->display_info.bpc =8 ; + connector->display_info.width_mm = mode->width_mm; + connector->display_info.height_mm = mode->height_mm;drm_display_info_set_bus_formats (&connector->display_info, &bus_format,1 );
drivers/gpu/drm/panel/panel-samsung-ld9040.c +2 -2
@@ -261,9 +261,9 @@ static int ld9040_enable(struct drm_panel *panel)return 0 ; } -static int ld9040_get_modes (struct drm_panel *panel) +static int ld9040_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct ld9040 *ctx =panel_to_ld9040 (panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-samsung-s6d16d0.c +2 -2
@@ -143,9 +143,9 @@ static int s6d16d0_disable(struct drm_panel *panel)return 0 ; } -static int s6d16d0_get_modes (struct drm_panel *panel) +static int s6d16d0_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &samsung_s6d16d0_mode);
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +2 -2
@@ -645,9 +645,9 @@ static const struct s6e3ha2_panel_desc samsung_s6e3hf2 = { .type = HF2_TYPE, }; -static int s6e3ha2_get_modes (struct drm_panel *panel) +static int s6e3ha2_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector; struct s6e3ha2 *ctx = container_of(panel, struct s6e3ha2, panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +2 -2
@@ -400,9 +400,9 @@ static int s6e63j0x03_enable(struct drm_panel *panel)return 0 ; } -static int s6e63j0x03_get_modes (struct drm_panel *panel) +static int s6e63j0x03_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &default_mode);
drivers/gpu/drm/panel/panel-samsung-s6e63m0.c +2 -2
@@ -362,9 +362,9 @@ static int s6e63m0_enable(struct drm_panel *panel)return 0 ; } -static int s6e63m0_get_modes (struct drm_panel *panel) +static int s6e63m0_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &default_mode);
drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c +2 -2
@@ -920,9 +920,9 @@ static int s6e8aa0_enable(struct drm_panel *panel)return 0 ; } -static int s6e8aa0_get_modes (struct drm_panel *panel) +static int s6e8aa0_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct s6e8aa0 *ctx =panel_to_s6e8aa0 (panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c +5 -4
@@ -56,9 +56,9 @@ static inline struct seiko_panel *to_seiko_panel(struct drm_panel *panel) return container_of(panel, struct seiko_panel, base); } -static int seiko_panel_get_fixed_modes (struct seiko_panel *panel) +static int seiko_panel_get_fixed_modes (struct seiko_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->base.connector;struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;
@@ -208,12 +208,13 @@ static int seiko_panel_enable(struct drm_panel *panel)return 0 ; } -static int seiko_panel_get_modes (struct drm_panel *panel) +static int seiko_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct seiko_panel *p =to_seiko_panel (panel);/* add hard-coded panel modes */ -return seiko_panel_get_fixed_modes (p); +return seiko_panel_get_fixed_modes (p, connector); } static int seiko_panel_get_timings(struct drm_panel *panel,
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +5 -4
@@ -278,7 +278,8 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int sharp_panel_get_modes (struct drm_panel *panel) +static int sharp_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -292,10 +293,10 @@ static int sharp_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =217 ; - panel->connector->display_info.height_mm =136 ; + connector->display_info.width_mm =217 ; + connector->display_info.height_mm =136 ;return 1 ; }
drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c +2 -2
@@ -100,9 +100,9 @@ static const struct drm_display_mode ls037v7dw01_mode = { .height_mm = 75, }; -static int ls037v7dw01_get_modes (struct drm_panel *panel) +static int ls037v7dw01_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &ls037v7dw01_mode);
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +5 -4
@@ -210,7 +210,8 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int sharp_nt_panel_get_modes (struct drm_panel *panel) +static int sharp_nt_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct drm_display_mode *mode;
@@ -224,10 +225,10 @@ static int sharp_nt_panel_get_modes(struct drm_panel *panel)drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =54 ; - panel->connector->display_info.height_mm =95 ; + connector->display_info.width_mm =54 ; + connector->display_info.height_mm =95 ;return 1 ; }
drivers/gpu/drm/panel/panel-simple.c +14 -13
@@ -117,9 +117,9 @@ static inline struct panel_simple *to_panel_simple(struct drm_panel *panel) return container_of(panel, struct panel_simple, base); } -static unsigned int panel_simple_get_timings_modes (struct panel_simple *panel) +static unsigned int panel_simple_get_timings_modes (struct panel_simple *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->base.connector;struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;
@@ -150,9 +150,9 @@ static unsigned int panel_simple_get_timings_modes(struct panel_simple *panel)return num; } -static unsigned int panel_simple_get_display_modes (struct panel_simple *panel) +static unsigned int panel_simple_get_display_modes (struct panel_simple *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->base.connector;struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;
@@ -181,9 +181,9 @@ static unsigned int panel_simple_get_display_modes(struct panel_simple *panel)return num; } -static int panel_simple_get_non_edid_modes (struct panel_simple *panel) +static int panel_simple_get_non_edid_modes (struct panel_simple *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->base.connector;struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;bool has_override = panel->override_mode.type;
@@ -204,7 +204,7 @@ static int panel_simple_get_non_edid_modes(struct panel_simple *panel)/* Only add timings if override was not there or failed to validate */ if (num ==0 && panel->desc->num_timings) - num =panel_simple_get_timings_modes (panel); + num =panel_simple_get_timings_modes (panel, connector);/* * Only add fixed modes if timings/override added no mode.
@@ -214,7 +214,7 @@ static int panel_simple_get_non_edid_modes(struct panel_simple *panel)*/ WARN_ON (panel->desc->num_timings && panel->desc->num_modes);if (num ==0 ) - num =panel_simple_get_display_modes (panel); + num =panel_simple_get_display_modes (panel, connector); connector->display_info.bpc = panel->desc->bpc; connector->display_info.width_mm = panel->desc->size.width;
@@ -304,23 +304,24 @@ static int panel_simple_enable(struct drm_panel *panel)return 0 ; } -static int panel_simple_get_modes (struct drm_panel *panel) +static int panel_simple_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct panel_simple *p =to_panel_simple (panel);int num =0 ;/* probe EDID if a DDC bus is available */ if (p->ddc) { -struct edid *edid =drm_get_edid (panel->connector, p->ddc); -drm_connector_update_edid_property (panel->connector, edid); +struct edid *edid =drm_get_edid (connector, p->ddc); +drm_connector_update_edid_property (connector, edid);if (edid) { - num +=drm_add_edid_modes (panel->connector, edid); + num +=drm_add_edid_modes (connector, edid);kfree (edid); } }/* add hard-coded panel modes */ - num +=panel_simple_get_non_edid_modes (p); + num +=panel_simple_get_non_edid_modes (p, connector);return num; }
drivers/gpu/drm/panel/panel-sitronix-st7701.c +5 -4
@@ -264,7 +264,8 @@ static int st7701_unprepare(struct drm_panel *panel)return 0 ; } -static int st7701_get_modes (struct drm_panel *panel) +static int st7701_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {struct st7701 *st7701 =panel_to_st7701 (panel);const struct drm_display_mode *desc_mode = st7701->desc->mode;
@@ -280,10 +281,10 @@ static int st7701_get_modes(struct drm_panel *panel) }drm_mode_set_name (mode); -drm_mode_probed_add (panel->connector, mode); +drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm = desc_mode->width_mm; - panel->connector->display_info.height_mm = desc_mode->height_mm; + connector->display_info.width_mm = desc_mode->width_mm; + connector->display_info.height_mm = desc_mode->height_mm;return 1 ; }
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +4 -4
@@ -170,9 +170,9 @@ static const struct drm_display_mode default_mode = { .vrefresh = 60, }; -static int st7789v_get_modes (struct drm_panel *panel) +static int st7789v_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &default_mode);
@@ -188,8 +188,8 @@ static int st7789v_get_modes(struct drm_panel *panel) mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;drm_mode_probed_add (connector, mode); - panel->connector->display_info.width_mm =61 ; - panel->connector->display_info.height_mm =103 ; + connector->display_info.width_mm =61 ; + connector->display_info.height_mm =103 ;return 1 ; }
drivers/gpu/drm/panel/panel-sony-acx565akm.c +2 -2
@@ -521,9 +521,9 @@ static const struct drm_display_mode acx565akm_mode = { .height_mm = 46, }; -static int acx565akm_get_modes (struct drm_panel *panel) +static int acx565akm_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &acx565akm_mode);
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +2 -2
@@ -287,9 +287,9 @@ static const struct drm_display_mode td028ttec1_mode = { .height_mm = 58, }; -static int td028ttec1_get_modes (struct drm_panel *panel) +static int td028ttec1_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &td028ttec1_mode);
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +2 -2
@@ -346,9 +346,9 @@ static const struct drm_display_mode td043mtea1_mode = { .height_mm = 56, }; -static int td043mtea1_get_modes (struct drm_panel *panel) +static int td043mtea1_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct drm_display_mode *mode; mode =drm_mode_duplicate (panel->drm, &td043mtea1_mode);
drivers/gpu/drm/panel/panel-tpo-tpg110.c +2 -2
@@ -384,9 +384,9 @@ static int tpg110_enable(struct drm_panel *panel)* presents the mode that is configured for the system under use, * and which is detected by reading the registers of the display. */ -static int tpg110_get_modes (struct drm_panel *panel) +static int tpg110_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct tpg110 *tpg =to_tpg110 (panel);struct drm_display_mode *mode;
drivers/gpu/drm/panel/panel-truly-nt35597.c +2 -2
@@ -454,9 +454,9 @@ static int truly_nt35597_enable(struct drm_panel *panel)return 0 ; } -static int truly_nt35597_get_modes (struct drm_panel *panel) +static int truly_nt35597_get_modes (struct drm_panel *panel, +struct drm_connector *connector) { -struct drm_connector *connector = panel->connector;struct truly_nt35597 *ctx =panel_to_ctx (panel);struct drm_display_mode *mode;const struct nt35597_config *config;
include/drm/drm_panel.h +4 -2
@@ -105,14 +105,16 @@ struct drm_panel_funcs {/** * @get_modes: * -* Add modes to the connector that the panel is attached to. +* Add panel modes to the given connector and return the number of +* modes added. * * This function is mandatory. * * Returns the number of modes added, -EOPNOTSUPP if callback * is missing, -EINVAL if panel is NULL. */ -int (*get_modes)(struct drm_panel *panel); +int (*get_modes)(struct drm_panel *panel, +struct drm_connector *connector);/** * @get_timings:
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 6/25 drm/panel: decouple connector from drm_panel
In reply to Sam RavnborgTo facilitate moving connector creation to display drivers, decouple the drm_connector from drm_panel.
This patch adds a connector argument to drm_panel_get_modes().
All users of drm_panel_get_modes() already had the connector available, so updating users was trivial.
With this patch drm_panel no longer keeps a reference to the drm_connector.
--- drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +- drivers/gpu/drm/bridge/panel.c | 2 +- drivers/gpu/drm/bridge/parade-ps8622.c | 2 +- drivers/gpu/drm/bridge/tc358764.c | 2 +- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- drivers/gpu/drm/drm_panel.c | 10 +++++----- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/imx/parallel-display.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +- drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_out.c | 2 +- drivers/gpu/drm/omapdrm/omap_connector.c | 3 ++- drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +- drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- drivers/gpu/drm/sti/sti_dvo.c | 2 +- drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +- drivers/gpu/drm/tegra/output.c | 2 +- include/drm/drm_panel.h | 9 +-------- 26 files changed, 31 insertions(+), 37 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +1 -1
@@ -493,7 +493,7 @@ static int anx6345_get_modes(struct drm_connector *connector)mutex_unlock (&anx6345->lock);if (!num_modes && anx6345->panel) - num_modes +=drm_panel_get_modes (anx6345->panel); + num_modes +=drm_panel_get_modes (anx6345->panel, connector);return num_modes; }
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +1 -1
@@ -1111,7 +1111,7 @@ static int analogix_dp_get_modes(struct drm_connector *connector)int ret, num_modes =0 ;if (dp->plat_data->panel) { - num_modes +=drm_panel_get_modes (dp->plat_data->panel); + num_modes +=drm_panel_get_modes (dp->plat_data->panel, connector); }else { ret =analogix_dp_prepare_panel (dp, true, false);if (ret) {
drivers/gpu/drm/bridge/panel.c +1 -1
@@ -37,7 +37,7 @@ static int panel_bridge_connector_get_modes(struct drm_connector *connector)struct panel_bridge *panel_bridge =drm_connector_to_panel_bridge (connector); -return drm_panel_get_modes (panel_bridge->panel); +return drm_panel_get_modes (panel_bridge->panel, connector); } static const struct drm_connector_helper_funcs
drivers/gpu/drm/bridge/parade-ps8622.c +1 -1
@@ -461,7 +461,7 @@ static int ps8622_get_modes(struct drm_connector *connector) ps8622 =connector_to_ps8622 (connector); -return drm_panel_get_modes (ps8622->panel); +return drm_panel_get_modes (ps8622->panel, connector); }static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = {
drivers/gpu/drm/bridge/tc358764.c +1 -1
@@ -282,7 +282,7 @@ static int tc358764_get_modes(struct drm_connector *connector) {struct tc358764 *ctx =connector_to_tc358764 (connector); -return drm_panel_get_modes (ctx->panel); +return drm_panel_get_modes (ctx->panel, connector); } static const
drivers/gpu/drm/bridge/tc358767.c +1 -1
@@ -1346,7 +1346,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)return 0 ; } - count =drm_panel_get_modes (tc->panel); + count =drm_panel_get_modes (tc->panel, connector);if (count >0 )return count;
drivers/gpu/drm/bridge/ti-sn65dsi86.c +1 -1
@@ -206,7 +206,7 @@ static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector) {struct ti_sn_bridge *pdata =connector_to_ti_sn_bridge (connector); -return drm_panel_get_modes (pdata->panel); +return drm_panel_get_modes (pdata->panel, connector); } static enum drm_mode_status
drivers/gpu/drm/drm_panel.c +5 -5
@@ -114,10 +114,9 @@ EXPORT_SYMBOL(drm_panel_remove);*/ int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) { -if (panel->connector) +if (panel->drm)return -EBUSY ; - panel->connector = connector; panel->drm = connector->dev;return 0 ;
@@ -136,7 +135,6 @@ EXPORT_SYMBOL(drm_panel_attach);*/ void drm_panel_detach (struct drm_panel *panel) { - panel->connector =NULL ; panel->drm =NULL ; }EXPORT_SYMBOL (drm_panel_detach);
@@ -248,6 +246,7 @@ EXPORT_SYMBOL(drm_panel_disable);/** * drm_panel_get_modes - probe the available display modes of a panel * @panel: DRM panel +* @connector: DRM connector * * The modes probed from the panel are automatically added to the connector * that the panel is attached to.
@@ -255,13 +254,14 @@ EXPORT_SYMBOL(drm_panel_disable);* Return: The number of modes available from the panel on success or a * negative error code on failure. */ -int drm_panel_get_modes (struct drm_panel *panel) +int drm_panel_get_modes (struct drm_panel *panel, +struct drm_connector *connector) {if (!panel)return -EINVAL ;if (panel->funcs && panel->funcs->get_modes) -return panel->funcs->get_modes (panel, panel->connector); +return panel->funcs->get_modes (panel, connector);return -EOPNOTSUPP ; }
drivers/gpu/drm/exynos/exynos_drm_dpi.c +1 -1
@@ -85,7 +85,7 @@ static int exynos_dpi_get_modes(struct drm_connector *connector) }if (ctx->panel) -return drm_panel_get_modes (ctx->panel); +return drm_panel_get_modes (ctx->panel, connector);return 0 ; }
drivers/gpu/drm/exynos/exynos_drm_dsi.c +1 -1
@@ -1461,7 +1461,7 @@ static int exynos_dsi_get_modes(struct drm_connector *connector)struct exynos_dsi *dsi =connector_to_dsi (connector);if (dsi->panel) -return drm_panel_get_modes (dsi->panel); +return drm_panel_get_modes (dsi->panel, connector);return 0 ; }
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +1 -1
@@ -68,7 +68,7 @@ static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector)struct fsl_dcu_drm_connector *fsl_connector; fsl_connector =to_fsl_dcu_connector (connector); -return drm_panel_get_modes (fsl_connector->panel); +return drm_panel_get_modes (fsl_connector->panel, connector); } static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector,
drivers/gpu/drm/imx/imx-ldb.c +1 -1
@@ -127,7 +127,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)struct imx_ldb_channel *imx_ldb_ch =con_to_imx_ldb_ch (connector);int num_modes; - num_modes =drm_panel_get_modes (imx_ldb_ch->panel); + num_modes =drm_panel_get_modes (imx_ldb_ch->panel, connector);if (num_modes >0 )return num_modes;
drivers/gpu/drm/imx/parallel-display.c +1 -1
@@ -50,7 +50,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)struct device_node *np = imxpd->dev->of_node;int num_modes; - num_modes =drm_panel_get_modes (imxpd->panel); + num_modes =drm_panel_get_modes (imxpd->panel, connector);if (num_modes >0 )return num_modes;
drivers/gpu/drm/mediatek/mtk_dsi.c +1 -1
@@ -821,7 +821,7 @@ static int mtk_dsi_connector_get_modes(struct drm_connector *connector) {struct mtk_dsi *dsi =connector_to_dsi (connector); -return drm_panel_get_modes (dsi->panel); +return drm_panel_get_modes (dsi->panel, connector); }static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = {
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +1 -1
@@ -53,7 +53,7 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector)if (panel) {drm_panel_attach (panel, connector); - ret =drm_panel_get_modes (panel); + ret =drm_panel_get_modes (panel, connector);drm_panel_detach (panel); }
drivers/gpu/drm/msm/dsi/dsi_manager.c +1 -1
@@ -329,7 +329,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)* attached to the drm_panel. */ drm_panel_attach (panel, connector); - num =drm_panel_get_modes (panel); + num =drm_panel_get_modes (panel, connector);if (!num)return 0 ;
drivers/gpu/drm/mxsfb/mxsfb_out.c +1 -1
@@ -31,7 +31,7 @@ static int mxsfb_panel_get_modes(struct drm_connector *connector)drm_connector_to_mxsfb_drm_private (connector);if (mxsfb->panel) -return drm_panel_get_modes (mxsfb->panel); +return drm_panel_get_modes (mxsfb->panel, connector);return 0 ; }
drivers/gpu/drm/omapdrm/omap_connector.c +2 -1
@@ -229,7 +229,8 @@ static int omap_connector_get_modes(struct drm_connector *connector)* operation to the panel API. */ if (omap_connector->output->panel) -return drm_panel_get_modes (omap_connector->output->panel); +return drm_panel_get_modes (omap_connector->output->panel, + connector);/* * We can't retrieve modes, which can happen for instance for a DVI or
drivers/gpu/drm/rcar-du/rcar_lvds.c +1 -1
@@ -91,7 +91,7 @@ static int rcar_lvds_connector_get_modes(struct drm_connector *connector) {struct rcar_lvds *lvds =connector_to_rcar_lvds (connector); -return drm_panel_get_modes (lvds->panel); +return drm_panel_get_modes (lvds->panel, connector); } static int rcar_lvds_connector_atomic_check(struct drm_connector *connector,
drivers/gpu/drm/rockchip/rockchip_lvds.c +1 -1
@@ -201,7 +201,7 @@ static int rockchip_lvds_connector_get_modes(struct drm_connector *connector)struct rockchip_lvds *lvds =connector_to_lvds (connector);struct drm_panel *panel = lvds->panel; -return drm_panel_get_modes (panel); +return drm_panel_get_modes (panel, connector); } static const
drivers/gpu/drm/sti/sti_dvo.c +1 -1
@@ -339,7 +339,7 @@ static int sti_dvo_connector_get_modes(struct drm_connector *connector)struct sti_dvo *dvo = dvo_connector->dvo;if (dvo->panel) -return drm_panel_get_modes (dvo->panel); +return drm_panel_get_modes (dvo->panel, connector);return 0 ; }
drivers/gpu/drm/sun4i/sun4i_lvds.c +1 -1
@@ -43,7 +43,7 @@ static int sun4i_lvds_get_modes(struct drm_connector *connector)struct sun4i_lvds *lvds =drm_connector_to_sun4i_lvds (connector); -return drm_panel_get_modes (lvds->panel); +return drm_panel_get_modes (lvds->panel, connector); }static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = {
drivers/gpu/drm/sun4i/sun4i_rgb.c +1 -1
@@ -47,7 +47,7 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector)struct sun4i_rgb *rgb =drm_connector_to_sun4i_rgb (connector); -return drm_panel_get_modes (rgb->panel); +return drm_panel_get_modes (rgb->panel, connector); }/*
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +1 -1
@@ -795,7 +795,7 @@ static int sun6i_dsi_get_modes(struct drm_connector *connector) {struct sun6i_dsi *dsi =connector_to_sun6i_dsi (connector); -return drm_panel_get_modes (dsi->panel); +return drm_panel_get_modes (dsi->panel, connector); }static struct drm_connector_helper_funcs sun6i_dsi_connector_helper_funcs = {
drivers/gpu/drm/tegra/output.c +1 -1
@@ -23,7 +23,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)* ignore any other means of obtaining a mode. */ if (output->panel) { - err =drm_panel_get_modes (output->panel); + err =drm_panel_get_modes (output->panel, connector);if (err >0 )return err; }
include/drm/drm_panel.h +1 -8
@@ -139,13 +139,6 @@ struct drm_panel {*/ struct drm_device *drm; -/** -* @connector: -* -* DRM connector that the panel is attached to. -*/ -struct drm_connector *connector; -/** * @dev: *
@@ -204,7 +197,7 @@ int drm_panel_unprepare(struct drm_panel *panel);int drm_panel_enable (struct drm_panel *panel);int drm_panel_disable (struct drm_panel *panel); -int drm_panel_get_modes (struct drm_panel *panel); +int drm_panel_get_modes (struct drm_panel *panel,struct drm_connector *connector);#if defined(CONFIG_OF ) && defined(CONFIG_DRM_PANEL )struct drm_panel *of_drm_find_panel (const struct device_node *np);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 7/25 drm/panel: drop drm_device from drm_panel
In reply to Sam RavnborgThe panel drivers used drm_panel.drm for two purposes:
1) Argument to drm_mode_duplicate()
2) drm->dev was used in error messages
The first usage is replaced with drm_connector.dev
- drm_connector is already connected to a drm_device and we have a valid connector
The second usage is replaced with drm_panel.dev
- this makes drivers more consistent in their dev argument used for dev_err() and friends
With these replacements there are no more uses of drm_panel.drm, so it is removed from struct drm_panel.
With this change drm_panel_attach() and drm_panel_detach() no longer have any use as they are empty functions.
v2:
- editorial correction in changelog (Laurent)
--- drivers/gpu/drm/drm_panel.c | 6 ------ drivers/gpu/drm/panel/panel-arm-versatile.c | 2 +- .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 2 +- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 15 ++++++++------- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 2 +- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 6 +++--- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 2 +- .../gpu/drm/panel/panel-kingdisplay-kd097d04.c | 6 +++--- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 2 +- drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 ++-- drivers/gpu/drm/panel/panel-lvds.c | 2 +- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 2 +- .../gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 ++--- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- .../gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 4 ++-- .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 4 ++-- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 5 ++--- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 2 +- drivers/gpu/drm/panel/panel-raydium-rm68200.c | 2 +- .../gpu/drm/panel/panel-rocktech-jh057n00900.c | 2 +- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 2 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 2 +- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 9 ++++----- drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 4 ++-- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 2 +- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 4 ++-- drivers/gpu/drm/panel/panel-simple.c | 15 ++++++--------- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 ++-- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 2 +- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 2 +- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 2 +- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 2 +- include/drm/drm_panel.h | 7 ------- 38 files changed, 63 insertions(+), 81 deletions(-)
drivers/gpu/drm/drm_panel.c +0 -6
@@ -114,11 +114,6 @@ EXPORT_SYMBOL(drm_panel_remove);*/ int drm_panel_attach (struct drm_panel *panel,struct drm_connector *connector) { -if (panel->drm) -return -EBUSY ; - - panel->drm = connector->dev; -return 0 ; }EXPORT_SYMBOL (drm_panel_attach);
@@ -135,7 +130,6 @@ EXPORT_SYMBOL(drm_panel_attach);*/ void drm_panel_detach (struct drm_panel *panel) { - panel->drm =NULL ; }EXPORT_SYMBOL (drm_panel_detach);
drivers/gpu/drm/panel/panel-arm-versatile.c +1 -1
@@ -270,7 +270,7 @@ static int versatile_panel_get_modes(struct drm_panel *panel, connector->display_info.height_mm = vpanel->panel_type->height_mm; connector->display_info.bus_flags = vpanel->panel_type->bus_flags; - mode =drm_mode_duplicate (panel->drm, &vpanel->panel_type->mode); + mode =drm_mode_duplicate (connector->dev, &vpanel->panel_type->mode);drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;
drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +1 -1
@@ -168,7 +168,7 @@ static int feiyang_get_modes(struct drm_panel *panel,struct feiyang *ctx =panel_to_feiyang (panel);struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &feiyang_default_mode); + mode =drm_mode_duplicate (connector->dev, &feiyang_default_mode);if (!mode) { DRM_DEV_ERROR(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n", feiyang_default_mode.hdisplay,
drivers/gpu/drm/panel/panel-ilitek-ili9322.c +8 -7
@@ -645,6 +645,7 @@ static int ili9322_get_modes(struct drm_panel *panel, struct drm_connector *connector) {struct ili9322 *ili =panel_to_ili9322 (panel); +struct drm_device *drm = connector->dev;struct drm_display_mode *mode;struct drm_display_info *info;
@@ -663,26 +664,26 @@ static int ili9322_get_modes(struct drm_panel *panel,switch (ili->input) {case ILI9322_INPUT_SRGB_DUMMY_320X240 : - mode =drm_mode_duplicate (panel->drm, &srgb_320x240_mode); + mode =drm_mode_duplicate (drm, &srgb_320x240_mode);break ;case ILI9322_INPUT_SRGB_DUMMY_360X240 : - mode =drm_mode_duplicate (panel->drm, &srgb_360x240_mode); + mode =drm_mode_duplicate (drm, &srgb_360x240_mode);break ;case ILI9322_INPUT_PRGB_THROUGH :case ILI9322_INPUT_PRGB_ALIGNED : - mode =drm_mode_duplicate (panel->drm, &prgb_320x240_mode); + mode =drm_mode_duplicate (drm, &prgb_320x240_mode);break ;case ILI9322_INPUT_YUV_640X320_YCBCR : - mode =drm_mode_duplicate (panel->drm, &yuv_640x320_mode); + mode =drm_mode_duplicate (drm, &yuv_640x320_mode);break ;case ILI9322_INPUT_YUV_720X360_YCBCR : - mode =drm_mode_duplicate (panel->drm, &yuv_720x360_mode); + mode =drm_mode_duplicate (drm, &yuv_720x360_mode);break ;case ILI9322_INPUT_ITU_R_BT656_720X360_YCBCR : - mode =drm_mode_duplicate (panel->drm, &itu_r_bt_656_720_mode); + mode =drm_mode_duplicate (drm, &itu_r_bt_656_720_mode);break ;case ILI9322_INPUT_ITU_R_BT656_640X320_YCBCR : - mode =drm_mode_duplicate (panel->drm, &itu_r_bt_656_640_mode); + mode =drm_mode_duplicate (drm, &itu_r_bt_656_640_mode);break ;default : mode =NULL ;
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +1 -1
@@ -393,7 +393,7 @@ static int ili9881c_get_modes(struct drm_panel *panel,struct ili9881c *ctx =panel_to_ili9881c (panel);struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &bananapi_default_mode); + mode =drm_mode_duplicate (connector->dev, &bananapi_default_mode);if (!mode) { dev_err(&ctx->dsi->dev, "failed to add mode %ux%ux@%u\n", bananapi_default_mode.hdisplay,
drivers/gpu/drm/panel/panel-innolux-p079zca.c +3 -3
@@ -211,7 +211,7 @@ static int innolux_panel_enable(struct drm_panel *panel) ret =backlight_enable (innolux->backlight);if (ret) { -DRM_DEV_ERROR (panel->drm->dev, +DRM_DEV_ERROR (panel->dev,"Failed to enable backlight %d\n" , ret);return ret; }
@@ -410,9 +410,9 @@ static int innolux_panel_get_modes(struct drm_panel *panel,const struct drm_display_mode *m = innolux->desc->mode;struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, m); + mode =drm_mode_duplicate (connector->dev, m);if (!mode) { -DRM_DEV_ERROR (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +DRM_DEV_ERROR (panel->dev,"failed to add mode %ux%ux@%u\n" , m->hdisplay, m->vdisplay, m->vrefresh);return -ENOMEM ; }
drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +1 -1
@@ -307,7 +307,7 @@ static int jdi_panel_get_modes(struct drm_panel *panel,struct jdi_panel *jdi =to_jdi_panel (panel);struct device *dev = &jdi->dsi->dev; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { dev_err(dev, "failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c +3 -3
@@ -310,7 +310,7 @@ static int kingdisplay_panel_enable(struct drm_panel *panel) ret =backlight_enable (kingdisplay->backlight);if (ret) { -DRM_DEV_ERROR (panel->drm->dev, +DRM_DEV_ERROR (panel->dev,"Failed to enable backlight %d\n" , ret);return ret; }
@@ -338,9 +338,9 @@ static int kingdisplay_panel_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -DRM_DEV_ERROR (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +DRM_DEV_ERROR (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-lg-lb035q02.c +1 -1
@@ -146,7 +146,7 @@ static int lb035q02_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &lb035q02_mode); + mode =drm_mode_duplicate (connector->dev, &lb035q02_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-lg-lg4573.c +2 -2
@@ -214,9 +214,9 @@ static int lg4573_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-lvds.c +1 -1
@@ -112,7 +112,7 @@ static int panel_lvds_get_modes(struct drm_panel *panel,struct panel_lvds *lvds =to_panel_lvds (panel);struct drm_display_mode *mode; - mode =drm_mode_create (lvds->panel.drm); + mode =drm_mode_create (connector->dev);if (!mode)return 0 ;
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c +1 -1
@@ -128,7 +128,7 @@ static int nl8048_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &nl8048_mode); + mode =drm_mode_duplicate (connector->dev, &nl8048_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-novatek-nt39016.c +1 -1
@@ -213,7 +213,7 @@ static int nt39016_get_modes(struct drm_panel *drm_panel,const struct nt39016_panel_info *panel_info = panel->panel_info;struct drm_display_mode *mode; - mode =drm_mode_duplicate (drm_panel->drm, &panel_info->display_mode); + mode =drm_mode_duplicate (connector->dev, &panel_info->display_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c +2 -3
@@ -146,7 +146,6 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel, {struct lcd_olinuxino *lcd =to_lcd_olinuxino (panel);struct lcd_olinuxino_info *lcd_info = &lcd->eeprom.info; -struct drm_device *drm = lcd->panel.drm;struct lcd_olinuxino_mode *lcd_mode;struct drm_display_mode *mode;u32 i, num =0 ;
@@ -155,9 +154,9 @@ static int lcd_olinuxino_get_modes(struct drm_panel *panel, lcd_mode = (struct lcd_olinuxino_mode *) &lcd->eeprom.reserved[i *sizeof (*lcd_mode)]; - mode =drm_mode_create (drm); + mode =drm_mode_create (connector->dev);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%u@%u\n" , lcd_mode->hactive, lcd_mode->vactive, lcd_mode->refresh);
drivers/gpu/drm/panel/panel-orisetech-otm8009a.c +1 -1
@@ -354,7 +354,7 @@ static int otm8009a_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_ERROR("failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c +2 -2
@@ -118,9 +118,9 @@ static int osd101t2587_panel_get_modes(struct drm_panel *panel,struct osd101t2587_panel *osd101t2587 =ti_osd_panel (panel);struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, osd101t2587->default_mode); + mode =drm_mode_duplicate (connector->dev, osd101t2587->default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , osd101t2587->default_mode->hdisplay, osd101t2587->default_mode->vdisplay, osd101t2587->default_mode->vrefresh);
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +2 -2
@@ -171,9 +171,9 @@ static int wuxga_nt_panel_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +2 -3
@@ -312,7 +312,6 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)static int rpi_touchscreen_get_modes (struct drm_panel *panel,struct drm_connector *connector) { -struct drm_device *drm = panel->drm;unsigned int i, num =0 ;static const u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ;
@@ -320,9 +319,9 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel,const struct drm_display_mode *m = &rpi_touchscreen_modes[i];struct drm_display_mode *mode; - mode =drm_mode_duplicate (drm, m); + mode =drm_mode_duplicate (connector->dev, m);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%u@%u\n" , m->hdisplay, m->vdisplay, m->vrefresh);continue ; }
drivers/gpu/drm/panel/panel-raydium-rm67191.c +1 -1
@@ -441,7 +441,7 @@ static int rad_panel_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_DEV_ERROR(panel->dev, "failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-raydium-rm68200.c +1 -1
@@ -340,7 +340,7 @@ static int rm68200_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_ERROR("failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +1 -1
@@ -236,7 +236,7 @@ static int jh057n_get_modes(struct drm_panel *panel,struct jh057n *ctx =panel_to_jh057n (panel);struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c +1 -1
@@ -127,7 +127,7 @@ static int rb070d30_panel_get_modes(struct drm_panel *panel,struct drm_display_mode *mode;static const u32 bus_format =MEDIA_BUS_FMT_RGB888_1X24 ; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_DEV_ERROR(&ctx->dsi->dev, "Failed to add mode " DRM_MODE_FMT "\n",
drivers/gpu/drm/panel/panel-samsung-s6d16d0.c +1 -1
@@ -148,7 +148,7 @@ static int s6d16d0_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &samsung_s6d16d0_mode); + mode =drm_mode_duplicate (connector->dev, &samsung_s6d16d0_mode);if (!mode) {DRM_ERROR ("bad mode or failed to add mode\n" );return -EINVAL ;
drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +1 -1
@@ -651,7 +651,7 @@ static int s6e3ha2_get_modes(struct drm_panel *panel, struct s6e3ha2 *ctx = container_of(panel, struct s6e3ha2, panel);struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, ctx->desc->mode); + mode =drm_mode_duplicate (connector->dev, ctx->desc->mode);if (!mode) { DRM_ERROR("failed to add mode %ux%ux@%u\n", ctx->desc->mode->hdisplay, ctx->desc->mode->vdisplay,
drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c +1 -1
@@ -405,7 +405,7 @@ static int s6e63j0x03_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_ERROR("failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-samsung-s6e63m0.c +1 -1
@@ -367,7 +367,7 @@ static int s6e63m0_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { DRM_ERROR("failed to add mode %ux%ux@%u\n", default_mode.hdisplay, default_mode.vdisplay,
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c +4 -5
@@ -59,7 +59,6 @@ static inline struct seiko_panel *to_seiko_panel(struct drm_panel *panel)static int seiko_panel_get_fixed_modes (struct seiko_panel *panel,struct drm_connector *connector) { -struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;
@@ -71,9 +70,9 @@ static int seiko_panel_get_fixed_modes(struct seiko_panel *panel,struct videomode vm;videomode_from_timing (dt, &vm); - mode =drm_mode_create (drm); + mode =drm_mode_create (connector->dev);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u\n" , +dev_err (panel->base.dev,"failed to add mode %ux%u\n" , dt->hactive.typ, dt->vactive.typ);continue ; }
@@ -92,9 +91,9 @@ static int seiko_panel_get_fixed_modes(struct seiko_panel *panel,for (i =0 ; i < panel->desc->num_modes; i++) {const struct drm_display_mode *m = &panel->desc->modes[i]; - mode =drm_mode_duplicate (drm, m); + mode =drm_mode_duplicate (connector->dev, m);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u@%u\n" , +dev_err (panel->base.dev,"failed to add mode %ux%u@%u\n" , m->hdisplay, m->vdisplay, m->vrefresh);continue ; }
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +2 -2
@@ -283,9 +283,9 @@ static int sharp_panel_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c +1 -1
@@ -105,7 +105,7 @@ static int ls037v7dw01_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &ls037v7dw01_mode); + mode =drm_mode_duplicate (connector->dev, &ls037v7dw01_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +2 -2
@@ -215,9 +215,9 @@ static int sharp_nt_panel_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-simple.c +6 -9
@@ -120,7 +120,6 @@ static inline struct panel_simple *to_panel_simple(struct drm_panel *panel)static unsigned int panel_simple_get_timings_modes (struct panel_simple *panel,struct drm_connector *connector) { -struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;
@@ -129,9 +128,9 @@ static unsigned int panel_simple_get_timings_modes(struct panel_simple *panel,struct videomode vm;videomode_from_timing (dt, &vm); - mode =drm_mode_create (drm); + mode =drm_mode_create (connector->dev);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u\n" , +dev_err (panel->base.dev,"failed to add mode %ux%u\n" , dt->hactive.typ, dt->vactive.typ);continue ; }
@@ -153,16 +152,15 @@ static unsigned int panel_simple_get_timings_modes(struct panel_simple *panel,static unsigned int panel_simple_get_display_modes (struct panel_simple *panel,struct drm_connector *connector) { -struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;unsigned int i, num =0 ;for (i =0 ; i < panel->desc->num_modes; i++) {const struct drm_display_mode *m = &panel->desc->modes[i]; - mode =drm_mode_duplicate (drm, m); + mode =drm_mode_duplicate (connector->dev, m);if (!mode) { -dev_err (drm->dev,"failed to add mode %ux%u@%u\n" , +dev_err (panel->base.dev,"failed to add mode %ux%u@%u\n" , m->hdisplay, m->vdisplay, m->vrefresh);continue ; }
@@ -184,7 +182,6 @@ static unsigned int panel_simple_get_display_modes(struct panel_simple *panel,static int panel_simple_get_non_edid_modes (struct panel_simple *panel,struct drm_connector *connector) { -struct drm_device *drm = panel->base.drm;struct drm_display_mode *mode;bool has_override = panel->override_mode.type;unsigned int num =0 ;
@@ -193,12 +190,12 @@ static int panel_simple_get_non_edid_modes(struct panel_simple *panel,return 0 ;if (has_override) { - mode =drm_mode_duplicate (drm, &panel->override_mode); + mode =drm_mode_duplicate (connector->dev, &panel->override_mode);if (mode) {drm_mode_probed_add (connector, mode); num =1 ; }else { -dev_err (drm->dev,"failed to add override mode\n" ); +dev_err (panel->base.dev,"failed to add override mode\n" ); } }
drivers/gpu/drm/panel/panel-sitronix-st7701.c +1 -1
@@ -271,7 +271,7 @@ static int st7701_get_modes(struct drm_panel *panel,const struct drm_display_mode *desc_mode = st7701->desc->mode;struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, desc_mode); + mode =drm_mode_duplicate (connector->dev, desc_mode);if (!mode) { DRM_DEV_ERROR(&st7701->dsi->dev, "failed to add mode %ux%ux@%u\n",
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +2 -2
@@ -175,9 +175,9 @@ static int st7789v_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &default_mode); + mode =drm_mode_duplicate (connector->dev, &default_mode);if (!mode) { -dev_err (panel->drm->dev,"failed to add mode %ux%ux@%u\n" , +dev_err (panel->dev,"failed to add mode %ux%ux@%u\n" , default_mode.hdisplay, default_mode.vdisplay, default_mode.vrefresh);return -ENOMEM ;
drivers/gpu/drm/panel/panel-sony-acx565akm.c +1 -1
@@ -526,7 +526,7 @@ static int acx565akm_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &acx565akm_mode); + mode =drm_mode_duplicate (connector->dev, &acx565akm_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +1 -1
@@ -292,7 +292,7 @@ static int td028ttec1_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &td028ttec1_mode); + mode =drm_mode_duplicate (connector->dev, &td028ttec1_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c +1 -1
@@ -351,7 +351,7 @@ static int td043mtea1_get_modes(struct drm_panel *panel, {struct drm_display_mode *mode; - mode =drm_mode_duplicate (panel->drm, &td043mtea1_mode); + mode =drm_mode_duplicate (connector->dev, &td043mtea1_mode);if (!mode)return -ENOMEM ;
drivers/gpu/drm/panel/panel-tpo-tpg110.c +1 -1
@@ -394,7 +394,7 @@ static int tpg110_get_modes(struct drm_panel *panel, connector->display_info.height_mm = tpg->height; connector->display_info.bus_flags = tpg->panel_mode->bus_flags; - mode =drm_mode_duplicate (panel->drm, &tpg->panel_mode->mode); + mode =drm_mode_duplicate (connector->dev, &tpg->panel_mode->mode);drm_mode_set_name (mode); mode->type =DRM_MODE_TYPE_DRIVER |DRM_MODE_TYPE_PREFERRED ;
include/drm/drm_panel.h +0 -7
@@ -132,13 +132,6 @@ struct drm_panel_funcs {* struct drm_panel - DRM panel object */ struct drm_panel { -/** -* @drm: -* -* DRM device owning the panel. -*/ -struct drm_device *drm; -/** * @dev: *
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 8/25 drm/panel: feiyang-fy07024di26a30d: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +3 -7
@@ -9,7 +9,6 @@#include <drm/drm_panel.h> #include <drm/drm_print.h> -#include <linux/backlight.h> #include <linux/gpio/consumer.h> #include <linux/delay.h> #include <linux/module.h>
@@ -22,7 +21,6 @@ struct feiyang {struct drm_panel panel;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *dvdd;struct regulator *avdd;struct gpio_desc *reset;
@@ -102,7 +100,6 @@ static int feiyang_enable(struct drm_panel *panel)msleep (200 );mipi_dsi_dcs_set_display_on (ctx->dsi); -backlight_enable (ctx->backlight);return 0 ; }
@@ -111,7 +108,6 @@ static int feiyang_disable(struct drm_panel *panel) {struct feiyang *ctx =panel_to_feiyang (panel); -backlight_disable (ctx->backlight);return mipi_dsi_dcs_set_display_off (ctx->dsi); }
@@ -225,9 +221,9 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi)return PTR_ERR (ctx->reset); } - ctx->backlight =devm_of_find_backlight (&dsi->dev); -if (IS_ERR (ctx->backlight)) -return PTR_ERR (ctx->backlight); + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; ret =drm_panel_add (&ctx->panel);if (ret <0 )
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 9/25 drm/panel: ilitek-ili9881c: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +3 -16
@@ -3,7 +3,6 @@* Copyright (C) 2017-2018, Bootlin */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h>
@@ -25,7 +24,6 @@ struct ili9881c {struct drm_panel panel;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *power;struct gpio_desc *reset; };
@@ -348,7 +346,6 @@ static int ili9881c_enable(struct drm_panel *panel)msleep (120 );mipi_dsi_dcs_set_display_on (ctx->dsi); -backlight_enable (ctx->backlight);return 0 ; }
@@ -357,7 +354,6 @@ static int ili9881c_disable(struct drm_panel *panel) {struct ili9881c *ctx =panel_to_ili9881c (panel); -backlight_disable (ctx->backlight);return mipi_dsi_dcs_set_display_off (ctx->dsi); }
@@ -423,7 +419,6 @@ static const struct drm_panel_funcs ili9881c_funcs = {static int ili9881c_dsi_probe (struct mipi_dsi_device *dsi) { -struct device_node *np;struct ili9881c *ctx;int ret;
@@ -448,14 +443,9 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)return PTR_ERR (ctx->reset); } - np =of_parse_phandle (dsi->dev.of_node,"backlight" ,0 ); -if (np) { - ctx->backlight =of_find_backlight_by_node (np); -of_node_put (np); - -if (!ctx->backlight) -return -EPROBE_DEFER ; - } + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; ret =drm_panel_add (&ctx->panel);if (ret <0 )
@@ -475,9 +465,6 @@ static int ili9881c_dsi_remove(struct mipi_dsi_device *dsi)mipi_dsi_detach (dsi);drm_panel_remove (&ctx->panel); -if (ctx->backlight) -put_device (&ctx->backlight->dev); -return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 10/25 drm/panel: innolux-p079zca: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-)
drivers/gpu/drm/panel/panel-innolux-p079zca.c +8 -20
@@ -3,7 +3,6 @@* Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -52,7 +51,6 @@ struct innolux_panel {struct mipi_dsi_device *link;const struct panel_desc *desc; -struct backlight_device *backlight;struct regulator_bulk_data *supplies;struct gpio_desc *enable_gpio;
@@ -72,8 +70,6 @@ static int innolux_panel_disable(struct drm_panel *panel)if (!innolux->enabled)return 0 ; -backlight_disable (innolux->backlight); - innolux->enabled = false;return 0 ;
@@ -204,18 +200,10 @@ static int innolux_panel_prepare(struct drm_panel *panel)static int innolux_panel_enable (struct drm_panel *panel) {struct innolux_panel *innolux =to_innolux_panel (panel); -int ret;if (innolux->enabled)return 0 ; - ret =backlight_enable (innolux->backlight); -if (ret) { -DRM_DEV_ERROR (panel->dev, -"Failed to enable backlight %d\n" , ret); -return ret; - } - innolux->enabled = true;return 0 ;
@@ -482,13 +470,13 @@ static int innolux_panel_add(struct mipi_dsi_device *dsi, innolux->enable_gpio =NULL ; } - innolux->backlight =devm_of_find_backlight (dev); -if (IS_ERR (innolux->backlight)) -return PTR_ERR (innolux->backlight); -drm_panel_init (&innolux->base, dev, &innolux_panel_funcs,DRM_MODE_CONNECTOR_DSI ); + err =drm_panel_of_backlight (&innolux->base); +if (err) +return err; + err =drm_panel_add (&innolux->base);if (err <0 )return err;
@@ -526,12 +514,12 @@ static int innolux_panel_remove(struct mipi_dsi_device *dsi)struct innolux_panel *innolux =mipi_dsi_get_drvdata (dsi);int err; - err =innolux_panel_unprepare (&innolux->base); + err =drm_panel_unprepare (&innolux->base);if (err <0 )DRM_DEV_ERROR (&dsi->dev,"failed to unprepare panel: %d\n" , err); - err =innolux_panel_disable (&innolux->base); + err =drm_panel_disable (&innolux->base);if (err <0 )DRM_DEV_ERROR (&dsi->dev,"failed to disable panel: %d\n" , err);
@@ -549,8 +537,8 @@ static void innolux_panel_shutdown(struct mipi_dsi_device *dsi) {struct innolux_panel *innolux =mipi_dsi_get_drvdata (dsi); -innolux_panel_unprepare (&innolux->base); -innolux_panel_disable (&innolux->base); +drm_panel_unprepare (&innolux->base); +drm_panel_disable (&innolux->base); }static struct mipi_dsi_driver innolux_panel_driver = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 11/25 drm/panel: kingdisplay-kd097d04: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../drm/panel/panel-kingdisplay-kd097d04.c | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-)
drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c +8 -20
@@ -3,7 +3,6 @@* Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -23,7 +22,6 @@ struct kingdisplay_panel {struct drm_panel base;struct mipi_dsi_device *link; -struct backlight_device *backlight;struct regulator *supply;struct gpio_desc *enable_gpio;
@@ -191,8 +189,6 @@ static int kingdisplay_panel_disable(struct drm_panel *panel)if (!kingdisplay->enabled)return 0 ; -backlight_disable (kingdisplay->backlight); - err =mipi_dsi_dcs_set_display_off (kingdisplay->link);if (err <0 ) DRM_DEV_ERROR(panel->dev, "failed to set display off: %d\n",
@@ -303,18 +299,10 @@ static int kingdisplay_panel_prepare(struct drm_panel *panel)static int kingdisplay_panel_enable (struct drm_panel *panel) {struct kingdisplay_panel *kingdisplay =to_kingdisplay_panel (panel); -int ret;if (kingdisplay->enabled)return 0 ; - ret =backlight_enable (kingdisplay->backlight); -if (ret) { -DRM_DEV_ERROR (panel->dev, -"Failed to enable backlight %d\n" , ret); -return ret; - } - kingdisplay->enabled = true;return 0 ;
@@ -388,13 +376,13 @@ static int kingdisplay_panel_add(struct kingdisplay_panel *kingdisplay) kingdisplay->enable_gpio =NULL ; } - kingdisplay->backlight =devm_of_find_backlight (dev); -if (IS_ERR (kingdisplay->backlight)) -return PTR_ERR (kingdisplay->backlight); -drm_panel_init (&kingdisplay->base, &kingdisplay->link->dev, &kingdisplay_panel_funcs,DRM_MODE_CONNECTOR_DSI ); + err =drm_panel_of_backlight (&kingdisplay->base); +if (err) +return err; +return drm_panel_add (&kingdisplay->base); }
@@ -432,12 +420,12 @@ static int kingdisplay_panel_remove(struct mipi_dsi_device *dsi)struct kingdisplay_panel *kingdisplay =mipi_dsi_get_drvdata (dsi);int err; - err =kingdisplay_panel_unprepare (&kingdisplay->base); + err =drm_panel_unprepare (&kingdisplay->base);if (err <0 )DRM_DEV_ERROR (&dsi->dev,"failed to unprepare panel: %d\n" , err); - err =kingdisplay_panel_disable (&kingdisplay->base); + err =drm_panel_disable (&kingdisplay->base);if (err <0 )DRM_DEV_ERROR (&dsi->dev,"failed to disable panel: %d\n" , err);
@@ -455,8 +443,8 @@ static void kingdisplay_panel_shutdown(struct mipi_dsi_device *dsi) {struct kingdisplay_panel *kingdisplay =mipi_dsi_get_drvdata (dsi); -kingdisplay_panel_unprepare (&kingdisplay->base); -kingdisplay_panel_disable (&kingdisplay->base); +drm_panel_unprepare (&kingdisplay->base); +drm_panel_disable (&kingdisplay->base); }static struct mipi_dsi_driver kingdisplay_panel_driver = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 12/25 drm/panel: lvds: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-lvds.c | 40 ++++-------------------------- 1 file changed, 5 insertions(+), 35 deletions(-)
drivers/gpu/drm/panel/panel-lvds.c +5 -35
@@ -8,7 +8,6 @@* Contact: Laurent Pinchart ([email protected]) */ -#include <linux/backlight.h> #include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of_platform.h>
@@ -34,7 +33,6 @@ struct panel_lvds {unsigned int bus_format;bool data_mirror; -struct backlight_device *backlight;struct regulator *supply;struct gpio_desc *enable_gpio;
@@ -46,19 +44,6 @@ static inline struct panel_lvds *to_panel_lvds(struct drm_panel *panel) return container_of(panel, struct panel_lvds, panel); } -static int panel_lvds_disable (struct drm_panel *panel) -{ -struct panel_lvds *lvds =to_panel_lvds (panel); - -if (lvds->backlight) { - lvds->backlight->props.power =FB_BLANK_POWERDOWN ; - lvds->backlight->props.state |=BL_CORE_FBBLANK ; -backlight_update_status (lvds->backlight); - } - -return 0 ; -} -static int panel_lvds_unprepare (struct drm_panel *panel) {struct panel_lvds *lvds =to_panel_lvds (panel);
@@ -93,19 +78,6 @@ static int panel_lvds_prepare(struct drm_panel *panel)return 0 ; } -static int panel_lvds_enable (struct drm_panel *panel) -{ -struct panel_lvds *lvds =to_panel_lvds (panel); - -if (lvds->backlight) { - lvds->backlight->props.state &= ~BL_CORE_FBBLANK ; - lvds->backlight->props.power =FB_BLANK_UNBLANK ; -backlight_update_status (lvds->backlight); - } - -return 0 ; -} -static int panel_lvds_get_modes (struct drm_panel *panel,struct drm_connector *connector) {
@@ -132,10 +104,8 @@ static int panel_lvds_get_modes(struct drm_panel *panel, }static const struct drm_panel_funcs panel_lvds_funcs = { - .disable = panel_lvds_disable, .unprepare = panel_lvds_unprepare, .prepare = panel_lvds_prepare, - .enable = panel_lvds_enable, .get_modes = panel_lvds_get_modes, };
@@ -242,10 +212,6 @@ static int panel_lvds_probe(struct platform_device *pdev)return ret; } - lvds->backlight =devm_of_find_backlight (lvds->dev); -if (IS_ERR (lvds->backlight)) -return PTR_ERR (lvds->backlight); -/* * TODO: Handle all power supplies specified in the DT node in a generic * way for panels that don't care about power supply ordering. LVDS
@@ -257,6 +223,10 @@ static int panel_lvds_probe(struct platform_device *pdev)drm_panel_init (&lvds->panel, lvds->dev, &panel_lvds_funcs,DRM_MODE_CONNECTOR_LVDS ); + ret =drm_panel_of_backlight (&lvds->panel); +if (ret) +return ret; + ret =drm_panel_add (&lvds->panel);if (ret <0 )return ret;
@@ -271,7 +241,7 @@ static int panel_lvds_remove(struct platform_device *pdev)drm_panel_remove (&lvds->panel); -panel_lvds_disable (&lvds->panel); +drm_panel_disable (&lvds->panel);return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 13/25 drm/panel: olimex-lcd-olinuxino: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c +6 -12
@@ -6,7 +6,6 @@* Author: Stefan Mavrodiev <[email protected]> */ -#include <linux/backlight.h> #include <linux/crc32.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h>
@@ -68,7 +67,6 @@ struct lcd_olinuxino {bool prepared;bool enabled; -struct backlight_device *backlight;struct regulator *supply;struct gpio_desc *enable_gpio;
@@ -87,8 +85,6 @@ static int lcd_olinuxino_disable(struct drm_panel *panel)if (!lcd->enabled)return 0 ; -backlight_disable (lcd->backlight); - lcd->enabled = false;return 0 ;
@@ -134,8 +130,6 @@ static int lcd_olinuxino_enable(struct drm_panel *panel)if (lcd->enabled)return 0 ; -backlight_enable (lcd->backlight); - lcd->enabled = true;return 0 ;
@@ -283,13 +277,13 @@ static int lcd_olinuxino_probe(struct i2c_client *client,if (IS_ERR (lcd->enable_gpio))return PTR_ERR (lcd->enable_gpio); - lcd->backlight =devm_of_find_backlight (dev); -if (IS_ERR (lcd->backlight)) -return PTR_ERR (lcd->backlight); -drm_panel_init (&lcd->panel, dev, &lcd_olinuxino_funcs,DRM_MODE_CONNECTOR_DPI ); + ret =drm_panel_of_backlight (&lcd->panel); +if (ret) +return ret; +return drm_panel_add (&lcd->panel); }
@@ -299,8 +293,8 @@ static int lcd_olinuxino_remove(struct i2c_client *client)drm_panel_remove (&panel->panel); -lcd_olinuxino_disable (&panel->panel); -lcd_olinuxino_unprepare (&panel->panel); +drm_panel_disable (&panel->panel); +drm_panel_unprepare (&panel->panel);return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 14/25 drm/panel: osd-osd101t2587-53ts: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../drm/panel/panel-osd-osd101t2587-53ts.c | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-)
drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c +9 -15
@@ -4,7 +4,6 @@* Author: Peter Ujfalusi <[email protected]> */ -#include <linux/backlight.h> #include <linux/module.h> #include <linux/of.h> #include <linux/regulator/consumer.h>
@@ -20,7 +19,6 @@ struct osd101t2587_panel {struct drm_panel base;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *supply;bool prepared;
@@ -42,8 +40,6 @@ static int osd101t2587_panel_disable(struct drm_panel *panel)if (!osd101t2587->enabled)return 0 ; -backlight_disable (osd101t2587->backlight); - ret =mipi_dsi_shutdown_peripheral (osd101t2587->dsi); osd101t2587->enabled = false;
@@ -91,8 +87,6 @@ static int osd101t2587_panel_enable(struct drm_panel *panel)if (ret)return ret; -backlight_enable (osd101t2587->backlight); - osd101t2587->enabled = true;return ret;
@@ -158,18 +152,19 @@ MODULE_DEVICE_TABLE(of, osd101t2587_of_match);static int osd101t2587_panel_add (struct osd101t2587_panel *osd101t2587) {struct device *dev = &osd101t2587->dsi->dev; +int ret; osd101t2587->supply =devm_regulator_get (dev,"power" );if (IS_ERR (osd101t2587->supply))return PTR_ERR (osd101t2587->supply); - osd101t2587->backlight =devm_of_find_backlight (dev); -if (IS_ERR (osd101t2587->backlight)) -return PTR_ERR (osd101t2587->backlight); -drm_panel_init (&osd101t2587->base, &osd101t2587->dsi->dev, &osd101t2587_panel_funcs,DRM_MODE_CONNECTOR_DSI ); + ret =drm_panel_of_backlight (&osd101t2587->base); +if (ret) +return ret; +return drm_panel_add (&osd101t2587->base); }
@@ -215,12 +210,11 @@ static int osd101t2587_panel_remove(struct mipi_dsi_device *dsi)struct osd101t2587_panel *osd101t2587 =mipi_dsi_get_drvdata (dsi);int ret; - ret =osd101t2587_panel_disable (&osd101t2587->base); + ret =drm_panel_disable (&osd101t2587->base);if (ret <0 )dev_warn (&dsi->dev,"failed to disable panel: %d\n" , ret); -osd101t2587_panel_unprepare (&osd101t2587->base); - +drm_panel_unprepare (&osd101t2587->base);drm_panel_remove (&osd101t2587->base); ret =mipi_dsi_detach (dsi);
@@ -234,8 +228,8 @@ static void osd101t2587_panel_shutdown(struct mipi_dsi_device *dsi) {struct osd101t2587_panel *osd101t2587 =mipi_dsi_get_drvdata (dsi); -osd101t2587_panel_disable (&osd101t2587->base); -osd101t2587_panel_unprepare (&osd101t2587->base); +drm_panel_disable (&osd101t2587->base); +drm_panel_unprepare (&osd101t2587->base); }static struct mipi_dsi_driver osd101t2587_panel_driver = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 15/25 drm/panel: panasonic-vvx10f034n00: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../drm/panel/panel-panasonic-vvx10f034n00.c | 45 +++---------------- 1 file changed, 6 insertions(+), 39 deletions(-)
drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c +6 -39
@@ -7,7 +7,6 @@* Based on AUO panel driver by Rob Clark <[email protected]> */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/of.h>
@@ -31,7 +30,6 @@ struct wuxga_nt_panel {struct drm_panel base;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *supply;bool prepared;
@@ -62,12 +60,6 @@ static int wuxga_nt_panel_disable(struct drm_panel *panel) mipi_ret =mipi_dsi_shutdown_peripheral (wuxga_nt->dsi); -if (wuxga_nt->backlight) { - wuxga_nt->backlight->props.power =FB_BLANK_POWERDOWN ; - wuxga_nt->backlight->props.state |=BL_CORE_FBBLANK ; - bl_ret =backlight_update_status (wuxga_nt->backlight); - } - wuxga_nt->enabled = false;return mipi_ret ? mipi_ret : bl_ret;
@@ -142,12 +134,6 @@ static int wuxga_nt_panel_enable(struct drm_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 ;
@@ -206,7 +192,6 @@ MODULE_DEVICE_TABLE(of, wuxga_nt_of_match);static int wuxga_nt_panel_add (struct wuxga_nt_panel *wuxga_nt) {struct device *dev = &wuxga_nt->dsi->dev; -struct device_node *np;int ret; wuxga_nt->mode = &default_mode;
@@ -215,38 +200,20 @@ static int wuxga_nt_panel_add(struct wuxga_nt_panel *wuxga_nt)if (IS_ERR (wuxga_nt->supply))return PTR_ERR (wuxga_nt->supply); - np =of_parse_phandle (dev->of_node,"backlight" ,0 ); -if (np) { - wuxga_nt->backlight =of_find_backlight_by_node (np); -of_node_put (np); - -if (!wuxga_nt->backlight) -return -EPROBE_DEFER ; - } -drm_panel_init (&wuxga_nt->base, &wuxga_nt->dsi->dev, &wuxga_nt_panel_funcs,DRM_MODE_CONNECTOR_DSI ); - ret =drm_panel_add (&wuxga_nt->base); -if (ret <0 ) - goto put_backlight; - -return 0 ; - -put_backlight: -if (wuxga_nt->backlight) -put_device (&wuxga_nt->backlight->dev); + ret =drm_panel_of_backlight (&wuxga_nt->base); +if (ret) +return ret; -return ret; +return drm_panel_add (&wuxga_nt->base); }static void wuxga_nt_panel_del (struct wuxga_nt_panel *wuxga_nt) {if (wuxga_nt->base.dev)drm_panel_remove (&wuxga_nt->base); - -if (wuxga_nt->backlight) -put_device (&wuxga_nt->backlight->dev); }static int wuxga_nt_panel_probe (struct mipi_dsi_device *dsi)
@@ -281,7 +248,7 @@ static int wuxga_nt_panel_remove(struct mipi_dsi_device *dsi)struct wuxga_nt_panel *wuxga_nt =mipi_dsi_get_drvdata (dsi);int ret; - ret =wuxga_nt_panel_disable (&wuxga_nt->base); + ret =drm_panel_disable (&wuxga_nt->base);if (ret <0 )dev_err (&dsi->dev,"failed to disable panel: %d\n" , ret);
@@ -298,7 +265,7 @@ static void wuxga_nt_panel_shutdown(struct mipi_dsi_device *dsi) {struct wuxga_nt_panel *wuxga_nt =mipi_dsi_get_drvdata (dsi); -wuxga_nt_panel_disable (&wuxga_nt->base); +drm_panel_disable (&wuxga_nt->base); }static struct mipi_dsi_driver wuxga_nt_panel_driver = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 16/25 drm/panel: raydium-rm68200: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-raydium-rm68200.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/panel/panel-raydium-rm68200.c +5 -10
@@ -6,9 +6,9 @@* Yannick Fertre <[email protected]> */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/regulator/consumer.h>
@@ -78,7 +78,6 @@ struct rm68200 {struct drm_panel panel;struct gpio_desc *reset_gpio;struct regulator *supply; -struct backlight_device *backlight;bool prepared;bool enabled; };
@@ -242,8 +241,6 @@ static int rm68200_disable(struct drm_panel *panel)if (!ctx->enabled)return 0 ; -backlight_disable (ctx->backlight); - ctx->enabled = false;return 0 ;
@@ -328,8 +325,6 @@ static int rm68200_enable(struct drm_panel *panel)if (ctx->enabled)return 0 ; -backlight_enable (ctx->backlight); - ctx->enabled = true;return 0 ;
@@ -392,10 +387,6 @@ static int rm68200_probe(struct mipi_dsi_device *dsi)return ret; } - ctx->backlight =devm_of_find_backlight (dev); -if (IS_ERR (ctx->backlight)) -return PTR_ERR (ctx->backlight); -mipi_dsi_set_drvdata (dsi, ctx); ctx->dev = dev;
@@ -408,6 +399,10 @@ static int rm68200_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &rm68200_drm_funcs,DRM_MODE_CONNECTOR_DSI ); + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 17/25 drm/panel: rocktech-jh057n00900: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver. While touching the include files sort them
and divide them up in blocks.
--- .../drm/panel/panel-rocktech-jh057n00900.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c +12 -12
@@ -5,20 +5,22 @@* Copyright (C) Purism SPC 2019 */ -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_modes.h> -#include <drm/drm_panel.h> -#include <drm/drm_print.h> -#include <linux/backlight.h> #include <linux/debugfs.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/media-bus-format.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/regulator/consumer.h> +#include <video/display_timing.h> #include <video/mipi_display.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_modes.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#define DRV_NAME "panel-rocktech-jh057n00900"/* Manufacturer specific Commands send via DSI */
@@ -47,7 +49,6 @@ struct jh057n {struct device *dev;struct drm_panel panel;struct gpio_desc *reset_gpio; -struct backlight_device *backlight;struct regulator *vcc;struct regulator *iovcc;bool prepared;
@@ -152,7 +153,7 @@ static int jh057n_enable(struct drm_panel *panel)return ret; } -return backlight_enable (ctx->backlight); +return 0 ; }static int jh057n_disable (struct drm_panel *panel)
@@ -160,7 +161,6 @@ static int jh057n_disable(struct drm_panel *panel)struct jh057n *ctx =panel_to_jh057n (panel);struct mipi_dsi_device *dsi =to_mipi_dsi_device (ctx->dev); -backlight_disable (ctx->backlight);return mipi_dsi_dcs_set_display_off (dsi); }
@@ -321,10 +321,6 @@ static int jh057n_probe(struct mipi_dsi_device *dsi) dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST |MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; - ctx->backlight =devm_of_find_backlight (dev); -if (IS_ERR (ctx->backlight)) -return PTR_ERR (ctx->backlight); - ctx->vcc =devm_regulator_get (dev,"vcc" );if (IS_ERR (ctx->vcc)) { ret =PTR_ERR (ctx->vcc);
@@ -347,6 +343,10 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)drm_panel_init (&ctx->panel, dev, &jh057n_drm_funcs,DRM_MODE_CONNECTOR_DSI ); + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; +drm_panel_add (&ctx->panel); ret =mipi_dsi_attach (dsi);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 18/25 drm/panel: ronbo-rb070d30: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/gpu/drm/panel/panel-ronbo-rb070d30.c +3 -16
@@ -7,7 +7,6 @@* This file based on panel-ilitek-ili9881c.c */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h>
@@ -29,7 +28,6 @@struct rb070d30_panel {struct drm_panel panel;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *supply;struct {
@@ -84,22 +82,13 @@ static int rb070d30_panel_enable(struct drm_panel *panel)if (ret)return ret; - ret =backlight_enable (ctx->backlight); -if (ret) - goto out; -return 0 ; - -out: -mipi_dsi_dcs_enter_sleep_mode (ctx->dsi); -return ret; }static int rb070d30_panel_disable (struct drm_panel *panel) {struct rb070d30_panel *ctx =panel_to_rb070d30_panel (panel); -backlight_disable (ctx->backlight);return mipi_dsi_dcs_enter_sleep_mode (ctx->dsi); }
@@ -208,11 +197,9 @@ static int rb070d30_panel_dsi_probe(struct mipi_dsi_device *dsi)return PTR_ERR (ctx->gpios.shlr); } - ctx->backlight =devm_of_find_backlight (&dsi->dev); -if (IS_ERR (ctx->backlight)) { -DRM_DEV_ERROR (&dsi->dev,"Couldn't get our backlight\n" ); -return PTR_ERR (ctx->backlight); - } + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; ret =drm_panel_add (&ctx->panel);if (ret <0 )
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 19/25 drm/panel: seiko-43wvf1g: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 36 ++++----------------- 1 file changed, 6 insertions(+), 30 deletions(-)
drivers/gpu/drm/panel/panel-seiko-43wvf1g.c +6 -30
@@ -6,7 +6,6 @@* Based on Panel Simple driver by Thierry Reding <[email protected]> */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/of.h>
@@ -46,7 +45,6 @@ struct seiko_panel {bool prepared;bool enabled;const struct seiko_panel_desc *desc; -struct backlight_device *backlight;struct regulator *dvdd;struct regulator *avdd; };
@@ -127,12 +125,6 @@ static int seiko_panel_disable(struct drm_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 ;
@@ -196,12 +188,6 @@ static int seiko_panel_enable(struct drm_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 ;
@@ -245,7 +231,6 @@ static const struct drm_panel_funcs seiko_panel_funcs = {static int seiko_panel_probe (struct device *dev,const struct seiko_panel_desc *desc) { -struct device_node *backlight;struct seiko_panel *panel;int err;
@@ -265,18 +250,13 @@ static int seiko_panel_probe(struct device *dev,if (IS_ERR (panel->avdd))return PTR_ERR (panel->avdd); - backlight =of_parse_phandle (dev->of_node,"backlight" ,0 ); -if (backlight) { - panel->backlight =of_find_backlight_by_node (backlight); -of_node_put (backlight); - -if (!panel->backlight) -return -EPROBE_DEFER ; - } -drm_panel_init (&panel->base, dev, &seiko_panel_funcs,DRM_MODE_CONNECTOR_DPI ); + err =drm_panel_of_backlight (&panel->base); +if (err) +return err; + err =drm_panel_add (&panel->base);if (err <0 )return err;
@@ -291,11 +271,7 @@ static int seiko_panel_remove(struct platform_device *pdev)struct seiko_panel *panel =dev_get_drvdata (&pdev->dev);drm_panel_remove (&panel->base); - -seiko_panel_disable (&panel->base); - -if (panel->backlight) -put_device (&panel->backlight->dev); +drm_panel_disable (&panel->base);return 0 ; }
@@ -304,7 +280,7 @@ static void seiko_panel_shutdown(struct platform_device *pdev) {struct seiko_panel *panel =dev_get_drvdata (&pdev->dev); -seiko_panel_disable (&panel->base); +drm_panel_disable (&panel->base); }static const struct display_timing seiko_43wvf1g_timing = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 20/25 drm/panel: sharp-lq101r1sx01: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../gpu/drm/panel/panel-sharp-lq101r1sx01.c | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c +7 -14
@@ -3,7 +3,6 @@* Copyright (C) 2014 NVIDIA Corporation */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -23,7 +22,6 @@ struct sharp_panel {struct mipi_dsi_device *link1;struct mipi_dsi_device *link2; -struct backlight_device *backlight;struct regulator *supply;bool prepared;
@@ -94,8 +92,6 @@ static int sharp_panel_disable(struct drm_panel *panel)if (!sharp->enabled)return 0 ; -backlight_disable (sharp->backlight); - sharp->enabled = false;return 0 ;
@@ -258,8 +254,6 @@ static int sharp_panel_enable(struct drm_panel *panel)if (sharp->enabled)return 0 ; -backlight_enable (sharp->backlight); - sharp->enabled = true;return 0 ;
@@ -317,7 +311,7 @@ MODULE_DEVICE_TABLE(of, sharp_of_match);static int sharp_panel_add (struct sharp_panel *sharp) { -struct device *dev = &sharp->link1->dev; +int ret; sharp->mode = &default_mode;
@@ -325,14 +319,13 @@ static int sharp_panel_add(struct sharp_panel *sharp)if (IS_ERR (sharp->supply))return PTR_ERR (sharp->supply); - sharp->backlight =devm_of_find_backlight (dev); - -if (IS_ERR (sharp->backlight)) -return PTR_ERR (sharp->backlight); -drm_panel_init (&sharp->base, &sharp->link1->dev, &sharp_panel_funcs,DRM_MODE_CONNECTOR_DSI ); + ret =drm_panel_of_backlight (&sharp->base); +if (ret) +return ret; +return drm_panel_add (&sharp->base); }
@@ -408,7 +401,7 @@ static int sharp_panel_remove(struct mipi_dsi_device *dsi)return 0 ; } - err =sharp_panel_disable (&sharp->base); + err =drm_panel_disable (&sharp->base);if (err <0 )dev_err (&dsi->dev,"failed to disable panel: %d\n" , err);
@@ -429,7 +422,7 @@ static void sharp_panel_shutdown(struct mipi_dsi_device *dsi)if (!sharp)return ; -sharp_panel_disable (&sharp->base); +drm_panel_disable (&sharp->base); }static struct mipi_dsi_driver sharp_panel_driver = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 21/25 drm/panel: sharp-ls043t1le01: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../gpu/drm/panel/panel-sharp-ls043t1le01.c | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c +7 -13
@@ -7,7 +7,6 @@* Based on AUO panel driver by Rob Clark <[email protected]> */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -25,7 +24,6 @@ struct sharp_nt_panel {struct drm_panel base;struct mipi_dsi_device *dsi; -struct backlight_device *backlight;struct regulator *supply;struct gpio_desc *reset_gpio;
@@ -107,8 +105,6 @@ static int sharp_nt_panel_disable(struct drm_panel *panel)if (!sharp_nt->enabled)return 0 ; -backlight_disable (sharp_nt->backlight); - sharp_nt->enabled = false;return 0 ;
@@ -190,8 +186,6 @@ static int sharp_nt_panel_enable(struct drm_panel *panel)if (sharp_nt->enabled)return 0 ; -backlight_enable (sharp_nt->backlight); - sharp_nt->enabled = true;return 0 ;
@@ -244,6 +238,7 @@ static const struct drm_panel_funcs sharp_nt_panel_funcs = {static int sharp_nt_panel_add (struct sharp_nt_panel *sharp_nt) {struct device *dev = &sharp_nt->dsi->dev; +int ret; sharp_nt->mode = &default_mode;
@@ -260,14 +255,13 @@ static int sharp_nt_panel_add(struct sharp_nt_panel *sharp_nt)gpiod_set_value (sharp_nt->reset_gpio,0 ); } - sharp_nt->backlight =devm_of_find_backlight (dev); - -if (IS_ERR (sharp_nt->backlight)) -return PTR_ERR (sharp_nt->backlight); -drm_panel_init (&sharp_nt->base, &sharp_nt->dsi->dev, &sharp_nt_panel_funcs,DRM_MODE_CONNECTOR_DSI ); + ret =drm_panel_of_backlight (&sharp_nt->base); +if (ret) +return ret; +return drm_panel_add (&sharp_nt->base); }
@@ -309,7 +303,7 @@ static int sharp_nt_panel_remove(struct mipi_dsi_device *dsi)struct sharp_nt_panel *sharp_nt =mipi_dsi_get_drvdata (dsi);int ret; - ret =sharp_nt_panel_disable (&sharp_nt->base); + ret =drm_panel_disable (&sharp_nt->base);if (ret <0 )dev_err (&dsi->dev,"failed to disable panel: %d\n" , ret);
@@ -326,7 +320,7 @@ static void sharp_nt_panel_shutdown(struct mipi_dsi_device *dsi) {struct sharp_nt_panel *sharp_nt =mipi_dsi_get_drvdata (dsi); -sharp_nt_panel_disable (&sharp_nt->base); +drm_panel_disable (&sharp_nt->base); }static const struct of_device_id sharp_nt_of_match[] = {
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 22/25 drm/panel: sitronix-st7701: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/panel/panel-sitronix-st7701.c +4 -8
@@ -9,7 +9,6 @@#include <drm/drm_panel.h> #include <drm/drm_print.h> -#include <linux/backlight.h> #include <linux/gpio/consumer.h> #include <linux/delay.h> #include <linux/module.h>
@@ -103,7 +102,6 @@ struct st7701 {struct mipi_dsi_device *dsi;const struct st7701_panel_desc *desc; -struct backlight_device *backlight;struct regulator_bulk_data *supplies;struct gpio_desc *reset;unsigned int sleep_delay;
@@ -223,7 +221,6 @@ static int st7701_enable(struct drm_panel *panel)struct st7701 *st7701 =panel_to_st7701 (panel);ST7701_DSI (st7701,MIPI_DCS_SET_DISPLAY_ON ,0x00 ); -backlight_enable (st7701->backlight);return 0 ; }
@@ -232,7 +229,6 @@ static int st7701_disable(struct drm_panel *panel) {struct st7701 *st7701 =panel_to_st7701 (panel); -backlight_disable (st7701->backlight);ST7701_DSI (st7701,MIPI_DCS_SET_DISPLAY_OFF ,0x00 );return 0 ;
@@ -366,10 +362,6 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)return PTR_ERR (st7701->reset); } - st7701->backlight =devm_of_find_backlight (&dsi->dev); -if (IS_ERR (st7701->backlight)) -return PTR_ERR (st7701->backlight); -drm_panel_init (&st7701->panel, &dsi->dev, &st7701_funcs,DRM_MODE_CONNECTOR_DSI );
@@ -384,6 +376,10 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi)*/ st7701->sleep_delay =120 + desc->panel_sleep_delay; + ret =drm_panel_of_backlight (&st7701->panel); +if (ret) +return ret; + ret =drm_panel_add (&st7701->panel);if (ret <0 )return ret;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 23/25 drm/panel: sitronix-st7789v: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- .../gpu/drm/panel/panel-sitronix-st7789v.c | 37 ++----------------- 1 file changed, 4 insertions(+), 33 deletions(-)
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +4 -33
@@ -3,7 +3,6 @@* Copyright (C) 2017 Free Electrons */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/module.h>
@@ -116,7 +115,6 @@ struct st7789v {struct drm_panel panel;struct spi_device *spi;struct gpio_desc *reset; -struct backlight_device *backlight;struct regulator *power; };
@@ -323,12 +321,6 @@ static int st7789v_enable(struct drm_panel *panel) {struct st7789v *ctx =panel_to_st7789v (panel); -if (ctx->backlight) { - ctx->backlight->props.state &= ~BL_CORE_FBBLANK ; - ctx->backlight->props.power =FB_BLANK_UNBLANK ; -backlight_update_status (ctx->backlight); - } -return st7789v_write_command (ctx,MIPI_DCS_SET_DISPLAY_ON ); }
@@ -339,12 +331,6 @@ static int st7789v_disable(struct drm_panel *panel)ST7789V_TEST (ret,st7789v_write_command (ctx,MIPI_DCS_SET_DISPLAY_OFF )); -if (ctx->backlight) { - ctx->backlight->props.power =FB_BLANK_POWERDOWN ; - ctx->backlight->props.state |=BL_CORE_FBBLANK ; -backlight_update_status (ctx->backlight); - } -return 0 ; }
@@ -370,7 +356,6 @@ static const struct drm_panel_funcs st7789v_drm_funcs = {static int st7789v_probe (struct spi_device *spi) { -struct device_node *backlight;struct st7789v *ctx;int ret;
@@ -394,26 +379,15 @@ static int st7789v_probe(struct spi_device *spi)return PTR_ERR (ctx->reset); } - backlight =of_parse_phandle (spi->dev.of_node,"backlight" ,0 ); -if (backlight) { - ctx->backlight =of_find_backlight_by_node (backlight); -of_node_put (backlight); - -if (!ctx->backlight) -return -EPROBE_DEFER ; - } + ret =drm_panel_of_backlight (&ctx->panel); +if (ret) +return ret; ret =drm_panel_add (&ctx->panel);if (ret <0 ) - goto err_free_backlight; +return ret;return 0 ; - -err_free_backlight: -if (ctx->backlight) -put_device (&ctx->backlight->dev); - -return ret; }static int st7789v_remove (struct spi_device *spi)
@@ -422,9 +396,6 @@ static int st7789v_remove(struct spi_device *spi)drm_panel_remove (&ctx->panel); -if (ctx->backlight) -put_device (&ctx->backlight->dev); -return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 24/25 drm/panel: tpo-td028ttec1: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c +4 -10
@@ -17,7 +17,6 @@* H. Nikolaus Schaller <[email protected]> */ -#include <linux/backlight.h> #include <linux/delay.h> #include <linux/module.h> #include <linux/spi/spi.h>
@@ -83,7 +82,6 @@ struct td028ttec1_panel {struct drm_panel panel;struct spi_device *spi; -struct backlight_device *backlight; };#define to_td028ttec1_device (p) container_of(p, struct td028ttec1_panel, panel)
@@ -243,8 +241,6 @@ static int td028ttec1_enable(struct drm_panel *panel)if (ret)return ret; -backlight_enable (lcd->backlight); -return 0 ; }
@@ -252,8 +248,6 @@ static int td028ttec1_disable(struct drm_panel *panel) {struct td028ttec1_panel *lcd =to_td028ttec1_device (panel); -backlight_disable (lcd->backlight); -jbt_ret_write_0 (lcd,JBT_REG_DISPLAY_OFF ,NULL );return 0 ;
@@ -334,10 +328,6 @@ static int td028ttec1_probe(struct spi_device *spi)spi_set_drvdata (spi, lcd); lcd->spi = spi; - lcd->backlight =devm_of_find_backlight (&spi->dev); -if (IS_ERR (lcd->backlight)) -return PTR_ERR (lcd->backlight); - spi->mode =SPI_MODE_3 ; spi->bits_per_word =9 ;
@@ -350,6 +340,10 @@ static int td028ttec1_probe(struct spi_device *spi)drm_panel_init (&lcd->panel, &lcd->spi->dev, &td028ttec1_funcs,DRM_MODE_CONNECTOR_DPI ); + ret =drm_panel_of_backlight (&lcd->panel); +if (ret) +return ret; +return drm_panel_add (&lcd->panel); }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 25/25 drm/panel: tpo-tpg110: use drm_panel backlight support
In reply to Sam RavnborgUse the backlight support in drm_panel to simplify the driver
--- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/gpu/drm/panel/panel-tpo-tpg110.c +6 -14
@@ -14,13 +14,13 @@#include <drm/drm_panel.h> #include <drm/drm_print.h> -#include <linux/backlight.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/spi/spi.h>
@@ -76,10 +76,6 @@ struct tpg110 {* @panel: the DRM panel instance for this device */ struct drm_panel panel; -/** -* @backlight: backlight for this panel -*/ -struct backlight_device *backlight;/** * @panel_type: the panel mode as detected */
@@ -356,8 +352,6 @@ static int tpg110_disable(struct drm_panel *panel) val &= ~TPG110_CTRL2_PM ;tpg110_write_reg (tpg,TPG110_CTRL2_PM , val); -backlight_disable (tpg->backlight); -return 0 ; }
@@ -366,8 +360,6 @@ static int tpg110_enable(struct drm_panel *panel)struct tpg110 *tpg =to_tpg110 (panel);u8 val; -backlight_enable (tpg->backlight); -/* Take chip out of standby */ val =tpg110_read_reg (tpg,TPG110_CTRL2_PM ); val |=TPG110_CTRL2_PM ;
@@ -432,11 +424,6 @@ static int tpg110_probe(struct spi_device *spi)if (ret)DRM_DEV_ERROR (dev,"no panel height specified\n" ); -/* Look for some optional backlight */ - tpg->backlight =devm_of_find_backlight (dev); -if (IS_ERR (tpg->backlight)) -return PTR_ERR (tpg->backlight); -/* This asserts the GRESTB signal, putting the display into reset */ tpg->grestb =devm_gpiod_get (dev,"grestb" ,GPIOD_OUT_HIGH );if (IS_ERR (tpg->grestb)) {
@@ -459,6 +446,11 @@ static int tpg110_probe(struct spi_device *spi)drm_panel_init (&tpg->panel, dev, &tpg110_drm_funcs,DRM_MODE_CONNECTOR_DPI ); + + ret =drm_panel_of_backlight (&tpg->panel); +if (ret) +return ret; +spi_set_drvdata (spi, tpg);return drm_panel_add (&tpg->panel);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 38 lines · Sam Ravnborg
This patchset include a couple of different
things - all related to panels.- The callbacks are optional - so drop error if
callback is not present.- Add support for backlight in
drm_panel.
This allows us to make much simpler backlight
support to most panels.
The patchset include conversion of most of the
trivial cases.- Drop
drm_connectorfromdrm_panel.
This change required many changes to most
panels and many bridges and display drivers. This is by far the most invasive change in this patchset.With this patchset
drm_panel_(attach|detach)are nop's but they are kept for now.A few of these patches has been sent out before - but versioning started again from v1 - as the most patches are new.
I have tested the panel-simple changes, and thus some of the infrastructure changes.
The testing was done on an earlier iteration - and I ended up submitting this as Laurent and others started to depend on it.v2:
This is mostly addressing comments from Laurent.
- dropget_timingsremoval, we should start using it
- do not fail indrm_panel_of_backlight()if DT is not enabled
- updated changelogs and code comments in many places (thanks Laurent!)
-get_modesis a mandatory callback - return-EOPNOTSUPPif not specified
- log if backlight update fails
- added a-b/r-bs
o thanks to Laurent and Linus for the prompt reviews!
Quoted 2 lines
When "drm/panel: add backlight support" is reviewed I plan to apply the full series to drm-misc-next.
Fixed the last bits pointed out by Laurent and pushed to drm-misc-next.
Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel