From 0a70f564a052c491b12770d1218a2d8dd8b71924 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Mon, 29 Jun 2020 09:53:54 -0500
Subject: Add patches from stabilization

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 ...t7703-Prepare-for-supporting-multiple-pan.patch | 129 +++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 0006-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch

(limited to '0006-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch')

diff --git a/0006-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch b/0006-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch
new file mode 100644
index 000000000..8436ea3cb
--- /dev/null
+++ b/0006-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch
@@ -0,0 +1,129 @@
+From 19802e031428f7cf967259fdf8794a971164a44a Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman <megous@megous.com>
+Date: Fri, 26 Jun 2020 02:55:54 +0200
+Subject: [PATCH 06/13] 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 511af659f273b..08cbc316266c1 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
+
-- 
cgit