drm/i915: combine device info printing into one

We'll be moving info between static and runtime info. Combine the
printing functions into one to keep the output sensible and (mostly)
unchanged in the process.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Maarten Lankhort <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8579bfe0fcc5ee8390d4cded68a0167a618097f5.1660910433.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 94e5c29d2ee3af52354a842258644befc222f7a5..d131703de3d9f3af3ec7703047555857aa19e1ad 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -66,8 +66,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
 
        seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915));
 
-       intel_device_info_print_static(INTEL_INFO(i915), &p);
-       intel_device_info_print_runtime(RUNTIME_INFO(i915), &p);
+       intel_device_info_print(INTEL_INFO(i915), RUNTIME_INFO(i915), &p);
        i915_print_iommu_status(i915, &p);
        intel_gt_info_print(&to_gt(i915)->info, &p);
        intel_driver_caps_print(&i915->caps, &p);

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index deb8a8b76965a19bbd8fba1f24bd30e9f198d524..563797d5e6e18ceada9d14fae07a861641fa8953 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -793,8 +793,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
                                             INTEL_INFO(dev_priv)->platform),
                           GRAPHICS_VER(dev_priv));
 
-               intel_device_info_print_static(INTEL_INFO(dev_priv), &p);
-               intel_device_info_print_runtime(RUNTIME_INFO(dev_priv), &p);
+               intel_device_info_print(INTEL_INFO(dev_priv),
+                                       RUNTIME_INFO(dev_priv), &p);
                i915_print_iommu_status(dev_priv, &p);
                intel_gt_info_print(&to_gt(dev_priv)->info, &p);
        }

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 32e92651ef7c25b6c534462862fdf9335bfd01e2..d10f4eb0e2722675ba7f6d987bfcc422381367e3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -646,8 +646,7 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,
 {
        struct drm_printer p = i915_error_printer(m);
 
-       intel_device_info_print_static(&error->device_info, &p);
-       intel_device_info_print_runtime(&error->runtime_info, &p);
+       intel_device_info_print(&error->device_info, &error->runtime_info, &p);
        intel_driver_caps_print(&error->driver_caps, &p);
 }
 

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index d98fbbd589aaa43669187b6e937dbe701aed5228..7793ce243981e5be33fb4beebd77349739a00db0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -88,8 +88,9 @@ const char *intel_platform_name(enum intel_platform platform)
        return platform_names[platform];
 }
 
-void intel_device_info_print_static(const struct intel_device_info *info,
-                                   struct drm_printer *p)
+void intel_device_info_print(const struct intel_device_info *info,
+                            const struct intel_runtime_info *runtime,
+                            struct drm_printer *p)
 {
        if (info->graphics.rel)
                drm_printf(p, "graphics version: %u.%02u\n", info->graphics.ver,
@@ -122,12 +123,8 @@ void intel_device_info_print_static(const struct intel_device_info *info,
 #define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display.name))
        DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
 #undef PRINT_FLAG
-}
 
-void intel_device_info_print_runtime(const struct intel_runtime_info *info,
-                                    struct drm_printer *p)
-{
-       drm_printf(p, "rawclk rate: %u kHz\n", info->rawclk_freq);
+       drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);
 }
 
 #undef INTEL_VGA_DEVICE

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 23bf230aa10486a931a355881d86ae58c7fcf6a2..b2fb9440e952e33a51dfc5a8cf3bb67202b40996 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -291,10 +291,9 @@ const char *intel_platform_name(enum intel_platform platform);
 void intel_device_info_subplatform_init(struct drm_i915_private *dev_priv);
 void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
 
-void intel_device_info_print_static(const struct intel_device_info *info,
-                                   struct drm_printer *p);
-void intel_device_info_print_runtime(const struct intel_runtime_info *info,
-                                    struct drm_printer *p);
+void intel_device_info_print(const struct intel_device_info *info,
+                            const struct intel_runtime_info *runtime,
+                            struct drm_printer *p);
 
 void intel_driver_caps_print(const struct intel_driver_caps *caps,
                             struct drm_printer *p);