[Intel-gfx] [PULL] drm-intel-next

Jani Nikula jani.nikula at intel.com
Thu Apr 1 09:06:12 UTC 2021


Hi Dave & Daniel -

The final drm-intel-next feature pull for v5.13. Or, truthfully, a pull
request of refactoring both to clean up and prepare for future.

Joonas will still send a drm-intel-gt-next pull request, probably next
week due to easter holidays.

We'll do backmerges to sync up after everything's in drm-next.


BR,
Jani.


drm-intel-next-2021-04-01:
Features:
- Add support for FBs requiring a power-of-two stride padding (Imre)

Refactoring:
- Disassociate display version from gen (Matt)
- Refactor legacy DP and HDMI code to separate files (Ville)
- Refactor FB plane code to a separate file (Imre)
- Refactor VBT child device info parsing and usage (Jani)
- Refactor KBL/TGL/ADL-S display and gt stepping schemes (Jani)

Fixes:
- DP Link-Training Tunable PHY Repeaters (LTTPR) fixes (Imre)
- HDCP fixes (Anshuman)
- DP 2.0 HDMI 2.1 PCON Fixed Rate Link (FRL) fixes (Ankit)
- Set HDA link parameters in driver (Kai)
- Fix enabled_planes bitmask (Ville)
- Fix transposed arguments to skl_plane_wm_level() (Ville)
- Stop adding planes to the commit needlessly (Ville)

BR,
Jani.

The following changes since commit 2b25fb31a38d4fe8e745754036052ef8b16fe712:

  Merge tag 'gvt-next-2021-03-16' of https://github.com/intel/gvt-linux into drm-intel-next (2021-03-16 13:42:33 +0200)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2021-04-01

for you to fetch changes up to 81f1f8f1e1489c0bf051d5241ec10da07869b911:

  drm/i915: Fix docbook header for __intel_runtime_pm_get_if_active() (2021-03-31 16:57:33 +0300)

----------------------------------------------------------------
Features:
- Add support for FBs requiring a power-of-two stride padding (Imre)

Refactoring:
- Disassociate display version from gen (Matt)
- Refactor legacy DP and HDMI code to separate files (Ville)
- Refactor FB plane code to a separate file (Imre)
- Refactor VBT child device info parsing and usage (Jani)
- Refactor KBL/TGL/ADL-S display and gt stepping schemes (Jani)

Fixes:
- DP Link-Training Tunable PHY Repeaters (LTTPR) fixes (Imre)
- HDCP fixes (Anshuman)
- DP 2.0 HDMI 2.1 PCON Fixed Rate Link (FRL) fixes (Ankit)
- Set HDA link parameters in driver (Kai)
- Fix enabled_planes bitmask (Ville)
- Fix transposed arguments to skl_plane_wm_level() (Ville)
- Stop adding planes to the commit needlessly (Ville)

----------------------------------------------------------------
Ankit Nautiyal (3):
      drm/i915/display: Remove FRL related code from disable DP sequence for older platforms
      drm/dp_helper: Define options for FRL training for HDMI2.1 PCON
      drm/i915/display: Configure HDMI2.1 Pcon for FRL only if Src-Ctl mode is available

Anshuman Gupta (6):
      drm/i915/hdcp: mst streams type1 capability check
      drm/i915/hdcp: HDCP2.2 MST Link failure recovery
      drm/i915/hdcp: link hdcp2 recovery on link enc stopped
      drm/i915/hdcp: return correct error code
      drm/i915/hdcp: Add DP HDCP2.2 timeout to read entire msg
      drm/hdcp: DP HDCP2.2 errata LC_Send_L_Prime=16

Bhaskar Chowdhury (1):
      drm/i915/display: Fix a typo

