tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/i915/dislay: convert i9xx_display_sr.[ch] to struct intel_display

Going forward, struct intel_display is the main device data structure
for display. Switch to it.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241126101222.2671224-2-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula 36a585f6 ce44eb00

+41 -45
+36 -40
drivers/gpu/drm/i915/display/i9xx_display_sr.c
··· 10 10 #include "intel_gmbus.h" 11 11 #include "intel_pci_config.h" 12 12 13 - static void i9xx_display_save_swf(struct drm_i915_private *i915) 13 + static void i9xx_display_save_swf(struct intel_display *display) 14 14 { 15 - struct intel_display *display = &i915->display; 16 15 int i; 17 16 18 17 /* Scratch space */ 19 - if (DISPLAY_VER(i915) == 2 && IS_MOBILE(i915)) { 18 + if (DISPLAY_VER(display) == 2 && display->platform.mobile) { 20 19 for (i = 0; i < 7; i++) { 21 - display->restore.saveSWF0[i] = intel_de_read(display, SWF0(i915, i)); 22 - display->restore.saveSWF1[i] = intel_de_read(display, SWF1(i915, i)); 20 + display->restore.saveSWF0[i] = intel_de_read(display, SWF0(display, i)); 21 + display->restore.saveSWF1[i] = intel_de_read(display, SWF1(display, i)); 23 22 } 24 23 for (i = 0; i < 3; i++) 25 - display->restore.saveSWF3[i] = intel_de_read(display, SWF3(i915, i)); 26 - } else if (DISPLAY_VER(i915) == 2) { 24 + display->restore.saveSWF3[i] = intel_de_read(display, SWF3(display, i)); 25 + } else if (DISPLAY_VER(display) == 2) { 27 26 for (i = 0; i < 7; i++) 28 - display->restore.saveSWF1[i] = intel_de_read(display, SWF1(i915, i)); 29 - } else if (HAS_GMCH(i915)) { 27 + display->restore.saveSWF1[i] = intel_de_read(display, SWF1(display, i)); 28 + } else if (HAS_GMCH(display)) { 30 29 for (i = 0; i < 16; i++) { 31 - display->restore.saveSWF0[i] = intel_de_read(display, SWF0(i915, i)); 32 - display->restore.saveSWF1[i] = intel_de_read(display, SWF1(i915, i)); 30 + display->restore.saveSWF0[i] = intel_de_read(display, SWF0(display, i)); 31 + display->restore.saveSWF1[i] = intel_de_read(display, SWF1(display, i)); 33 32 } 34 33 for (i = 0; i < 3; i++) 35 - display->restore.saveSWF3[i] = intel_de_read(display, SWF3(i915, i)); 34 + display->restore.saveSWF3[i] = intel_de_read(display, SWF3(display, i)); 36 35 } 37 36 } 38 37 39 - static void i9xx_display_restore_swf(struct drm_i915_private *i915) 38 + static void i9xx_display_restore_swf(struct intel_display *display) 40 39 { 41 - struct intel_display *display = &i915->display; 42 40 int i; 43 41 44 42 /* Scratch space */ 45 - if (DISPLAY_VER(i915) == 2 && IS_MOBILE(i915)) { 43 + if (DISPLAY_VER(display) == 2 && display->platform.mobile) { 46 44 for (i = 0; i < 7; i++) { 47 - intel_de_write(display, SWF0(i915, i), display->restore.saveSWF0[i]); 48 - intel_de_write(display, SWF1(i915, i), display->restore.saveSWF1[i]); 45 + intel_de_write(display, SWF0(display, i), display->restore.saveSWF0[i]); 46 + intel_de_write(display, SWF1(display, i), display->restore.saveSWF1[i]); 49 47 } 50 48 for (i = 0; i < 3; i++) 51 - intel_de_write(display, SWF3(i915, i), display->restore.saveSWF3[i]); 52 - } else if (DISPLAY_VER(i915) == 2) { 49 + intel_de_write(display, SWF3(display, i), display->restore.saveSWF3[i]); 50 + } else if (DISPLAY_VER(display) == 2) { 53 51 for (i = 0; i < 7; i++) 54 - intel_de_write(display, SWF1(i915, i), display->restore.saveSWF1[i]); 55 - } else if (HAS_GMCH(i915)) { 52 + intel_de_write(display, SWF1(display, i), display->restore.saveSWF1[i]); 53 + } else if (HAS_GMCH(display)) { 56 54 for (i = 0; i < 16; i++) { 57 - intel_de_write(display, SWF0(i915, i), display->restore.saveSWF0[i]); 58 - intel_de_write(display, SWF1(i915, i), display->restore.saveSWF1[i]); 55 + intel_de_write(display, SWF0(display, i), display->restore.saveSWF0[i]); 56 + intel_de_write(display, SWF1(display, i), display->restore.saveSWF1[i]); 59 57 } 60 58 for (i = 0; i < 3; i++) 61 - intel_de_write(display, SWF3(i915, i), display->restore.saveSWF3[i]); 59 + intel_de_write(display, SWF3(display, i), display->restore.saveSWF3[i]); 62 60 } 63 61 } 64 62 65 - void i9xx_display_sr_save(struct drm_i915_private *i915) 63 + void i9xx_display_sr_save(struct intel_display *display) 66 64 { 67 - struct intel_display *display = &i915->display; 68 - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); 65 + struct pci_dev *pdev = to_pci_dev(display->drm->dev); 69 66 70 - if (!HAS_DISPLAY(i915)) 67 + if (!HAS_DISPLAY(display)) 71 68 return; 72 69 73 70 /* Display arbitration control */ 74 - if (DISPLAY_VER(i915) <= 4) 75 - display->restore.saveDSPARB = intel_de_read(display, DSPARB(i915)); 71 + if (DISPLAY_VER(display) <= 4) 72 + display->restore.saveDSPARB = intel_de_read(display, DSPARB(display)); 76 73 77 - if (DISPLAY_VER(i915) == 4) 74 + if (DISPLAY_VER(display) == 4) 78 75 pci_read_config_word(pdev, GCDGMBUS, &display->restore.saveGCDGMBUS); 79 76 80 - i9xx_display_save_swf(i915); 77 + i9xx_display_save_swf(display); 81 78 } 82 79 83 - void i9xx_display_sr_restore(struct drm_i915_private *i915) 80 + void i9xx_display_sr_restore(struct intel_display *display) 84 81 { 85 - struct intel_display *display = &i915->display; 86 - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); 82 + struct pci_dev *pdev = to_pci_dev(display->drm->dev); 87 83 88 - if (!HAS_DISPLAY(i915)) 84 + if (!HAS_DISPLAY(display)) 89 85 return; 90 86 91 - i9xx_display_restore_swf(i915); 87 + i9xx_display_restore_swf(display); 92 88 93 - if (DISPLAY_VER(i915) == 4) 89 + if (DISPLAY_VER(display) == 4) 94 90 pci_write_config_word(pdev, GCDGMBUS, display->restore.saveGCDGMBUS); 95 91 96 92 /* Display arbitration */ 97 - if (DISPLAY_VER(i915) <= 4) 98 - intel_de_write(display, DSPARB(i915), display->restore.saveDSPARB); 93 + if (DISPLAY_VER(display) <= 4) 94 + intel_de_write(display, DSPARB(display), display->restore.saveDSPARB); 99 95 }
+3 -3
drivers/gpu/drm/i915/display/i9xx_display_sr.h
··· 6 6 #ifndef __I9XX_DISPLAY_SR_H__ 7 7 #define __I9XX_DISPLAY_SR_H__ 8 8 9 - struct drm_i915_private; 9 + struct intel_display; 10 10 11 - void i9xx_display_sr_save(struct drm_i915_private *i915); 12 - void i9xx_display_sr_restore(struct drm_i915_private *i915); 11 + void i9xx_display_sr_save(struct intel_display *display); 12 + void i9xx_display_sr_restore(struct intel_display *display); 13 13 14 14 #endif
+2 -2
drivers/gpu/drm/i915/i915_driver.c
··· 1052 1052 intel_dpt_suspend(dev_priv); 1053 1053 i915_ggtt_suspend(to_gt(dev_priv)->ggtt); 1054 1054 1055 - i9xx_display_sr_save(dev_priv); 1055 + i9xx_display_sr_save(display); 1056 1056 1057 1057 opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold; 1058 1058 intel_opregion_suspend(display, opregion_target_state); ··· 1169 1169 1170 1170 intel_dmc_resume(display); 1171 1171 1172 - i9xx_display_sr_restore(dev_priv); 1172 + i9xx_display_sr_restore(display); 1173 1173 1174 1174 intel_vga_redisable(display); 1175 1175