sunxi-6.16: move drm-sun4i-Mark-one-of-the-UI-planes-as-a-cursor-one.patch

This patch breaks the cursor display.

Author: The-going

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de2-Initialize-layer-fields-earlier.patch

@@ -17,7 +17,7 @@ Reviewed-by: Chen-Yu Tsai <[email protected]>
  2 files changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
-index fd25316a6d65..3840242dfaf3 100644
+index aa987bca1dbb..cb9b694fef10 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
 @@ -295,6 +295,11 @@ struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
@@ -29,10 +29,10 @@ index fd25316a6d65..3840242dfaf3 100644
 +	layer->channel = channel;
 +	layer->overlay = 0;
 +
- 	/* possible crtcs are set later */
- 	ret = drm_universal_plane_init(drm, &layer->plane, 0,
- 				       &sun8i_ui_layer_funcs,
-@@ -322,10 +327,6 @@ struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
+ 	if (index == 0)
+ 		type = DRM_PLANE_TYPE_PRIMARY;
+ 
+@@ -325,10 +330,6 @@ struct sun8i_layer *sun8i_ui_layer_init_one(struct drm_device *drm,
  	}
 
  	drm_plane_helper_add(&layer->plane, &sun8i_ui_layer_helper_funcs);

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de2-de3-add-mixer-version-enum.patch

@@ -1,4 +1,4 @@
-From b49e4fb3439c50eb6effc559366b3e88e2ac2f27 Mon Sep 17 00:00:00 2001
+From 90f292bafa6d6198248b7349cd9945a1258ceaac Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 29 Sep 2024 22:04:45 +1300
 Subject: drm: sun4i: de2/de3: add mixer version enum
@@ -35,10 +35,10 @@ index e12a81fa9108..2d5a2cf7cba2 100644
  				     fmt_type, encoding, range);
  		return;
 diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index fb5348388eb5..c38ea430a149 100644
