[ARK PATCH 0/17] rebase Pinephone screen patches

Missing build dependency pesign on...

❌ FAIL: Test report for kernel ...

GitLab Bridge on behalf of pbrobinson

Sunday, 12 July 2020 Sun, 12 Jul '20

8:09 a.m.

From: pbrobinson on gitlab.com Revert the old version of the patches, apply the latest upstream version: I hope I've done this the right way, there will be a config update too.

Show replies by date

GitLab Bridge on behalf of pbrobinson

Sunday, 12 July Sun, 12 Jul

8:09 a.m.

New subject: [ARK PATCH 2/17] Revert "drm: panel: add Xingbangda XBD599 panel"

From: Peter Robinson <pbrobinson(a)gmail.com> This reverts commit 5d53795bb19e39f048ac8028ec36ff04765e1237. --- drivers/gpu/drm/panel/Kconfig | 9 - drivers/gpu/drm/panel/Makefile | 1 - .../gpu/drm/panel/panel-xingbangda-xbd599.c | 366 ------------------ 3 files changed, 376 deletions(-) delete mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 1f55a87bb657..39055c1f0e2f 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -462,15 +462,6 @@ config DRM_PANEL_VISIONOX_RM69299 Say Y here if you want to enable support for Visionox RM69299 DSI Video Mode panel. -config DRM_PANEL_XINGBANGDA_XBD599 - tristate "Xingbangda XBD599 panel" - depends on OF - depends on DRM_MIPI_DSI - depends on BACKLIGHT_CLASS_DEVICE - help - Say Y here if you want to enable support for the Xingbangda XBD599 - MIPI DSI Video Mode panel. - config DRM_PANEL_XINPENG_XPP055C272 tristate "Xinpeng XPP055C272 panel driver" depends on OF diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 7b6b0c0397d6..de74f282c433 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -49,5 +49,4 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o obj-$(CONFIG_DRM_PANEL_VISIONOX_RM69299) += panel-visionox-rm69299.o -obj-$(CONFIG_DRM_PANEL_XINGBANGDA_XBD599) += panel-xingbangda-xbd599.o obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o diff --git a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c b/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c deleted file mode 100644 index b483f96ee1db..000000000000 --- a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c +++ /dev/null @@ -1,366 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Xingbangda XBD599 MIPI-DSI panel driver - * - * Copyright (C) 2019-2020 Icenowy Zheng <icenowy(a)aosc.io> - * - * Based on panel-rocktech-jh057n00900.c, which is: - * Copyright (C) Purism SPC 2019 - */ - -#include <linux/delay.h> -#include <linux/gpio/consumer.h> -#include <linux/mod_devicetable.h> -#include <linux/module.h> -#include <linux/of_device.h> -#include <linux/regulator/consumer.h> - -#include <drm/drm_mipi_dsi.h> -#include <drm/drm_modes.h> -#include <drm/drm_panel.h> -#include <drm/drm_print.h> - -/* Manufacturer specific Commands send via DSI */ -#define ST7703_CMD_ALL_PIXEL_OFF 0x22 -#define ST7703_CMD_ALL_PIXEL_ON 0x23 -#define ST7703_CMD_SETDISP 0xB2 -#define ST7703_CMD_SETRGBIF 0xB3 -#define ST7703_CMD_SETCYC 0xB4 -#define ST7703_CMD_SETBGP 0xB5 -#define ST7703_CMD_SETVCOM 0xB6 -#define ST7703_CMD_SETOTP 0xB7 -#define ST7703_CMD_SETPOWER_EXT 0xB8 -#define ST7703_CMD_SETEXTC 0xB9 -#define ST7703_CMD_SETMIPI 0xBA -#define ST7703_CMD_SETVDC 0xBC -#define ST7703_CMD_SETSCR 0xC0 -#define ST7703_CMD_SETPOWER 0xC1 -#define ST7703_CMD_UNK_C6 0xC6 -#define ST7703_CMD_SETPANEL 0xCC -#define ST7703_CMD_SETGAMMA 0xE0 -#define ST7703_CMD_SETEQ 0xE3 -#define ST7703_CMD_SETGIP1 0xE9 -#define ST7703_CMD_SETGIP2 0xEA - -static const char * const regulator_names[] = { - "iovcc", - "vcc", -}; - -struct xbd599 { - struct device *dev; - struct drm_panel panel; - struct gpio_desc *reset_gpio; - struct regulator_bulk_data supplies[ARRAY_SIZE(regulator_names)]; - bool prepared; -}; - -static inline struct xbd599 *panel_to_xbd599(struct drm_panel *panel) -{ - return container_of(panel, struct xbd599, panel); -} - -#define dsi_dcs_write_seq(dsi, cmd, seq...) do { \ - static const u8 d[] = { seq }; \ - int ret; \ - ret = mipi_dsi_dcs_write(dsi, cmd, d, ARRAY_SIZE(d)); \ - if (ret < 0) \ - return ret; \ - } while (0) - -static int xbd599_init_sequence(struct xbd599 *ctx) -{ - struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); - struct device *dev = ctx->dev; - int ret; - - /* - * Init sequence was supplied by the panel vendor. - */ - dsi_dcs_write_seq(dsi, ST7703_CMD_SETEXTC, - 0xF1, 0x12, 0x83); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETMIPI, - 0x33, 0x81, 0x05, 0xF9, 0x0E, 0x0E, 0x20, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, - 0x00, 0x91, 0x0a, 0x00, 0x00, 0x02, 0x4F, 0x11, - 0x00, 0x00, 0x37); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER_EXT, - 0x25, 0x22, 0x20, 0x03); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETRGBIF, - 0x10, 0x10, 0x05, 0x05, 0x03, 0xFF, 0x00, 0x00, - 0x00, 0x00); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETSCR, - 0x73, 0x73, 0x50, 0x50, 0x00, 0xC0, 0x08, 0x70, - 0x00); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETCYC, 0x80); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETDISP, 0xF0, 0x12, 0xF0); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETEQ, - 0x00, 0x00, 0x0B, 0x0B, 0x10, 0x10, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0x00, 0xC0, 0x10); - dsi_dcs_write_seq(dsi, 0xC6, 0x01, 0x00, 0xFF, 0xFF, 0x00); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER, - 0x74, 0x00, 0x32, 0x32, 0x77, 0xF1, 0xFF, 0xFF, - 0xCC, 0xCC, 0x77, 0x77); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETBGP, 0x07, 0x07); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETVCOM, 0x2C, 0x2C); - dsi_dcs_write_seq(dsi, 0xBF, 0x02, 0x11, 0x00); - - dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP1, - 0x82, 0x10, 0x06, 0x05, 0xA2, 0x0A, 0xA5, 0x12, - 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38, - 0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88, - 0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64, - 0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, - 0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP2, - 0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88, - 0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13, - 0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, - 0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A, - 0xA5, 0x00, 0x00, 0x00, 0x00); - dsi_dcs_write_seq(dsi, ST7703_CMD_SETGAMMA, - 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, 0x35, - 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, 0x12, - 0x18, 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, - 0x35, 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, - 0x12, 0x18); - msleep(20); - - ret = mipi_dsi_dcs_exit_sleep_mode(dsi); - if (ret < 0) { - DRM_DEV_ERROR(dev, "Failed to exit sleep mode\n"); - return ret; - } - msleep(250); - - ret = mipi_dsi_dcs_set_display_on(dsi); - if (ret) - return ret; - msleep(50); - - DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n"); - return 0; -} - -static int xbd599_prepare(struct drm_panel *panel) -{ - struct xbd599 *ctx = panel_to_xbd599(panel); - int ret; - - if (ctx->prepared) - return 0; - - ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies); - if (ret) - return ret; - - DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n"); - gpiod_set_value_cansleep(ctx->reset_gpio, 1); - usleep_range(20, 40); - gpiod_set_value_cansleep(ctx->reset_gpio, 0); - msleep(20); - - ctx->prepared = true; - - return 0; -} - -static int xbd599_enable(struct drm_panel *panel) -{ - struct xbd599 *ctx = panel_to_xbd599(panel); - int ret; - - ret = xbd599_init_sequence(ctx); - if (ret < 0) { - DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n", - ret); - return ret; - } - - return 0; -} - -static int xbd599_disable(struct drm_panel *panel) -{ - struct xbd599 *ctx = panel_to_xbd599(panel); - struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); - - return mipi_dsi_dcs_set_display_off(dsi); -} - -static int xbd599_unprepare(struct drm_panel *panel) -{ - struct xbd599 *ctx = panel_to_xbd599(panel); - - if (!ctx->prepared) - return 0; - - gpiod_set_value_cansleep(ctx->reset_gpio, 1); - regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies); - ctx->prepared = false; - - return 0; -} - -static const struct drm_display_mode xbd599_default_mode = { - .hdisplay = 720, - .hsync_start = 720 + 40, - .hsync_end = 720 + 40 + 40, - .htotal = 720 + 40 + 40 + 40, - .vdisplay = 1440, - .vsync_start = 1440 + 18, - .vsync_end = 1440 + 18 + 10, - .vtotal = 1440 + 18 + 10 + 17, - .vrefresh = 60, - .clock = 69000, - .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, - - .width_mm = 68, - .height_mm = 136, - .type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED, -}; - -static int xbd599_get_modes(struct drm_panel *panel, - struct drm_connector *connector) -{ - struct xbd599 *ctx = panel_to_xbd599(panel); - struct drm_display_mode *mode; - - mode = drm_mode_duplicate(connector->dev, &xbd599_default_mode); - if (!mode) { - DRM_DEV_ERROR(ctx->dev, "Failed to add mode\n"); - return -ENOMEM; - } - - drm_mode_set_name(mode); - - mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; - connector->display_info.width_mm = mode->width_mm; - connector->display_info.height_mm = mode->height_mm; - drm_mode_probed_add(connector, mode); - - return 1; -} - -static const struct drm_panel_funcs xbd599_drm_funcs = { - .prepare = xbd599_prepare, - .enable = xbd599_enable, - .disable = xbd599_disable, - .unprepare = xbd599_unprepare, - .get_modes = xbd599_get_modes, -}; - -static int xbd599_probe(struct mipi_dsi_device *dsi) -{ - struct device *dev = &dsi->dev; - struct xbd599 *ctx; - int i, ret; - - ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); - if (!ctx) - return -ENOMEM; - - for (i = 0; i < ARRAY_SIZE(ctx->supplies); i++) - ctx->supplies[i].supply = regulator_names[i]; - - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies), - ctx->supplies); - if (ret < 0) { - DRM_DEV_ERROR(&dsi->dev, "cannot get regulators\n"); - return ret; - } - - ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(ctx->reset_gpio)) { - DRM_DEV_ERROR(dev, "cannot get reset gpio\n"); - return PTR_ERR(ctx->reset_gpio); - } - - mipi_dsi_set_drvdata(dsi, ctx); - - ctx->dev = dev; - - dsi->lanes = 4; - dsi->format = MIPI_DSI_FMT_RGB888; - dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE; - - drm_panel_init(&ctx->panel, &dsi->dev, &xbd599_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); - if (ret < 0) { - DRM_DEV_ERROR(dev, "mipi_dsi_attach failed. Is host ready?\n"); - drm_panel_remove(&ctx->panel); - return ret; - } - - DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n", - xbd599_default_mode.hdisplay, - xbd599_default_mode.vdisplay, - xbd599_default_mode.vrefresh, - mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes); - - return 0; -} - -static void xbd599_shutdown(struct mipi_dsi_device *dsi) -{ - struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - ret = drm_panel_unprepare(&ctx->panel); - if (ret < 0) - DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n", - ret); -} - -static int xbd599_remove(struct mipi_dsi_device *dsi) -{ - struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi); - int ret; - - xbd599_shutdown(dsi); - - ret = mipi_dsi_detach(dsi); - if (ret < 0) - DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n", - ret); - - drm_panel_remove(&ctx->panel); - - return 0; -} - -static const struct of_device_id xbd599_of_match[] = { - { .compatible = "xingbangda,xbd599", }, - { /* sentinel */ } -}; -MODULE_DEVICE_TABLE(of, xbd599_of_match); - -static struct mipi_dsi_driver xbd599_driver = { - .probe = xbd599_probe, - .remove = xbd599_remove, - .shutdown = xbd599_shutdown, - .driver = { - .name = "panel-xingbangda-xbd599", - .of_match_table = xbd599_of_match, - }, -}; -module_mipi_dsi_driver(xbd599_driver); - -MODULE_AUTHOR("Icenowy Zheng <icenowy(a)aosc.io>"); -MODULE_DESCRIPTION("DRM driver for Xingbangda XBD599 MIPI DSI panel"); -MODULE_LICENSE("GPL v2"); -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 3/17] Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation"

