On Mon, 29 Aug 2022, Jani Nikula <jani.nikula@xxxxxxxxx> wrote: > Hi Dave & Daniel - > > drm-intel-next-2022-08-29: > drm/i915 feature pull for v6.1: Hey, I started making another pull request, but realized you haven't pulled this one yet. Anything the matter, or just fell between the cracks? BR, Jani. > > Features and functionality: > - Early Meteorlake (MTL) enabling (José, Radhakrishna, Clint, Imre, Vandita, Ville, Jani) > - Support more HDMI pixel clock frequencies on DG2 (Clint) > - Sanity check PCI BARs (Piotr Piórkowski) > - Enable DC5 on DG2 (Anusha) > - DG2 DMC firmware version bump to v2.07 (Madhumitha) > - New ADL-S PCI ID (José) > > Refactoring and cleanups: > - Add display sub-struct to struct drm_i915_private (Jani) > - Add initial runtime info to device info (Jani) > - Split out HDCP and backlight registers to separate files (Jani) > > Fixes: > - Skip wm/ddb readout for disabled pipes (Ville) > - HDMI port timing quirk for GLK ECS Liva Q2 (Diego Santa Cruz) > - Fix bw init null pointer dereference (Łukasz Bartosik) > - Disable PPS power hook for DP AUX backlight (Jouni) > - Avoid warnings on registering multiple backlight devices (Arun) > - Fix dual-link DSI backlight and CABC ports for display 11+ (Jani) > - Fix Type-C PHY ownership programming in HDMI legacy mode (Imre) > - Fix unclaimed register access while loading PIPEDMC-C/D (Imre) > - Bump up CDCLK for DG2 (Stan) > - Prune modes that require HDMI 2.1 FRL (Ankit) > - Disable FBC when PSR1 is enabled in display 12-13 (Matt) > - Fix TGL+ HDMI transcoder clock and DDI BUF disable order (Imre) > - Disable PSR before disable pipe (José) > - Disable DMC handlers during firmware loading/disabling on display 12+ (Imre) > - Disable clock gating for PIPEDMC-A/B as a workaround (Imre) > > Merges: > - Two drm-next backmerges (Rodrigo, Jani) > > BR, > Jani. > > The following changes since commit 2c2d7a67defa198a8b8148dbaddc9e5554efebc8: > > Merge tag 'drm-intel-gt-next-2022-08-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2022-08-26 10:03:43 +1000) > > are available in the Git repository at: > > git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2022-08-29 > > for you to fetch changes up to 917bda9ab155032a02be1a57ebd4d949ae9e1528: > > Merge drm/drm-next into drm-intel-next (2022-08-29 15:14:59 +0300) > > ---------------------------------------------------------------- > drm/i915 feature pull for v6.1: > > Features and functionality: > - Early Meteorlake (MTL) enabling (José, Radhakrishna, Clint, Imre, Vandita, Ville, Jani) > - Support more HDMI pixel clock frequencies on DG2 (Clint) > - Sanity check PCI BARs (Piotr Piórkowski) > - Enable DC5 on DG2 (Anusha) > - DG2 DMC firmware version bump to v2.07 (Madhumitha) > - New ADL-S PCI ID (José) > > Refactoring and cleanups: > - Add display sub-struct to struct drm_i915_private (Jani) > - Add initial runtime info to device info (Jani) > - Split out HDCP and backlight registers to separate files (Jani) > > Fixes: > - Skip wm/ddb readout for disabled pipes (Ville) > - HDMI port timing quirk for GLK ECS Liva Q2 (Diego Santa Cruz) > - Fix bw init null pointer dereference (Łukasz Bartosik) > - Disable PPS power hook for DP AUX backlight (Jouni) > - Avoid warnings on registering multiple backlight devices (Arun) > - Fix dual-link DSI backlight and CABC ports for display 11+ (Jani) > - Fix Type-C PHY ownership programming in HDMI legacy mode (Imre) > - Fix unclaimed register access while loading PIPEDMC-C/D (Imre) > - Bump up CDCLK for DG2 (Stan) > - Prune modes that require HDMI 2.1 FRL (Ankit) > - Disable FBC when PSR1 is enabled in display 12-13 (Matt) > - Fix TGL+ HDMI transcoder clock and DDI BUF disable order (Imre) > - Disable PSR before disable pipe (José) > - Disable DMC handlers during firmware loading/disabling on display 12+ (Imre) > - Disable clock gating for PIPEDMC-A/B as a workaround (Imre) > > Merges: > - Two drm-next backmerges (Rodrigo, Jani) > > ---------------------------------------------------------------- > Ankit Nautiyal (1): > drm/i915/hdmi: Prune modes that require HDMI2.1 FRL > > Anusha Srivatsa (3): > drm/i915/display: Cleanup intel_phy_is_combo() > drm/i915: Pass drm_i915_private struct instead of gt for gen11_gu_misc_irq_handler/ack() > drm/i915/dg2: Add support for DC5 state > > Arun R Murthy (1): > drm/i915/display: avoid warnings when registering dual panel backlight > > Bo Liu (1): > drm/i915/irq: Fix a "the the" typo > > Clint Taylor (1): > drm/i915/mtl: Fix rawclk for Meteorlake PCH > > Diego Santa Cruz (1): > drm/i915/glk: ECS Liva Q2 needs GLK HDMI port timing quirk > > Imre Deak (6): > drm/i915/tgl+: Fix HDMI transcoder clock vs. DDI BUF disabling order > drm/i915/d12+: Disable DMC handlers during loading/disabling the firmware > drm/i915/d13: Add Wa_16015201720 disabling clock gating for PIPEDMC-A/B > drm/i915/xelpd: Fix unclaimed accesses while loading PIPEDMC-C/D > drm/i915/tc: Fix PHY ownership programming in HDMI legacy mode > drm/i915/mtl: Add VBT port and AUX_CH mapping > > Jani Nikula (42): > drm/i915/hdcp: split out hdcp registers to a separate file > drm/i915/hdcp: replace BIT() with REG_BIT() in register definitions > drm/i915/backlight: split out backlight registers to a separate file > drm/i915/dsi: filter invalid backlight and CABC ports > drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+ > drm/i915/dsi: use VBT backlight and CABC port definitions directly > drm/i915/mtl: Meteorlake and later support DP 2.0 > drm/i915/utils: remove unused KBps/MBps/GBps macros > drm/i915: combine device info printing into one > drm/i915: add initial runtime info into device info > drm/i915: move graphics.ver and graphics.rel to runtime info > drm/i915: move fbc_mask to runtime info > drm/i915: move page_sizes to runtime info > drm/i915: move ppgtt_type and ppgtt_size to runtime info > drm/i915: move has_pooled_eu to runtime info > drm/i915: move memory_regions to runtime info > drm/i915: move platform_engine_mask to runtime info > drm/i915: move pipe_mask and cpu_transcoder_mask to runtime info > drm/i915: move has_hdcp to runtime info > drm/i915: move has_dmc to runtime info > drm/i915: move has_dsc to runtime info > drm/i915: add display sub-struct to drm_i915_private > drm/i915: move cdclk_funcs to display.funcs > drm/i915: move dpll_funcs to display.funcs > drm/i915: move hotplug_funcs to display.funcs > drm/i915: move wm_disp funcs to display.funcs > drm/i915: move fdi_funcs to display.funcs > drm/i915: move color_funcs to display.funcs > drm/i915: move and group gmbus members under display.gmbus > drm/i915: move and group pps members under display.pps > drm/i915: move dmc to display.dmc > drm/i915: move and split audio under display.audio and display.funcs > drm/i915: move dpll under display.dpll > drm/i915: move and group fbdev under display.fbdev > drm/i915: move wm to display.wm > drm/i915: move hotplug to display.hotplug > drm/i915: move overlay to display.overlay > drm/i915: move and group sagv under display.sagv > drm/i915/vrr: drop window2_delay member from i915 > drm/i915: move INTEL_FRONTBUFFER_* macros to intel_frontbuffer.h > drm/i915: split gem quirks from display quirks > Merge drm/drm-next into drm-intel-next > > José Roberto de Souza (4): > Revert "drm/i915/display: Ensure PSR gets disabled if no encoders in new state" > drm/i915/psr: Disable PSR before disable pipe > drm/i915/display/mtl: Extend MBUS programming > drm/i915: Add new ADL-S pci id > > Jouni Högander (2): > drm/i915/display: Ensure PSR gets disabled if no encoders in new state > drm/i915/backlight: Disable pps power hook for aux based backlight > > Madhumitha Tolakanahalli Pradeep (1): > drm/i915/dmc: Update DG2 DMC firmware to v2.07 > > Matt Roper (1): > drm/i915: Add Wa_14016291713 > > Piotr Piórkowski (2): > drm/i915: Use of BARs names instead of numbers > drm/i915: Sanitycheck PCI BARs > > Radhakrishna Sripada (6): > drm/i915/mtl: Add PCH support > drm/i915/mtl: Add support for MTL in Display Init sequences > drm/i915: Extract wm latency adjustment to its own function > drm/i915/mtl: memory latency data from LATENCY_LPX_LPY for WM > drm/i915/mtl: Update memory bandwidth parameters > drm/i915/mtl: Reuse adl-p DBUF calculations > > Rodrigo Vivi (1): > Merge drm/drm-next into drm-intel-next > > Stanislav Lisovskiy (1): > drm/i915/dg2: Bump up CDCLK for DG2 > > Swati Sharma (1): > drm/i915/display: Add debug print for scaler filter > > Taylor, Clinton A (1): > drm/i915/dg2: Add additional HDMI pixel clock frequencies > > Vandita Kulkarni (2): > drm/i915/dsc/mtl: Update the DSC minor version > drm/i915/dsc/mtl: Enable alternate ICH method > > Ville Syrjälä (2): > drm/i915/mtl: Introduce FBC B > drm/i915: Skip wm/ddb readout for disabled pipes > > Łukasz Bartosik (1): > drm/i915: fix null pointer dereference > > drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- > drivers/gpu/drm/i915/display/icl_dsi.c | 20 +- > drivers/gpu/drm/i915/display/intel_audio.c | 96 +- > drivers/gpu/drm/i915/display/intel_backlight.c | 38 +- > .../gpu/drm/i915/display/intel_backlight_regs.h | 124 +++ > drivers/gpu/drm/i915/display/intel_bios.c | 24 +- > drivers/gpu/drm/i915/display/intel_bw.c | 66 +- > drivers/gpu/drm/i915/display/intel_cdclk.c | 87 +- > drivers/gpu/drm/i915/display/intel_color.c | 34 +- > .../gpu/drm/i915/display/intel_crtc_state_dump.c | 9 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 46 +- > drivers/gpu/drm/i915/display/intel_display.c | 82 +- > drivers/gpu/drm/i915/display/intel_display.h | 4 +- > drivers/gpu/drm/i915/display/intel_display_core.h | 261 +++++ > .../gpu/drm/i915/display/intel_display_debugfs.c | 55 +- > drivers/gpu/drm/i915/display/intel_display_power.c | 29 +- > .../drm/i915/display/intel_display_power_well.c | 19 +- > drivers/gpu/drm/i915/display/intel_dmc.c | 142 ++- > drivers/gpu/drm/i915/display/intel_dmc.h | 1 + > drivers/gpu/drm/i915/display/intel_dmc_regs.h | 2 + > drivers/gpu/drm/i915/display/intel_dp.c | 24 +- > drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 1 + > drivers/gpu/drm/i915/display/intel_dpll.c | 24 +- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 112 +- > drivers/gpu/drm/i915/display/intel_dsi.h | 3 - > .../gpu/drm/i915/display/intel_dsi_dcs_backlight.c | 14 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 12 +- > drivers/gpu/drm/i915/display/intel_fbc.h | 1 + > drivers/gpu/drm/i915/display/intel_fbdev.c | 26 +- > drivers/gpu/drm/i915/display/intel_fdi.c | 8 +- > drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + > drivers/gpu/drm/i915/display/intel_frontbuffer.h | 18 + > drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +- > drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +- > drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 270 +++++ > drivers/gpu/drm/i915/display/intel_hdmi.c | 10 + > drivers/gpu/drm/i915/display/intel_hotplug.c | 116 +- > drivers/gpu/drm/i915/display/intel_lpe_audio.c | 47 +- > drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- > drivers/gpu/drm/i915/display/intel_overlay.c | 12 +- > drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +- > drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- > drivers/gpu/drm/i915/display/intel_pps.c | 48 +- > drivers/gpu/drm/i915/display/intel_psr.c | 16 +- > drivers/gpu/drm/i915/display/intel_quirks.c | 3 + > drivers/gpu/drm/i915/display/intel_snps_phy.c | 1116 ++++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_tc.c | 4 +- > drivers/gpu/drm/i915/display/intel_vdsc.c | 4 +- > drivers/gpu/drm/i915/display/intel_vrr.c | 14 +- > drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- > drivers/gpu/drm/i915/display/vlv_dsi.c | 7 +- > drivers/gpu/drm/i915/gem/i915_gem_pages.c | 4 +- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 11 +- > drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- > drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- > .../drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +- > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 +- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- > drivers/gpu/drm/i915/gt/intel_ggtt.c | 16 +- > drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- > drivers/gpu/drm/i915/gt/intel_gt.c | 3 +- > drivers/gpu/drm/i915/gt/intel_ppgtt.c | 2 +- > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 17 +- > drivers/gpu/drm/i915/gt/intel_sseu.c | 5 +- > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 - > drivers/gpu/drm/i915/gvt/cfg_space.c | 5 +- > drivers/gpu/drm/i915/gvt/handlers.c | 4 +- > drivers/gpu/drm/i915/i915_debugfs.c | 5 +- > drivers/gpu/drm/i915/i915_driver.c | 23 +- > drivers/gpu/drm/i915/i915_drv.h | 284 +---- > drivers/gpu/drm/i915/i915_gem.c | 5 +- > drivers/gpu/drm/i915/i915_getparam.c | 2 +- > drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- > drivers/gpu/drm/i915/i915_irq.c | 94 +- > drivers/gpu/drm/i915/i915_pci.c | 266 ++--- > drivers/gpu/drm/i915/i915_pci.h | 6 + > drivers/gpu/drm/i915/i915_reg.h | 404 +------ > drivers/gpu/drm/i915/i915_utils.h | 4 - > drivers/gpu/drm/i915/intel_device_info.c | 71 +- > drivers/gpu/drm/i915/intel_device_info.h | 82 +- > drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + > drivers/gpu/drm/i915/intel_pch.c | 9 +- > drivers/gpu/drm/i915/intel_pch.h | 4 + > drivers/gpu/drm/i915/intel_pci_config.h | 7 + > drivers/gpu/drm/i915/intel_pm.c | 358 ++++--- > drivers/gpu/drm/i915/intel_uncore.c | 2 +- > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 8 +- > include/drm/i915_pciids.h | 1 + > 89 files changed, 3172 insertions(+), 1684 deletions(-) > create mode 100644 drivers/gpu/drm/i915/display/intel_backlight_regs.h > create mode 100644 drivers/gpu/drm/i915/display/intel_display_core.h > create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_regs.h -- Jani Nikula, Intel Open Source Graphics Center
