Merge tag 'LA.UM.9.14.r1-20500.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers into android12-5.4-lahaina

"LA.UM.9.14.r1-20500.01-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-20500.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers:
  disp: msm: add msm framebuffer emulation
  makefile: add gki config support for display techpack for kona
  Revert "disp: msm: dsi: Add DSI PLL support for 7nm_v4_1 arch"
  disp: msm: dsi: Add DSI PLL support for 7nm_v4_1 arch
  disp: msm: sde: disable dsi ctrl regulator during deepsleep
  disp: msm: sde: update uidle ctl register only for master encoder
  disp: msm: avoid minidump region addition for mdss register dumps
  disp: msm: add skip panel power off dt property

Change-Id: I1ade9627b3ade718cb923b0ca23031fc9e639808

techpack/display/Makefile

@@ -2,11 +2,13 @@
 
 # auto-detect subdirs
 ifeq ($(CONFIG_ARCH_KONA), y)
-include $(srctree)/techpack/display/config/konadisp.conf
-endif
-
-ifeq ($(CONFIG_ARCH_KONA), y)
+     ifeq ($(CONFIG_QGKI), y)
+		include $(srctree)/techpack/display/config/konadisp.conf
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/konadispconf.h
+     else
+		include $(srctree)/techpack/display/config/gki_konadisp.conf
+LINUXINCLUDE    += -include $(srctree)/techpack/display/config/gki_konadispconf.h
+     endif
 endif
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)

techpack/display/config/gki_konadisp.conf

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+export CONFIG_DRM_MSM=y
+export CONFIG_DRM_MSM_SDE=y
+export CONFIG_SYNC_FILE=y
+export CONFIG_DRM_MSM_DSI=y
+export CONFIG_DRM_MSM_DP=y
+export CONFIG_QCOM_MDSS_DP_PLL=y
+export CONFIG_DSI_PARSER=y
+export CONFIG_DRM_SDE_WB=y
+export CONFIG_DRM_MSM_REGISTER_LOGGING=y
+export CONFIG_QCOM_MDSS_PLL=y
+export CONFIG_MSM_SDE_ROTATOR=y
+export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
+export CONFIG_DRM_SDE_RSC=y
+export CONFIG_DISPLAY_BUILD=m

techpack/display/config/gki_konadispconf.h

@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#define CONFIG_DRM_MSM 1
+#define CONFIG_DRM_MSM_SDE 1
+#define CONFIG_SYNC_FILE 1
+#define CONFIG_DRM_MSM_DSI 1
+#define CONFIG_DRM_MSM_DP 1
+#define CONFIG_QCOM_MDSS_DP_PLL 1
+#define CONFIG_DSI_PARSER 1
+#define CONFIG_DRM_SDE_WB 1
+#define CONFIG_DRM_MSM_REGISTER_LOGGING 1
+#define CONFIG_DRM_SDE_EVTLOG_DEBUG 1
+#define CONFIG_QCOM_MDSS_PLL 1
+#define CONFIG_GKI_DISPLAY 1
+#define CONFIG_MSM_SDE_ROTATOR 1
+#define CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG 1
+#define CONFIG_DRM_SDE_RSC 1
+

techpack/display/config/konadisp.conf

@@ -11,3 +11,4 @@ export CONFIG_QCOM_MDSS_PLL=y
 export CONFIG_MSM_SDE_ROTATOR=y
 export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
 export CONFIG_DRM_SDE_RSC=y
+export CONFIG_DISPLAY_BUILD=y

techpack/display/msm/dsi/dsi_display.c

@@ -2455,6 +2455,63 @@ void dsi_display_enable_event(struct drm_connector *connector,
 	}
 }
 