From: Peter Robinson <pbrobinson(a)gmail.com> This reverts commit d20a2ac9c6ecf514e115f06b6744b584bbc7c1b8. --- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index 52e009dc632b..aa67cb037e9d 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, */ #define HSA_PACKET_OVERHEAD 10 hsa = max((unsigned int)HSA_PACKET_OVERHEAD, - (mode->hsync_end - mode->hsync_start) * Bpp) - HSA_PACKET_OVERHEAD; + (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD); /* * The backporch is set using a blanking packet (4 @@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, */ #define HBP_PACKET_OVERHEAD 6 hbp = max((unsigned int)HBP_PACKET_OVERHEAD, - (mode->htotal - mode->hsync_end) * Bpp) - HBP_PACKET_OVERHEAD; + (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD); /* * The frontporch is set using a sync event (4 bytes) @@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, */ #define HFP_PACKET_OVERHEAD 16 hfp = max((unsigned int)HFP_PACKET_OVERHEAD, - (mode->hsync_start - mode->hdisplay) * Bpp) - HFP_PACKET_OVERHEAD; + (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD); /* * The blanking is set using a sync event (4 bytes) @@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi, */ #define HBLK_PACKET_OVERHEAD 10 hblk = max((unsigned int)HBLK_PACKET_OVERHEAD, - (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp) - - HBLK_PACKET_OVERHEAD; + (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp - + HBLK_PACKET_OVERHEAD); /* * And I'm not entirely sure what vblk is about. The driver in -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 1/17] Revert "dt-bindings: panel: add binding for Xingbangda XBD599 panel"

From: Peter Robinson <pbrobinson(a)gmail.com> This reverts commit 8a717270db2000ff734d89e9448b32fbc038c49a. --- .../display/panel/xingbangda,xbd599.yaml | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml diff --git a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml b/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml deleted file mode 100644 index b27bcf11198f..000000000000 --- a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/display/panel/xingbangda,xbd599.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Xingbangda XBD599 5.99in MIPI-DSI LCD panel - -maintainers: - - Icenowy Zheng <icenowy(a)aosc.io> - -allOf: - - $ref: panel-common.yaml# - -properties: - compatible: - const: xingbangda,xbd599 - reg: true - backlight: true - reset-gpios: true - vcc-supply: - description: regulator that supplies the VCC voltage - iovcc-supply: - description: regulator that supplies the IOVCC voltage - -required: - - compatible - - reg - - backlight - - vcc-supply - - iovcc-supply - -additionalProperties: false - -examples: - - | - dsi { - #address-cells = <1>; - #size-cells = <0>; - - panel@0 { - compatible = "xingbangda,xbd599"; - reg = <0>; - backlight = <&backlight>; - iovcc-supply = <&reg_dldo2>; - vcc-supply = <&reg_ldo_io0>; - }; - }; - -... -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 9/17] drm/panel: st7703: Rename functions from jh057n prefix to st7703

