mbox series

[00/11] drm/i915: split out display regs

Message ID cover.1725908151.git.jani.nikula@intel.com (mailing list archive)
Headers show
Series drm/i915: split out display regs | expand

Message

Jani Nikula Sept. 9, 2024, 6:58 p.m. UTC
We've split out register macros from i915_reg.h functionally, but it has
slowed down quite a bit. At this stage, split out all the display regs
from i915_reg.h.

The first ten patches are manual style cleanup, primarily to help the
automation to do the split in patch 11.

This should pave the way for further cleanups.

BR,
Jani.


Jani Nikula (11):
  drm/i915/reg: fix transcoder timing register style
  drm/i915/reg: fix g4x pipe data/link m/n register style
  drm/i915/reg: fix pipe conf, stat etc. register style
  drm/i915/reg: fix pipe data/link m/n register style
  drm/i915/reg: fix SKL scaler register style
  drm/i915/reg: fix PCH transcoder timing and data/link m/n style
  drm/i915/reg: fix DIP CTL register style
  drm/i915/reg: fix small register style issues here and there
  drm/i915/reg: remove unused DSI register macros
  drm/i915/reg: remove superfluous whitespace
  drm/i915: split out display regs from i915_reg.h

 drivers/gpu/drm/i915/display/g4x_dp.c         |    1 +
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |    1 +
 drivers/gpu/drm/i915/display/hsw_ips.c        |    1 +
 drivers/gpu/drm/i915/display/i9xx_plane.c     |    2 +
 drivers/gpu/drm/i915/display/i9xx_wm.c        |    1 +
 drivers/gpu/drm/i915/display/icl_dsi.c        |    1 +
 .../gpu/drm/i915/display/intel_backlight.c    |    2 +-
 drivers/gpu/drm/i915/display/intel_bios.c     |    1 +
 drivers/gpu/drm/i915/display/intel_bw.c       |    3 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |    3 +-
 .../gpu/drm/i915/display/intel_combo_phy.c    |    1 +
 drivers/gpu/drm/i915/display/intel_crt.c      |    1 +
 drivers/gpu/drm/i915/display/intel_cx0_phy.c  |    2 +
 drivers/gpu/drm/i915/display/intel_ddi.c      |    1 +
 drivers/gpu/drm/i915/display/intel_display.c  |    3 +-
 .../drm/i915/display/intel_display_debugfs.c  |    1 +
 .../drm/i915/display/intel_display_device.c   |    6 +-
 .../gpu/drm/i915/display/intel_display_irq.c  |    2 +
 .../drm/i915/display/intel_display_power.c    |    1 +
 .../i915/display/intel_display_power_map.c    |    5 +-
 .../i915/display/intel_display_power_well.c   |    1 +
 .../gpu/drm/i915/display/intel_display_regs.h | 2986 ++++++++++++++++
 .../gpu/drm/i915/display/intel_display_wa.c   |    1 +
 drivers/gpu/drm/i915/display/intel_dmc.c      |    1 +
 drivers/gpu/drm/i915/display/intel_dp.c       |    4 +-
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c  |    1 +
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |    3 +-
 drivers/gpu/drm/i915/display/intel_dpio_phy.c |    1 +
 drivers/gpu/drm/i915/display/intel_dpll.c     |    1 +
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c |    1 +
 .../gpu/drm/i915/display/intel_dpt_common.c   |    1 +
 drivers/gpu/drm/i915/display/intel_drrs.c     |    1 +
 drivers/gpu/drm/i915/display/intel_dsb.c      |    1 +
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |    3 +-
 drivers/gpu/drm/i915/display/intel_dvo.c      |    1 +
 drivers/gpu/drm/i915/display/intel_fbc.c      |    3 +
 drivers/gpu/drm/i915/display/intel_fdi.c      |    3 +-
 .../drm/i915/display/intel_fifo_underrun.c    |    1 +
 drivers/gpu/drm/i915/display/intel_gmbus.c    |    1 +
 drivers/gpu/drm/i915/display/intel_hdcp.c     |    1 +
 drivers/gpu/drm/i915/display/intel_hdmi.c     |    1 +
 .../gpu/drm/i915/display/intel_hotplug_irq.c  |    1 +
 drivers/gpu/drm/i915/display/intel_lspcon.c   |    3 +-
 drivers/gpu/drm/i915/display/intel_lvds.c     |    3 +-
 .../drm/i915/display/intel_modeset_setup.c    |    3 +-
 drivers/gpu/drm/i915/display/intel_overlay.c  |    2 +
 drivers/gpu/drm/i915/display/intel_panel.c    |    1 +
 .../gpu/drm/i915/display/intel_pch_display.c  |    1 +
 .../gpu/drm/i915/display/intel_pch_refclk.c   |    1 +
 drivers/gpu/drm/i915/display/intel_pipe_crc.c |    1 +
 drivers/gpu/drm/i915/display/intel_pmdemand.c |    1 +
 drivers/gpu/drm/i915/display/intel_pps.c      |    1 +
 drivers/gpu/drm/i915/display/intel_psr.c      |    1 +
 drivers/gpu/drm/i915/display/intel_psr_regs.h |    1 +
 drivers/gpu/drm/i915/display/intel_sdvo.c     |    1 +
 drivers/gpu/drm/i915/display/intel_snps_phy.c |    1 +
 drivers/gpu/drm/i915/display/intel_tc.c       |    1 +
 drivers/gpu/drm/i915/display/intel_vblank.c   |    1 +
 drivers/gpu/drm/i915/display/intel_vga.c      |    2 +
 drivers/gpu/drm/i915/display/intel_vrr.c      |    3 +-
 drivers/gpu/drm/i915/display/skl_scaler.c     |    1 +
 .../drm/i915/display/skl_universal_plane.c    |    4 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |    1 +
 drivers/gpu/drm/i915/display/vlv_dsi.c        |    1 +
 drivers/gpu/drm/i915/gvt/display.c            |    1 +
 drivers/gpu/drm/i915/gvt/fb_decoder.c         |    1 +
 drivers/gpu/drm/i915/gvt/handlers.c           |    1 +
 drivers/gpu/drm/i915/gvt/interrupt.c          |    1 +
 drivers/gpu/drm/i915/gvt/mmio.c               |    1 +
 drivers/gpu/drm/i915/i915_reg.h               | 3016 +----------------
 drivers/gpu/drm/i915/intel_gvt_mmio_table.c   |    1 +
 71 files changed, 3098 insertions(+), 3016 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_display_regs.h

