diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 9f6e07f8beb0d4..b1cb03a9ed422d 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -1174,6 +1174,11 @@
 				};
 				*/
 			};
+
+			zap-shader {
+				memory-region = <&zap_shader_region>;
+				firmware-name = "a508_zap.mbn";
+			};
 		};
 
 		kgsl_smmu: iommu@5040000 {
@@ -1541,7 +1546,7 @@
 		};
 
 		mdss: display-subsystem@c900000 {
-			compatible = "qcom,mdss";
+			compatible = "qcom,sdm630-mdss", "qcom,mdss";
 			reg = <0x0c900000 0x1000>,
 			      <0x0c9b0000 0x1040>;
 			reg-names = "mdss_phys", "vbif_phys";
diff --git a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
index 19a527be16ba39..e84b3da96c86ee 100644
--- a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
@@ -15,7 +15,6 @@
 /delete-node/ &qseecom_mem;
 /delete-node/ &rmtfs_mem;
 /delete-node/ &tz_mem;
-/delete-node/ &zap_shader_region;
 
 / {
 	model = "Xiaomi Redmi Note 6 Pro";
@@ -510,4 +509,4 @@
 	vdd-3.3-ch0-supply = <&vreg_l19a_3p3>;
 
 	status = "okay";
-};
\ No newline at end of file
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
index 983a1ead0b9710..adc773de7d2137 100644
--- a/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
+++ b/arch/arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts
@@ -118,6 +118,8 @@
 		reset-gpios = <&tlmm 66 GPIO_ACTIVE_HIGH>;
 		touchscreen-size-x = <1080>;
 		touchscreen-size-y = <2340>;
+
+		status = "disabled";
 	};
 };
 
@@ -140,6 +142,69 @@
 	};
 };
 
+&adreno_gpu {
+	status = "okay";
+};
+
+&gpucc{
+	status = "okay";
+};
+
+&kgsl_smmu {
+	status = "okay";
+};
+
+&mdp {
+	status = "okay";
+};
+
+&mdss {
+	status = "okay";
+};
+
+&mdss_dsi0 {
+	status = "okay";
+
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	vdd-supply = <&vreg_l1b_0p925>;
+	vdda-supply = <&vreg_l1a_1p225>;
+	panel@0 {
+		compatible = "xiaomi,lavender-td4320";
+		reg = <0>;
+
+		reset-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
+		//disp-te-gpios = <&tlmm 59 GPIO_ACTIVE_HIGH>;
+
+		backlight = <&pm660l_wled>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;
+
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&mdss_dsi0_out>;
+			};
+		};
+	};
+};
+
+&mdss_dsi0_out {
+	data-lanes = <0 1 2 3>;
+	remote-endpoint = <&panel_in>;
+};
+
+&mdss_dsi0_phy {
+	vcca-supply = <&vreg_l1b_0p925>;
+	status = "okay";
+};
+
+&mmss_smmu {
+	status = "okay";
+};
+
 &lpass_smmu {
 	status = "okay";
 };