From: Ondrej Jirman <megous(a)megous.com> This is done so that code that's not specific to a particular jh057n panel is named after the controller. Functions specific to the panel are kept named after the panel. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 90 ++++++++++--------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index 38ff742bc120..511af659f273 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Rockteck jh057n00900 5.5" MIPI-DSI panel driver + * Driver for panels based on Sitronix ST7703 controller, souch as: + * + * - Rocktech jh057n00900 5.5" MIPI-DSI panel * * Copyright (C) Purism SPC 2019 */ @@ -21,7 +23,7 @@ #include <drm/drm_panel.h> #include <drm/drm_print.h> -#define DRV_NAME "panel-rocktech-jh057n00900" +#define DRV_NAME "panel-sitronix-st7703" /* Manufacturer specific Commands send via DSI */ #define ST7703_CMD_ALL_PIXEL_OFF 0x22 @@ -45,7 +47,7 @@ #define ST7703_CMD_SETGIP1 0xE9 #define ST7703_CMD_SETGIP2 0xEA -struct jh057n { +struct st7703 { struct device *dev; struct drm_panel panel; struct gpio_desc *reset_gpio; @@ -56,9 +58,9 @@ struct jh057n { struct dentry *debugfs; }; -static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel) +static inline struct st7703 *panel_to_st7703(struct drm_panel *panel) { - return container_of(panel, struct jh057n, panel); + return container_of(panel, struct st7703, panel); } #define dsi_generic_write_seq(dsi, seq...) do { \ @@ -69,7 +71,7 @@ static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel) return ret; \ } while (0) -static int jh057n_init_sequence(struct jh057n *ctx) +static int jh057n_init_sequence(struct st7703 *ctx) { struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); struct device *dev = ctx->dev; @@ -141,9 +143,9 @@ static int jh057n_init_sequence(struct jh057n *ctx) return 0; } -static int jh057n_enable(struct drm_panel *panel) +static int st7703_enable(struct drm_panel *panel) { - struct jh057n *ctx = panel_to_jh057n(panel); + struct st7703 *ctx = panel_to_st7703(panel); int ret; ret = jh057n_init_sequence(ctx); @@ -156,17 +158,17 @@ static int jh057n_enable(struct drm_panel *panel) return 0; } -static int jh057n_disable(struct drm_panel *panel) +static int st7703_disable(struct drm_panel *panel) { - struct jh057n *ctx = panel_to_jh057n(panel); + struct st7703 *ctx = panel_to_st7703(panel); struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); return mipi_dsi_dcs_set_display_off(dsi); } -static int jh057n_unprepare(struct drm_panel *panel) +static int st7703_unprepare(struct drm_panel *panel) { - struct jh057n *ctx = panel_to_jh057n(panel); + struct st7703 *ctx = panel_to_st7703(panel); if (!ctx->prepared) return 0; @@ -178,9 +180,9 @@ static int jh057n_unprepare(struct drm_panel *panel) return 0; } -static int jh057n_prepare(struct drm_panel *panel) +static int st7703_prepare(struct drm_panel *panel) { - struct jh057n *ctx = panel_to_jh057n(panel); + struct st7703 *ctx = panel_to_st7703(panel); int ret; if (ctx->prepared) @@ -230,10 +232,10 @@ static const struct drm_display_mode default_mode = { .height_mm = 130, }; -static int jh057n_get_modes(struct drm_panel *panel, +static int st7703_get_modes(struct drm_panel *panel, struct drm_connector *connector) { - struct jh057n *ctx = panel_to_jh057n(panel); + struct st7703 *ctx = panel_to_st7703(panel); struct drm_display_mode *mode; mode = drm_mode_duplicate(connector->dev, &default_mode); @@ -254,17 +256,17 @@ static int jh057n_get_modes(struct drm_panel *panel, return 1; } -static const struct drm_panel_funcs jh057n_drm_funcs = { - .disable = jh057n_disable, - .unprepare = jh057n_unprepare, - .prepare = jh057n_prepare, - .enable = jh057n_enable, - .get_modes = jh057n_get_modes, +static const struct drm_panel_funcs st7703_drm_funcs = { + .disable = st7703_disable, + .unprepare = st7703_unprepare, + .prepare = st7703_prepare, + .enable = st7703_enable, + .get_modes = st7703_get_modes, }; static int allpixelson_set(void *data, u64 val) { - struct jh057n *ctx = data; + struct st7703 *ctx = data; struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); DRM_DEV_DEBUG_DRIVER(ctx->dev, "Setting all pixels on\n"); @@ -282,7 +284,7 @@ static int allpixelson_set(void *data, u64 val) DEFINE_SIMPLE_ATTRIBUTE(allpixelson_fops, NULL, allpixelson_set, "%llu\n"); -static void jh057n_debugfs_init(struct jh057n *ctx) +static void st7703_debugfs_init(struct st7703 *ctx) { ctx->debugfs = debugfs_create_dir(DRV_NAME, NULL); @@ -290,16 +292,16 @@ static void jh057n_debugfs_init(struct jh057n *ctx) &allpixelson_fops); } -static void jh057n_debugfs_remove(struct jh057n *ctx) +static void st7703_debugfs_remove(struct st7703 *ctx) { debugfs_remove_recursive(ctx->debugfs); ctx->debugfs = NULL; } -static int jh057n_probe(struct mipi_dsi_device *dsi) +static int st7703_probe(struct mipi_dsi_device *dsi) { struct device *dev = &dsi->dev; - struct jh057n *ctx; + struct st7703 *ctx; int ret; ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); @@ -340,7 +342,7 @@ static int jh057n_probe(struct mipi_dsi_device *dsi) return ret; } - drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs, + drm_panel_init(&ctx->panel, dev, &st7703_drm_funcs, DRM_MODE_CONNECTOR_DSI); ret = drm_panel_of_backlight(&ctx->panel); @@ -363,13 +365,13 @@ static int jh057n_probe(struct mipi_dsi_device *dsi) default_mode.vrefresh, mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes); - jh057n_debugfs_init(ctx); + st7703_debugfs_init(ctx); return 0; } -static void jh057n_shutdown(struct mipi_dsi_device *dsi) +static void st7703_shutdown(struct mipi_dsi_device *dsi) { - struct jh057n *ctx = mipi_dsi_get_drvdata(dsi); + struct st7703 *ctx = mipi_dsi_get_drvdata(dsi); int ret; ret = drm_panel_unprepare(&ctx->panel); @@ -383,12 +385,12 @@ static void jh057n_shutdown(struct mipi_dsi_device *dsi) ret); } -static int jh057n_remove(struct mipi_dsi_device *dsi) +static int st7703_remove(struct mipi_dsi_device *dsi) { - struct jh057n *ctx = mipi_dsi_get_drvdata(dsi); + struct st7703 *ctx = mipi_dsi_get_drvdata(dsi); int ret; - jh057n_shutdown(dsi); + st7703_shutdown(dsi); ret = mipi_dsi_detach(dsi); if (ret < 0) @@ -397,28 +399,28 @@ static int jh057n_remove(struct mipi_dsi_device *dsi) drm_panel_remove(&ctx->panel); - jh057n_debugfs_remove(ctx); + st7703_debugfs_remove(ctx); return 0; } -static const struct of_device_id jh057n_of_match[] = { +static const struct of_device_id st7703_of_match[] = { { .compatible = "rocktech,jh057n00900" }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(of, jh057n_of_match); +MODULE_DEVICE_TABLE(of, st7703_of_match); -static struct mipi_dsi_driver jh057n_driver = { - .probe = jh057n_probe, - .remove = jh057n_remove, - .shutdown = jh057n_shutdown, +static struct mipi_dsi_driver st7703_driver = { + .probe = st7703_probe, + .remove = st7703_remove, + .shutdown = st7703_shutdown, .driver = { .name = DRV_NAME, - .of_match_table = jh057n_of_match, + .of_match_table = st7703_of_match, }, }; -module_mipi_dsi_driver(jh057n_driver); +module_mipi_dsi_driver(st7703_driver); MODULE_AUTHOR("Guido GÃ¼nther <agx(a)sigxcpu.org>"); -MODULE_DESCRIPTION("DRM driver for Rocktech JH057N00900 MIPI DSI panel"); +MODULE_DESCRIPTION("DRM driver for Sitronix ST7703 based MIPI DSI panels"); MODULE_LICENSE("GPL v2"); -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 4/17] Revert "arm64: allwinner: dts: a64: add LCD-related device nodes for PinePhone"