Comments

Ville Syrjälä Sept. 9, 2024, 9:03 p.m. UTC | #1
On Mon, Sep 09, 2024 at 09:58:51PM +0300, Jani Nikula wrote:
> We've split out register macros from i915_reg.h functionally, but it has
> slowed down quite a bit. At this stage, split out all the display regs
> from i915_reg.h.
> 
> The first ten patches are manual style cleanup, primarily to help the
> automation to do the split in patch 11.
> 
> This should pave the way for further cleanups.
> 
> BR,
> Jani.
> 
> 
> Jani Nikula (11):
>   drm/i915/reg: fix transcoder timing register style
>   drm/i915/reg: fix g4x pipe data/link m/n register style
>   drm/i915/reg: fix pipe conf, stat etc. register style
>   drm/i915/reg: fix pipe data/link m/n register style
>   drm/i915/reg: fix SKL scaler register style
>   drm/i915/reg: fix PCH transcoder timing and data/link m/n style
>   drm/i915/reg: fix DIP CTL register style
>   drm/i915/reg: fix small register style issues here and there
>   drm/i915/reg: remove unused DSI register macros
>   drm/i915/reg: remove superfluous whitespace
>   drm/i915: split out display regs from i915_reg.h

The last patch had some confusion which probably needs looking at,
and one earlier patch has tabs and spaces mixed up a bit.

