drm/panel, of, sysfb: Use OF panel-orientation helper in simpledrm
Subsystems (13)
Thomas Zimmermann
maintainerv4 cover drm/panel, of, sysfb: Use OF panel-orientation helper in simpledrm
Improve support for panel orientation in simpledrm. There's a rotation property in the DT panel node. Read the value and set the connector's orientation property accordingly.
Patch 1 moves the existing code for parsing the rotation to drm_of.c. This makes it available to simpledrm without introducing a dependency on DRM_PANEL.
Patch 2 updates simpledrm and patch 3 updates all DRM panel drivers to use the new helper function.
These patches have previously been part of another series that improved simpledrm in general. So we start with v4 instead of v1. Keep existing R-b tags.
v4:
- integrate Thierry's panel-update patch
- update anbernic, chipone, ili9488 panels that were merged recently v3:
- see https://lore.kernel.org/dri-devel/[email protected]/
Thierry Reding (1):
drm/panel: Use drm_of_get_panel_orientation()
Thomas Zimmermann (2):
drm/of: Implement drm_of_get_panel_orientation() drm/sysfb: simpledrm: Read panel orientation from DT node
drivers/gpu/drm/drm_of.c | 44 +++++++++++++++++++ drivers/gpu/drm/drm_panel.c | 44 +------------------ drivers/gpu/drm/panel/panel-anbernic-td4310.c | 3 +- .../drm/panel/panel-boe-th101mb31ig002-28a.c | 3 +- .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 3 +- .../gpu/drm/panel/panel-chipone-icna35xx.c | 3 +- .../gpu/drm/panel/panel-chipwealth-ch13726a.c | 3 +- drivers/gpu/drm/panel/panel-edp.c | 3 +- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- .../gpu/drm/panel/panel-focaltech-ota7290b.c | 3 +- drivers/gpu/drm/panel/panel-himax-hx83102.c | 3 +- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 3 +- .../gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 3 +- .../gpu/drm/panel/panel-jadard-jd9365da-h3.c | 2 +- drivers/gpu/drm/panel/panel-lvds.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt36523.c | 3 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 3 +- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 3 +- .../gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- drivers/gpu/drm/sysfb/simpledrm.c | 11 ++++- include/drm/drm_of.h | 11 +++++ include/drm/drm_panel.h | 8 ---- 26 files changed, 104 insertions(+), 74 deletions(-)
base-commit: a2d82f27ac35c691c1c65b40c72b13d8b2a7f91f
Signature · 1 line
2.54.0
Thomas Zimmermann
maintainerPATCH v4 1/3 drm/of: Implement drm_of_get_panel_orientation()
Implement drm_of_get_panel_orientation() to retrieve a panel's rotation property as enum drm_panel_orientation. The code has been taken from of_drm_get_panel_orientation(), so convert that helper over. Callers of the old helper can be converted as well.
--- drivers/gpu/drm/drm_of.c | 44 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_panel.c | 26 ++-------------------- include/drm/drm_of.h | 11 ++++++++++ 3 files changed, 57 insertions(+), 24 deletions(-)
drivers/gpu/drm/drm_of.c +44 -0
@@ -7,6 +7,7 @@#include <linux/of_graph.h> #include <drm/drm_bridge.h> +#include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_device.h> #include <drm/drm_encoder.h>
@@ -220,6 +221,49 @@ int drm_of_encoder_active_endpoint(struct device_node *node, }EXPORT_SYMBOL_GPL (drm_of_encoder_active_endpoint); +/** +* drm_of_get_panel_orientation - look up the orientation of the panel through +* the "rotation" binding from a device tree node +* @np: device tree node of the panel +* @orientation: orientation enum to be filled in +* +* Looks up the rotation of a panel in the device tree. The orientation of the +* panel is expressed as a property name "rotation" in the device tree. The +* rotation in the device tree is counter clockwise. +* +* Return: 0 when a valid rotation value (0, 90, 180, or 270) is read or the +* rotation property doesn't exist. Return a negative error code on failure. +*/ +int drm_of_get_panel_orientation (const struct device_node *np, +enum drm_panel_orientation *orientation) +{ +int rotation, ret; + + ret =of_property_read_u32 (np,"rotation" , &rotation); +if (ret == -EINVAL ) { +/* Don't return an error if there's no rotation property. */ + *orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; +return 0 ; + } + +if (ret <0 ) +return ret; + +if (rotation ==0 ) + *orientation =DRM_MODE_PANEL_ORIENTATION_NORMAL ; +else if (rotation ==90 ) + *orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP ; +else if (rotation ==180 ) + *orientation =DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP ; +else if (rotation ==270 ) + *orientation =DRM_MODE_PANEL_ORIENTATION_LEFT_UP ; +else +return -EINVAL ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (drm_of_get_panel_orientation); +/** * drm_of_find_panel_or_bridge - return connected panel or bridge device * @np: device tree node containing encoder output ports
drivers/gpu/drm/drm_panel.c +2 -24
@@ -28,6 +28,7 @@#include <linux/of.h> #include <drm/drm_crtc.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_print.h>
@@ -508,30 +509,7 @@ EXPORT_SYMBOL(of_drm_find_panel);int of_drm_get_panel_orientation (const struct device_node *np,enum drm_panel_orientation *orientation) { -int rotation, ret; - - ret =of_property_read_u32 (np,"rotation" , &rotation); -if (ret == -EINVAL ) { -/* Don't return an error if there's no rotation property. */ - *orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; -return 0 ; - } - -if (ret <0 ) -return ret; - -if (rotation ==0 ) - *orientation =DRM_MODE_PANEL_ORIENTATION_NORMAL ; -else if (rotation ==90 ) - *orientation =DRM_MODE_PANEL_ORIENTATION_RIGHT_UP ; -else if (rotation ==180 ) - *orientation =DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP ; -else if (rotation ==270 ) - *orientation =DRM_MODE_PANEL_ORIENTATION_LEFT_UP ; -else -return -EINVAL ; - -return 0 ; +return drm_of_get_panel_orientation (np, orientation); }EXPORT_SYMBOL (of_drm_get_panel_orientation);#endif
include/drm/drm_of.h +11 -0
@@ -20,6 +20,8 @@ struct device_node;struct mipi_dsi_device_info ;struct mipi_dsi_host ; +enum drm_panel_orientation ; +/** * enum drm_lvds_dual_link_pixels - Pixel order of an LVDS dual-link connection * @DRM_LVDS_DUAL_LINK_EVEN_ODD_PIXELS: Even pixels are expected to be generated
@@ -47,6 +49,8 @@ int drm_of_component_probe(struct device *dev,int drm_of_encoder_active_endpoint (struct device_node *node,struct drm_encoder *encoder,struct of_endpoint *endpoint); +int drm_of_get_panel_orientation (const struct device_node *np, +enum drm_panel_orientation *orientation); int drm_of_find_panel_or_bridge(const struct device_node *np, int port, int endpoint, struct drm_panel **panel,
@@ -101,6 +105,13 @@ static inline int drm_of_encoder_active_endpoint(struct device_node *node, {return -EINVAL ; } + +static inline int drm_of_get_panel_orientation (const struct device_node *np, +enum drm_panel_orientation *orientation) +{ +return -EINVAL ; +} + static inline int drm_of_find_panel_or_bridge(const struct device_node *np, int port, int endpoint, struct drm_panel **panel,
Signature · 1 line
2.54.0
Re: [PATCH v4 1/3] drm/of: Implement drm_of_get_panel_orientation()
Quoted 5 lines · Thomas Zimmermann
Implement
drm_of_get_panel_orientation()to retrieve a panel's rotation property as enumdrm_panel_orientation. The code has been taken fromof_drm_get_panel_orientation(), so convert that helper over. Callers of the old helper can be converted as well.
Quoted 8 lines
Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Maxime Ripard <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>--- drivers/gpu/drm/drm_of.c | 44 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_panel.c | 26 ++-------------------- include/drm/drm_of.h | 11 ++++++++++ 3 files changed, 57 insertions(+), 24 deletions(-)
Thomas Zimmermann
maintainerPATCH v4 2/3 drm/sysfb: simpledrm: Read panel orientation from DT node
In reply to Thomas ZimmermannA device-tree panel node can specify the panel's rotation in steps of 90 degrees. Set the DRM connector orientation accordingly. Use UNKNOWN for the orientation if the field is missing or invalid.
v3:
- read the orientation with drm_of_get_panel_orientation() (Thierry)
--- drivers/gpu/drm/sysfb/simpledrm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/sysfb/simpledrm.c +9 -2
@@ -28,6 +28,7 @@#include <drm/drm_managed.h> #include <drm/drm_modeset_helper.h> #include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_of.h> #include <drm/drm_print.h> #include <drm/drm_probe_helper.h>
@@ -623,6 +624,7 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,int width, height, stride;u16 width_mm =0 , height_mm =0 ;struct device_node *panel_node; +enum drm_panel_orientation orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ;const struct drm_format_info *format;u64 size;struct resource *res, *mem =NULL ;
@@ -698,6 +700,12 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv, ret =simplefb_get_panel_height_mm_of (dev, panel_node);if (ret >0 ) height_mm = ret; +/* +* Ignore errors from parsing the panel orientation. With +* the orientation initialized to UNKNOWN, the connector +* helpers will do the right thing. +*/ +drm_of_get_panel_orientation (panel_node, &orientation);of_node_put (panel_node); } }else {
@@ -861,8 +869,7 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,if (ret)return ERR_PTR (ret);drm_connector_helper_add (connector, &simpledrm_connector_helper_funcs); -drm_connector_set_panel_orientation_with_quirk (connector, -DRM_MODE_PANEL_ORIENTATION_UNKNOWN , +drm_connector_set_panel_orientation_with_quirk (connector, orientation, width, height); ret =drm_connector_attach_encoder (connector, encoder);
Signature · 1 line
2.54.0
Thomas Zimmermann
maintainerPATCH v4 3/3 drm/panel: Use drm_of_get_panel_orientation()
In reply to Thomas ZimmermannFrom: Thierry Reding <[email protected]>
The old of_drm_get_panel_orientation() function was replaced by the drm_of_get_panel_orientation() in the core DRM OF helpers. Replace all uses of the old helper and remove it.
Changes in v4:
- also convert anbernic, chipone and ili9488 panels
Changes in v2:
- include drm_of.h in all drivers to make sure the new symbol is defined
--- drivers/gpu/drm/drm_panel.c | 20 ------------------- drivers/gpu/drm/panel/panel-anbernic-td4310.c | 3 ++- .../drm/panel/panel-boe-th101mb31ig002-28a.c | 3 ++- .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 3 ++- .../gpu/drm/panel/panel-chipone-icna35xx.c | 3 ++- .../gpu/drm/panel/panel-chipwealth-ch13726a.c | 3 ++- drivers/gpu/drm/panel/panel-edp.c | 3 ++- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 ++- .../gpu/drm/panel/panel-focaltech-ota7290b.c | 3 ++- drivers/gpu/drm/panel/panel-himax-hx83102.c | 3 ++- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 ++- drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 3 ++- .../gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 3 ++- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 ++- drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 3 ++- .../gpu/drm/panel/panel-jadard-jd9365da-h3.c | 2 +- drivers/gpu/drm/panel/panel-lvds.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt36523.c | 3 ++- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 3 ++- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 3 ++- .../gpu/drm/panel/panel-sitronix-st7789v.c | 3 ++- include/drm/drm_panel.h | 8 -------- 23 files changed, 39 insertions(+), 49 deletions(-)
drivers/gpu/drm/drm_panel.c +0 -20
@@ -492,26 +492,6 @@ struct drm_panel *of_drm_find_panel(const struct device_node *np) return ERR_PTR(-EPROBE_DEFER); }EXPORT_SYMBOL (of_drm_find_panel); - -/** -* of_drm_get_panel_orientation - look up the orientation of the panel through -* the "rotation" binding from a device tree node -* @np: device tree node of the panel -* @orientation: orientation enum to be filled in -* -* Looks up the rotation of a panel in the device tree. The orientation of the -* panel is expressed as a property name "rotation" in the device tree. The -* rotation in the device tree is counter clockwise. -* -* Return: 0 when a valid rotation value (0, 90, 180, or 270) is read or the -* rotation property doesn't exist. Return a negative error code on failure. -*/ -int of_drm_get_panel_orientation (const struct device_node *np, -enum drm_panel_orientation *orientation) -{ -return drm_of_get_panel_orientation (np, orientation); -} -EXPORT_SYMBOL (of_drm_get_panel_orientation);#endif /* Find panel by fwnode. This should be identical to of_drm_find_panel(). */
drivers/gpu/drm/panel/panel-anbernic-td4310.c +2 -1
@@ -12,6 +12,7 @@#include <linux/regulator/consumer.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -165,7 +166,7 @@ static int panel_anbernic_td4310_probe(struct mipi_dsi_device *dsi)if (!ctx->panel_info)return -EINVAL ; - ret =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (ret <0 )return dev_err_probe (dev, ret,"Failed to get panel orientation\n" );
drivers/gpu/drm/panel/panel-boe-th101mb31ig002-28a.c +2 -1
@@ -15,6 +15,7 @@#include <drm/drm_connector.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -380,7 +381,7 @@ static int boe_th101mb31ig002_dsi_probe(struct mipi_dsi_device *dsi)return dev_err_probe (&dsi->dev,PTR_ERR (ctx->reset),"Failed to get reset GPIO\n" ); - ret =of_drm_get_panel_orientation (dsi->dev.of_node, + ret =drm_of_get_panel_orientation (dsi->dev.of_node, &ctx->orientation);if (ret) return dev_err_probe(&dsi->dev, ret,
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c +2 -1
@@ -13,6 +13,7 @@#include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <video/mipi_display.h>
@@ -1722,7 +1723,7 @@ static int boe_panel_add(struct boe_panel *boe) boe->base.prepare_prev_first = true; - err =of_drm_get_panel_orientation (dev->of_node, &boe->orientation); + err =drm_of_get_panel_orientation (dev->of_node, &boe->orientation);if (err <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, err);return err;
drivers/gpu/drm/panel/panel-chipone-icna35xx.c +2 -1
@@ -21,6 +21,7 @@#include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -374,7 +375,7 @@ static int icna35xx_probe(struct mipi_dsi_device *dsi) pinfo->dsi = dsi;mipi_dsi_set_drvdata (dsi, pinfo); - ret =of_drm_get_panel_orientation (dev->of_node, &pinfo->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &pinfo->orientation);if (ret <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, ret);return ret;
drivers/gpu/drm/panel/panel-chipwealth-ch13726a.c +2 -1
@@ -13,6 +13,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <video/mipi_display.h>
@@ -268,7 +269,7 @@ static int ch13726a_probe(struct mipi_dsi_device *dsi)return dev_err_probe (dev,PTR_ERR (ctx->reset_gpio),"Failed to get reset-gpios\n" ); - ret =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (ret <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, ret);return ret;
drivers/gpu/drm/panel/panel-edp.c +2 -1
@@ -40,6 +40,7 @@#include <drm/drm_crtc.h> #include <drm/drm_device.h> #include <drm/drm_edid.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> /**
@@ -865,7 +866,7 @@ static int panel_edp_probe(struct device *dev, const struct panel_desc *desc,return dev_err_probe (dev,PTR_ERR (panel->enable_gpio),"failed to request GPIO\n" ); - err =of_drm_get_panel_orientation (dev->of_node, &panel->orientation); + err =drm_of_get_panel_orientation (dev->of_node, &panel->orientation);if (err) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, err);return err;
drivers/gpu/drm/panel/panel-elida-kd35t133.c +2 -1
@@ -21,6 +21,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> /* Manufacturer specific Commands send via DSI */
@@ -233,7 +234,7 @@ static int kd35t133_probe(struct mipi_dsi_device *dsi)return ret; } - ret =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (ret <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, ret);return ret;
drivers/gpu/drm/panel/panel-focaltech-ota7290b.c +2 -1
@@ -17,6 +17,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -181,7 +182,7 @@ static int ota7290b_probe(struct mipi_dsi_device *dsi)return dev_err_probe (&dsi->dev,PTR_ERR (ctx->vdd),"Couldn't get our VDD supply\n" ); - ret =of_drm_get_panel_orientation (dsi->dev.of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dsi->dev.of_node, &ctx->orientation);if (ret) {dev_err (&dsi->dev,"%pOF: failed to get orientation: %d\n" , dsi->dev.of_node, ret);
drivers/gpu/drm/panel/panel-himax-hx83102.c +2 -1
@@ -17,6 +17,7 @@#include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <video/mipi_display.h>
@@ -1264,7 +1265,7 @@ static int hx83102_panel_add(struct hx83102 *ctx) ctx->base.prepare_prev_first = true; - err =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + err =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (err <0 )return dev_err_probe (dev, err,"failed to get orientation\n" );
drivers/gpu/drm/panel/panel-himax-hx8394.c +2 -1
@@ -22,6 +22,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #define DRV_NAME "panel-himax-hx8394"
@@ -992,7 +993,7 @@ static int hx8394_probe(struct mipi_dsi_device *dsi)return dev_err_probe (dev,PTR_ERR (ctx->reset_gpio),"Failed to get reset gpio\n" ); - ret =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (ret <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, ret);return ret;
drivers/gpu/drm/panel/panel-ilitek-ili9488.c +2 -1
@@ -13,6 +13,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -237,7 +238,7 @@ static int ili9488_dsi_probe(struct mipi_dsi_device *dsi)if (ret <0 )return dev_err_probe (dev, ret,"failed to get regulators\n" ); - ret =of_drm_get_panel_orientation (dev->of_node, &ili->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ili->orientation);if (ret)return dev_err_probe (dev, ret,"failed to get orientation\n" );
drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c +2 -1
@@ -10,6 +10,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -132,7 +133,7 @@ static int ili9806e_dsi_probe(struct mipi_dsi_device *dsi) dsi->format = ctx->desc->format; dsi->lanes = ctx->desc->lanes; - ret =of_drm_get_panel_orientation (dev->of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &ctx->orientation);if (ret)return dev_err_probe (dev, ret,"Failed to get orientation\n" );
drivers/gpu/drm/panel/panel-ilitek-ili9881c.c +2 -1
@@ -16,6 +16,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <video/mipi_display.h>
@@ -2571,7 +2572,7 @@ static int ili9881c_dsi_probe(struct mipi_dsi_device *dsi)return dev_err_probe (&dsi->dev,PTR_ERR (ctx->reset),"Couldn't get our reset GPIO\n" ); - ret =of_drm_get_panel_orientation (dsi->dev.of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dsi->dev.of_node, &ctx->orientation);if (ret) {dev_err (&dsi->dev,"%pOF: failed to get orientation: %d\n" , dsi->dev.of_node, ret);
drivers/gpu/drm/panel/panel-ilitek-ili9882t.c +2 -1
@@ -13,6 +13,7 @@#include <drm/drm_connector.h> #include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <video/mipi_display.h>
@@ -795,7 +796,7 @@ static int ili9882t_add(struct ili9882t *ili)gpiod_set_value_cansleep (ili->enable_gpio,0 ); - err =of_drm_get_panel_orientation (dev->of_node, &ili->orientation); + err =drm_of_get_panel_orientation (dev->of_node, &ili->orientation);if (err <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, err);return err;
drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c +1 -1
@@ -2992,7 +2992,7 @@ static int jadard_dsi_probe(struct mipi_dsi_device *dsi)return dev_err_probe (&dsi->dev,PTR_ERR (jadard->vccio),"failed to get vccio regulator\n" ); - ret =of_drm_get_panel_orientation (dev->of_node, &jadard->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &jadard->orientation);if (ret <0 )return dev_err_probe (dev, ret,"failed to get orientation\n" );
drivers/gpu/drm/panel/panel-lvds.c +1 -1
@@ -126,7 +126,7 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds)struct device_node *np = lvds->dev->of_node;int ret; - ret =of_drm_get_panel_orientation (np, &lvds->orientation); + ret =drm_of_get_panel_orientation (np, &lvds->orientation);if (ret <0 ) {dev_err (lvds->dev,"%pOF: failed to get orientation %d\n" , np, ret);return ret;
drivers/gpu/drm/panel/panel-novatek-nt36523.c +2 -1
@@ -19,6 +19,7 @@#include <drm/drm_crtc.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #define DSI_NUM_MIN 1
@@ -1206,7 +1207,7 @@ static int nt36523_probe(struct mipi_dsi_device *dsi) pinfo->dsi[0 ] = dsi;mipi_dsi_set_drvdata (dsi, pinfo); - ret =of_drm_get_panel_orientation (dev->of_node, &pinfo->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &pinfo->orientation);if (ret <0 ) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, ret);return ret;
drivers/gpu/drm/panel/panel-simple.c +1 -1
@@ -693,7 +693,7 @@ static struct panel_simple *panel_simple_probe(struct device *dev)return dev_err_cast_probe (dev, panel->enable_gpio,"failed to request GPIO\n" ); - err =of_drm_get_panel_orientation (dev->of_node, &panel->orientation); + err =drm_of_get_panel_orientation (dev->of_node, &panel->orientation);if (err) {dev_err (dev,"%pOF: failed to get orientation %d\n" , dev->of_node, err);return ERR_PTR (err);
drivers/gpu/drm/panel/panel-sitronix-st7701.c +2 -1
@@ -7,6 +7,7 @@#include <drm/drm_mipi_dbi.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #include <linux/bitfield.h>
@@ -1296,7 +1297,7 @@ static int st7701_probe(struct device *dev, int connector_type)return PTR_ERR (st7701->reset); } - ret =of_drm_get_panel_orientation (dev->of_node, &st7701->orientation); + ret =drm_of_get_panel_orientation (dev->of_node, &st7701->orientation);if (ret <0 )return dev_err_probe (dev, ret,"Failed to get orientation\n" );
drivers/gpu/drm/panel/panel-sitronix-st7703.c +2 -1
@@ -21,6 +21,7 @@#include <drm/drm_mipi_dsi.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #define DRV_NAME "panel-sitronix-st7703"
@@ -874,7 +875,7 @@ static int st7703_probe(struct mipi_dsi_device *dsi)return dev_err_probe (dev,PTR_ERR (ctx->iovcc),"Failed to request iovcc regulator\n" ); - ret =of_drm_get_panel_orientation (dsi->dev.of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (dsi->dev.of_node, &ctx->orientation);if (ret <0 )return dev_err_probe (&dsi->dev, ret,"Failed to get orientation\n" );
drivers/gpu/drm/panel/panel-sitronix-st7789v.c +2 -1
@@ -14,6 +14,7 @@#include <drm/drm_device.h> #include <drm/drm_modes.h> +#include <drm/drm_of.h> #include <drm/drm_panel.h> #define ST7789V_RAMCTRL_CMD 0xb0
@@ -646,7 +647,7 @@ static int st7789v_probe(struct spi_device *spi)if (ret)return dev_err_probe (dev, ret,"Failed to get backlight\n" ); - ret =of_drm_get_panel_orientation (spi->dev.of_node, &ctx->orientation); + ret =drm_of_get_panel_orientation (spi->dev.of_node, &ctx->orientation);if (ret)return dev_err_probe (&spi->dev, ret,"Failed to get orientation\n" );
include/drm/drm_panel.h +0 -8
@@ -337,19 +337,11 @@ 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); -int of_drm_get_panel_orientation (const struct device_node *np, -enum drm_panel_orientation *orientation);#else static inline struct drm_panel *of_drm_find_panel (const struct device_node *np) {return ERR_PTR (-ENODEV ); } - -static inline int of_drm_get_panel_orientation (const struct device_node *np, -enum drm_panel_orientation *orientation) -{ -return -ENODEV ; -}#endif #if defined(CONFIG_DRM_PANEL )
Signature · 1 line
2.54.0
Re: [PATCH v4 3/3] drm/panel: Use drm_of_get_panel_orientation()
Quoted 6 lines · Thomas Zimmermann
From: Thierry Reding <[email protected]>
The old
of_drm_get_panel_orientation()function was replaced by thedrm_of_get_panel_orientation()in the core DRM OF helpers. Replace all uses of the old helper and remove it.
Quoted 7 lines
Changes in v4:
- also convert anbernic, chipone and ili9488 panels
Changes in v2:
- includedrm_of.hin all drivers to make sure the new symbol is definedSigned-off-by Thierry Reding <[email protected]>---
Signature · 5 lines
Best regards, Javier Martinez Canillas Core Platforms Red Hat
Re: [PATCH v4 0/3] drm/panel,of,sysfb: Use OF panel-orientation helper in simpledrm
In reply to Thomas ZimmermannMerged into drm-misc-next now.
Due to bit rot, I had to adapt panel-renesas-r63419.c to the new interface. No functional changes there.
Am 01.07.26 um 14:03 schrieb Thomas Zimmermann:
Quoted 58 lines
Improve support for panel orientation in simpledrm. There's a rotation property in the DT panel node. Read the value and set the connector's orientation property accordingly.
Patch 1 moves the existing code for parsing the rotation to
drm_of.c. This makes it available to simpledrm without introducing a dependency onDRM_PANEL.Patch 2 updates simpledrm and patch 3 updates all DRM panel drivers to use the new helper function.
These patches have previously been part of another series that improved simpledrm in general. So we start with v4 instead of v1. Keep existing R-b tags.
v4:
- integrate Thierry's panel-update patch
- update anbernic, chipone, ili9488 panels that were merged recently v3:
- see https://lore.kernel.org/dri-devel/[email protected]/Thierry Reding (1):
drm/panel: Usedrm_of_get_panel_orientation()Thomas Zimmermann (2):
drm/of: Implementdrm_of_get_panel_orientation()drm/sysfb: simpledrm: Read panel orientation from DT nodedrivers/gpu/drm/drm_of.c | 44 +++++++++++++++++++ drivers/gpu/drm/drm_panel.c | 44 +------------------ drivers/gpu/drm/panel/panel-anbernic-td4310.c | 3 +- .../drm/panel/panel-boe-th101mb31ig002-28a.c | 3 +- .../gpu/drm/panel/panel-boe-tv101wum-nl6.c | 3 +- .../gpu/drm/panel/panel-chipone-icna35xx.c | 3 +- .../gpu/drm/panel/panel-chipwealth-ch13726a.c | 3 +- drivers/gpu/drm/panel/panel-edp.c | 3 +- drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- .../gpu/drm/panel/panel-focaltech-ota7290b.c | 3 +- drivers/gpu/drm/panel/panel-himax-hx83102.c | 3 +- drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 3 +- .../gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 3 +- .../gpu/drm/panel/panel-jadard-jd9365da-h3.c | 2 +- drivers/gpu/drm/panel/panel-lvds.c | 2 +- drivers/gpu/drm/panel/panel-novatek-nt36523.c | 3 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 3 +- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 3 +- .../gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- drivers/gpu/drm/sysfb/simpledrm.c | 11 ++++- include/drm/drm_of.h | 11 +++++ include/drm/drm_panel.h | 8 ---- 26 files changed, 104 insertions(+), 74 deletions(-)base-commit:
a2d82f27ac35c691c1c65b40c72b13d8b2a7f91f
Signature · 6 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)