From: Peter Robinson <pbrobinson(a)gmail.com> This reverts commit 6b9deda8c30064a254bc66e3f6763281c96db7db. --- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index 96d9150423e0..cefda145c3c9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -16,15 +16,6 @@ aliases { serial0 = &uart0; }; - backlight: backlight { - compatible = "pwm-backlight"; - pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>; - brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>; - default-brightness-level = <15>; - enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ - power-supply = <&reg_ldo_io0>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -93,30 +84,6 @@ &dai { status = "okay"; }; -&de { - status = "okay"; -}; - -&dphy { - status = "okay"; -}; - -&dsi { - vcc-dsi-supply = <&reg_dldo1>; - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - panel@0 { - compatible = "xingbangda,xbd599"; - reg = <0>; - reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */ - iovcc-supply = <&reg_dldo2>; - vcc-supply = <&reg_ldo_io0>; - backlight = <&backlight>; - }; -}; - &ehci0 { status = "okay"; }; @@ -221,10 +188,6 @@ &r_pio { */ }; -&r_pwm { - status = "okay"; -}; - &r_rsb { status = "okay"; -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 6/17] dt-bindings: panel: Convert rocktech, jh057n00900 to yaml

From: Ondrej Jirman <megous(a)megous.com> Convert Rocktech MIPI DSI panel driver from txt to yaml bindings. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- .../display/panel/rocktech,jh057n00900.txt | 23 ------- .../display/panel/rocktech,jh057n00900.yaml | 66 +++++++++++++++++++ 2 files changed, 66 insertions(+), 23 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt deleted file mode 100644 index a372c5d84695..000000000000 --- a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt +++ /dev/null @@ -1,23 +0,0 @@ -Rocktech jh057n00900 5.5" 720x1440 TFT LCD panel - -Required properties: -- compatible: should be "rocktech,jh057n00900" -- reg: DSI virtual channel of the peripheral -- reset-gpios: panel reset gpio -- backlight: phandle of the backlight device attached to the panel -- vcc-supply: phandle of the regulator that provides the vcc supply voltage. -- iovcc-supply: phandle of the regulator that provides the iovcc supply - voltage. - -Example: - - &mipi_dsi { - panel@0 { - compatible = "rocktech,jh057n00900"; - reg = <0>; - backlight = <&backlight>; - reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; - vcc-supply = <&reg_2v8_p>; - iovcc-supply = <&reg_1v8_p>; - }; - }; diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml new file mode 100644 index 000000000000..f97c48550741 --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml @@ -0,0 +1,66 @@ +# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/panel/rocktech,jh057n00900.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel + +maintainers: + - Ondrej Jirman <megi(a)xff.cz> + +description: | + Rocktech JH057N00900 is a 720x1440 TFT LCD panel + connected using a MIPI-DSI video interface. + +allOf: + - $ref: panel-common.yaml# + +properties: + compatible: + const: rocktech,jh057n00900 + + reg: + maxItems: 1 + description: DSI virtual channel + + vcc-supply: + description: Panel power supply + + vccio-supply: + description: I/O voltage supply + + reset-gpios: + description: GPIO used for the reset pin + maxItems: 1 + + backlight: + description: Backlight used by the panel + $ref: "/schemas/types.yaml#/definitions/phandle" + +required: + - compatible + - reg + - vcc-supply + - vccio-supply + - reset-gpios + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + dsi { + #address-cells = <1>; + #size-cells = <0>; + panel@0 { + compatible = "rocktech,jh057n00900"; + reg = <0>; + vcc-supply = <&reg_2v8_p>; + iovcc-supply = <&reg_1v8_p>; + reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; + backlight = <&backlight>; + }; + }; +... -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 10/17] drm/panel: st7703: Prepare for supporting multiple panels

From: Ondrej Jirman <megous(a)megous.com> Parametrize the driver so that it can support more panels based on st7703 controller. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index 511af659f273..08cbc316266c 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -13,6 +13,7 @@ #include <linux/media-bus-format.h> #include <linux/mod_devicetable.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/regulator/consumer.h> #include <video/display_timing.h> @@ -56,6 +57,15 @@ struct st7703 { bool prepared; struct dentry *debugfs; + const struct st7703_panel_desc *desc; +}; + +struct st7703_panel_desc { + const struct drm_display_mode *mode; + unsigned int lanes; + unsigned long mode_flags; + enum mipi_dsi_pixel_format format; + int (*init_sequence)(struct st7703 *ctx); }; static inline struct st7703 *panel_to_st7703(struct drm_panel *panel) @@ -148,7 +158,7 @@ static int st7703_enable(struct drm_panel *panel) struct st7703 *ctx = panel_to_st7703(panel); int ret; - ret = jh057n_init_sequence(ctx); + ret = ctx->desc->init_sequence(ctx); if (ret < 0) { DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n", ret); @@ -216,7 +226,7 @@ static int st7703_prepare(struct drm_panel *panel) return ret; } -static const struct drm_display_mode default_mode = { +static const struct drm_display_mode jh057n00900_mode = { .hdisplay = 720, .hsync_start = 720 + 90, .hsync_end = 720 + 90 + 20, @@ -232,17 +242,26 @@ static const struct drm_display_mode default_mode = { .height_mm = 130, }; +struct st7703_panel_desc jh057n00900_panel_desc = { + .mode = &jh057n00900_mode, + .lanes = 4, + .mode_flags = MIPI_DSI_MODE_VIDEO | + MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE, + .format = MIPI_DSI_FMT_RGB888, + .init_sequence = jh057n_init_sequence, +}; + static int st7703_get_modes(struct drm_panel *panel, struct drm_connector *connector) { struct st7703 *ctx = panel_to_st7703(panel); struct drm_display_mode *mode; - mode = drm_mode_duplicate(connector->dev, &default_mode); + mode = drm_mode_duplicate(connector->dev, ctx->desc->mode); if (!mode) { DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n", - default_mode.hdisplay, default_mode.vdisplay, - default_mode.vrefresh); + ctx->desc->mode->hdisplay, ctx->desc->mode->vdisplay, + ctx->desc->mode->vrefresh); return -ENOMEM; } @@ -317,11 +336,11 @@ static int st7703_probe(struct mipi_dsi_device *dsi) mipi_dsi_set_drvdata(dsi, ctx); ctx->dev = dev; + ctx->desc = of_device_get_match_data(dev); - dsi->lanes = 4; - dsi->format = MIPI_DSI_FMT_RGB888; - dsi->mode_flags = MIPI_DSI_MODE_VIDEO | - MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE; + dsi->mode_flags = ctx->desc->mode_flags; + dsi->format = ctx->desc->format; + dsi->lanes = ctx->desc->lanes; ctx->vcc = devm_regulator_get(dev, "vcc"); if (IS_ERR(ctx->vcc)) { @@ -361,8 +380,8 @@ static int st7703_probe(struct mipi_dsi_device *dsi) } DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n", - default_mode.hdisplay, default_mode.vdisplay, - default_mode.vrefresh, + ctx->desc->mode->hdisplay, ctx->desc->mode->vdisplay, + ctx->desc->mode->vrefresh, mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes); st7703_debugfs_init(ctx); @@ -405,7 +424,7 @@ static int st7703_remove(struct mipi_dsi_device *dsi) } static const struct of_device_id st7703_of_match[] = { - { .compatible = "rocktech,jh057n00900" }, + { .compatible = "rocktech,jh057n00900", .data = &jh057n00900_panel_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, st7703_of_match); -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 5/17] dt-bindings: vendor-prefixes: Add Xingbangda

From: Icenowy Zheng <icenowy(a)aosc.io> Shenzhen Xingbangda Display Technology Co., Ltd is a company which produces LCD modules. It supplies the LCD panels for the PinePhone. Add the vendor prefix of it. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> Signed-off-by: Ondrej Jirman <megous(a)megous.com> Acked-by: Rob Herring <robh(a)kernel.org> --- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index ef6d75b9113a..af154d1604eb 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -1155,6 +1155,8 @@ patternProperties: description: Xiaomi Technology Co., Ltd. "^xillybus,.*": description: Xillybus Ltd. + "^xingbangda,.*": + description: Shenzhen Xingbangda Display Technology Co., Ltd "^xinpeng,.*": description: Shenzhen Xinpeng Technology Co., Ltd "^xlnx,.*": -- GitLab

Jiri Benc

Monday, 13 July Mon, 13 Jul

9:52 a.m.

New subject: [ARK PATCH 5/17] dt-bindings: vendor-prefixes: Add Xingbangda

On Sun, 12 Jul 2020 13:09:19 -0000, GitLab Bridge on behalf of pbrobinson wrote:

...

This is missing an upstream commit id reference. Similarly for other patches in this series. Please submit v2 with the references added. Politely, Nacked-by: Jiri Benc <jbenc(a)redhat.com>

GitLab Bridge on behalf of pbrobinson

Sunday, 12 July Sun, 12 Jul

8:09 a.m.

New subject: [ARK PATCH 7/17] dt-bindings: panel: Add compatible for Xingbangda XBD599 panel

From: Ondrej Jirman <megous(a)megous.com> Xingbangda XBD599 is a 5.99" 720x1440 MIPI-DSI LCD panel. It is based on Sitronix ST7703 LCD controller just like rocktech,jh057n00900. It is used in PinePhone. Add a compatible for it. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- .../bindings/display/panel/rocktech,jh057n00900.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml index f97c48550741..4d43a1b36d7c 100644 --- a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml +++ b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml @@ -18,7 +18,11 @@ allOf: properties: compatible: - const: rocktech,jh057n00900 + enum: + # Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel + - rocktech,jh057n00900 + # Xingbangda XBD599 5.99" 720x1440 TFT LCD panel + - xingbangda,xbd599 reg: maxItems: 1 -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 8/17] drm/panel: rocktech-jh057n00900: Rename the driver to st7703