+int dsi_display_ctrl_vreg_on(struct dsi_display *display)
+{
+	int rc = 0;
+	int i;
+	struct dsi_display_ctrl *ctrl;
+	struct dsi_ctrl *dsi_ctrl;
+
+	display_for_each_ctrl(i, display) {
+		ctrl = &display->ctrl[i];
+		if (!ctrl->ctrl)
+			continue;
+
+		dsi_ctrl = ctrl->ctrl;
+		if (dsi_ctrl->current_state.host_initialized) {
+			rc = dsi_pwr_enable_regulator(
+					&dsi_ctrl->pwr_info.host_pwr, true);
+			if (rc) {
+				DSI_ERR("[%s] Failed to enable vreg, rc=%d\n",
+				       dsi_ctrl->name, rc);
+				goto error;
+			}
+			DSI_DEBUG("[%s] Enable ctrl vreg\n", dsi_ctrl->name);
+		}
+	}
+error:
+	return rc;
+}
+
+int dsi_display_ctrl_vreg_off(struct dsi_display *display)
+{
+	int rc = 0;
+	int i;
+	struct dsi_display_ctrl *ctrl;
+	struct dsi_ctrl *dsi_ctrl;
+
+	display_for_each_ctrl(i, display) {
+		ctrl = &display->ctrl[i];
+		if (!ctrl->ctrl)
+			continue;
+
+		dsi_ctrl = ctrl->ctrl;
+		if (dsi_ctrl->current_state.host_initialized) {
+			rc = dsi_pwr_enable_regulator(
+				&dsi_ctrl->pwr_info.host_pwr, false);
+			if (rc) {
+				DSI_ERR("[%s] Failed to disable vreg, rc=%d\n",
+				       dsi_ctrl->name, rc);
+				goto error;
+			}
+			DSI_DEBUG("[%s] Disable ctrl vreg\n", dsi_ctrl->name);
+		}
+	}
+error:
+	return rc;
+}
+
+
 static int dsi_display_ctrl_power_on(struct dsi_display *display)
 {
 	int rc = 0;
@@ -4204,6 +4261,9 @@ static int dsi_display_parse_dt(struct dsi_display *display)
 	display->needs_clk_src_reset = of_property_read_bool(of_node,
 				"qcom,needs-clk-src-reset");
 
+	display->needs_ctrl_vreg_disable = of_property_read_bool(of_node,
+				"qcom,needs-ctrl-vreg-disable");
+
 	/* Parse all external bridges from port 0 */
 	display_for_each_ctrl(i, display) {
 		display->ext_bridge[i].node_of =

techpack/display/msm/dsi/dsi_display.h

@@ -215,6 +215,7 @@ struct dsi_display {
 	bool is_te_irq_enabled;
 	struct completion esd_te_gate;
 	bool needs_clk_src_reset;
+	bool needs_ctrl_vreg_disable;
 
 	u32 ctrl_count;
 	struct dsi_display_ctrl ctrl[MAX_DSI_CTRLS_PER_DISPLAY];
@@ -817,4 +818,21 @@ int dsi_display_unset_clk_src(struct dsi_display *display);
  * Return: Zero on Success
  */
 int dsi_display_set_clk_src(struct dsi_display *display);
+
+/**
+ * dsi_display_ctrl_vreg_on() - enable dsi ctrl regulator
+ * @display:         Handle to display
+ *
+ * Return: Zero on Success
+ */
+int dsi_display_ctrl_vreg_on(struct dsi_display *display);
+
+/**
+ * dsi_display_ctrl_vreg_off() - disable dsi ctrl regulator
+ * @display:         Handle to display
+ *
+ * Return: Zero on Success
+ */
+int dsi_display_ctrl_vreg_off(struct dsi_display *display);
+
 #endif /* _DSI_DISPLAY_H_ */

techpack/display/msm/dsi/dsi_panel.c

@@ -379,7 +379,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 {
 	int rc = 0;
 
-	if (panel->is_twm_en) {
+	if (panel->is_twm_en || panel->skip_panel_off) {
 		DSI_DEBUG("TWM Enabled, skip panel power off\n");
 		return rc;
 	}
@@ -2085,6 +2085,9 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->reset_gpio_always_on = utils->read_bool(utils->data,
 			"qcom,platform-reset-gpio-always-on");
 
+	panel->skip_panel_off = utils->read_bool(utils->data,
+			"qcom,skip-panel-power-off");
+
 	panel->spr_info.enable = false;
 	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;
 

techpack/display/msm/dsi/dsi_panel.h

@@ -245,6 +245,7 @@ struct dsi_panel {
 	atomic_t esd_recovery_pending;
 
 	bool is_twm_en;
+	bool skip_panel_off;
 	bool panel_initialized;
 	bool te_using_watchdog_timer;
 	struct dsi_qsync_capabilities qsync_caps;

techpack/display/msm/msm_fbdev.c

@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ */
+
+#include <drm/drm_crtc.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+
+#include "msm_drv.h"
+#include "msm_kms.h"
+
+extern int msm_gem_mmap_obj(struct drm_gem_object *obj,
+					struct vm_area_struct *vma);
+static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma);
+
+/*
+ * fbdev funcs, to implement legacy fbdev interface on top of drm driver
+ */
+
+#define to_msm_fbdev(x) container_of(x, struct msm_fbdev, base)
+
+struct msm_fbdev {
+	struct drm_fb_helper base;
+	struct drm_framebuffer *fb;
+};
+
+static struct fb_ops msm_fb_ops = {
+	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
+
+	/* Note: to properly handle manual update displays, we wrap the
+	 * basic fbdev ops which write to the framebuffer
+	 */
+	.fb_read = drm_fb_helper_sys_read,
+	.fb_write = drm_fb_helper_sys_write,
+	.fb_fillrect = drm_fb_helper_sys_fillrect,
+	.fb_copyarea = drm_fb_helper_sys_copyarea,
+	.fb_imageblit = drm_fb_helper_sys_imageblit,
+	.fb_mmap = msm_fbdev_mmap,
+};
+
+static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
+{
+	struct drm_fb_helper *helper = (struct drm_fb_helper *)info->par;
+	struct msm_fbdev *fbdev = to_msm_fbdev(helper);
+	struct drm_gem_object *bo = msm_framebuffer_bo(fbdev->fb, 0);
+	int ret = 0;
+
+	ret = drm_gem_mmap_obj(bo, bo->size, vma);
+	if (ret) {
+		pr_err("%s:drm_gem_mmap_obj fail\n", __func__);
+		return ret;
+	}
+
+	return msm_gem_mmap_obj(bo, vma);
+}
+
+static int msm_fbdev_create(struct drm_fb_helper *helper,
+		struct drm_fb_helper_surface_size *sizes)
+{
+	struct msm_fbdev *fbdev = to_msm_fbdev(helper);
+	struct drm_device *dev = helper->dev;
+	struct msm_drm_private *priv = dev->dev_private;
+	struct drm_framebuffer *fb = NULL;
+	struct drm_gem_object *bo;
+	struct fb_info *fbi = NULL;
+	uint64_t paddr;
+	uint32_t format;
+	int ret, pitch;
+
+	format = drm_mode_legacy_fb_format(sizes->surface_bpp, sizes->surface_depth);
+
+	DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
+			sizes->surface_height, sizes->surface_bpp,
+			sizes->fb_width, sizes->fb_height);
+
+	pitch = align_pitch(sizes->surface_width, sizes->surface_bpp);
+	fb = msm_alloc_stolen_fb(dev, sizes->surface_width,
+			sizes->surface_height, pitch, format);
+
+	if (IS_ERR(fb)) {
+		DRM_DEV_ERROR(dev->dev, "failed to allocate fb\n");
+		return PTR_ERR(fb);
+	}
+
+	bo = msm_framebuffer_bo(fb, 0);
+
+	mutex_lock(&dev->struct_mutex);
+
+	/*
+	 * NOTE: if we can be guaranteed to be able to map buffer
+	 * in panic (ie. lock-safe, etc) we could avoid pinning the
+	 * buffer now:
+	 */
+	ret = msm_gem_get_and_pin_iova(bo, priv->kms->aspace, &paddr);
+	if (ret) {
+		DRM_DEV_ERROR(dev->dev, "failed to get buffer obj iova: %d\n", ret);
+		goto fail_unlock;
+	}
+
+	fbi = drm_fb_helper_alloc_fbi(helper);
+	if (IS_ERR(fbi)) {
+		DRM_DEV_ERROR(dev->dev, "failed to allocate fb info\n");
+		ret = PTR_ERR(fbi);
+		goto fail_unlock;
+	}
+
+	DBG("fbi=%pK, dev=%pK", fbi, dev);
+
+	fbdev->fb = fb;
+	helper->fb = fb;
+
+	fbi->fbops = &msm_fb_ops;
+
+	drm_fb_helper_fill_info(fbi, helper, sizes);
+
+	dev->mode_config.fb_base = paddr;
+
+	fbi->screen_base = msm_gem_get_vaddr(bo);
+	if (IS_ERR(fbi->screen_base)) {
+		ret = PTR_ERR(fbi->screen_base);
+		goto fail_unlock;
+	}
+	fbi->screen_size = bo->size;
+	fbi->fix.smem_start = paddr;
+	fbi->fix.smem_len = bo->size;
+
+	DBG("par=%pK, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
+	DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
+
+	mutex_unlock(&dev->struct_mutex);
+
+	return 0;
+
+fail_unlock:
+	mutex_unlock(&dev->struct_mutex);
+	drm_framebuffer_remove(fb);
+	return ret;
+}
+
+static const struct drm_fb_helper_funcs msm_fb_helper_funcs = {
+	.fb_probe = msm_fbdev_create,
+};
+
+/* initialize fbdev helper */
+struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
+{
+	struct msm_drm_private *priv = dev->dev_private;
+	struct msm_fbdev *fbdev = NULL;
+	struct drm_fb_helper *helper;
+	int ret;
+
+	fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
+	if (!fbdev)
+		goto fail;
+
+	helper = &fbdev->base;
+
+	drm_fb_helper_prepare(dev, helper, &msm_fb_helper_funcs);
+
+	ret = drm_fb_helper_init(dev, helper, priv->num_connectors);
+	if (ret) {
+		DRM_DEV_ERROR(dev->dev, "could not init fbdev: ret=%d\n", ret);
+		goto fail;
+	}
+
+	ret = drm_fb_helper_single_add_all_connectors(helper);
+	if (ret)
+		goto fini;
+
+	/* the fw fb could be anywhere in memory */
+	drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false);
+
+	ret = drm_fb_helper_initial_config(helper, 32);
+	if (ret)
+		goto fini;
+
+	priv->fbdev = helper;
+
+	return helper;
+
+fini:
+	drm_fb_helper_fini(helper);
+fail:
+	kfree(fbdev);
+	return NULL;
+}
+
+void msm_fbdev_free(struct drm_device *dev)
+{
+	struct msm_drm_private *priv = dev->dev_private;
+	struct drm_fb_helper *helper = priv->fbdev;
+	struct msm_fbdev *fbdev;
+
+	DBG();
+
+	drm_fb_helper_unregister_fbi(helper);
+
+	drm_fb_helper_fini(helper);
+
+	fbdev = to_msm_fbdev(priv->fbdev);
+
+	/* this will free the backing object */
+	if (fbdev->fb) {
+		struct drm_gem_object *bo =
+			msm_framebuffer_bo(fbdev->fb, 0);
+		msm_gem_put_vaddr(bo);
+		drm_framebuffer_remove(fbdev->fb);
+	}
+
+	kfree(fbdev);
+
+	priv->fbdev = NULL;
+}

techpack/display/msm/sde/sde_encoder.c

@@ -141,7 +141,10 @@ void sde_encoder_uidle_enable(struct drm_encoder *drm_enc, bool enable)
 	for (i = 0; i < sde_enc->num_phys_encs; i++) {
 		struct sde_encoder_phys *phys = sde_enc->phys_encs[i];
 
-		if (phys && phys->hw_ctl && phys->hw_ctl->ops.uidle_enable) {
+		if (phys && phys->hw_ctl && phys->hw_ctl->ops.uidle_enable &&
+				phys->split_role != ENC_ROLE_SLAVE) {
+			if (enable)
+				SDE_EVT32(DRMID(drm_enc), enable);
 			phys->hw_ctl->ops.uidle_enable(phys->hw_ctl, enable);
 		}
 	}

techpack/display/msm/sde/sde_kms.c

@@ -3715,38 +3715,51 @@ void sde_kms_display_early_wakeup(struct drm_device *dev,
 }
 
 #ifdef CONFIG_DEEPSLEEP
-static int _sde_kms_pm_set_clk_src(struct sde_kms *sde_kms, bool enable)
+static int _sde_kms_pm_deepsleep_helper(struct sde_kms *sde_kms, bool enter)
 {
 	int i, rc = 0;
 	void *display;
 	struct dsi_display *dsi_display;
 
-	if (mem_sleep_current == PM_SUSPEND_MEM) {
-		SDE_INFO("Deepsleep\n");
+	if (mem_sleep_current != PM_SUSPEND_MEM)
+		return 0;
 
-		for (i = 0; i < sde_kms->dsi_display_count; i++) {
-			display = sde_kms->dsi_displays[i];
-			dsi_display = (struct dsi_display *)display;
+	SDE_INFO("Deepsleep : enter %d\n", enter);
 
-			if (!dsi_display->needs_clk_src_reset)
-				continue;
+	for (i = 0; i < sde_kms->dsi_display_count; i++) {
+		display = sde_kms->dsi_displays[i];
+		dsi_display = (struct dsi_display *)display;
 
-			if (enable)
-				rc = dsi_display_set_clk_src(dsi_display);
-			else
-				rc = dsi_display_unset_clk_src(dsi_display);
 
-			if (rc) {
-				SDE_ERROR("failed to set clks rc:%d\n", rc);
-				return rc;
-			}
+		if (enter) {
+			/* During deepsleep, clk_parent are reset at HW
+			 * but sw caching is retained in clk framework. To
+			 * maintain same state. unset parents and restore
+			 * during exit.
+			 */
+			if (dsi_display->needs_clk_src_reset)
+				(void)dsi_display_unset_clk_src(dsi_display);
+
+			/* DSI ctrl regulator can be disabled, even in static
+			 * screen, during deepsleep
+			 */
+			if (dsi_display->needs_ctrl_vreg_disable)
+				(void)dsi_display_ctrl_vreg_off(dsi_display);
+		} else {
+			if (dsi_display->needs_ctrl_vreg_disable)
+				(void)dsi_display_ctrl_vreg_on(dsi_display);
+
+			if (dsi_display->needs_clk_src_reset)
+				(void)dsi_display_set_clk_src(dsi_display);
+
 		}
 	}
 
 	return rc;
 }
 #else
-static inline int _sde_kms_pm_set_clk_src(struct sde_kms *sde_kms, bool enable)
+static inline int _sde_kms_pm_deepsleep_helper(struct sde_kms *sde_kms,
+					bool enter)
 {
 	return 0;
 }
@@ -3943,8 +3956,7 @@ unlock:
 	pm_runtime_put_sync(dev);
 	pm_runtime_get_noresume(dev);
 
-	/* reset clock source based on PM suspend state */
-	_sde_kms_pm_set_clk_src(sde_kms, false);
+	_sde_kms_pm_deepsleep_helper(sde_kms, true);
 
 	/* dump clock state before entering suspend */
 	if (sde_kms->pm_suspend_clk_dump)
@@ -3983,8 +3995,8 @@ retry:
 		goto end;
 	}
 
-	/* reset clock source based on PM suspend state */
-	_sde_kms_pm_set_clk_src(sde_kms, true);
+	/* If coming out of deepsleep, restore resources.*/
+	_sde_kms_pm_deepsleep_helper(sde_kms, false);
 
 	sde_kms->suspend_block = false;