Imre Deak (29):
      drm/i915/ilk-glk: Fix link training on links with LTTPRs
      drm/i915: Disable LTTPR support when the DPCD rev < 1.4
      drm/i915: Disable LTTPR support when the LTTPR rev < 1.4
      drm/i915: Fix the GT fence revocation runtime PM logic
      drm/i915: Fix rotation setup during plane HW readout
      drm/i915/selftest: Fix error handling in igt_vma_remapped_gtt()
      drm/i915/selftest: Fix debug message in igt_vma_remapped_gtt()
      drm/i915: Make sure i915_ggtt_view is inited when creating an FB
      drm/i915/selftest: Make sure to init i915_ggtt_view in igt_vma_rotate_remap()
      drm/i915/intel_fb: Pull FB plane functions from intel_display_types.h
      drm/i915/intel_fb: Pull FB plane functions from skl_universal_plane.c
      drm/i915/intel_fb: Pull is_surface_linear() from intel_display.c/skl_universal_plane.c
      drm/i915/intel_fb: Pull FB plane functions from intel_sprite.c
      drm/i915/intel_fb: Pull FB plane functions from intel_display.c
      drm/i915/intel_fb: Unexport intel_fb_check_stride()
      drm/i915/intel_fb: s/dev_priv/i915/
      drm/i915/intel_fb: Factor out convert_plane_offset_to_xy()
      drm/i915/intel_fb: Factor out calc_plane_aligned_offset()
      drm/i915/intel_fb: Factor out calc_plane_normal_size()
      drm/i915: Unify the FB and plane state view information into one struct
      drm/i915: Store the normal view FB pitch in FB's intel_fb_view
      drm/i915: Simplify copying the FB view state to the plane state
      drm/i915/intel_fb: Factor out calc_plane_remap_info()
      drm/i915: Shrink the size of intel_remapped_plane_info struct
      drm/i915/selftest: Unify use of intel_remapped_plane_info in igt_vma_rotate_remap()
      drm/i915: s/stride/src_stride/ in the intel_remapped_plane_info struct
      drm/i915: Add support for FBs requiring a POT stride alignment
      drm/i915/selftest: Add remap/rotate vma subtests when dst_stride!=width/height
      drm/i915: Fix docbook header for __intel_runtime_pm_get_if_active()

Jani Nikula (23):
      drm/i915: remove unused ADLS_REVID_* macros
      drm/i915/bios: mass convert dev_priv to i915
      drm/i915/bios: store bdb version in i915
      drm/i915/bios: reduce indent in sanitize_ddc_pin and sanitize_aux_ch
      drm/i915/bios: move aux ch and ddc checks at a lower level
      drm/i915/bios: limit default outputs by platform on missing VBT
      drm/i915/bios: limit default outputs to ports A through F
      drm/i915/bios: create fake child devices on missing VBT
      drm/i915/bios: rename display_device_data to intel_bios_encoder_data
      drm/i915/bios: add i915 backpointer to intel_bios_encoder_data
      drm/i915/bios: add helper functions to check output support
      drm/i915/bios: save a higher level pointer in ddi_vbt_port_info[]
      drm/i915/bios: start using the intel_bios_encoder_data directly
      drm/i915/bios: start using intel_bios_encoder_data for Type-C USB and TBT
      drm/i915/bios: add intel_bios_encoder_data to encoder, use for iboost
      drm/i915/dsc: fix DSS CTL register usage for ICL DSI transcoders
      drm/i915: split out stepping info to a new file
      drm/i915: add new helpers for accessing stepping info
      drm/i915: switch KBL to the new stepping scheme
      drm/i915: switch TGL and ADL to the new stepping scheme
      drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP
      drm/i915: rename disp_stepping->display_step and gt_stepping->gt_step
      drm/i915: rename i915_rev_steppings->intel_step_info

Kai Vehmanen (1):
      drm/i915/audio: set HDA link parameters in driver

