Skip to content

Commit 4ae7eb9

Browse files
jnikulajnikula
committed
drm/i915: separate display info printing from the rest
Add new function intel_display_device_info_print() and print the display device info there instead of intel_device_info_print(). This also fixes the display runtime info printing to use the actual runtime info instead of the static defaults. Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/30d4f93c58839bc9312b43423cd43bc0ef655a35.1687878757.git.jani.nikula@intel.com
1 parent 8776711 commit 4ae7eb9

7 files changed

Lines changed: 38 additions & 20 deletions

File tree

‎drivers/gpu/drm/i915/display/intel_display_device.c‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,3 +981,24 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915)
981981
display_fused_off:
982982
memset(display_runtime, 0, sizeof(*display_runtime));
983983
}
984+
985+
void intel_display_device_info_print(const struct intel_display_device_info *info,
986+
const struct intel_display_runtime_info *runtime,
987+
struct drm_printer *p)
988+
{
989+
if (runtime->ip.rel)
990+
drm_printf(p, "display version: %u.%02u\n",
991+
runtime->ip.ver,
992+
runtime->ip.rel);
993+
else
994+
drm_printf(p, "display version: %u\n",
995+
runtime->ip.ver);
996+
997+
#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->name))
998+
DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
999+
#undef PRINT_FLAG
1000+
1001+
drm_printf(p, "has_hdcp: %s\n", str_yes_no(runtime->has_hdcp));
1002+
drm_printf(p, "has_dmc: %s\n", str_yes_no(runtime->has_dmc));
1003+
drm_printf(p, "has_dsc: %s\n", str_yes_no(runtime->has_dsc));
1004+
}

‎drivers/gpu/drm/i915/display/intel_display_device.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "intel_display_limits.h"
1212

1313
struct drm_i915_private;
14+
struct drm_printer;
1415

1516
#define DEV_INFO_DISPLAY_FOR_EACH_FLAG(func) \
1617
/* Keep in alphabetical order */ \
@@ -127,4 +128,8 @@ intel_display_device_probe(struct drm_i915_private *i915, bool has_gmdid,
127128
u16 *ver, u16 *rel, u16 *step);
128129
void intel_display_device_info_runtime_init(struct drm_i915_private *i915);
129130

131+
void intel_display_device_info_print(const struct intel_display_device_info *info,
132+
const struct intel_display_runtime_info *runtime,
133+
struct drm_printer *p);
134+
130135
#endif

‎drivers/gpu/drm/i915/i915_debugfs.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ static int i915_capabilities(struct seq_file *m, void *data)
6767
seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915));
6868

6969
intel_device_info_print(INTEL_INFO(i915), RUNTIME_INFO(i915), &p);
70+
intel_display_device_info_print(DISPLAY_INFO(i915), DISPLAY_RUNTIME_INFO(i915), &p);
7071
i915_print_iommu_status(i915, &p);
7172
intel_gt_info_print(&to_gt(i915)->info, &p);
7273
intel_driver_caps_print(&i915->caps, &p);

‎drivers/gpu/drm/i915/i915_driver.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,8 @@ static void i915_welcome_messages(struct drm_i915_private *dev_priv)
711711

712712
intel_device_info_print(INTEL_INFO(dev_priv),
713713
RUNTIME_INFO(dev_priv), &p);
714+
intel_display_device_info_print(DISPLAY_INFO(dev_priv),
715+
DISPLAY_RUNTIME_INFO(dev_priv), &p);
714716
i915_print_iommu_status(dev_priv, &p);
715717
for_each_gt(gt, dev_priv, i)
716718
intel_gt_info_print(&gt->info, &p);

‎drivers/gpu/drm/i915/i915_gpu_error.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,8 @@ static void err_print_capabilities(struct drm_i915_error_state_buf *m,
649649
struct drm_printer p = i915_error_printer(m);
650650

651651
intel_device_info_print(&error->device_info, &error->runtime_info, &p);
652+
intel_display_device_info_print(&error->display_device_info,
653+
&error->display_runtime_info, &p);
652654
intel_driver_caps_print(&error->driver_caps, &p);
653655
}
654656

@@ -1983,6 +1985,10 @@ static void capture_gen(struct i915_gpu_coredump *error)
19831985
memcpy(&error->runtime_info,
19841986
RUNTIME_INFO(i915),
19851987
sizeof(error->runtime_info));
1988+
memcpy(&error->display_device_info, DISPLAY_INFO(i915),
1989+
sizeof(error->display_device_info));
1990+
memcpy(&error->display_runtime_info, DISPLAY_RUNTIME_INFO(i915),
1991+
sizeof(error->display_runtime_info));
19861992
error->driver_caps = i915->caps;
19871993
}
19881994

‎drivers/gpu/drm/i915/i915_gpu_error.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <drm/drm_mm.h>
1616

17+
#include "display/intel_display_device.h"
1718
#include "gt/intel_engine.h"
1819
#include "gt/intel_gt_types.h"
1920
#include "gt/uc/intel_uc_fw.h"
@@ -209,6 +210,8 @@ struct i915_gpu_coredump {
209210

210211
struct intel_device_info device_info;
211212
struct intel_runtime_info runtime_info;
213+
struct intel_display_device_info display_device_info;
214+
struct intel_display_runtime_info display_runtime_info;
212215
struct intel_driver_caps driver_caps;
213216
struct i915_params params;
214217

‎drivers/gpu/drm/i915/intel_device_info.c‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ void intel_device_info_print(const struct intel_device_info *info,
9393
const struct intel_runtime_info *runtime,
9494
struct drm_printer *p)
9595
{
96-
const struct intel_display_runtime_info *display_runtime =
97-
&info->display->__runtime_defaults;
98-
9996
if (runtime->graphics.ip.rel)
10097
drm_printf(p, "graphics version: %u.%02u\n",
10198
runtime->graphics.ip.ver,
@@ -112,14 +109,6 @@ void intel_device_info_print(const struct intel_device_info *info,
112109
drm_printf(p, "media version: %u\n",
113110
runtime->media.ip.ver);
114111

115-
if (display_runtime->ip.rel)
116-
drm_printf(p, "display version: %u.%02u\n",
117-
display_runtime->ip.ver,
118-
display_runtime->ip.rel);
119-
else
120-
drm_printf(p, "display version: %u\n",
121-
display_runtime->ip.ver);
122-
123112
drm_printf(p, "graphics stepping: %s\n", intel_step_name(runtime->step.graphics_step));
124113
drm_printf(p, "media stepping: %s\n", intel_step_name(runtime->step.media_step));
125114
drm_printf(p, "display stepping: %s\n", intel_step_name(runtime->step.display_step));
@@ -138,15 +127,6 @@ void intel_device_info_print(const struct intel_device_info *info,
138127
#undef PRINT_FLAG
139128

140129
drm_printf(p, "has_pooled_eu: %s\n", str_yes_no(runtime->has_pooled_eu));
141-
142-
#define PRINT_FLAG(name) drm_printf(p, "%s: %s\n", #name, str_yes_no(info->display->name))
143-
DEV_INFO_DISPLAY_FOR_EACH_FLAG(PRINT_FLAG);
144-
#undef PRINT_FLAG
145-
146-
drm_printf(p, "has_hdcp: %s\n", str_yes_no(display_runtime->has_hdcp));
147-
drm_printf(p, "has_dmc: %s\n", str_yes_no(display_runtime->has_dmc));
148-
drm_printf(p, "has_dsc: %s\n", str_yes_no(display_runtime->has_dsc));
149-
150130
drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);
151131
}
152132

0 commit comments

Comments
 (0)