Apart from those the series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> 
>  drivers/gpu/drm/i915/display/g4x_dp.c         |    1 +
>  drivers/gpu/drm/i915/display/g4x_hdmi.c       |    1 +
>  drivers/gpu/drm/i915/display/hsw_ips.c        |    1 +
>  drivers/gpu/drm/i915/display/i9xx_plane.c     |    2 +
>  drivers/gpu/drm/i915/display/i9xx_wm.c        |    1 +
>  drivers/gpu/drm/i915/display/icl_dsi.c        |    1 +
>  .../gpu/drm/i915/display/intel_backlight.c    |    2 +-
>  drivers/gpu/drm/i915/display/intel_bios.c     |    1 +
>  drivers/gpu/drm/i915/display/intel_bw.c       |    3 +-
>  drivers/gpu/drm/i915/display/intel_cdclk.c    |    3 +-
>  .../gpu/drm/i915/display/intel_combo_phy.c    |    1 +
>  drivers/gpu/drm/i915/display/intel_crt.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_cx0_phy.c  |    2 +
>  drivers/gpu/drm/i915/display/intel_ddi.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_display.c  |    3 +-
>  .../drm/i915/display/intel_display_debugfs.c  |    1 +
>  .../drm/i915/display/intel_display_device.c   |    6 +-
>  .../gpu/drm/i915/display/intel_display_irq.c  |    2 +
>  .../drm/i915/display/intel_display_power.c    |    1 +
>  .../i915/display/intel_display_power_map.c    |    5 +-
>  .../i915/display/intel_display_power_well.c   |    1 +
>  .../gpu/drm/i915/display/intel_display_regs.h | 2986 ++++++++++++++++
>  .../gpu/drm/i915/display/intel_display_wa.c   |    1 +
>  drivers/gpu/drm/i915/display/intel_dmc.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_dp.c       |    4 +-
>  drivers/gpu/drm/i915/display/intel_dp_hdcp.c  |    1 +
>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |    3 +-
>  drivers/gpu/drm/i915/display/intel_dpio_phy.c |    1 +
>  drivers/gpu/drm/i915/display/intel_dpll.c     |    1 +
>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c |    1 +
>  .../gpu/drm/i915/display/intel_dpt_common.c   |    1 +
>  drivers/gpu/drm/i915/display/intel_drrs.c     |    1 +
>  drivers/gpu/drm/i915/display/intel_dsb.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |    3 +-
>  drivers/gpu/drm/i915/display/intel_dvo.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_fbc.c      |    3 +
>  drivers/gpu/drm/i915/display/intel_fdi.c      |    3 +-
>  .../drm/i915/display/intel_fifo_underrun.c    |    1 +
>  drivers/gpu/drm/i915/display/intel_gmbus.c    |    1 +
>  drivers/gpu/drm/i915/display/intel_hdcp.c     |    1 +
>  drivers/gpu/drm/i915/display/intel_hdmi.c     |    1 +
>  .../gpu/drm/i915/display/intel_hotplug_irq.c  |    1 +
>  drivers/gpu/drm/i915/display/intel_lspcon.c   |    3 +-
>  drivers/gpu/drm/i915/display/intel_lvds.c     |    3 +-
>  .../drm/i915/display/intel_modeset_setup.c    |    3 +-
>  drivers/gpu/drm/i915/display/intel_overlay.c  |    2 +
>  drivers/gpu/drm/i915/display/intel_panel.c    |    1 +
>  .../gpu/drm/i915/display/intel_pch_display.c  |    1 +
>  .../gpu/drm/i915/display/intel_pch_refclk.c   |    1 +
>  drivers/gpu/drm/i915/display/intel_pipe_crc.c |    1 +
>  drivers/gpu/drm/i915/display/intel_pmdemand.c |    1 +
>  drivers/gpu/drm/i915/display/intel_pps.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_psr.c      |    1 +
>  drivers/gpu/drm/i915/display/intel_psr_regs.h |    1 +
>  drivers/gpu/drm/i915/display/intel_sdvo.c     |    1 +
>  drivers/gpu/drm/i915/display/intel_snps_phy.c |    1 +
>  drivers/gpu/drm/i915/display/intel_tc.c       |    1 +
>  drivers/gpu/drm/i915/display/intel_vblank.c   |    1 +
>  drivers/gpu/drm/i915/display/intel_vga.c      |    2 +
>  drivers/gpu/drm/i915/display/intel_vrr.c      |    3 +-
>  drivers/gpu/drm/i915/display/skl_scaler.c     |    1 +
>  .../drm/i915/display/skl_universal_plane.c    |    4 +-
>  drivers/gpu/drm/i915/display/skl_watermark.c  |    1 +
>  drivers/gpu/drm/i915/display/vlv_dsi.c        |    1 +
>  drivers/gpu/drm/i915/gvt/display.c            |    1 +
>  drivers/gpu/drm/i915/gvt/fb_decoder.c         |    1 +
>  drivers/gpu/drm/i915/gvt/handlers.c           |    1 +
>  drivers/gpu/drm/i915/gvt/interrupt.c          |    1 +
>  drivers/gpu/drm/i915/gvt/mmio.c               |    1 +
>  drivers/gpu/drm/i915/i915_reg.h               | 3016 +----------------
>  drivers/gpu/drm/i915/intel_gvt_mmio_table.c   |    1 +
>  71 files changed, 3098 insertions(+), 3016 deletions(-)
>  create mode 100644 drivers/gpu/drm/i915/display/intel_display_regs.h
> 
> -- 
> 2.39.2
Jani Nikula Sept. 10, 2024, 1:32 p.m. UTC | #2
On Tue, 10 Sep 2024, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Mon, Sep 09, 2024 at 09:58:51PM +0300, Jani Nikula wrote:
>> We've split out register macros from i915_reg.h functionally, but it has
>> slowed down quite a bit. At this stage, split out all the display regs
>> from i915_reg.h.
>> 
>> The first ten patches are manual style cleanup, primarily to help the
>> automation to do the split in patch 11.
>> 
>> This should pave the way for further cleanups.
>> 
>> BR,
>> Jani.
>> 
>> 
>> Jani Nikula (11):
>>   drm/i915/reg: fix transcoder timing register style
>>   drm/i915/reg: fix g4x pipe data/link m/n register style
>>   drm/i915/reg: fix pipe conf, stat etc. register style
>>   drm/i915/reg: fix pipe data/link m/n register style
>>   drm/i915/reg: fix SKL scaler register style
>>   drm/i915/reg: fix PCH transcoder timing and data/link m/n style
>>   drm/i915/reg: fix DIP CTL register style
>>   drm/i915/reg: fix small register style issues here and there
>>   drm/i915/reg: remove unused DSI register macros
>>   drm/i915/reg: remove superfluous whitespace
>>   drm/i915: split out display regs from i915_reg.h
>
> The last patch had some confusion which probably needs looking at,
> and one earlier patch has tabs and spaces mixed up a bit.
>
> Apart from those the series is
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Thanks!