From: Ondrej Jirman <megous(a)megous.com> This rename is done so that the driver matches the name of the display controller and in preparation for adding support for more panels to the driver. This is just a basic file rename, with no code changes. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/Kconfig | 26 +++++++++---------- drivers/gpu/drm/panel/Makefile | 2 +- ...-jh057n00900.c => panel-sitronix-st7703.c} | 0 3 files changed, 14 insertions(+), 14 deletions(-) rename drivers/gpu/drm/panel/{panel-rocktech-jh057n00900.c => panel-sitronix-st7703.c} (100%) diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 39055c1f0e2f..de2f2a452be5 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -283,19 +283,6 @@ config DRM_PANEL_RAYDIUM_RM68200 Say Y here if you want to enable support for Raydium RM68200 720x1280 DSI video mode panel. -config DRM_PANEL_ROCKTECH_JH057N00900 - tristate "Rocktech JH057N00900 MIPI touchscreen panel" - depends on OF - depends on DRM_MIPI_DSI - depends on BACKLIGHT_CLASS_DEVICE - help - Say Y here if you want to enable support for Rocktech JH057N00900 - MIPI DSI panel as e.g. used in the Librem 5 devkit. It has a - resolution of 720x1440 pixels, a built in backlight and touch - controller. - Touch input support is provided by the goodix driver and needs to be - selected separately. - config DRM_PANEL_RONBO_RB070D30 tristate "Ronbo Electronics RB070D30 panel" depends on OF @@ -395,6 +382,19 @@ config DRM_PANEL_SITRONIX_ST7701 ST7701 controller for 480X864 LCD panels with MIPI/RGB/SPI system interfaces. +config DRM_PANEL_SITRONIX_ST7703 + tristate "Sitronix ST7703 based MIPI touchscreen panels" + depends on OF + depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE + help + Say Y here if you want to enable support for Sitronix ST7703 based + panels, souch as Rocktech JH057N00900 MIPI DSI panel as e.g. used in + the Librem 5 devkit. It has a resolution of 720x1440 pixels, a built + in backlight and touch controller. + Touch input support is provided by the goodix driver and needs to be + selected separately. + config DRM_PANEL_SITRONIX_ST7789V tristate "Sitronix ST7789V panel" depends on OF && SPI diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index de74f282c433..e45ceac6286f 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00) += panel-panasonic-vvx10f034n00.o obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen.o obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o -obj-$(CONFIG_DRM_PANEL_ROCKTECH_JH057N00900) += panel-rocktech-jh057n00900.o obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6D16D0) += panel-samsung-s6d16d0.o @@ -41,6 +40,7 @@ obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7701) += panel-sitronix-st7701.o +obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o obj-$(CONFIG_DRM_PANEL_SONY_ACX424AKP) += panel-sony-acx424akp.o obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o diff --git a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c similarity index 100% rename from drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c rename to drivers/gpu/drm/panel/panel-sitronix-st7703.c -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 15/17] drm/panel: st7703: Assert reset prior to powering down the regulators

From: Ondrej Jirman <megous(a)megous.com> The reset pin is inverted, so if we don't assert reset, the actual gpio will be high and may keep driving the IO port of the panel. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index e771281eb547..92930e127559 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -416,6 +416,7 @@ static int st7703_unprepare(struct drm_panel *panel) if (!ctx->prepared) return 0; + gpiod_set_value_cansleep(ctx->reset_gpio, 1); regulator_disable(ctx->iovcc); regulator_disable(ctx->vcc); ctx->prepared = false; -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 13/17] drm/panel: st7703: Add support for Xingbangda XBD599

