WIPstaging/work

4 files changed, 25 insertions, 3 deletions

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index b5bfe2da412..46e55bfb961 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1329,10 +1329,14 @@ static void tegra_crtc_atomic_flush(struct drm_crtc *crtc)
 	struct tegra_dc *dc = to_tegra_dc(crtc);
 	u32 value;
 
+	pr_debug("> %s(crtc=%p)\n", __func__, crtc);
+
 	value = state->planes | GENERAL_ACT_REQ;
 
 	tegra_dc_writel(dc, value << 8, DC_CMD_STATE_CONTROL);
 	tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);
+
+	pr_debug("< %s()\n", __func__);
 }
 
 static const struct drm_crtc_helper_funcs tegra_crtc_helper_funcs = {
@@ -2015,12 +2019,20 @@ static int tegra_dc_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int tegra_dc_suspend(struct device *dev)
 {
-	return 0;
+	int err = 0;
+	pr_debug("> %s(dev=%p)\n", __func__, dev);
+	pr_debug("  name: %s\n", dev_name(dev));
+	pr_debug("< %s() = %d\n", __func__, err);
+	return err;
 }
 
 static int tegra_dc_resume(struct device *dev)
 {
-	return 0;
+	int err = 0;
+	pr_debug("> %s(dev=%p)\n", __func__, dev);
+	pr_debug("  name: %s\n", dev_name(dev));
+	pr_debug("< %s() = %d\n", __func__, err);
+	return err;
 }
 #endif
 
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index cbf04d44f65..c2ff0a25ab6 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1004,8 +1004,11 @@ static int host1x_drm_suspend(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
 
+	pr_debug("> %s(dev=%p)\n", __func__, dev);
+
 	drm_kms_helper_poll_disable(drm);
 
+	pr_debug("< %s()\n", __func__);
 	return 0;
 }
 
@@ -1013,8 +1016,11 @@ static int host1x_drm_resume(struct device *dev)
 {
 	struct drm_device *drm = dev_get_drvdata(dev);
 
+	pr_debug("> %s(dev=%p)\n", __func__, dev);
+
 	drm_kms_helper_poll_enable(drm);
 
+	pr_debug("< %s()\n", __func__);
 	return 0;
 }
 #endif
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 351bd01d29d..5b8d264c396 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -803,6 +803,8 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
 	unsigned long value;
 	int err = 0;
 
+	pr_debug("> %s(encoder=%p, mode=%p, adjusted=%p)\n", __func__,
+		 encoder, mode, adjusted);
 	mutex_lock(&sor->lock);
 
 	if (sor->enabled)
@@ -1224,6 +1226,8 @@ static void tegra_sor_encoder_mode_set(struct drm_encoder *encoder,
 
 unlock:
 	mutex_unlock(&sor->lock);
+
+	pr_debug("< %s()\n", __func__);
 }
 
 static void tegra_sor_encoder_disable(struct drm_encoder *encoder)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 02d6b6d2879..4889c7e13b5 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2035,7 +2035,7 @@ int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, cha
 	return -1;
 }
 
-bool console_suspend_enabled = true;
+bool console_suspend_enabled = false;
 EXPORT_SYMBOL(console_suspend_enabled);
 
 static int __init console_suspend_disable(char *str)