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 94e5c29..d131703 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 deb8a8b..563797d 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 32e9265..d10f4eb 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 d98fbbd..7793ce2 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 23bf230..b2fb944 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);