Currently, DSS control is configured from various files; this change aims to consolidate all DSS-related functionalities, such as display stream splitting, joining, MSO configuration, and joining configuration, into one place. A new file, intel_dss_regs.h, will store register information, while the helpers to configure DSS and related stuff will be moved to intel_dss.c with its corresponding header file intel_dss.h. Along with this, the helpers related to retrieve information about the pipe joiners are also moved from intel_display.c to intel_joiner. Additionally, wherever possible, the drm_i915_private structure is replaced with the new intel_display structure as part of ongoing efforts to phase out the old structure. Rev2: -Addressed review comments from Jani. -Moved all joiner stuff into a separate file. Rev3: -Rebase Ankit Nautiyal (19): drm/i915/display: Move all DSS control registers to a new file drm/i915/dss_regs: Use REG_* macros for the DSS ctl bits drm/i915/ddi: Move all mso related helpers to a new file drm/i915/dss: Move to struct intel_display drm/i915/icl_dsi: Avoid using intel_dsi in configure_dual_link_mode drm/i915/icl_dsi: Use intel_display in configure_dual_link_mode drm/i915/icl_dsi: Move helpers to configure dsi dual link to intel_dss drm/i915/vdsc: Rename helper to check if the pipe supports dsc drm/i915/vdsc: Move all dss stuff in dss files drm/i915/dss: Use struct intel_display in dss dsc helpers drm/i915/display: Move dss stuff in intel_dss files drm/i915/display: Rename static functions that use joiner drm/i915/display: Separate out joiner stuff in a new file drm/i915/display: Move intel_crtc_joined_pipe_mask to intel_joiner drm/i915/display: Move helpers for primary joiner to intel_joiner drm/i915/display: Move intel_crtc_is_joiner_secondary to intel_joiner drm/i915/display: Move intel_crtc_joiner_secondary_pipes to intel_joiner drm/i915/joiner: Use struct intel_display in intel_joiner_enabled_pipes drm/i915/joiner: Use struct intel_display in intel_joiner_supported_pipes drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/icl_dsi.c | 55 +-- .../gpu/drm/i915/display/intel_atomic_plane.c | 3 +- .../drm/i915/display/intel_crtc_state_dump.c | 5 +- drivers/gpu/drm/i915/display/intel_ddi.c | 95 +---- drivers/gpu/drm/i915/display/intel_display.c | 359 +++--------------- drivers/gpu/drm/i915/display/intel_display.h | 9 +- .../drm/i915/display/intel_display_debugfs.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 +- drivers/gpu/drm/i915/display/intel_drrs.c | 5 +- drivers/gpu/drm/i915/display/intel_dss.c | 268 +++++++++++++ drivers/gpu/drm/i915/display/intel_dss.h | 35 ++ drivers/gpu/drm/i915/display/intel_dss_regs.h | 51 +++ drivers/gpu/drm/i915/display/intel_joiner.c | 265 +++++++++++++ drivers/gpu/drm/i915/display/intel_joiner.h | 36 ++ .../drm/i915/display/intel_modeset_setup.c | 15 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 74 +--- drivers/gpu/drm/i915/display/intel_vdsc.h | 2 +- .../gpu/drm/i915/display/intel_vdsc_regs.h | 38 -- drivers/gpu/drm/xe/Makefile | 2 + 20 files changed, 757 insertions(+), 572 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_dss.c create mode 100644 drivers/gpu/drm/i915/display/intel_dss.h create mode 100644 drivers/gpu/drm/i915/display/intel_dss_regs.h create mode 100644 drivers/gpu/drm/i915/display/intel_joiner.c create mode 100644 drivers/gpu/drm/i915/display/intel_joiner.h -- 2.45.2