Fixed the indentation in patch 5 with a new patch, and sent everything
but the last one in a separate series [1]. Feel free to clean up the SPI
etc. on top of that, and I'll try to see what can be done about the irq
regs. After those, it's trivial to regenerate the last patch with my
scripts, and, with any luck, the result will be better.

BR,
Jani.


[1] https://lore.kernel.org/r/cover.1725974820.git.jani.nikula@intel.com


>
>> 
>>  drivers/gpu/drm/i915/display/g4x_dp.c         |    1 +
>>  drivers/gpu/drm/i915/display/g4x_hdmi.c       |    1 +
>>  drivers/gpu/drm/i915/display/hsw_ips.c        |    1 +
>>  drivers/gpu/drm/i915/display/i9xx_plane.c     |    2 +
>>  drivers/gpu/drm/i915/display/i9xx_wm.c        |    1 +
>>  drivers/gpu/drm/i915/display/icl_dsi.c        |    1 +
>>  .../gpu/drm/i915/display/intel_backlight.c    |    2 +-
>>  drivers/gpu/drm/i915/display/intel_bios.c     |    1 +
>>  drivers/gpu/drm/i915/display/intel_bw.c       |    3 +-
>>  drivers/gpu/drm/i915/display/intel_cdclk.c    |    3 +-
>>  .../gpu/drm/i915/display/intel_combo_phy.c    |    1 +
>>  drivers/gpu/drm/i915/display/intel_crt.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_cx0_phy.c  |    2 +
>>  drivers/gpu/drm/i915/display/intel_ddi.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_display.c  |    3 +-
>>  .../drm/i915/display/intel_display_debugfs.c  |    1 +
>>  .../drm/i915/display/intel_display_device.c   |    6 +-
>>  .../gpu/drm/i915/display/intel_display_irq.c  |    2 +
>>  .../drm/i915/display/intel_display_power.c    |    1 +
>>  .../i915/display/intel_display_power_map.c    |    5 +-
>>  .../i915/display/intel_display_power_well.c   |    1 +
>>  .../gpu/drm/i915/display/intel_display_regs.h | 2986 ++++++++++++++++
>>  .../gpu/drm/i915/display/intel_display_wa.c   |    1 +
>>  drivers/gpu/drm/i915/display/intel_dmc.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_dp.c       |    4 +-
>>  drivers/gpu/drm/i915/display/intel_dp_hdcp.c  |    1 +
>>  drivers/gpu/drm/i915/display/intel_dp_mst.c   |    3 +-
>>  drivers/gpu/drm/i915/display/intel_dpio_phy.c |    1 +
>>  drivers/gpu/drm/i915/display/intel_dpll.c     |    1 +
>>  drivers/gpu/drm/i915/display/intel_dpll_mgr.c |    1 +
>>  .../gpu/drm/i915/display/intel_dpt_common.c   |    1 +
>>  drivers/gpu/drm/i915/display/intel_drrs.c     |    1 +
>>  drivers/gpu/drm/i915/display/intel_dsb.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |    3 +-
>>  drivers/gpu/drm/i915/display/intel_dvo.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_fbc.c      |    3 +
>>  drivers/gpu/drm/i915/display/intel_fdi.c      |    3 +-
>>  .../drm/i915/display/intel_fifo_underrun.c    |    1 +
>>  drivers/gpu/drm/i915/display/intel_gmbus.c    |    1 +
>>  drivers/gpu/drm/i915/display/intel_hdcp.c     |    1 +
>>  drivers/gpu/drm/i915/display/intel_hdmi.c     |    1 +
>>  .../gpu/drm/i915/display/intel_hotplug_irq.c  |    1 +
>>  drivers/gpu/drm/i915/display/intel_lspcon.c   |    3 +-
>>  drivers/gpu/drm/i915/display/intel_lvds.c     |    3 +-
>>  .../drm/i915/display/intel_modeset_setup.c    |    3 +-
>>  drivers/gpu/drm/i915/display/intel_overlay.c  |    2 +
>>  drivers/gpu/drm/i915/display/intel_panel.c    |    1 +
>>  .../gpu/drm/i915/display/intel_pch_display.c  |    1 +
>>  .../gpu/drm/i915/display/intel_pch_refclk.c   |    1 +
>>  drivers/gpu/drm/i915/display/intel_pipe_crc.c |    1 +
>>  drivers/gpu/drm/i915/display/intel_pmdemand.c |    1 +
>>  drivers/gpu/drm/i915/display/intel_pps.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_psr.c      |    1 +
>>  drivers/gpu/drm/i915/display/intel_psr_regs.h |    1 +
>>  drivers/gpu/drm/i915/display/intel_sdvo.c     |    1 +
>>  drivers/gpu/drm/i915/display/intel_snps_phy.c |    1 +
>>  drivers/gpu/drm/i915/display/intel_tc.c       |    1 +
>>  drivers/gpu/drm/i915/display/intel_vblank.c   |    1 +
>>  drivers/gpu/drm/i915/display/intel_vga.c      |    2 +
>>  drivers/gpu/drm/i915/display/intel_vrr.c      |    3 +-
>>  drivers/gpu/drm/i915/display/skl_scaler.c     |    1 +
>>  .../drm/i915/display/skl_universal_plane.c    |    4 +-
>>  drivers/gpu/drm/i915/display/skl_watermark.c  |    1 +
>>  drivers/gpu/drm/i915/display/vlv_dsi.c        |    1 +
>>  drivers/gpu/drm/i915/gvt/display.c            |    1 +
>>  drivers/gpu/drm/i915/gvt/fb_decoder.c         |    1 +
>>  drivers/gpu/drm/i915/gvt/handlers.c           |    1 +
>>  drivers/gpu/drm/i915/gvt/interrupt.c          |    1 +
>>  drivers/gpu/drm/i915/gvt/mmio.c               |    1 +
>>  drivers/gpu/drm/i915/i915_reg.h               | 3016 +----------------
>>  drivers/gpu/drm/i915/intel_gvt_mmio_table.c   |    1 +
>>  71 files changed, 3098 insertions(+), 3016 deletions(-)
>>  create mode 100644 drivers/gpu/drm/i915/display/intel_display_regs.h
>> 
>> -- 
>> 2.39.2