+index 1b498568e7df..35b1f3d50504 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-@@ -629,7 +629,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -624,7 +624,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 
  	if (!mixer->hw_preconfigured) {
  	/* Reset registers and disable unused sub-engines */
@@ -47,87 +47,87 @@ index fb5348388eb5..c38ea430a149 100644
  		for (i = 0; i < DE3_MIXER_UNIT_SIZE; i += 4)
  			regmap_write(mixer->engine.regs, i, 0);
 
-@@ -732,6 +732,7 @@ static void sun8i_mixer_remove(struct platform_device *pdev)
+@@ -727,6 +727,7 @@ static void sun8i_mixer_remove(struct platform_device *pdev)
 
  static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.scaler_mask	= 0xf,
  	.scanline_yuv	= 2048,
  	.ui_num		= 3,
-@@ -740,6 +741,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
+@@ -735,6 +736,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
 
  static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
  	.ccsc		= CCSC_MIXER1_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.scaler_mask	= 0x3,
  	.scanline_yuv	= 2048,
  	.ui_num		= 1,
-@@ -748,6 +750,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
+@@ -743,6 +745,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
 
  static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 432000000,
  	.scaler_mask	= 0xf,
  	.scanline_yuv	= 2048,
-@@ -757,6 +760,7 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+@@ -752,6 +755,7 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
 
  static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0xf,
  	.scanline_yuv	= 2048,
-@@ -766,6 +770,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = {
+@@ -761,6 +765,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = {
 
  static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
  	.ccsc		= CCSC_MIXER1_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0x3,
  	.scanline_yuv	= 2048,
-@@ -774,6 +779,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
+@@ -769,6 +774,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
  };
 
  static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 +	.de_type = sun8i_mixer_de2,
  	.vi_num = 2,
  	.ui_num = 1,
  	.scaler_mask = 0x3,
-@@ -784,6 +790,7 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
+@@ -779,6 +785,7 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 
  static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
  	.ccsc		= CCSC_D1_MIXER0_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0x3,
  	.scanline_yuv	= 2048,
-@@ -793,6 +800,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
+@@ -788,6 +795,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
 
  static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = {
  	.ccsc		= CCSC_MIXER1_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0x1,
  	.scanline_yuv	= 1024,
-@@ -802,6 +810,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = {
+@@ -797,6 +805,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = {
 
  static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0xf,
  	.scanline_yuv	= 4096,
-@@ -811,6 +820,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
+@@ -806,6 +815,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
 
  static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
  	.ccsc		= CCSC_MIXER1_LAYOUT,
 +	.de_type	= sun8i_mixer_de2,
  	.mod_rate	= 297000000,
  	.scaler_mask	= 0x3,
  	.scanline_yuv	= 2048,
-@@ -820,7 +830,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
+@@ -815,7 +825,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
 
  static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
@@ -253,5 +253,5 @@ index 2e49a6e5f1f1..aa346c3beb30 100644
 
  		if (format->hsub == 1 && format->vsub == 1)
 -- 
-2.35.3
+2.51.0
 

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de2-de3-refactor-mixer-initialisation.patch

@@ -1,4 +1,4 @@
-From 52a7d96a033601a9cee79fe217e895cfb860b872 Mon Sep 17 00:00:00 2001
+From 4042b1c4ed4e1cfe9170cbb57d49e13f419afa3d Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 29 Sep 2024 22:04:46 +1300
 Subject: drm: sun4i: de2/de3: refactor mixer initialisation
@@ -14,10 +14,10 @@ Reviewed-by: Andre Przywara <[email protected]>
  1 file changed, 38 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index c38ea430a149..0419859a9f89 100644
+index 35b1f3d50504..6d26381a2f2b 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-@@ -503,6 +503,42 @@ static int sun8i_mixer_of_get_id(struct device_node *node)
+@@ -498,6 +498,42 @@ static int sun8i_mixer_of_get_id(struct device_node *node)
  	return of_ep.id;
  }
 
@@ -60,7 +60,7 @@ index c38ea430a149..0419859a9f89 100644
  static int sun8i_mixer_bind(struct device *dev, struct device *master,
  			      void *data)
  {
-@@ -511,8 +547,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -506,8 +542,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
  	struct sun4i_drv *drv = drm->dev_private;
  	struct sun8i_mixer *mixer;
  	void __iomem *regs;
@@ -69,7 +69,7 @@ index c38ea430a149..0419859a9f89 100644
  	int i, ret;
 
  	/*
-@@ -625,8 +659,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -620,8 +654,6 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 
  	list_add_tail(&mixer->engine.list, &drv->engine_list);
 
@@ -78,7 +78,7 @@ index c38ea430a149..0419859a9f89 100644
  	if (!mixer->hw_preconfigured) {
  	/* Reset registers and disable unused sub-engines */
  	if (mixer->cfg->de_type == sun8i_mixer_de3) {
-@@ -643,7 +675,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -638,7 +670,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
  		regmap_write(mixer->engine.regs, SUN50I_MIXER_FMT_EN, 0);
  		regmap_write(mixer->engine.regs, SUN50I_MIXER_CDC0_EN, 0);
  		regmap_write(mixer->engine.regs, SUN50I_MIXER_CDC1_EN, 0);
@@ -87,7 +87,7 @@ index c38ea430a149..0419859a9f89 100644
  		for (i = 0; i < DE2_MIXER_UNIT_SIZE; i += 4)
  			regmap_write(mixer->engine.regs, i, 0);
 
-@@ -656,35 +688,9 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -651,35 +683,9 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
  		regmap_write(mixer->engine.regs, SUN8I_MIXER_DCSC_EN, 0);
  	}
 

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de3-add-YUV-support-to-the-DE3-mixer.patch

@@ -1,4 +1,4 @@
-From 1a66bdf301ea483f5c3993fb6795bc0236bab5c1 Mon Sep 17 00:00:00 2001
+From 681152c96fe02df6fb36ecef2fed562511d871fe Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 29 Sep 2024 22:04:40 +1300
 Subject: drm: sun4i: de3: add YUV support to the DE3 mixer
@@ -17,7 +17,7 @@ Signed-off-by: Ryan Walklin <[email protected]>
  2 files changed, 52 insertions(+)
 
 diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index 45a218121310..fb5348388eb5 100644
+index fe1b58004a7b..1b498568e7df 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
 @@ -23,8 +23,11 @@
@@ -32,7 +32,7 @@ index 45a218121310..fb5348388eb5 100644
  #include "sun8i_mixer.h"
  #include "sun8i_ui_layer.h"
  #include "sun8i_vi_layer.h"
-@@ -425,12 +428,52 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
+@@ -420,12 +423,52 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
 
  	DRM_DEBUG_DRIVER("Switching display mixer interlaced mode %s\n",
  			 interlaced ? "on" : "off");
@@ -85,7 +85,7 @@ index 45a218121310..fb5348388eb5 100644
  };
 
  static const struct regmap_config sun8i_mixer_regmap_config = {
-@@ -492,6 +535,10 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -487,6 +530,10 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
  	mixer->engine.ops = &sun8i_engine_ops;
  	mixer->engine.node = dev->of_node;
  	mixer->drv = drv;

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de3-add-formatter-flag-to-mixer-config.patch

@@ -1,4 +1,4 @@
-From 67de80fb6dce1b60822731628cba536c07fa2e10 Mon Sep 17 00:00:00 2001
+From 56afb6bff57f83073c83a49f6f6bccf387ab8116 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 29 Sep 2024 22:04:39 +1300
 Subject: drm: sun4i: de3: add formatter flag to mixer config
@@ -17,10 +17,10 @@ Signed-off-by: Ryan Walklin <[email protected]>
  2 files changed, 3 insertions(+)
 
 diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index 20a78d48ccdf..45a218121310 100644
+index fbfa7e6a25aa..fe1b58004a7b 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-@@ -774,6 +774,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
+@@ -769,6 +769,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
  static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
  	.ccsc		= CCSC_MIXER0_LAYOUT,
  	.is_de3		= true,

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-de33-mixer-add-Display-Engine-3.3-DE33-support.patch

@@ -1,4 +1,4 @@
-From 66c111f3315d2c34c2f9bfb39de61bf3ec46a5f6 Mon Sep 17 00:00:00 2001
+From bbbfdc8bc71a4d5a6fb291aae3027f40dd999816 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <[email protected]>
 Date: Sun, 29 Sep 2024 22:04:55 +1300
 Subject: drm: sun4i: de33: mixer: add Display Engine 3.3 (DE33) support
@@ -26,7 +26,7 @@ Signed-off-by: Ryan Walklin <[email protected]>
  2 files changed, 108 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
-index a319db11cc68..bfed8a6b453f 100644
+index f05017443565..53143646fc1c 100644
 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
 +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
 @@ -351,8 +351,12 @@ static void sun8i_mixer_commit(struct sunxi_engine *engine,
@@ -44,7 +44,7 @@ index a319db11cc68..bfed8a6b453f 100644
  }
 
  static struct drm_plane **sun8i_layers_init(struct drm_device *drm,
-@@ -406,25 +410,33 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
+@@ -401,25 +405,33 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
  				 const struct drm_display_mode *mode)
  {
  	struct sun8i_mixer *mixer = engine_to_sun8i_mixer(engine);
@@ -81,7 +81,7 @@ index a319db11cc68..bfed8a6b453f 100644
  			   SUN8I_MIXER_BLEND_OUTCTL_INTERLACED, val);
 
  	DRM_DEBUG_DRIVER("Switching display mixer interlaced mode %s\n",
-@@ -435,10 +447,8 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
+@@ -430,10 +442,8 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
  	else
  		val = 0xff108080;
 
@@ -94,7 +94,7 @@ index a319db11cc68..bfed8a6b453f 100644
 
  	if (mixer->cfg->has_formatter)
  		sun50i_fmt_setup(mixer, mode->hdisplay,
-@@ -478,12 +488,29 @@ static const struct sunxi_engine_ops sun8i_engine_ops = {
+@@ -473,12 +483,29 @@ static const struct sunxi_engine_ops sun8i_engine_ops = {
  };
 
  static const struct regmap_config sun8i_mixer_regmap_config = {
@@ -124,7 +124,7 @@ index a319db11cc68..bfed8a6b453f 100644
  static int sun8i_mixer_of_get_id(struct device_node *node)
  {
  	struct device_node *ep, *remote;
-@@ -506,36 +533,48 @@ static int sun8i_mixer_of_get_id(struct device_node *node)
+@@ -501,36 +528,48 @@ static int sun8i_mixer_of_get_id(struct device_node *node)
 
  static void sun8i_mixer_init(struct sun8i_mixer *mixer)
  {
@@ -179,7 +179,7 @@ index a319db11cc68..bfed8a6b453f 100644
  			   SUN8I_MIXER_BLEND_PIPE_CTL_EN_MSK, 0);
  	}
  }
-@@ -618,6 +657,30 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
+@@ -613,6 +652,30 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
  		return PTR_ERR(mixer->engine.regs);
  	}
 
@@ -210,7 +210,7 @@ index a319db11cc68..bfed8a6b453f 100644
  	mixer->reset = devm_reset_control_get(dev, NULL);
  	if (IS_ERR(mixer->reset)) {
  		dev_err(dev, "Couldn't get our reset line\n");
-@@ -846,6 +909,18 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
+@@ -841,6 +904,18 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
  	.vi_num		= 1,
  };
 
@@ -229,7 +229,7 @@ index a319db11cc68..bfed8a6b453f 100644
  static const struct of_device_id sun8i_mixer_of_table[] = {
  	{
  		.compatible = "allwinner,sun8i-a83t-de2-mixer-0",
-@@ -891,6 +966,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
+@@ -886,6 +961,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
  		.compatible = "allwinner,sun50i-h6-de3-mixer-0",
  		.data = &sun50i_h6_mixer0_cfg,
  	},
@@ -301,5 +301,5 @@ index ecba096c553b..f67f4b124a19 100644
  	else
  		return DE2_CH_BASE + channel * DE2_CH_SIZE;
 -- 
-2.35.3
+2.51.0