tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/debugfs: continue display debugfs struct intel_display conversion
Nudge intel_display_debugfs.[ch] conversion to struct intel_display
forward.
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e1262dc019d42ed0e294606fc875427bda336cb9.1740502116.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+13
-21
+9
-17
drivers/gpu/drm/i915/display/intel_display_debugfs.c
+9
-17
drivers/gpu/drm/i915/display/intel_display_debugfs.c
···
49
49
return to_intel_display(node->minor->dev);
50
50
}
51
51
52
-
static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
53
-
{
54
-
return to_i915(node->minor->dev);
55
-
}
56
-
57
52
static int intel_display_caps(struct seq_file *m, void *data)
58
53
{
59
54
struct intel_display *display = node_to_intel_display(m->private);
···
80
85
81
86
static int i915_sr_status(struct seq_file *m, void *unused)
82
87
{
83
-
struct drm_i915_private *dev_priv = node_to_i915(m->private);
84
88
struct intel_display *display = node_to_intel_display(m->private);
89
+
struct drm_i915_private *dev_priv = to_i915(display->drm);
85
90
intel_wakeref_t wakeref;
86
91
bool sr_enabled = false;
87
92
···
97
102
else if (display->platform.i915gm)
98
103
sr_enabled = intel_de_read(display, INSTPM) & INSTPM_SELF_EN;
99
104
else if (display->platform.pineview)
100
-
sr_enabled = intel_de_read(display, DSPFW3(dev_priv)) & PINEVIEW_SELF_REFRESH_EN;
105
+
sr_enabled = intel_de_read(display, DSPFW3(display)) & PINEVIEW_SELF_REFRESH_EN;
101
106
else if (display->platform.valleyview || display->platform.cherryview)
102
107
sr_enabled = intel_de_read(display, FW_BLC_SELF_VLV) & FW_CSPWRDWNEN;
103
108
···
152
157
153
158
static int i915_power_domain_info(struct seq_file *m, void *unused)
154
159
{
155
-
struct drm_i915_private *i915 = node_to_i915(m->private);
156
-
struct intel_display *display = &i915->display;
160
+
struct intel_display *display = node_to_intel_display(m->private);
157
161
158
162
intel_display_power_debug(display, m);
159
163
···
582
588
static int i915_display_info(struct seq_file *m, void *unused)
583
589
{
584
590
struct intel_display *display = node_to_intel_display(m->private);
585
-
struct drm_i915_private *dev_priv = node_to_i915(m->private);
591
+
struct drm_i915_private *dev_priv = to_i915(display->drm);
586
592
struct intel_crtc *crtc;
587
593
struct drm_connector *connector;
588
594
struct drm_connector_list_iter conn_iter;
···
707
713
static int i915_lpsp_status(struct seq_file *m, void *unused)
708
714
{
709
715
struct intel_display *display = node_to_intel_display(m->private);
710
-
struct drm_i915_private *i915 = node_to_i915(m->private);
711
716
bool lpsp_enabled = false;
712
717
713
718
if (DISPLAY_VER(display) >= 13 || IS_DISPLAY_VER(display, 9, 10)) {
714
719
lpsp_enabled = !intel_lpsp_power_well_enabled(display, SKL_DISP_PW_2);
715
720
} else if (IS_DISPLAY_VER(display, 11, 12)) {
716
721
lpsp_enabled = !intel_lpsp_power_well_enabled(display, ICL_DISP_PW_3);
717
-
} else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) {
722
+
} else if (display->platform.haswell || display->platform.broadwell) {
718
723
lpsp_enabled = !intel_lpsp_power_well_enabled(display, HSW_DISP_PW_GLOBAL);
719
724
} else {
720
725
seq_puts(m, "LPSP: not supported\n");
···
829
836
{"i915_lpsp_status", i915_lpsp_status, 0},
830
837
};
831
838
832
-
void intel_display_debugfs_register(struct drm_i915_private *i915)
839
+
void intel_display_debugfs_register(struct intel_display *display)
833
840
{
834
-
struct intel_display *display = &i915->display;
835
-
struct drm_minor *minor = i915->drm.primary;
841
+
struct drm_i915_private *i915 = to_i915(display->drm);
842
+
struct drm_minor *minor = display->drm->primary;
836
843
837
844
debugfs_create_file("i915_fifo_underrun_reset", 0644, minor->debugfs_root,
838
845
display, &i915_fifo_underrun_reset_ops);
···
858
865
struct intel_connector *connector = m->private;
859
866
struct intel_display *display = to_intel_display(connector);
860
867
struct intel_encoder *encoder = intel_attached_encoder(connector);
861
-
struct drm_i915_private *i915 = to_i915(connector->base.dev);
862
868
int connector_type = connector->base.connector_type;
863
869
bool lpsp_capable = false;
864
870
···
884
892
(connector_type == DRM_MODE_CONNECTOR_DSI ||
885
893
connector_type == DRM_MODE_CONNECTOR_eDP ||
886
894
connector_type == DRM_MODE_CONNECTOR_DisplayPort));
887
-
else if (IS_HASWELL(i915) || IS_BROADWELL(i915))
895
+
else if (display->platform.haswell || display->platform.broadwell)
888
896
lpsp_capable = connector_type == DRM_MODE_CONNECTOR_eDP;
889
897
890
898
seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable");
+3
-3
drivers/gpu/drm/i915/display/intel_display_debugfs.h
+3
-3
drivers/gpu/drm/i915/display/intel_display_debugfs.h
···
6
6
#ifndef __INTEL_DISPLAY_DEBUGFS_H__
7
7
#define __INTEL_DISPLAY_DEBUGFS_H__
8
8
9
-
struct drm_i915_private;
10
9
struct intel_connector;
11
10
struct intel_crtc;
11
+
struct intel_display;
12
12
13
13
#ifdef CONFIG_DEBUG_FS
14
-
void intel_display_debugfs_register(struct drm_i915_private *i915);
14
+
void intel_display_debugfs_register(struct intel_display *display);
15
15
void intel_connector_debugfs_add(struct intel_connector *connector);
16
16
void intel_crtc_debugfs_add(struct intel_crtc *crtc);
17
17
#else
18
-
static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
18
+
static inline void intel_display_debugfs_register(struct intel_display *display) {}
19
19
static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
20
20
static inline void intel_crtc_debugfs_add(struct intel_crtc *crtc) {}
21
21
#endif