Matt Roper (6):
      drm/i915/display: Convert gen5/gen6 tests to IS_IRONLAKE/IS_SANDYBRIDGE
      drm/i915: Add DISPLAY_VER() and related macros
      drm/i915/display: Eliminate most usage of INTEL_GEN()
      drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in intel_pm.c
      drm/i915: Convert INTEL_GEN() to DISPLAY_VER() as appropriate in i915_irq.c
      drm/i915/display: Simplify GLK display version tests

Ville Syrjälä (10):
      drm/i915: Remove dead TPS3->TPS2 fallback code
      drm/i915: Remove dead signal level debugs
      drm/i915: Relocate intel_dp_program_link_training_pattern()
      drm/i915: Split intel_ddi_encoder_reset() from intel_dp_encoder_reset()
      drm/i915: Introduce g4x_dp.c
      drm/i915: Introduce g4x_hdmi.c
      drm/i915: Give g4x_{dp,hdmi}.c g4x_ namespace
      drm/i915: Fix enabled_planes bitmask
      drm/i915: Fix transposed arguments to skl_plane_wm_level()
      drm/i915: Stop adding planes to the commit needlessly

Wan Jiabing (1):
      drm/i915: Remove repeated declaration

 drivers/gpu/drm/drm_dp_helper.c                    |   24 +-
 drivers/gpu/drm/i915/Makefile                      |    4 +
 drivers/gpu/drm/i915/display/g4x_dp.c              | 1432 ++++++++++++++++
 drivers/gpu/drm/i915/display/g4x_dp.h              |   30 +
 drivers/gpu/drm/i915/display/g4x_hdmi.c            |  616 +++++++
 drivers/gpu/drm/i915/display/g4x_hdmi.h            |   19 +
 drivers/gpu/drm/i915/display/i9xx_plane.c          |   77 +-
 drivers/gpu/drm/i915/display/icl_dsi.c             |   14 +-
 drivers/gpu/drm/i915/display/intel_atomic.c        |    7 +-
 drivers/gpu/drm/i915/display/intel_atomic_plane.c  |    5 +-
 drivers/gpu/drm/i915/display/intel_audio.c         |   48 +-
 drivers/gpu/drm/i915/display/intel_bios.c          | 1114 +++++++------
 drivers/gpu/drm/i915/display/intel_bios.h          |   17 +-
 drivers/gpu/drm/i915/display/intel_bw.c            |   10 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c         |   66 +-
 drivers/gpu/drm/i915/display/intel_color.c         |   32 +-
 drivers/gpu/drm/i915/display/intel_combo_phy.c     |    8 +-
 drivers/gpu/drm/i915/display/intel_crt.c           |   12 +-
 drivers/gpu/drm/i915/display/intel_crt.h           |    1 -
 drivers/gpu/drm/i915/display/intel_crtc.c          |   20 +-
 drivers/gpu/drm/i915/display/intel_csr.c           |    4 +-
 drivers/gpu/drm/i915/display/intel_cursor.c        |   29 +-
 drivers/gpu/drm/i915/display/intel_ddi.c           |  143 +-
 drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c |    4 +-
 drivers/gpu/drm/i915/display/intel_display.c       | 1160 ++-----------
 drivers/gpu/drm/i915/display/intel_display.h       |   14 -
 .../gpu/drm/i915/display/intel_display_debugfs.c   |   47 +-
 drivers/gpu/drm/i915/display/intel_display_power.c |   54 +-
 drivers/gpu/drm/i915/display/intel_display_types.h |  100 +-
 drivers/gpu/drm/i915/display/intel_dp.c            | 1718 ++------------------
 drivers/gpu/drm/i915/display/intel_dp.h            |   11 -
 drivers/gpu/drm/i915/display/intel_dp_aux.c        |   19 +-
 drivers/gpu/drm/i915/display/intel_dp_hdcp.c       |   84 +-
 .../gpu/drm/i915/display/intel_dp_link_training.c  |  108 +-
 .../gpu/drm/i915/display/intel_dp_link_training.h  |    5 +-
 drivers/gpu/drm/i915/display/intel_dp_mst.c        |   20 +-
 drivers/gpu/drm/i915/display/intel_dpll.c          |   12 +-
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c      |   22 +-
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c       |    4 +-
 drivers/gpu/drm/i915/display/intel_fb.c            |  962 +++++++++++
 drivers/gpu/drm/i915/display/intel_fb.h            |   54 +
 drivers/gpu/drm/i915/display/intel_fbc.c           |   68 +-
 drivers/gpu/drm/i915/display/intel_fdi.c           |    6 +-
 drivers/gpu/drm/i915/display/intel_fifo_underrun.c |    8 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c         |    2 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c          |   54 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c          |  647 +-------
 drivers/gpu/drm/i915/display/intel_hdmi.h          |    3 -
 drivers/gpu/drm/i915/display/intel_lvds.c          |   12 +-
 drivers/gpu/drm/i915/display/intel_overlay.c       |   12 +-
 drivers/gpu/drm/i915/display/intel_panel.c         |   18 +-
 drivers/gpu/drm/i915/display/intel_pipe_crc.c      |   16 +-
 drivers/gpu/drm/i915/display/intel_pps.c           |    7 +-
 drivers/gpu/drm/i915/display/intel_psr.c           |   51 +-
 drivers/gpu/drm/i915/display/intel_sdvo.c          |    8 +-
 drivers/gpu/drm/i915/display/intel_sprite.c        |   74 +-
 drivers/gpu/drm/i915/display/intel_sprite.h        |    1 -
 drivers/gpu/drm/i915/display/intel_tc.c            |    8 +-
 drivers/gpu/drm/i915/display/intel_tv.c            |    8 +-
 drivers/gpu/drm/i915/display/intel_vdsc.c          |   22 +-
 drivers/gpu/drm/i915/display/intel_vga.c           |    4 +-
 drivers/gpu/drm/i915/display/intel_vrr.h           |    1 -
 drivers/gpu/drm/i915/display/skl_scaler.c          |    8 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c |  182 +--
 drivers/gpu/drm/i915/display/skl_universal_plane.h |    2 -
 drivers/gpu/drm/i915/gt/gen8_engine_cs.c           |    2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c               |   56 +-
 drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c       |   13 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.c        |   55 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |   16 +-
 drivers/gpu/drm/i915/i915_drv.c                    |    3 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  150 +-
 drivers/gpu/drm/i915/i915_irq.c                    |   66 +-
 drivers/gpu/drm/i915/i915_pci.c                    |    3 +-
 drivers/gpu/drm/i915/i915_vma_types.h              |   12 +-
 drivers/gpu/drm/i915/intel_device_info.c           |    2 +-
 drivers/gpu/drm/i915/intel_device_info.h           |    6 +
 drivers/gpu/drm/i915/intel_pm.c                    |  146 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |   29 +-
 drivers/gpu/drm/i915/intel_runtime_pm.h            |    5 +
 drivers/gpu/drm/i915/intel_step.c                  |  106 ++
 drivers/gpu/drm/i915/intel_step.h                  |   40 +
 drivers/gpu/drm/i915/selftests/i915_vma.c          |  219 ++-
 include/drm/drm_dp_helper.h                        |    6 +-
 include/drm/drm_hdcp.h                             |    5 +-
 85 files changed, 5466 insertions(+), 4826 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.c
 create mode 100644 drivers/gpu/drm/i915/display/g4x_dp.h
 create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.c
 create mode 100644 drivers/gpu/drm/i915/display/g4x_hdmi.h
 create mode 100644 drivers/gpu/drm/i915/display/intel_fb.c
 create mode 100644 drivers/gpu/drm/i915/display/intel_fb.h
 create mode 100644 drivers/gpu/drm/i915/intel_step.c
 create mode 100644 drivers/gpu/drm/i915/intel_step.h

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the Intel-gfx mailing list