Hi Dave and Daniel, Here goes the final pull request from drm-intel-next targeting 6.2. Manly more display clean-ups and the removal of the force_probe protection on DG2. drm-intel-next-2022-11-18: GVT Changes: - gvt-next stuff mostly with refactor for the new MDEV interface. i915 Changes: - PSR fixes and improvements (Jouni) - DP DSC fixes (Vinod, Jouni) - More general display cleanups (Jani) - More display collor management cleanup targetting degamma (Ville) - remove circ_buf.h includes (Jiri) - wait power off delay at driver remove to optimize probe (Jani) - More audio cleanup targeting the ELD precompute readout (Ville) - Enable DC power states on all eDP ports (Imre) - RPL-P stepping info (Matt Atwood) - MTL enabling patches (RK) - Removal of DG2 force_probe (Matt) Thanks, Rodrigo. The following changes since commit c02f20d38fb90eba606277874581db124ace42c4: drm/nouveau/disp: fix incorrect/broken hdmi methods (2022-11-14 16:17:22 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2022-11-18 for you to fetch changes up to d2eae8e98d5979aa4a767e1cbf53ab9f6a83a38e: drm/i915/dg2: Drop force_probe requirement (2022-11-18 15:38:33 -0500) ---------------------------------------------------------------- GVT Changes: - gvt-next stuff mostly with refactor for the new MDEV interface. i915 Changes: - PSR fixes and improvements (Jouni) - DP DSC fixes (Vinod, Jouni) - More general display cleanups (Jani) - More display collor management cleanup targetting degamma (Ville) - remove circ_buf.h includes (Jiri) - wait power off delay at driver remove to optimize probe (Jani) - More audio cleanup targeting the ELD precompute readout (Ville) - Enable DC power states on all eDP ports (Imre) - RPL-P stepping info (Matt Atwood) - MTL enabling patches (RK) - Removal of DG2 force_probe (Matt) ---------------------------------------------------------------- Colin Ian King (1): drm/i915/reg: Fix spelling mistake "Unsupport" -> "Unsupported" Imre Deak (9): drm/i915: Fix warn in intel_display_power_*_domain() functions drm/i915: Preallocate the debug power domain wakerefs array drm/i915: Move the POWER_DOMAIN_AUX_IO_A definition to its logical place drm/i915: Use the AUX_IO power domain only for eDP/PSR port drm/i915/tgl+: Enable display DC power states on all eDP ports drm/i915: Add missing AUX_IO_A power domain->well mappings drm/i915: Add missing DC_OFF power domain->well mappings drm/i915: Factor out function to get/put AUX_IO power for main link drm/i915/mtl+: Don't enable the AUX_IO power for non-eDP port main links Jani Nikula (21): drm/i915/gmbus: move GPIO enum to gmbus drm/i915: reduce includes in intel_connector.h drm/i915: reduce includes in intel_fifo_underrun.h drm/i915: un-inline icl_hdr_plane_mask() to simplify includes drm/i915/dpio: un-inline the vlv phy/channel mapping functions drm/i915/dpio: move dpio_channel and dpio_phy enums to intel_dpio_phy.h drm/i915: reduce includes in intel_display_power.h drm/i915/display: reduce the includes in intel_dvo_dev.h drm/i915/display: reduce includes in intel_hdmi.h drm/i915/display: reduce includes in g4x_dp.h includes drm/i915/irq: make gen2_irq_init()/gen2_irq_reset() static drm/i915/display: move struct intel_link_m_n to intel_display_types.h drm/i915/reg: move masked field helpers to i915_reg_defs.h drm/i915/reg: move pick even and pick to reg defs drm/i915: split out intel_display_reg_defs.h drm/i915: stop including i915_irq.h from i915_trace.h drm/i915/edp: wait power off delay at driver remove to optimize probe drm/i915/hti: abstract hti handling drm/i915/display: move hti under display sub-struct drm/i915/display: move global_obj_list under display sub-struct drm/i915/display: move restore state and ctx under display sub-struct Jiapeng Chong (4): drm/i915/gvt: Fix kernel-doc drm/i915/gvt: Fix kernel-doc drm/i915/gvt: Fix kernel-doc drm/i915/gvt: Remove the unused function get_pt_type() Jiri Slaby (SUSE) (1): drm/i915: remove circ_buf.h includes Jouni Högander (4): drm/i915/psr: Send update also on invalidate drm/i915/mtl: Fix PSR2_MAN_TRK_CTL bit getter functions for MTL drm/i915/psr: Ensure panel granularity aligns with DSC slice height drm/i915/psr: Remove inappropriate DSC slice alignment warning Julia Lawall (1): drm/i915/gvt: fix typo in comment Matt Atwood (1): drm/i915/rpl-p: Add stepping info Matt Roper (1): drm/i915/dg2: Drop force_probe requirement Mauro Carvalho Chehab (1): drm/i915: gvt: fix kernel-doc trivial warnings Paulo Miguel Almeida (1): i915/gvt: remove hardcoded value on crc32_start calculation Radhakrishna Sripada (2): drm/i915/mtl: Fix dram info readout drm/i915/mtl: Skip doubling channel numbers for LPDDR4/LPDDDR5 Rodrigo Vivi (2): Merge drm/drm-next into drm-intel-next Merge tag 'gvt-next-2022-11-17' of https://github.com/intel/gvt-linux into drm-intel-next Ville Syrjälä (26): drm/i915: Use sizeof(variable) instead sizeof(type) drm/i915: Use _MMIO_PIPE() for SKL_BOTTOM_COLOR drm/i915: s/dev_priv/i915/ in intel_color.c drm/i915: s/icl_load_gcmax/ivb_load_lut_max/ drm/i915: Split ivb_load_lut_ext_max() into two parts drm/i915: Deconfuse the ilk+ 12.4 LUT entry functions drm/i915: Pass limited_range explicitly to ilk_csc_convert_ctm() drm/i915: Reuse ilk_gamma_mode() on ivb+ drm/i915: Reject YCbCr output with degamma+gamma on pre-icl drm/i915: Share {csc,gamma}_enable calculation for ilk/snb vs. ivb+ drm/i915: Use intel_crtc_needs_modeset() more drm/i915: Create resized LUTs for ivb+ split gamma mode drm/i915: Pass intel_plane to plane tracepoints drm/i915: Print plane name in fbc tracepoints drm/i915: Pass i915 to frontbuffer tracepoints drm/i915: Add device name to display tracepoints drm/i915: Clean up legacy palette defines drm/i915: Clean up 10bit precision palette defines drm/i915: Clean up 12.4bit precision palette defines drm/i915: Clean up chv CGM (de)gamma defines drm/i915: Reorder 12.4 lut udw vs. ldw functions drm/i915: Introduce g4x_hdmi_compute_config() drm/i915: Force RGB output for DVI sink drm/i915: Treat HDMI as DVI when cloning drm/i915/audio: Unify get_saved_enc() drm/i915/audio: Realign some function arguments Vinod Govindapillai (1): drm/i915: update DSC feature flag handling during device init Zhi Wang (1): drm/i915/gvt: remove the vgpu->released and its sanity check wangjianli (1): drm/i915: fix repeated words in comments drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/g4x_dp.c | 1 + drivers/gpu/drm/i915/display/g4x_dp.h | 2 +- drivers/gpu/drm/i915/display/g4x_hdmi.c | 15 +- drivers/gpu/drm/i915/display/i9xx_plane.c | 4 +- drivers/gpu/drm/i915/display/icl_dsi.c | 1 + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 28 +- drivers/gpu/drm/i915/display/intel_audio_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_backlight.c | 1 + .../gpu/drm/i915/display/intel_backlight_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_bw.c | 3 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 3 +- drivers/gpu/drm/i915/display/intel_color.c | 594 ++++++++++++--------- drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 + drivers/gpu/drm/i915/display/intel_connector.h | 2 +- drivers/gpu/drm/i915/display/intel_crt.c | 2 + drivers/gpu/drm/i915/display/intel_cursor.c | 3 +- drivers/gpu/drm/i915/display/intel_ddi.c | 102 ++-- drivers/gpu/drm/i915/display/intel_display.c | 39 +- drivers/gpu/drm/i915/display/intel_display.h | 39 +- drivers/gpu/drm/i915/display/intel_display_core.h | 21 + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 + drivers/gpu/drm/i915/display/intel_display_power.c | 42 +- drivers/gpu/drm/i915/display/intel_display_power.h | 15 +- .../gpu/drm/i915/display/intel_display_power_map.c | 69 ++- .../drm/i915/display/intel_display_power_well.h | 2 +- .../gpu/drm/i915/display/intel_display_reg_defs.h | 53 ++ drivers/gpu/drm/i915/display/intel_display_trace.h | 206 ++++--- drivers/gpu/drm/i915/display/intel_display_types.h | 55 +- drivers/gpu/drm/i915/display/intel_dp.c | 7 + drivers/gpu/drm/i915/display/intel_dp_aux.c | 1 + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 43 ++ drivers/gpu/drm/i915/display/intel_dpio_phy.h | 19 +- drivers/gpu/drm/i915/display/intel_dpll.c | 2 + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 12 +- drivers/gpu/drm/i915/display/intel_drrs.c | 1 + drivers/gpu/drm/i915/display/intel_dsb.c | 1 + drivers/gpu/drm/i915/display/intel_dvo.c | 1 + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 8 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_fdi.c | 1 + drivers/gpu/drm/i915/display/intel_fifo_underrun.h | 3 +- drivers/gpu/drm/i915/display/intel_frontbuffer.c | 4 +- drivers/gpu/drm/i915/display/intel_global_state.c | 4 +- drivers/gpu/drm/i915/display/intel_global_state.h | 2 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 22 +- drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 33 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 8 +- drivers/gpu/drm/i915/display/intel_hti.c | 38 ++ drivers/gpu/drm/i915/display/intel_hti.h | 18 + drivers/gpu/drm/i915/display/intel_hti_regs.h | 16 + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 + drivers/gpu/drm/i915/display/intel_lspcon.c | 1 + drivers/gpu/drm/i915/display/intel_lvds.c | 1 + drivers/gpu/drm/i915/display/intel_mg_phy_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_modeset_setup.c | 1 + drivers/gpu/drm/i915/display/intel_panel.c | 1 + drivers/gpu/drm/i915/display/intel_pch_display.c | 1 + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 1 + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 3 +- drivers/gpu/drm/i915/display/intel_pps.c | 10 +- drivers/gpu/drm/i915/display/intel_psr.c | 21 +- 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_snps_phy_regs.h | 2 +- drivers/gpu/drm/i915/display/intel_sprite.c | 1 + drivers/gpu/drm/i915/display/intel_sprite.h | 9 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 + drivers/gpu/drm/i915/display/intel_vdsc.c | 1 + drivers/gpu/drm/i915/display/intel_vga.c | 1 + drivers/gpu/drm/i915/display/intel_vrr.c | 1 + drivers/gpu/drm/i915/display/skl_scaler.c | 2 + drivers/gpu/drm/i915/display/skl_universal_plane.c | 7 + drivers/gpu/drm/i915/display/skl_universal_plane.h | 1 + drivers/gpu/drm/i915/display/skl_watermark.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 1 + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 2 +- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 1 + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 + .../gpu/drm/i915/gt/intel_execlists_submission.c | 1 + drivers/gpu/drm/i915/gt/intel_gt.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_gtt.c | 1 + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 + drivers/gpu/drm/i915/gt/intel_workarounds.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 + drivers/gpu/drm/i915/gvt/cfg_space.c | 2 +- drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + drivers/gpu/drm/i915/gvt/display.c | 2 + drivers/gpu/drm/i915/gvt/dmabuf.h | 2 +- drivers/gpu/drm/i915/gvt/firmware.c | 2 +- drivers/gpu/drm/i915/gvt/gtt.c | 7 +- drivers/gpu/drm/i915/gvt/gvt.h | 2 - drivers/gpu/drm/i915/gvt/handlers.c | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 4 - drivers/gpu/drm/i915/gvt/mmio.c | 1 + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + drivers/gpu/drm/i915/gvt/page_track.c | 2 +- drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- drivers/gpu/drm/i915/i915_drv.h | 15 - drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_irq.c | 11 +- drivers/gpu/drm/i915/i915_irq.h | 9 - drivers/gpu/drm/i915/i915_pci.c | 1 - drivers/gpu/drm/i915/i915_perf.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 131 ++--- drivers/gpu/drm/i915/i915_reg_defs.h | 30 +- drivers/gpu/drm/i915/i915_trace.h | 1 - drivers/gpu/drm/i915/intel_device_info.c | 5 +- drivers/gpu/drm/i915/intel_dram.c | 3 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 11 +- drivers/gpu/drm/i915/intel_step.c | 7 + drivers/gpu/drm/i915/intel_uncore.c | 1 + drivers/gpu/drm/i915/vlv_sideband.c | 2 + 122 files changed, 1173 insertions(+), 749 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_reg_defs.h create mode 100644 drivers/gpu/drm/i915/display/intel_hti.c create mode 100644 drivers/gpu/drm/i915/display/intel_hti.h create mode 100644 drivers/gpu/drm/i915/display/intel_hti_regs.h