From: Ondrej Jirman <megous(a)megous.com> Xingbangda XBD599 is a 5.99" 720x1440 MIPI-DSI LCD panel used in PinePhone. Add support for it. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 199 +++++++++++++++++- 1 file changed, 197 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index cdbf7dfb4dd4..33611419059a 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -39,10 +39,11 @@ #define ST7703_CMD_SETEXTC 0xB9 #define ST7703_CMD_SETMIPI 0xBA #define ST7703_CMD_SETVDC 0xBC -#define ST7703_CMD_UNKNOWN0 0xBF +#define ST7703_CMD_UNKNOWN_BF 0xBF #define ST7703_CMD_SETSCR 0xC0 #define ST7703_CMD_SETPOWER 0xC1 #define ST7703_CMD_SETPANEL 0xCC +#define ST7703_CMD_UNKNOWN_C6 0xC6 #define ST7703_CMD_SETGAMMA 0xE0 #define ST7703_CMD_SETEQ 0xE3 #define ST7703_CMD_SETGIP1 0xE9 @@ -109,7 +110,7 @@ static int jh057n_init_sequence(struct st7703 *ctx) msleep(20); dsi_generic_write_seq(dsi, ST7703_CMD_SETVCOM, 0x3F, 0x3F); - dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN0, 0x02, 0x11, 0x00); + dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN_BF, 0x02, 0x11, 0x00); dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1, 0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12, 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38, @@ -163,6 +164,199 @@ struct st7703_panel_desc jh057n00900_panel_desc = { .init_sequence = jh057n_init_sequence, }; +#define dsi_dcs_write_seq(dsi, cmd, seq...) do { \ + static const u8 d[] = { seq }; \ + int ret; \ + ret = mipi_dsi_dcs_write(dsi, cmd, d, ARRAY_SIZE(d)); \ + if (ret < 0) \ + return ret; \ + } while (0) + + +static int xbd599_init_sequence(struct st7703 *ctx) +{ + struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); + + /* + * Init sequence was supplied by the panel vendor. + */ + + /* Magic sequence to unlock user commands below. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETEXTC, 0xF1, 0x12, 0x83); + + dsi_dcs_write_seq(dsi, ST7703_CMD_SETMIPI, + 0x33, /* VC_main = 0, Lane_Number = 3 (4 lanes) */ + 0x81, /* DSI_LDO_SEL = 1.7V, RTERM = 90 Ohm */ + 0x05, /* IHSRX = x6 (Low High Speed driving ability) */ + 0xF9, /* TX_CLK_SEL = fDSICLK/16 */ + 0x0E, /* HFP_OSC (min. HFP number in DSI mode) */ + 0x0E, /* HBP_OSC (min. HBP number in DSI mode) */ + /* The rest is undocumented in ST7703 datasheet */ + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x44, 0x25, 0x00, 0x91, 0x0a, 0x00, 0x00, 0x02, + 0x4F, 0x11, 0x00, 0x00, 0x37); + + dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER_EXT, + 0x25, /* PCCS = 2, ECP_DC_DIV = 1/4 HSYNC */ + 0x22, /* DT = 15ms XDK_ECP = x2 */ + 0x20, /* PFM_DC_DIV = /1 */ + 0x03 /* ECP_SYNC_EN = 1, VGX_SYNC_EN = 1 */); + + /* RGB I/F porch timing */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETRGBIF, + 0x10, /* VBP_RGB_GEN */ + 0x10, /* VFP_RGB_GEN */ + 0x05, /* DE_BP_RGB_GEN */ + 0x05, /* DE_FP_RGB_GEN */ + /* The rest is undocumented in ST7703 datasheet */ + 0x03, 0xFF, + 0x00, 0x00, + 0x00, 0x00); + + /* Source driving settings. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETSCR, + 0x73, /* N_POPON */ + 0x73, /* N_NOPON */ + 0x50, /* I_POPON */ + 0x50, /* I_NOPON */ + 0x00, /* SCR[31,24] */ + 0xC0, /* SCR[23,16] */ + 0x08, /* SCR[15,8] */ + 0x70, /* SCR[7,0] */ + 0x00 /* Undocumented */); + + /* NVDDD_SEL = -1.8V, VDDD_SEL = out of range (possibly 1.9V?) */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E); + + /* + * SS_PANEL = 1 (reverse scan), GS_PANEL = 0 (normal scan) + * REV_PANEL = 1 (normally black panel), BGR_PANEL = 1 (BGR) + */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B); + + /* Zig-Zag Type C column inversion. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETCYC, 0x80); + + /* Set display resolution. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETDISP, + 0xF0, /* NL = 240 */ + 0x12, /* RES_V_LSB = 0, BLK_CON = VSSD, + * RESO_SEL = 720RGB + */ + 0xF0 /* WHITE_GND_EN = 1 (GND), + * WHITE_FRAME_SEL = 7 frames, + * ISC = 0 frames + */); + + dsi_dcs_write_seq(dsi, ST7703_CMD_SETEQ, + 0x00, /* PNOEQ */ + 0x00, /* NNOEQ */ + 0x0B, /* PEQGND */ + 0x0B, /* NEQGND */ + 0x10, /* PEQVCI */ + 0x10, /* NEQVCI */ + 0x00, /* PEQVCI1 */ + 0x00, /* NEQVCI1 */ + 0x00, /* reserved */ + 0x00, /* reserved */ + 0xFF, /* reserved */ + 0x00, /* reserved */ + 0xC0, /* ESD_DET_DATA_WHITE = 1, ESD_WHITE_EN = 1 */ + 0x10 /* SLPIN_OPTION = 1 (no need vsync after sleep-in) + * VEDIO_NO_CHECK_EN = 0 + * ESD_WHITE_GND_EN = 0 + * ESD_DET_TIME_SEL = 0 frames + */); + + /* Undocumented command. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_UNKNOWN_C6, 0x01, 0x00, 0xFF, 0xFF, 0x00); + + dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER, + 0x74, /* VBTHS, VBTLS: VGH = 17V, VBL = -11V */ + 0x00, /* FBOFF_VGH = 0, FBOFF_VGL = 0 */ + 0x32, /* VRP */ + 0x32, /* VRN */ + 0x77, /* reserved */ + 0xF1, /* APS = 1 (small), + * VGL_DET_EN = 1, VGH_DET_EN = 1, + * VGL_TURBO = 1, VGH_TURBO = 1 + */ + 0xFF, /* VGH1_L_DIV, VGL1_L_DIV (1.5MHz) */ + 0xFF, /* VGH1_R_DIV, VGL1_R_DIV (1.5MHz) */ + 0xCC, /* VGH2_L_DIV, VGL2_L_DIV (2.6MHz) */ + 0xCC, /* VGH2_R_DIV, VGL2_R_DIV (2.6MHz) */ + 0x77, /* VGH3_L_DIV, VGL3_L_DIV (4.5MHz) */ + 0x77 /* VGH3_R_DIV, VGL3_R_DIV (4.5MHz) */); + + /* Reference voltage. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETBGP, + 0x07, /* VREF_SEL = 4.2V */ + 0x07 /* NVREF_SEL = 4.2V */); + + dsi_dcs_write_seq(dsi, ST7703_CMD_SETVCOM, + 0x2C, /* VCOMDC_F = -0.67V */ + 0x2C /* VCOMDC_B = -0.67V */); + + /* Undocumented command. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_UNKNOWN_BF, 0x02, 0x11, 0x00); + + /* This command is to set forward GIP timing. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP1, + 0x82, 0x10, 0x06, 0x05, 0xA2, 0x0A, 0xA5, 0x12, + 0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38, + 0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88, + 0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64, + 0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, + 0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + + /* This command is to set backward GIP timing. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP2, + 0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88, + 0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13, + 0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, + 0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A, + 0xA5, 0x00, 0x00, 0x00, 0x00); + + /* Adjust the gamma characteristics of the panel. */ + dsi_dcs_write_seq(dsi, ST7703_CMD_SETGAMMA, + 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, 0x35, + 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, 0x12, + 0x18, 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, + 0x35, 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, + 0x12, 0x18); + + return 0; +} + +static const struct drm_display_mode xbd599_mode = { + .hdisplay = 720, + .hsync_start = 720 + 40, + .hsync_end = 720 + 40 + 40, + .htotal = 720 + 40 + 40 + 40, + .vdisplay = 1440, + .vsync_start = 1440 + 18, + .vsync_end = 1440 + 18 + 10, + .vtotal = 1440 + 18 + 10 + 17, + .vrefresh = 60, + .clock = 69000, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, + .width_mm = 68, + .height_mm = 136, +}; + +static const struct st7703_panel_desc xbd599_desc = { + .mode = &xbd599_mode, + .lanes = 4, + .mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE, + .format = MIPI_DSI_FMT_RGB888, + .init_sequence = xbd599_init_sequence, +}; + static int st7703_enable(struct drm_panel *panel) { struct st7703 *ctx = panel_to_st7703(panel); @@ -428,6 +622,7 @@ static int st7703_remove(struct mipi_dsi_device *dsi) static const struct of_device_id st7703_of_match[] = { { .compatible = "rocktech,jh057n00900", .data = &jh057n00900_panel_desc }, + { .compatible = "xingbangda,xbd599", .data = &xbd599_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, st7703_of_match); -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 14/17] drm/panel: st7703: Enter sleep after display off

