Hi Dave and Sima, Here goes one extra, and really the last one targeting 6.10. We have decided to do this extra one so we could include the good clean-up on i915/xe's fbdev work done by Thomas Zimmermann. And it looks like he has more work on top of that, so it would be good to propagate this initial one sooner and sync our trees. Thanks, Rodrigo. drm-intel-next-2024-04-30: Core DRM: - Export drm_client_dev_unregister (Thomas Zimmermann) Display i915: - More initial work to make display code more independent from i915 (Jani) - Convert i915/xe fbdev to DRM client (Thomas Zimmermann) - VLV/CHV DPIO register cleanup (Ville) The following changes since commit 6068bc209ac8d07a5d04e93f168465195e22a4cc: drm/i915/dsi: pass display to register macros instead of implicit variable (2024-04-23 17:00:14 +0300) are available in the Git repository at: https://anongit.freedesktop.org/git/drm/drm-intel tags/drm-intel-next-2024-04-30 for you to fetch changes up to 6f1923f54d77942376f47d05b08cddca19fc397f: drm/i915/dpio: Extract vlv_dpio_phy_regs.h (2024-04-30 21:20:52 +0300) ---------------------------------------------------------------- Core DRM: - Export drm_client_dev_unregister (Thomas Zimmermann) Display i915: - More initial work to make display code more independent from i915 (Jani) - Convert i915/xe fbdev to DRM client (Thomas Zimmermann) - VLV/CHV DPIO register cleanup (Ville) ---------------------------------------------------------------- Jani Nikula (13): drm/i915: convert _MMIO_PIPE3()/_MMIO_PORT3() to accept base drm/i915: pass dev_priv to _MMIO_PIPE2, _MMIO_TRANS2, _MMIO_CURSOR2 drm/i915/audio: move LPE audio regs to intel_audio_regs.h drm/i915/color: move palette registers to intel_color_regs.h drm/i915/display: split out intel_fbc_regs.h from i915_reg.h drm/i915/display: split out intel_sprite_regs.h from i915_reg.h drm/i915: pass dev_priv explicitly to PALETTE drm/i915: pass dev_priv explicitly to PIPE_WGC_C01_C00 drm/i915: pass dev_priv explicitly to PIPE_WGC_C02 drm/i915: pass dev_priv explicitly to PIPE_WGC_C11_C10 drm/i915: pass dev_priv explicitly to PIPE_WGC_C12 drm/i915: pass dev_priv explicitly to PIPE_WGC_C21_C20 drm/i915: pass dev_priv explicitly to PIPE_WGC_C22 Thomas Zimmermann (6): drm/client: Export drm_client_dev_unregister() drm/i915: Move fbdev functions drm/i915: Initialize fbdev DRM client with callback functions drm/{i915,xe}: Unregister in-kernel clients drm/{i915,xe}: Implement fbdev client callbacks drm/{i915, xe}: Implement fbdev emulation as in-kernel client Ville Syrjälä (14): drm/i915/dpio: Remove pointless VLV_PCS01_DW8 read drm/i915/dpio: s/VLV_REF_DW13/VLV_REF_DW11/ drm/i915/dpio: s/VLV_PLL_DW9_BCAST/VLV_PCS_DW17_BCAST/ drm/i915/dpio: Fix VLV DPIO PLL register dword numbering drm/i915/dpio: Remove pointless variables from vlv/chv DPLL code drm/i915/dpio: Rename some variables drm/i915/dpio: s/port/ch/ drm/i915/dpio: s/pipe/ch/ drm/i915/dpio: Derive the phy from the port rather than pipe in encoder hooks drm/i915/dpio: Give VLV DPIO group register a clearer name drm/i915/dpio: Rename a few CHV DPIO PHY registers drm/i915/dpio: Clean up VLV/CHV DPIO PHY register defines drm/i915/dpio: Clean up the vlv/chv PHY register bits drm/i915/dpio: Extract vlv_dpio_phy_regs.h drivers/gpu/drm/drm_client.c | 13 + drivers/gpu/drm/i915/display/intel_audio_regs.h | 16 + drivers/gpu/drm/i915/display/intel_color.c | 53 +- drivers/gpu/drm/i915/display/intel_color_regs.h | 42 +- drivers/gpu/drm/i915/display/intel_display.c | 2 +- .../gpu/drm/i915/display/intel_display_driver.c | 24 +- .../drm/i915/display/intel_display_power_well.c | 16 +- .../gpu/drm/i915/display/intel_display_reg_defs.h | 22 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 148 ++- drivers/gpu/drm/i915/display/intel_dpll.c | 262 +++-- drivers/gpu/drm/i915/display/intel_fbc.c | 1 + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 120 +++ drivers/gpu/drm/i915/display/intel_fbdev.c | 265 ++--- drivers/gpu/drm/i915/display/intel_fbdev.h | 29 +- drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- drivers/gpu/drm/i915/display/intel_psr_regs.h | 38 +- drivers/gpu/drm/i915/display/intel_sprite.c | 1 + drivers/gpu/drm/i915/display/intel_sprite_regs.h | 348 ++++++ drivers/gpu/drm/i915/display/vlv_dpio_phy_regs.h | 309 ++++++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + drivers/gpu/drm/i915/gvt/display.c | 1 + drivers/gpu/drm/i915/gvt/fb_decoder.c | 5 +- drivers/gpu/drm/i915/gvt/handlers.c | 1 + drivers/gpu/drm/i915/i915_driver.c | 22 - drivers/gpu/drm/i915/i915_reg.h | 1104 +++----------------- drivers/gpu/drm/i915/intel_clock_gating.c | 1 + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + drivers/gpu/drm/i915/vlv_sideband.c | 1 - drivers/gpu/drm/xe/display/xe_display.c | 11 - drivers/gpu/drm/xe/xe_device.c | 1 + 31 files changed, 1406 insertions(+), 1457 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_fbc_regs.h create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_regs.h create mode 100644 drivers/gpu/drm/i915/display/vlv_dpio_phy_regs.h
