[PATCH 21/22] Revert "debug msgs"

José Roberto de Souza jose.souza at intel.com
Tue Sep 11 22:51:18 UTC 2018


This reverts commit 2f4284d4a25100b14369c90879f6f5a4cd75f6c7.
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 31 --------------------
 drivers/gpu/drm/i915/i915_drv.c         | 39 -------------------------
 drivers/gpu/drm/i915/i915_gem.c         |  2 --
 drivers/gpu/drm/i915/i915_pci.c         |  2 --
 drivers/gpu/drm/i915/intel_fbdev.c      |  2 --
 drivers/gpu/drm/i915/intel_pm.c         |  1 -
 drivers/gpu/drm/i915/intel_runtime_pm.c | 13 +--------
 7 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d18f5923c174..b4744a68cd88 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2851,36 +2851,6 @@ static int i915_runtime_pm_status(struct seq_file *m, void *unused)
 	return 0;
 }
 
-static int i915_power_domain_hw(struct seq_file *m, void *unused)
-{
-	struct drm_i915_private *dev_priv = node_to_i915(m->private);
-	struct i915_power_domains *power_domains = &dev_priv->power_domains;
-	int i;
-
-	intel_runtime_pm_get(dev_priv);
-
-	mutex_lock(&power_domains->lock);
-	for (i = 0; i < power_domains->power_well_count; i++) {
-		struct i915_power_well *power_well;
-		bool enabled;
-
-		power_well = &power_domains->power_wells[i];
-		enabled = power_well->desc->ops->is_enabled(dev_priv,
-							    power_well);
-		seq_printf(m, "%-25s hw enabled:%s\n", power_well->desc->name,
-			   yesno(enabled));
-	}
-
-	seq_printf(m, "\tdev_priv->drm.dev->power.usage_count=%d\n", atomic_read(&dev_priv->drm.dev->power.usage_count));
-	seq_printf(m, "\tdev_priv->runtime_pm.wakeref_count=%d\n", atomic_read(&dev_priv->runtime_pm.wakeref_count));
-
-	mutex_unlock(&power_domains->lock);
-
-	intel_runtime_pm_put(dev_priv);
-
-	return 0;
-}
-
 static int i915_power_domain_info(struct seq_file *m, void *unused)
 {
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -4808,7 +4778,6 @@ static const struct drm_info_list i915_debugfs_list[] = {
 	{"i915_energy_uJ", i915_energy_uJ, 0},
 	{"i915_runtime_pm_status", i915_runtime_pm_status, 0},
 	{"i915_power_domain_info", i915_power_domain_info, 0},
-	{"i915_power_domain_hw", i915_power_domain_hw, 0},
 	{"i915_dmc_info", i915_dmc_info, 0},
 	{"i915_display_info", i915_display_info, 0},
 	{"i915_engine_info", i915_engine_info, 0},
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 53e4027b74af..f15cf3c50a93 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1363,28 +1363,6 @@ static void i915_driver_destroy(struct drm_i915_private *i915)
 	pci_set_drvdata(pdev, NULL);
 }
 
-void power_well_debug(struct drm_i915_private *dev_priv)
-{
-	struct i915_power_well *power_well;
-	bool enabled;
-
-	intel_runtime_pm_get(dev_priv);
-
-	DRM_DEBUG_KMS("power_well_debug {\n");
-	mutex_lock(&dev_priv->power_domains.lock);
-	for_each_power_well(dev_priv, power_well) {
-		enabled = power_well->desc->ops->is_enabled(dev_priv, power_well);
-		DRM_DEBUG_KMS("\t%-23s count=%d hw=%d\n", power_well->desc->name, power_well->count, enabled);
-	}
-
-	DRM_DEBUG_KMS("\tdev_priv->drm.dev->power.usage_count=%d\n", atomic_read(&dev_priv->drm.dev->power.usage_count));
-	DRM_DEBUG_KMS("\tdev_priv->runtime_pm.wakeref_count=%d\n", atomic_read(&dev_priv->runtime_pm.wakeref_count));
-	mutex_unlock(&dev_priv->power_domains.lock);
-	DRM_DEBUG_KMS("}\n");
-
-	intel_runtime_pm_put(dev_priv);
-}
-
 /**
  * i915_driver_load - setup chip and create an initial config
  * @pdev: PCI device
@@ -1460,8 +1438,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	i915_welcome_messages(dev_priv);
 
-	power_well_debug(dev_priv);
-
 	return 0;
 
 cleanup_gem:
@@ -2169,8 +2145,6 @@ static int i915_pm_prepare(struct device *kdev)
 	struct pci_dev *pdev = to_pci_dev(kdev);
 	struct drm_device *dev = pci_get_drvdata(pdev);
 
-	DRM_DEBUG_KMS("i915_pm_prepare\n");
-
 	if (!dev) {
 		dev_err(kdev, "DRM not initialized, aborting suspend.\n");
 		return -ENODEV;
@@ -2187,8 +2161,6 @@ static int i915_pm_suspend(struct device *kdev)
 	struct pci_dev *pdev = to_pci_dev(kdev);
 	struct drm_device *dev = pci_get_drvdata(pdev);
 
-	DRM_DEBUG_KMS("i915_pm_suspend\n");
-
 	if (!dev) {
 		dev_err(kdev, "DRM not initialized, aborting suspend.\n");
 		return -ENODEV;
@@ -2204,8 +2176,6 @@ static int i915_pm_suspend_late(struct device *kdev)
 {
 	struct drm_device *dev = &kdev_to_i915(kdev)->drm;
 
-	DRM_DEBUG_KMS("i915_pm_suspend_late\n");
-
 	/*
 	 * We have a suspend ordering issue with the snd-hda driver also
 	 * requiring our device to be power up. Due to the lack of a
@@ -2235,8 +2205,6 @@ static int i915_pm_resume_early(struct device *kdev)
 {
 	struct drm_device *dev = &kdev_to_i915(kdev)->drm;
 
-	DRM_DEBUG_KMS("i915_pm_resume_early\n");
-
 	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
 		return 0;
 
@@ -2247,8 +2215,6 @@ static int i915_pm_resume(struct device *kdev)
 {
 	struct drm_device *dev = &kdev_to_i915(kdev)->drm;
 
-	DRM_DEBUG_KMS("i915_pm_resume\n");
-
 	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
 		return 0;
 
@@ -2682,8 +2648,6 @@ static int intel_runtime_suspend(struct device *kdev)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	int ret;
 
-	DRM_DEBUG_KMS("i915_runtime_suspend\n");
-
 	if (WARN_ON_ONCE(!(dev_priv->gt_pm.rc6.enabled && HAS_RC6(dev_priv))))
 		return -ENODEV;
 
@@ -2780,13 +2744,10 @@ static int intel_runtime_resume(struct device *kdev)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	int ret = 0;
 
-	DRM_DEBUG_KMS("i915_runtime_resume\n");
-
 	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))
 		return -ENODEV;
 
 	DRM_DEBUG_KMS("Resuming device\n");
-	power_well_debug(dev_priv);
 
 	WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count));
 	disable_rpm_wakeref_asserts(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index c4c7d2431175..b389e084c8c6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3085,8 +3085,6 @@ i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)
 	 */
 	intel_uncore_forcewake_get(engine->i915, FORCEWAKE_ALL);
 
-	DRM_DEBUG_KMS("engine name=%s\n", engine->name);
-
 	request = engine->reset.prepare(engine);
 	if (request && request->fence.error == -EIO)
 		request = ERR_PTR(-EIO); /* Previous reset failed! */
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 2058fb69869e..de4a07841f5f 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -682,8 +682,6 @@ static void i915_pci_remove(struct pci_dev *pdev)
 {
 	struct drm_device *dev;
 
-	DRM_DEBUG_KMS("i915_pci_remove\n");
-
 	dev = pci_get_drvdata(pdev);
 	if (!dev) /* driver load aborted, nothing to cleanup */
 		return;
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index ff758b5e89c1..4627a12d8159 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -183,8 +183,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
 	void __iomem *vaddr;
 	int ret;
 
-	WARN_ON(!INTEL_INFO(dev_priv)->num_pipes);
-
 	if (intel_fb &&
 	    (sizes->fb_width > intel_fb->base.width ||
 	     sizes->fb_height > intel_fb->base.height)) {
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d031d10a202f..d550b3bd62f4 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -9316,7 +9316,6 @@ void intel_init_pm(struct drm_i915_private *dev_priv)
 	else if (IS_GEN5(dev_priv))
 		i915_ironlake_get_mem_freq(dev_priv);
 
-	// this stuff makes sense here?
 	/* For FIFO watermark updates */
 	if (INTEL_GEN(dev_priv) >= 9) {
 		skl_setup_wm_latency(dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 2fc8ebb75bd6..019100e177f7 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -978,7 +978,7 @@ static void vlv_init_display_clock_gating(struct drm_i915_private *dev_priv)
 	I915_WRITE(MI_ARB_VLV, MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE);
 	I915_WRITE(CBR1_VLV, 0);
 
-	WARN_ON(INTEL_INFO(dev_priv)->num_pipes && dev_priv->rawclk_freq == 0);
+	WARN_ON(dev_priv->rawclk_freq == 0);
 
 	I915_WRITE(RAWCLK_FREQ_VLV,
 		   DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 1000));
@@ -989,10 +989,6 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)
 	struct intel_encoder *encoder;
 	enum pipe pipe;
 
-	// TODO no need to run that
-
-	WARN_ON(!INTEL_INFO(dev_priv)->num_pipes);
-
 	/*
 	 * Enable the CRI clock source so we can get at the
 	 * display and the reference clock for VGA
@@ -1585,8 +1581,6 @@ bool intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv,
 	if (!intel_runtime_pm_get_if_in_use(dev_priv))
 		return false;
 
-	DRM_DEBUG_KMS("intel_display_power_get_if_enabled() domain=%d\n", domain);
-
 	mutex_lock(&power_domains->lock);
 
 	if (__intel_display_power_is_enabled(dev_priv, domain)) {
@@ -3150,16 +3144,11 @@ static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)
 	struct i915_power_domains *power_domains = &dev_priv->power_domains;
 	struct i915_power_well *power_well;
 
-	DRM_DEBUG_KMS("intel_power_domains_sync_hw\n");
-
 	mutex_lock(&power_domains->lock);
 	for_each_power_well(dev_priv, power_well) {
 		power_well->desc->ops->sync_hw(dev_priv, power_well);
 		power_well->hw_enabled =
 			power_well->desc->ops->is_enabled(dev_priv, power_well);
-		if (power_well->hw_enabled) {
-			DRM_DEBUG_KMS("\tpw %s hw enabled\n", power_well->desc->name);
-		}
 	}
 	mutex_unlock(&power_domains->lock);
 }
-- 
2.18.0



More information about the Intel-gfx-trybot mailing list