From: Ondrej Jirman <megous(a)megous.com> The datasheet suggests to issue sleep in after display off as a part of the panel's shutdown sequence. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index 33611419059a..e771281eb547 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -394,8 +394,19 @@ static int st7703_disable(struct drm_panel *panel) { struct st7703 *ctx = panel_to_st7703(panel); struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); + int ret; + + ret = mipi_dsi_dcs_set_display_off(dsi); + if (ret < 0) + DRM_DEV_ERROR(ctx->dev, + "Failed to turn off the display: %d\n", ret); - return mipi_dsi_dcs_set_display_off(dsi); + ret = mipi_dsi_dcs_enter_sleep_mode(dsi); + if (ret < 0) + DRM_DEV_ERROR(ctx->dev, + "Failed to enter sleep mode: %d\n", ret); + + return 0; } static int st7703_unprepare(struct drm_panel *panel) -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 16/17] arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone

From: Icenowy Zheng <icenowy(a)aosc.io> PinePhone uses PWM backlight and a XBD599 LCD panel over DSI for display. Backlight levels curve was optimized by Martijn Braam using a lux meter. Add its device nodes. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> Signed-off-by: Martijn Braam <martijn(a)brixit.nl> Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- .../allwinner/sun50i-a64-pinephone-1.1.dts | 19 ++++++++++ .../dts/allwinner/sun50i-a64-pinephone.dtsi | 35 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts index 06a775c41664..3e99a87e9ce5 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts @@ -9,3 +9,22 @@ / { model = "Pine64 PinePhone Braveheart (1.1)"; compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64"; }; + +&backlight { + power-supply = <&reg_ldo_io0>; + /* + * PWM backlight circuit on this PinePhone revision was changed since + * 1.0, and the lowest PWM duty cycle that doesn't lead to backlight + * being off is around 20%. Duty cycle for the lowest brightness level + * also varries quite a bit between individual boards, so the lowest + * value here was chosen as a safe default. + */ + brightness-levels = < + 774 793 814 842 + 882 935 1003 1088 + 1192 1316 1462 1633 + 1830 2054 2309 2596 + 2916 3271 3664 4096>; + num-interpolated-steps = <50>; + default-brightness-level = <400>; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index cefda145c3c9..85a7aa5efd32 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -16,6 +16,13 @@ aliases { serial0 = &uart0; }; + backlight: backlight { + compatible = "pwm-backlight"; + pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>; + enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */ + /* Backlight configuration differs per PinePhone revision. */ + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -84,6 +91,30 @@ &dai { status = "okay"; }; +&de { + status = "okay"; +}; + +&dphy { + status = "okay"; +}; + +&dsi { + vcc-dsi-supply = <&reg_dldo1>; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + panel@0 { + compatible = "xingbangda,xbd599"; + reg = <0>; + reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */ + iovcc-supply = <&reg_dldo2>; + vcc-supply = <&reg_ldo_io0>; + backlight = <&backlight>; + }; +}; + &ehci0 { status = "okay"; }; @@ -188,6 +219,10 @@ &r_pio { */ }; +&r_pwm { + status = "okay"; +}; + &r_rsb { status = "okay"; -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 11/17] drm/panel: st7703: Move code specific to jh057n closer together

From: Ondrej Jirman <megous(a)megous.com> It's better than having it spread around the driver. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index 08cbc316266c..d03aab10cfef 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -153,6 +153,31 @@ static int jh057n_init_sequence(struct st7703 *ctx) return 0; } +static const struct drm_display_mode jh057n00900_mode = { + .hdisplay = 720, + .hsync_start = 720 + 90, + .hsync_end = 720 + 90 + 20, + .htotal = 720 + 90 + 20 + 20, + .vdisplay = 1440, + .vsync_start = 1440 + 20, + .vsync_end = 1440 + 20 + 4, + .vtotal = 1440 + 20 + 4 + 12, + .vrefresh = 60, + .clock = 75276, + .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, + .width_mm = 65, + .height_mm = 130, +}; + +struct st7703_panel_desc jh057n00900_panel_desc = { + .mode = &jh057n00900_mode, + .lanes = 4, + .mode_flags = MIPI_DSI_MODE_VIDEO | + MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE, + .format = MIPI_DSI_FMT_RGB888, + .init_sequence = jh057n_init_sequence, +}; + static int st7703_enable(struct drm_panel *panel) { struct st7703 *ctx = panel_to_st7703(panel); @@ -226,31 +251,6 @@ static int st7703_prepare(struct drm_panel *panel) return ret; } -static const struct drm_display_mode jh057n00900_mode = { - .hdisplay = 720, - .hsync_start = 720 + 90, - .hsync_end = 720 + 90 + 20, - .htotal = 720 + 90 + 20 + 20, - .vdisplay = 1440, - .vsync_start = 1440 + 20, - .vsync_end = 1440 + 20 + 4, - .vtotal = 1440 + 20 + 4 + 12, - .vrefresh = 60, - .clock = 75276, - .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, - .width_mm = 65, - .height_mm = 130, -}; - -struct st7703_panel_desc jh057n00900_panel_desc = { - .mode = &jh057n00900_mode, - .lanes = 4, - .mode_flags = MIPI_DSI_MODE_VIDEO | - MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE, - .format = MIPI_DSI_FMT_RGB888, - .init_sequence = jh057n_init_sequence, -}; - static int st7703_get_modes(struct drm_panel *panel, struct drm_connector *connector) { -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 12/17] drm/panel: st7703: Move generic part of init sequence to enable callback

From: Ondrej Jirman <megous(a)megous.com> Calling sleep out and display on is a controller specific part of the initialization process. Move it out of the panel specific initialization function to the enable callback. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c index d03aab10cfef..cdbf7dfb4dd4 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c @@ -84,8 +84,6 @@ static inline struct st7703 *panel_to_st7703(struct drm_panel *panel) static int jh057n_init_sequence(struct st7703 *ctx) { struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); - struct device *dev = ctx->dev; - int ret; /* * Init sequence was supplied by the panel vendor. Most of the commands @@ -136,20 +134,7 @@ static int jh057n_init_sequence(struct st7703 *ctx) 0x18, 0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41, 0x37, 0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10, 0x11, 0x18); - msleep(20); - - ret = mipi_dsi_dcs_exit_sleep_mode(dsi); - if (ret < 0) { - DRM_DEV_ERROR(dev, "Failed to exit sleep mode: %d\n", ret); - return ret; - } - /* Panel is operational 120 msec after reset */ - msleep(60); - ret = mipi_dsi_dcs_set_display_on(dsi); - if (ret) - return ret; - DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n"); return 0; } @@ -181,6 +166,7 @@ struct st7703_panel_desc jh057n00900_panel_desc = { static int st7703_enable(struct drm_panel *panel) { struct st7703 *ctx = panel_to_st7703(panel); + struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev); int ret; ret = ctx->desc->init_sequence(ctx); @@ -190,6 +176,23 @@ static int st7703_enable(struct drm_panel *panel) return ret; } + msleep(20); + + ret = mipi_dsi_dcs_exit_sleep_mode(dsi); + if (ret < 0) { + DRM_DEV_ERROR(ctx->dev, "Failed to exit sleep mode: %d\n", ret); + return ret; + } + + /* Panel is operational 120 msec after reset */ + msleep(60); + + ret = mipi_dsi_dcs_set_display_on(dsi); + if (ret) + return ret; + + DRM_DEV_DEBUG_DRIVER(ctx->dev, "Panel init sequence done\n"); + return 0; } -- GitLab

GitLab Bridge on behalf of pbrobinson

8:09 a.m.

New subject: [ARK PATCH 17/17] arm64: dts: sun50i-a64-pinephone: Add touchscreen support

From: Ondrej Jirman <megous(a)megous.com> Pinephone has a Goodix GT917S capacitive touchscreen controller on I2C0 bus. Add support for it. Signed-off-by: Ondrej Jirman <megous(a)megous.com> --- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index 85a7aa5efd32..2d5694446d17 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -123,6 +123,25 @@ &ehci1 { status = "okay"; }; +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; + + touchscreen@5d { + compatible = "goodix,gt917s", "goodix,gt911"; + reg = <0x5d>; + interrupt-parent = <&pio>; + interrupts = <7 4 IRQ_TYPE_LEVEL_HIGH>; /* PH4 */ + irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + reset-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ + AVDD28-supply = <&reg_ldo_io0>; + VDDIO-supply = <&reg_ldo_io0>; + touchscreen-size-x = <720>; + touchscreen-size-y = <1440>; + }; +}; + &i2c1 { status = "okay"; -- GitLab

GitLab Bridge on behalf of Justin Forbes

Monday, 13 July Mon, 13 Jul

9:55 a.m.

From: Justin Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/509#note_37849...

...

Jeremy Cline commented: Jiri Benc jbenc(a)redhat.com commented via email: > > Shenzhen Xingbangda Display Technology Co., Ltd is a company which > produces LCD modules. It supplies the LCD panels for the PinePhone. > > Add the vendor prefix of it. > > Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> > Signed-off-by: Ondrej Jirman <megous(a)megous.com> > Acked-by: Rob Herring <robh(a)kernel.org> This is missing an upstream commit id reference. Similarly for other patches in this series. Please submit v2 with the references added. Politely, Nacked-by: Jiri Benc <jbenc(a)redhat.com>

This tree is literally based on Linus' up to date tree, upstream commit-id's don't exist in patches because if they have the upstream commit id, the patch no longer applies. Justin

Jiri Benc

10:25 a.m.

On Mon, 13 Jul 2020 14:55:15 -0000, GitLab Bridge on behalf of Justin Forbes wrote:

...

This tree is literally based on Linus' up to date tree, upstream commit-id's don't exist in patches because if they have the upstream commit id, the patch no longer applies.

I'm not sure I follow - of course the patches are not in Linus's tree but there are in some other maintainer's tree, right? As such, they do have a commit id (albeit not necessarily a stable one, depending on the maintainer; even a commit id that is going to change is still good enough for review, though). There were rare cases of maintainers not using git but keeping a series of patches manually; is it the case here? Also, the submission policy explicitly requires patches to contain upstream status and a commit id, so this shouldn't be surprising: https://cki-project.gitlab.io/kernel-ark/submitting-contributions.html#up... Jiri

Don Zickus

11:04 a.m.

On Sun, Jul 12, 2020 at 01:09:18PM -0000, GitLab Bridge on behalf of pbrobinson wrote:

...

From: pbrobinson on gitlab.com Revert the old version of the patches, apply the latest upstream version:

Hi Peter, It looks like most of your patches are git cherry-picks? If so, just using 'git cherry-pick -x' records the commit sha from the submaintainers tree and satisfies Jiri's request. Hopefully that is an easy tweak to make??? Cheers, Don

Peter Robinson

11:07 a.m.

...

On Sun, Jul 12, 2020 at 01:09:18PM -0000, GitLab Bridge on behalf of pbrobinson wrote: > From: pbrobinson on gitlab.com > > Revert the old version of the patches, apply the latest upstream > version: Hi Peter, It looks like most of your patches are git cherry-picks? If so, just using 'git cherry-pick -x' records the commit sha from the submaintainers tree and satisfies Jiri's request. Hopefully that is an easy tweak to make???

Not that I'm aware of, they were from patchwork, they were a newer version of a patch set we had already pulled in that I retrieved from the arm-kernel list patchwork, we often do that on Arm on Fedora around enablement of popular devices.

Don Zickus

12:27 p.m.

On Mon, Jul 13, 2020 at 05:07:35PM +0100, Peter Robinson wrote:

...

> On Sun, Jul 12, 2020 at 01:09:18PM -0000, GitLab Bridge on behalf of pbrobinson wrote: > > From: pbrobinson on gitlab.com > > > > Revert the old version of the patches, apply the latest upstream > > version: > > Hi Peter, > > It looks like most of your patches are git cherry-picks? If so, just using > 'git cherry-pick -x' records the commit sha from the submaintainers tree and > satisfies Jiri's request. Hopefully that is an easy tweak to make??? Not that I'm aware of, they were from patchwork, they were a newer version of a patch set we had already pulled in that I retrieved from the arm-kernel list patchwork, we often do that on Arm on Fedora around enablement of popular devices.

Ah, ok. Yeah, I discussed with Justin awhile ago, about just taking patches for Fedora from folks he trusted were taking upstream committed patches because that is the speed Fedora is used to. I will chat with Red Hat folks about what can be done to not get in the way. In general the concern is to make sure non-upstream'd accepted patches get reviewed. So pointing to upstream commits is the easiest way to reduce that concern (at least submaintainer commit ids as those will be the same in Linus's tree). Yeah, I know your arm patches have zero effect on RHEL. Patchwork patches don't have those ids, but I would think they are in an arm-next branch or something?? I will work on some ideas to not negatively impact your contributions. Thanks! Cheers, Don

