Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d558a1 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Dump device info at once 



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: default avatarMichal 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171221215735.30314-7-chris@chris-wilson.co.uk
parent 5fbbe8d4

drivers/gpu/drm/i915/i915_drv.c

+17 −16
Original line number Diff line number Diff line
@@ -931,12 +931,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, 


	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;
@@ -1089,11 +1083,6 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv) 
		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);
@@ -1303,6 +1292,21 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) 
	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
@@ -1388,13 +1392,10 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) 


	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: