From 27d558a1a0ab07bcf15b3ca7e816f9ed2f558e59 Mon Sep 17 00:00:00 2001
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
Date: Thu, 21 Dec 2017 21:57:35 +0000
Subject: [PATCH] drm/i915: Dump device info at once
Git-commit: 27d558a1a0ab07bcf15b3ca7e816f9ed2f558e59
Patch-mainline: v4.16-rc1
References: FATE#322643 bsc#1055900
We are dumping device info separately for sw_only and runtime part
but to simplify the code we can also do it from one place once
we complete driver load.
V2: use dedicated welcome function (Chris)
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171221185334.17396-8-michal.wajdeczko@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171221215735.30314-7-chris@chris-wilson.co.uk
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/i915/i915_drv.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -930,12 +930,6 @@ static int i915_driver_init_early(struct
intel_display_crc_init(dev_priv);
- if (drm_debug & DRM_UT_DRIVER) {
- struct drm_printer p = drm_debug_printer("i915 device info:");
-
- intel_device_info_dump(&dev_priv->info, &p);
- }
-
intel_detect_preproduction_hw(dev_priv);
return 0;
@@ -1088,11 +1082,6 @@ static int i915_driver_init_hw(struct dr
return -ENODEV;
intel_device_info_runtime_init(mkwrite_device_info(dev_priv));
- if (drm_debug & DRM_UT_DRIVER) {
- struct drm_printer p = drm_debug_printer("i915 device info:");
-
- intel_device_info_dump_runtime(&dev_priv->info, &p);
- }
intel_sanitize_options(dev_priv);
@@ -1300,6 +1289,21 @@ static void i915_driver_unregister(struc
i915_gem_shrinker_unregister(dev_priv);
}
+static void i915_welcome_messages(struct drm_i915_private *dev_priv)
+{
+ if (drm_debug & DRM_UT_DRIVER) {
+ struct drm_printer p = drm_debug_printer("i915 device info:");
+
+ intel_device_info_dump(&dev_priv->info, &p);
+ intel_device_info_dump_runtime(&dev_priv->info, &p);
+ }
+
+ if (IS_ENABLED(CONFIG_DRM_I915_DEBUG))
+ DRM_INFO("DRM_I915_DEBUG enabled\n");
+ if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
+ DRM_INFO("DRM_I915_DEBUG_GEM enabled\n");
+}
+
/**
* i915_driver_load - setup chip and create an initial config
* @pdev: PCI device
@@ -1385,13 +1389,10 @@ int i915_driver_load(struct pci_dev *pde
intel_init_ipc(dev_priv);
- if (IS_ENABLED(CONFIG_DRM_I915_DEBUG))
- DRM_INFO("DRM_I915_DEBUG enabled\n");
- if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM))
- DRM_INFO("DRM_I915_DEBUG_GEM enabled\n");
-
intel_runtime_pm_put(dev_priv);
+ i915_welcome_messages(dev_priv);
+
return 0;
out_cleanup_hw: