aa5ab7f890
* Mon Jul 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc5.1] - v5.8-rc5 rebase - arm64: dts: sun50i-a64-pinephone: Add touchscreen support (Ondrej Jirman) - arm64: dts: sun50i-a64-pinephone: Enable LCD support on PinePhone (Icenowy Zheng) - drm/panel: st7703: Assert reset prior to powering down the regulators (Ondrej Jirman) - drm/panel: st7703: Enter sleep after display off (Ondrej Jirman) - drm/panel: st7703: Add support for Xingbangda XBD599 (Ondrej Jirman) - drm/panel: st7703: Move generic part of init sequence to enable callback (Ondrej Jirman) - drm/panel: st7703: Move code specific to jh057n closer together (Ondrej Jirman) - drm/panel: st7703: Prepare for supporting multiple panels (Ondrej Jirman) - drm/panel: st7703: Rename functions from jh057n prefix to st7703 (Ondrej Jirman) - drm/panel: rocktech-jh057n00900: Rename the driver to st7703 (Ondrej Jirman) - dt-bindings: panel: Add compatible for Xingbangda XBD599 panel (Ondrej Jirman) - dt-bindings: panel: Convert rocktech, jh057n00900 to yaml (Ondrej Jirman) - dt-bindings: vendor-prefixes: Add Xingbangda (Icenowy Zheng) - Revert "arm64: allwinner: dts: a64: add LCD-related device nodes for PinePhone" (Peter Robinson) - Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation" (Peter Robinson) - Revert "drm: panel: add Xingbangda XBD599 panel" (Peter Robinson) - Revert "dt-bindings: panel: add binding for Xingbangda XBD599 panel" (Peter Robinson) - selinux: allow reading labels before policy is loaded (Jonathan Lebon) - Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only (Peter Robinson) - Update config for renamed panel driver. (Peter Robinson) - Enable SERIAL_SC16IS7XX for SPI interfaces (Peter Robinson) - Updated changelog for the release based on dcde237b9b0e (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
129 lines
4.1 KiB
Diff
129 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megous@megous.com>
|
|
Date: Fri, 26 Jun 2020 02:55:54 +0200
|
|
Subject: [PATCH] drm/panel: st7703: Prepare for supporting multiple panels
|
|
|
|
Parametrize the driver so that it can support more panels based
|
|
on st7703 controller.
|
|
|
|
Signed-off-by: Ondrej Jirman <megous@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);
|
|
--
|
|
2.26.2
|
|
|