Peter Robinson

12:34 p.m.

...

Well I'm been doing the arm/aarch64 kernel maintenance for around 8 years.

...

In general the concern is to make sure non-upstream'd accepted patches get reviewed.

In some cases I regularly rebase some patches that are evolving upstream, if you look at the reverted patches vs the new ones they are widely different based on upstream as the patches have evolved.

...

So pointing to upstream commits is the easiest way to reduce that concern (at least submaintainer commit ids as those will be the same in Linus's

Yes, when there is upstream I usually would, the new way of doing things is weird, do I do it in the MR, do I have to manually edit every single patch to add RHEMisms? I do this stuff in my spare time, this is laborious ATM compared to the old work flow.

...

Patchwork patches don't have those ids, but I would think they are in an arm-next branch or something??

There's a newer version of these patches upstream because the drm-misc-next where some of them have landed had other changes and they needed a rebase. In the past this was documented in the kernel.spec. > I will work on some ideas to not negatively impact your contributions. > > Thanks! > > Cheers, > Don >

Jiri Benc

Tuesday, 14 July Tue, 14 Jul

3:18 a.m.

On Mon, 13 Jul 2020 17:07:35 +0100, Peter Robinson wrote:

...

Not that I'm aware of, they were from patchwork

Could you put a link to patchwork to each particular patch? I think that would be enough to get an idea where the patches are coming from and should hopefully not be too intrusive to your scripts? Thanks, Jiri

1387

days inactive

1389

days old

kernel@lists.fedoraproject.org

Manage subscription

25 comments

5 participants

tags (0)

participants (5)

Don Zickus
GitLab Bridge on behalf of Justin Forbes
GitLab Bridge on behalf of pbrobinson
Jiri Benc
Peter Robinson

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[ARK PATCH 0/17] rebase Pinephone screen patches