@@ -487,6 +552,19 @@
 &tlmm {
 	gpio-reserved-ranges = <8 4>;
 
+	mdss_dsi_active: mdss_dsi_active {
+		function = "gpio";
+		pins = "gpio53";
+		drive-strength = <8>;
+		bias-disable;
+	};
+	mdss_te_active: mdss_te_active {
+		pins = "gpio59";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+
 	ts_pins_active: ts-pins-active-state {
 		pins = "gpio66", "gpio67";
 		function = "gpio";
@@ -519,7 +597,6 @@
 };
 
 &venus {
-	firmware-name = "qcom/venus-4.4/venus.mdt";
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
index f89b27c99f40cf..209c66ee2cd3d1 100644
--- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
@@ -83,6 +83,10 @@
 			opp-supported-hw = <0xff>;
 		};
 	};
+
+	zap-shader {
+		firmware-name = "a512_zap.mbn";
+	};
 };
 
 &CPU0 {
@@ -155,6 +159,8 @@
 };
 
 &mdss {
+	compatible = "qcom,sdm660-mdss", "qcom,mdss";
+
 	mdss_dsi1: dsi@c996000 {
 		compatible = "qcom,sdm660-dsi-ctrl",
 			     "qcom,mdss-dsi-ctrl";
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index e5916c10679679..2ad295ae40f4c1 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1768,7 +1768,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)
 
 	check_speed_bin(&pdev->dev);
 
-	nr_rings = 4;
+	/* NOTE: Disable preemption until it is fixed */
+	nr_rings = 1;
 
 	if (config->info->revn == 510)
 		nr_rings = 1;
diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index b52e2880ead453..f8bcde139af1b1 100644
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -882,4 +882,5 @@ config DRM_PANEL_XINPENG_XPP055C272
 	  Say Y here if you want to enable support for the Xinpeng
 	  XPP055C272 controller for 720x1280 LCD panels with MIPI/RGB/SPI
 	  system interfaces.
+source "drivers/gpu/drm/panel/msm8916-generated/Kconfig"
 endmenu
diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
index 9f5d0ba6551005..5a1ce8447510dd 100644
--- a/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@ -90,3 +90,4 @@ obj-$(CONFIG_DRM_PANEL_VISIONOX_VTDR6130) += panel-visionox-vtdr6130.o
 obj-$(CONFIG_DRM_PANEL_VISIONOX_R66451) += panel-visionox-r66451.o
 obj-$(CONFIG_DRM_PANEL_WIDECHIPS_WS2401) += panel-widechips-ws2401.o
 obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
+obj-y += msm8916-generated/
diff --git a/drivers/gpu/drm/panel/msm8916-generated/Kconfig b/drivers/gpu/drm/panel/msm8916-generated/Kconfig
new file mode 100644
index 00000000000000..1a09fd56e73854
--- /dev/null
+++ b/drivers/gpu/drm/panel/msm8916-generated/Kconfig
@@ -0,0 +1,12 @@
+menu "MSM8916 panel drivers generated with linux-mdss-dsi-panel-driver-generator"
+	depends on GPIOLIB && OF && REGULATOR
+	depends on DRM_MIPI_DSI
+
+config DRM_PANEL_MSM8916_GENERATED
+	tristate "Select all generated MSM8916 panel drivers by default"
+
+config DRM_PANEL_XIAOMI_LAVENDER_TD4320
+	tristate "Xiaomi LAVENDER TD4320"
+	default DRM_PANEL_MSM8916_GENERATED
+
+endmenu
diff --git a/drivers/gpu/drm/panel/msm8916-generated/Makefile b/drivers/gpu/drm/panel/msm8916-generated/Makefile
new file mode 100644
index 00000000000000..ea80f9d08271e9
--- /dev/null
+++ b/drivers/gpu/drm/panel/msm8916-generated/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_DRM_PANEL_XIAOMI_LAVENDER_TD4320) += panel-xiaomi-lavender-td4320.o
diff --git a/drivers/gpu/drm/panel/msm8916-generated/panel-xiaomi-lavender-td4320.c b/drivers/gpu/drm/panel/msm8916-generated/panel-xiaomi-lavender-td4320.c
new file mode 100644
index 00000000000000..359045a3b99b7f
--- /dev/null
+++ b/drivers/gpu/drm/panel/msm8916-generated/panel-xiaomi-lavender-td4320.c
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Copyright (c) 2024 FIXME
+// Generated with linux-mdss-dsi-panel-driver-generator from vendor device tree:
+//   Copyright (c) 2013, The Linux Foundation. All rights reserved. (FIXME)
+
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
+#include <linux/of.h>
+
+#include <video/mipi_display.h>
+
+#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_modes.h>
+#include <drm/drm_panel.h>
+
+struct td4320_boeplus {
+	struct drm_panel panel;
+	struct mipi_dsi_device *dsi;
+	struct gpio_desc *reset_gpio;
+	bool prepared;
+};
+
+static inline struct td4320_boeplus *to_td4320_boeplus(struct drm_panel *panel)
+{
+	return container_of(panel, struct td4320_boeplus, panel);
+}
+
+static void td4320_boeplus_reset(struct td4320_boeplus *ctx)
+{
+	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
+	usleep_range(1000, 2000);
+	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+	usleep_range(5000, 6000);
+	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
+	msleep(30);
+}
+
+static int td4320_boeplus_on(struct td4320_boeplus *ctx)
+{
+	struct mipi_dsi_device *dsi = ctx->dsi;
+	struct device *dev = &dsi->dev;
+	int ret;
+
+	dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+
+	mipi_dsi_generic_write_seq(dsi, 0xb0, 0x04);
+	mipi_dsi_generic_write_seq(dsi, 0xd6, 0x00);
+	mipi_dsi_generic_write_seq(dsi, 0xb8,
+				   0x19, 0x55, 0x00, 0xbe, 0x00, 0x00, 0x00);
+	mipi_dsi_generic_write_seq(dsi, 0xb9,
+				   0x4d, 0x55, 0x05, 0xe6, 0x00, 0x02, 0x03);
+	mipi_dsi_generic_write_seq(dsi, 0xba,
+				   0x9b, 0x5b, 0x07, 0xe6, 0x00, 0x13, 0x00);
+	mipi_dsi_generic_write_seq(dsi, 0xf9, 0x44, 0x3f, 0x00, 0x8d, 0xbf);
+	mipi_dsi_generic_write_seq(dsi, 0xce,
+				   0x5d, 0x00, 0x0f, 0x1f, 0x2f, 0x3f, 0x4f,
+				   0x5f, 0x6f, 0x7f, 0x8f, 0x9f, 0xaf, 0xbf,
+				   0xcf, 0xdf, 0xef, 0xff, 0x04, 0x00, 0x02,
+				   0x02, 0x42, 0x01, 0x69, 0x5a, 0x40, 0x40,
+				   0x00, 0x00, 0x04, 0xfa, 0x00);
+
+	ret = mipi_dsi_dcs_set_display_brightness(dsi, 0x00b8);
+	if (ret < 0) {
+		dev_err(dev, "Failed to set display brightness: %d\n", ret);
+		return ret;
+	}
+
+	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, 0x2c);
+	mipi_dsi_dcs_write_seq(dsi, MIPI_DCS_WRITE_POWER_SAVE, 0x00);
+	mipi_dsi_dcs_write_seq(dsi, 0xb0, 0x03);
+	mipi_dsi_dcs_write_seq(dsi, 0x11, 0x00);
+	msleep(96);
+	mipi_dsi_dcs_write_seq(dsi, 0x29, 0x00);
+	msleep(20);
+
+	return 0;
+}
+
+static int td4320_boeplus_off(struct td4320_boeplus *ctx)
+{
+	struct mipi_dsi_device *dsi = ctx->dsi;
+
+	dsi->mode_flags &= ~MIPI_DSI_MODE_LPM;
+
+	mipi_dsi_dcs_write_seq(dsi, 0x28, 0x00);
+	msleep(20);
+	mipi_dsi_dcs_write_seq(dsi, 0x10, 0x00);
+	msleep(120);
+
+	return 0;
+}
+
+static int td4320_boeplus_prepare(struct drm_panel *panel)
+{
+	struct td4320_boeplus *ctx = to_td4320_boeplus(panel);
+	struct device *dev = &ctx->dsi->dev;
+	int ret;
+
+	if (ctx->prepared)
+		return 0;
+
+	td4320_boeplus_reset(ctx);
+
+	ret = td4320_boeplus_on(ctx);
+	if (ret < 0) {
+		dev_err(dev, "Failed to initialize panel: %d\n", ret);
+		gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+		return ret;
+	}
+
+	ctx->prepared = true;
+	return 0;
+}
+
+static int td4320_boeplus_unprepare(struct drm_panel *panel)
+{
+	struct td4320_boeplus *ctx = to_td4320_boeplus(panel);
+	struct device *dev = &ctx->dsi->dev;
+	int ret;
+
+	if (!ctx->prepared)
+		return 0;
+
+	ret = td4320_boeplus_off(ctx);
+	if (ret < 0)
+		dev_err(dev, "Failed to un-initialize panel: %d\n", ret);
+
+	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
+
+	ctx->prepared = false;
+	return 0;
+}
+
+static const struct drm_display_mode td4320_boeplus_mode = {
+	.clock = (1080 + 86 + 2 + 100) * (2340 + 4 + 4 + 60) * 60 / 1000,
+	.hdisplay = 1080,
+	.hsync_start = 1080 + 86,
+	.hsync_end = 1080 + 86 + 2,
+	.htotal = 1080 + 86 + 2 + 100,
+	.vdisplay = 2340,
+	.vsync_start = 2340 + 4,
+	.vsync_end = 2340 + 4 + 4,
+	.vtotal = 2340 + 4 + 4 + 60,
+	.width_mm = 67,
+	.height_mm = 145,
+};
+
+static int td4320_boeplus_get_modes(struct drm_panel *panel,
+				    struct drm_connector *connector)
+{
+	struct drm_display_mode *mode;
+
+	mode = drm_mode_duplicate(connector->dev, &td4320_boeplus_mode);
+	if (!mode)
+		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 td4320_boeplus_panel_funcs = {
+	.prepare = td4320_boeplus_prepare,
+	.unprepare = td4320_boeplus_unprepare,
+	.get_modes = td4320_boeplus_get_modes,
+};
+
+static int td4320_boeplus_probe(struct mipi_dsi_device *dsi)
+{
+	struct device *dev = &dsi->dev;
+	struct td4320_boeplus *ctx;
+	int ret;
+
+	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
+	if (!ctx)
+		return -ENOMEM;
+
+	ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);
+	if (IS_ERR(ctx->reset_gpio))
+		return dev_err_probe(dev, PTR_ERR(ctx->reset_gpio),
+				     "Failed to get reset-gpios\n");
+
+	ctx->dsi = dsi;
+	mipi_dsi_set_drvdata(dsi, ctx);
+
+	dsi->lanes = 4;
+	dsi->format = MIPI_DSI_FMT_RGB888;
+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
+			  MIPI_DSI_CLOCK_NON_CONTINUOUS;
+
+	drm_panel_init(&ctx->panel, dev, &td4320_boeplus_panel_funcs,
+		       DRM_MODE_CONNECTOR_DSI);
+	ctx->panel.prepare_prev_first = true;
+
+	ret = drm_panel_of_backlight(&ctx->panel);
+	if (ret)
+		return dev_err_probe(dev, ret, "Failed to get backlight\n");
+
+	drm_panel_add(&ctx->panel);
+
+	ret = mipi_dsi_attach(dsi);
+	if (ret < 0) {
+		dev_err(dev, "Failed to attach to DSI host: %d\n", ret);
+		drm_panel_remove(&ctx->panel);
+		return ret;
+	}
+
+	return 0;
+}
+
+static void td4320_boeplus_remove(struct mipi_dsi_device *dsi)
+{
+	struct td4320_boeplus *ctx = mipi_dsi_get_drvdata(dsi);
+	int ret;
+
+	ret = mipi_dsi_detach(dsi);
+	if (ret < 0)
+		dev_err(&dsi->dev, "Failed to detach from DSI host: %d\n", ret);
+
+	drm_panel_remove(&ctx->panel);
+}
+
+static const struct of_device_id td4320_boeplus_of_match[] = {
+	{ .compatible = "xiaomi,lavender-td4320" }, // FIXME
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, td4320_boeplus_of_match);
+
+static struct mipi_dsi_driver td4320_boeplus_driver = {
+	.probe = td4320_boeplus_probe,
+	.remove = td4320_boeplus_remove,
+	.driver = {
+		.name = "panel-td4320-boeplus",
+		.of_match_table = td4320_boeplus_of_match,
+	},
+};
+module_mipi_dsi_driver(td4320_boeplus_driver);
+
+MODULE_AUTHOR("linux-mdss-dsi-panel-driver-generator <fix@me>"); // FIXME
+MODULE_DESCRIPTION("DRM driver for boe td4320 fhdplus video mode dsi panel");
+MODULE_LICENSE("GPL");
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 3491e9145f9d35..c9cfc300e1050a 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -255,6 +255,9 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
 	{ .compatible = "qcom,sc7280-mss-pil" },
 	{ .compatible = "qcom,sc8180x-mdss" },
 	{ .compatible = "qcom,sc8280xp-mdss" },
+	{ .compatible = "qcom,sdm630-mdss" },
+	{ .compatible = "qcom,sdm660-mdp5" },
+	{ .compatible = "qcom,sdm660-mdss" },
 	{ .compatible = "qcom,sdm660-mss-pil" },
 	{ .compatible = "qcom,sdm670-mdss" },
 	{ .compatible = "qcom,sdm845-mdss" },