tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/display: prefer DISPLAY_VER over GRAPHICS_VER in display s/r
Use display version checks for display scratch registers, not graphics
version. And for the older platforms it's the same thing anyway.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241126101222.2671224-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+8
-8
+8
-8
drivers/gpu/drm/i915/display/i9xx_display_sr.c
+8
-8
drivers/gpu/drm/i915/display/i9xx_display_sr.c
···
16
16
int i;
17
17
18
18
/* Scratch space */
19
-
if (GRAPHICS_VER(i915) == 2 && IS_MOBILE(i915)) {
19
+
if (DISPLAY_VER(i915) == 2 && IS_MOBILE(i915)) {
20
20
for (i = 0; i < 7; i++) {
21
21
display->restore.saveSWF0[i] = intel_de_read(display, SWF0(i915, i));
22
22
display->restore.saveSWF1[i] = intel_de_read(display, SWF1(i915, i));
23
23
}
24
24
for (i = 0; i < 3; i++)
25
25
display->restore.saveSWF3[i] = intel_de_read(display, SWF3(i915, i));
26
-
} else if (GRAPHICS_VER(i915) == 2) {
26
+
} else if (DISPLAY_VER(i915) == 2) {
27
27
for (i = 0; i < 7; i++)
28
28
display->restore.saveSWF1[i] = intel_de_read(display, SWF1(i915, i));
29
29
} else if (HAS_GMCH(i915)) {
···
42
42
int i;
43
43
44
44
/* Scratch space */
45
-
if (GRAPHICS_VER(i915) == 2 && IS_MOBILE(i915)) {
45
+
if (DISPLAY_VER(i915) == 2 && IS_MOBILE(i915)) {
46
46
for (i = 0; i < 7; i++) {
47
47
intel_de_write(display, SWF0(i915, i), display->restore.saveSWF0[i]);
48
48
intel_de_write(display, SWF1(i915, i), display->restore.saveSWF1[i]);
49
49
}
50
50
for (i = 0; i < 3; i++)
51
51
intel_de_write(display, SWF3(i915, i), display->restore.saveSWF3[i]);
52
-
} else if (GRAPHICS_VER(i915) == 2) {
52
+
} else if (DISPLAY_VER(i915) == 2) {
53
53
for (i = 0; i < 7; i++)
54
54
intel_de_write(display, SWF1(i915, i), display->restore.saveSWF1[i]);
55
55
} else if (HAS_GMCH(i915)) {
···
71
71
return;
72
72
73
73
/* Display arbitration control */
74
-
if (GRAPHICS_VER(i915) <= 4)
74
+
if (DISPLAY_VER(i915) <= 4)
75
75
display->restore.saveDSPARB = intel_de_read(display, DSPARB(i915));
76
76
77
-
if (GRAPHICS_VER(i915) == 4)
77
+
if (DISPLAY_VER(i915) == 4)
78
78
pci_read_config_word(pdev, GCDGMBUS, &display->restore.saveGCDGMBUS);
79
79
80
80
i9xx_display_save_swf(i915);
···
90
90
91
91
i9xx_display_restore_swf(i915);
92
92
93
-
if (GRAPHICS_VER(i915) == 4)
93
+
if (DISPLAY_VER(i915) == 4)
94
94
pci_write_config_word(pdev, GCDGMBUS, display->restore.saveGCDGMBUS);
95
95
96
96
/* Display arbitration */
97
-
if (GRAPHICS_VER(i915) <= 4)
97
+
if (DISPLAY_VER(i915) <= 4)
98
98
intel_de_write(display, DSPARB(i915), display->restore.saveDSPARB);
99
99
}