mbox series

[PULL] drm-intel-next for v4.21/v5.1

Message ID 87pnvneq5i.fsf@intel.com (mailing list archive)
State New, archived
Headers show
Series [PULL] drm-intel-next for v4.21/v5.1 | expand

Pull-request

git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2018-11-02

Message

Jani Nikula Nov. 2, 2018, 10:21 a.m. UTC
Hi Dave -

I just tagged this minutes ago, but I'm sending this now because I'll be
out for about a week. I don't expect you to pull this until some time
after -rc1 anyway. I'm asking Joonas and Rodrigo to tell you if this
one's a go or a no go.

There's a couple of backmerges in there, and I'd probably like to do
another one once you've backmerged from Linus.

I suck at making myself write proper changelogs. It's a random unordered
jumble, I'm afraid. One of these days I'll learn to do it
right. Promise!

BR,
Jani.


drm-intel-next-2018-11-02:
The first big pile of changes for v4.21/v5.1:

- DP Display Stream Compression preliminary work, helpers, etc. (Manasi, Anusha)
- Fix flex IO lane count programming (Manasi)
- GEM selftest updates (Chris, Matthew)
- ICL DSI enabling (Madhav, Jani)
- CSR firmware definition cleanup (Jani)
- CSR ICL stepping info, DC5/DC6 debugfs info (Jyoti)
- intel_display.c cleanups and code movement (Jani, Ville)
- PSR fixes and cleanup, enable PSR1 by default on gen9+ (José, Dhinakaran)
- Perf updates (Lionel)
- DP MST fixes (Lyude)
- Improved DP MST support logging (Ville)
- ICL workarounds (Oscar, Radhakrishna, Lucas, Anuj)
- Workaround cleanups (Rodrigo)
- HDCP 2.2 prep work (Ramalingam)
- AVI infoframes for LSPCON (Shashank)
- CRTC output formats YCBCR 4:2:0 and 4:4:4 (Shashank)
- ICL PLL refactoring (Vandita)
- Watermark fixes (Paulo)
- Master intr fixes (Mika)
- Amberlake platform (José, Shawn)
- Ensure HDA suspend/resume ordering (Imre)
- eDP orientation quirks (Hans)
- DP detect and link retrain fixes and cleanups (Dhinakaran)
- GuC fixes, cleanups and selftests (Daniele, Michal, Chris)
- ICL combophy/TC fixes and cleanups (Mahesh, Lucas, José)
- ICL RGB565 90/270 plane rotation (Juha-Pekka)
- HDMI 2.0 audio N values (Clint)
- Aux channel refactoring, ICL aux power fixes (Imre)
- Opregion suspend/resume improvement (Chris)
- Sort platform if ladders newest-to-oldest (Rodrigo)
- IPC fixes (José)
- PCH reset handshake fixes for PCH NOP (José)
- Store available engine masks in intel info (Tvrtko)
- Fix video DIP register definitions (Dhinakaran)
- ICL planar formats, NV12 (Maarten)
- Plane alpha blending support (Maarten)
- crtc->config usage removal cleanups (Maarten)
- Plane init cleanups (Ville)
- Use BITS_PER_TYPE (Chris)
- Remove i915.enable_ppgtt override (Chris)
- Scheduling priority improvements (Chris)
- Fix GTT 64-bit computations on 32-bit systems (Chris)
- A number of display fixes all around... (Ville)
- A number of GEM fixes all around... (Chris)
- Tons of other fixes and improvements (Everyone)
- Failure to properly credit everyone in the above changelog (Jani)

BR,
Jani.

The following changes since commit f9885ef875e9160454392f85159163674159c51f:

  Merge tag 'drm-intel-next-fixes-2018-10-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-11-02 15:17:57 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2018-11-02

for you to fetch changes up to 5468a543409653a94344671371ff784703fdcb26:

  drm/i915: Update DRIVER_DATE to 20181102 (2018-11-02 12:04:11 +0200)

----------------------------------------------------------------
The first big pile of changes for v4.21/v5.1:

- DP Display Stream Compression preliminary work, helpers, etc. (Manasi, Anusha)
- Fix flex IO lane count programming (Manasi)
- GEM selftest updates (Chris, Matthew)
- ICL DSI enabling (Madhav, Jani)
- CSR firmware definition cleanup (Jani)
- CSR ICL stepping info, DC5/DC6 debugfs info (Jyoti)
- intel_display.c cleanups and code movement (Jani, Ville)
- PSR fixes and cleanup, enable PSR1 by default on gen9+ (José, Dhinakaran)
- Perf updates (Lionel)
- DP MST fixes (Lyude)
- Improved DP MST support logging (Ville)
- ICL workarounds (Oscar, Radhakrishna, Lucas, Anuj)
- Workaround cleanups (Rodrigo)
- HDCP 2.2 prep work (Ramalingam)
- AVI infoframes for LSPCON (Shashank)
- CRTC output formats YCBCR 4:2:0 and 4:4:4 (Shashank)
- ICL PLL refactoring (Vandita)
- Watermark fixes (Paulo)
- Master intr fixes (Mika)
- Amberlake platform (José, Shawn)
- Ensure HDA suspend/resume ordering (Imre)
- eDP orientation quirks (Hans)
- DP detect and link retrain fixes and cleanups (Dhinakaran)
- GuC fixes, cleanups and selftests (Daniele, Michal, Chris)
- ICL combophy/TC fixes and cleanups (Mahesh, Lucas, José)
- ICL RGB565 90/270 plane rotation (Juha-Pekka)
- HDMI 2.0 audio N values (Clint)
- Aux channel refactoring, ICL aux power fixes (Imre)
- Opregion suspend/resume improvement (Chris)
- Sort platform if ladders newest-to-oldest (Rodrigo)
- IPC fixes (José)
- PCH reset handshake fixes for PCH NOP (José)
- Store available engine masks in intel info (Tvrtko)
- Fix video DIP register definitions (Dhinakaran)
- ICL planar formats, NV12 (Maarten)
- Plane alpha blending support (Maarten)
- crtc->config usage removal cleanups (Maarten)
- Plane init cleanups (Ville)
- Use BITS_PER_TYPE (Chris)
- Remove i915.enable_ppgtt override (Chris)
- Scheduling priority improvements (Chris)
- Fix GTT 64-bit computations on 32-bit systems (Chris)
- A number of display fixes all around... (Ville)
- A number of GEM fixes all around... (Chris)
- Tons of other fixes and improvements (Everyone)
- Failure to properly credit everyone in the above changelog (Jani)

----------------------------------------------------------------
Andi Shyti (1):
      drm/i915: fix wrong error number report

Animesh Manna (1):
      drm/i915/icl: Enable DC9 as lowest possible state during screen-off

Anuj Phogat (1):
      drm/i915/icl:Add Wa_1606682166

Anusha Srivatsa (5):
      firmware/dmc/icl: Add missing MODULE_FIRMWARE() for Icelake.
      drm/i915/dsc: Add slice_row_per_frame in DSC PPS programming
      drm/i915/icl: Add DSS_CTL Registers
      drm/i915/icl: Fix DC9 Suspend for ICL.
      drm/i915/icl: Fix DSS_CTL register names

Chris Wilson (38):
      drm/i915/execlists: Assert the queue is non-empty on unsubmitting
      drm/i915: Match code to comment and enforce ppgtt for execlists
      drm/i915: Convert to BITS_PER_TYPE
      drm/i915: Avoid compiler warning for maybe unused gu_misc_iir
      drm/i915/selftests: Smoketest preemption
      drm/i915: Remove i915.enable_ppgtt override
      drm/i915/execlists: Avoid kicking priority on the current context
      drm/i915/selftests: Split preemption smoke test into threads
      drm/i915/selftests: Include arbitration points in preemption smoketest
      drm/i915: Reserve some priority bits for internal use
      drm/i915: Combine multiple internal plists into the same i915_priolist bucket
      drm/i915: Priority boost for new clients
      drm/i915: Pull scheduling under standalone lock
      drm/i915: Priority boost for waiting clients
      drm/i915: Replace some open-coded i915_coherent_map_type()
      drm/i915: Show actual alongside requested frequency in debugfs/i915_rps_boost_info
      drm/i915/selftests: Hold task_struct ref for smoking kthread
      drm/i915: Handle incomplete Z_FINISH for compressed error states
      drm/i915: Clear the error PTE just once on finish
      drm/i915/execlists: Flush the CS events before unpinning
      drm/i915: Only reset seqno if actually idle
      drm/i915: Remove the global cache shrink & rcu barrier on allocation failure
      drm/i915: Fixup kernel doc for param name changes
      drm/i915: Show the DPCD read error inline
      drm/i915: Inject a failure point when registering a connector
      drm/i915/selftests: Disable shrinker across mmap-exhaustion
      drm/i915: Large page offsets for pread/pwrite
      drm/i915: Hold rpm wakeref for debugfs/i915_drop_caches_set
      drm/i915/guc: Propagate the fw xfer timeout
      drm/i915: Mark skl_update_plane and skl_disable_plane as static
      drm/i915: Mark up GTT sizes as u64
      drm/i915: Compare user's 64b GTT offset even on 32b
      drm/i915/selftests: Check for hangs mid context execution tests
      drm/i915: Park signaling thread while wrapping the seqno
      drm/i915/selftests: Test vm isolation
      drm/i915/gtt: Record the scratch pte
      drm/i915/gtt: Reuse the read-only 64KiB scratch page and directories
      drm/i915: Stop calling intel_opregion unregister/register in suspend/resume

Clint Taylor (1):
      drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values

Daniele Ceraolo Spurio (9):
      drm/i915/guc: init GuC descriptors after GuC load
      drm/i915/guc: Don't clear the cookie on doorbell destroy
      drm/i915/guc: fix GuC suspend/resume
      drm/i915/guc: drop negative doorbell alloc selftest
      drm/i915/guc: rename __create/destroy_doorbell
      drm/i915/guc: reserve the doorbell before selecting the cacheline
      drm/i915/guc: doorbell checking cleanup
      drm/i915/guc: fix comment about fallback to execlists
      drm/i915/guc: remove unneeded goto from selftest

Dhinakaran Pandiyan (12):
      drm/i915/dp: Fix link retraining comment in intel_dp_long_pulse()
      drm/i915/dp: Restrict link retrain workaround to external monitors
      drm/i915/dp: Use a local variable for intel_encoder *
      drm/i915/dp: Do not grab crtc modeset lock in intel_dp_detect()
      drm/i915/dp: Kill intel_dp->detect_done flag
      drm/i915/dp: Fix duplication of DEVICE_SERVICE_IRQ handling
      drm/i915/psr: Enable PSR1 on gen-9+ HW
      drm/i915: Fix VIDEO_DIP_CTL bit shifts
      drm/i915: Move VIDEO_DIP_CTL definitions to their right place.
      drm/i915: Add function to check for linear surfaces
      drm/i915: Do not program aux plane offsets on gen11+
      drm/i915: Switch the order of function parameters

Hang Yuan (1):
      drm/i915/gtt: Revert "Disable read-only support under GVT"

Hans de Goede (1):
      drm/i915: Check for panel orientation quirks on eDP panels

Imre Deak (10):
      drm/i915/gen9+: Fix initial readout for Y tiled framebuffers
      drm/i915: Ensure proper HDA suspend/resume ordering with a device link
      drm/i915: Move intel_aux_ch() to intel_bios.c
      drm/i915: Move aux_ch to intel_digital_port
      drm/i915: Init aux_ch for HDMI ports too
      drm/i915: Use a helper to get the aux power domain
      drm/i915: Enable AUX power earlier
      drm/i915: Enable AUX power for HDMI DDI/TypeC main link too
      drm/i915: Configure AUX_CH_CTL when enabling the AUX power domain
      drm/i915/icl+: Sanitize port to PLL mapping

Jani Nikula (25):
      Merge drm/drm-next into drm-intel-next-queued
      drm/i915/csr: keep firmware name and required version together
      drm/i915/csr: keep max firmware size together with firmare name and version
      drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""
      drm/i915/csr: restructure CSR firmware definition macros
      drm/i915/dp: optimize eDP 1.4+ link config fast and narrow
      drm/i915: add a common connector type independent destroy hook
      drm/i915: nuke the intel_lvds_connector
      drm/i915: rename intel_modes.c to intel_connector.c
      drm/i915: move intel connector specific functions to intel_connector.c
      drm/i915: rename and move intel_get_pipe_from_connector()
      drm/i915: Ensure _print_param() builds with Clang
      drm/i915: Ensure intel_engine_init_execlist() builds with Clang
      drm/i915: split out display quirks to a new file
      drm/i915/quirks: pass dev_priv instead of drm dev to quirk code
      drm/i915: make encoder enable and disable hooks optional
      drm/i915/dsi: refactor bitrate calculations in intel_dsi_vbt_init()
      drm/i915/dsi: abstract dphy parameter init
      drm/i915/dsi: abstract intel_dsi_tlpx_ns()
      Merge drm/drm-next into drm-intel-next-queued
      drm/i915: remove palette_offsets from device info in favor of _PICK()
      drm/i915: define _MMIO_PLANE() in terms of _PLANE() not _MMIO_PIPE()
      drm/i915: reorder and reindent the register choosing helper wrappers
      drm/i915: also group device info array helper macros with others
      drm/i915: Update DRIVER_DATE to 20181102

Jonathan Gray (1):
      drm/i915/ringbuffer: change header SPDX identifier to MIT

Joonas Lahtinen (1):
      drm/i915: Drop rpm wakeref on error in debugfs/i915_drop_caches_set

José Roberto de Souza (17):
      drm/i915/runtime_pm: Share code to enable/disable PCH reset handshake
      drm/i915: Unset reset pch handshake when PCH is not present in one place
      drm/i915: Do not modifiy reserved bit in gens that do not have IPC
      drm/i915: Move SKL IPC WA to HAS_IPC()
      drm/i915: Move IPC WA #1141 to init_ipc()
      drm/i915: Remove duplicated definition of intel_update_rawclk
      drm/i915/psr: Share PSR and PSR2 exit mask
      drm/i915/psr: Make MASK_DISP_REG_WRITE reserved in PSR_MASK for ICL
      drm/i915/psr: Remove PSR2 TODO error handling
      drm/i915/psr: Use WA to force HW tracking to exit PSR2
      drm/i915/psr: Remove alpm from i915_psr
      drm/i915/aml: Add new Amber Lake PCI ID
      drm/i915/debugfs: Do not print cached information of a disconnected sink
      drm/i915/icl: Set TC type to unknown in the disconnection flow
      drm/i915/icl: Set TC type to unknown when a sudden disconnection happen
      drm/i915: Initialize panel_vdd_work only for eDP ports
      drm/i915/icl: Fix crash when getting DPLL of a MST encoder in TC ports

Juha-Pekka Heikkila (1):
      drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

Jyoti Yadav (2):
      drm/i915/csr: Added ICL Stepping info
      drm/i915/csr Added DC5 and DC6 counter register for ICL in debugfs entry.

Lee, Shawn C (2):
      drm/i915: Add new AML_ULX support list
      drm/i915: Apply correct ddi translation table for AML device

Lionel Landwerlin (5):
      drm/i915/perf: update generated files headers
      drm/i915/perf: remove redundant oa buffer initialization
      drm/i915/perf: pass stream to vfuncs when possible
      drm/i915/perf: add a parameter to control the size of OA buffer
      drm/i915/perf: Fix warning in documentation

Lucas De Marchi (2):
      drm/i915/icl: apply Display WA #1178 to fix type C dongles
      drm/i915/icl: Introduce new macros to get combophy registers

Lyude Paul (7):
      drm/atomic_helper: Disallow new modesets on unregistered connectors
      drm/i915: Don't unset intel_connector->mst_port
      drm/i915: Skip vcpi allocation for MSTB ports that are gone
      drm/i915: Fix intel_dp_mst_best_encoder()
      drm/atomic_helper: Allow DPMS On<->Off changes for unregistered connectors
      drm/nouveau: Fix nv50_mstc->best_encoder()
      drm/atomic_helper: Stop modesets on unregistered connectors harder

Maarten Lankhorst (39):
      drm/i915: Clean up casts to crtc_state in intel_atomic_commit_tail()
      drm/i915: Handle cursor updating active_planes correctly, v2.
      drm/i915: Unconditionally clear plane visibility, v2.
      drm/i915: Make intel_crtc_disable_planes() use active planes mask.
      drm/i915: Replace call to commit_planes_on_crtc with internal update, v2.
      drm/i915: Clean up scaler setup, v2.
      drm/i915: Move programming plane scaler to its own function.
      drm/i915: Force planar YUV coordinates to be a multiple of 2, v2.
      drm/i915: Add plane alpha blending support, v2.
      drm/i915: Remove dereferences of crtc->config in set_pipeconf/misc functions, v2.
      drm/i915: Make panel fitter functions take state
      drm/i915: Make intel_set_pipe_timings/src_size take a pointer to crtc_state
      drm/i915: Use crtc_state in ironlake_enable_pch_transcoder
      drm/i915: Make skl_detach_scalers take crtc_state
      drm/i915: Make pll functions take crtc_state, v2.
      drm/i915: Make shared dpll functions take crtc_state, v3.
      drm/i915: Make ironlake_pch_transcoder_set_timings take crtc_state
      drm/i915: Get rid of crtc->config from icl_pll_to_ddi_pll_sel
      drm/i915: Use crtc->state in intel_fbdev_init_bios
      drm/i915: Get rid of crtc->config dereference in intel_dp_retrain_link
      drm/i915: Get rid of crtc->config in chv_data_lane_soft_reset
      drm/i915: Get rid of intel_crtc->config in crtc_enable/disable functions, v2.
      drm/i915: Make intel_dp_set_m_n take crtc_state
      drm/i915: Remove crtc->config references in vlv_prepare_pll
      drm/i915: Always read out M2_N2 in intel_cpu_transcoder_get_m_n, v2.
      drm/i915: Pass crtc_state to update_scanline_offset
      drm/i915: Remove crtc->config dereferences in intel_sanitize_crtc
      drm/i915: Remove crtc->config dereferences in intel_modeset_setup_hw_state
      drm/i915: Pass crtc_state to lpt_program_iclkip
      drm/i915: Pass crtc_state to ivybridge_update_fdi_bc_bifurcation
      drm/i915: Remove crtc->config dereference from drrs_ctl
      drm/i915: Fix unsigned overflow when calculating total data rate, v2.
      drm/i915/gen11: Enable 6 sprites on gen11
      drm/i915/gen11: Link nv12 Y and UV planes in the atomic state, v5.
      drm/i915/gen11: Handle watermarks correctly for separate Y/UV planes, v2.
      drm/i915/gen11: Program the scalers correctly for planar formats, v3.
      drm/i915/gen11: Program the chroma upsampler for HDR planes.
      drm/i915/gen11: Program the Y and UV plane for planar mode correctly, v3.
      drm/i915/gen11: Expose planar format support on gen11, v2.

Madhav Chauhan (39):
      drm/i915/icl: Configure lane sequencing of combo phy transmitter
      drm/i915/icl: DSI vswing programming sequence
      drm/i915/icl: Enable DDI Buffer
      drm/i915/icl: Program T_INIT_MASTER registers
      drm/i915/icl: Define data/clock lanes dphy timing registers
      drm/i915/icl: Define TA_TIMING_PARAM registers
      drm/i915/icl: Make common DSI functions available
      drm/i915/icl: Program DSI clock and data lane timing params
      drm/i915/icl: Program TA_TIMING_PARAM registers
      drm/i915/icl: Get DSI transcoder for a given port
      drm/i915/icl: Add macros for MMIO of DSI transcoder registers
      drm/i915/icl: Define TRANS_DSI_FUNC_CONF register
      drm/i915/icl: Configure DSI transcoders
      drm/i915/icl: Define TRANS_DDI_FUNC_CTL DSI registers
      drm/i915/icl: Program TRANS_DDI_FUNC_CTL registers
      drm/i915/icl: Define DSI transcoder timing registers
      drm/i915/icl: Configure DSI transcoder timings
      drm/i915/icl: Define TRANS_CONF register for DSI
      drm/i915/icl: Enable DSI transcoders
      drm/i915/icl: Define DSI panel programming registers
      drm/i915/icl: Move dsi host init code to common file
      drm/i915/dsi: move connector mode functions to common file
      drm/i915/icl: Set max return packet size for DSI panel
      drm/i915/icl: Power on DSI panel
      drm/i915/icl: Wait for header/payload credits release
      drm/i915/icl: Turn ON panel backlight
      drm/i915/icl: Turn OFF panel backlight
      drm/i915/icl: Disable DSI transcoders
      drm/i915/icl: Power down DSI panel
      drm/i915/icl: Put DSI link in ULPS
      drm/i915/icl: Disable DDI function
      drm/i915/icl: Disable portsync mode
      drm/i915/icl: Disable DSI ports
      drm/i915/icl: Disable DSI IO power
      drm/i915/icl: Define DSI timeout registers
      drm/i915/icl: Program HS_TX_TIMEOUT/LP_RX_TIMEOUT/TA_TIMEOUT registers
      drm/i915/icl: Add DSI packet payload/header registers
      drm/i915/icl: Find DSI presence for ICL
      drm/i915/icl: Don't wait for empty FIFO

Mahesh Kumar (6):
      drm/i915: use for_each_pipe loop to assign crtc_mask
      drm/i915/icl: enable SAGV for ICL platform
      drm/i915/icl: create function to identify combophy port
      drm/i915/icl: use combophy/TC helper functions during display detection
      drm/i915/icl: Combine all port/combophy macros at one place
      drm/i915/icl: Fix DDI/TC port clk_off bits

Manasi Navare (9):
      drm/i915/dp: Link train Fallback on eDP only if fallback link BW can fit panel's native mode
      drm/dp: Add DP DSC DPCD receiver capability size define and missing SHIFT
      drm/i915/dp: Cache the DP/eDP DSC DPCD register set on Hotplug/eDP Init
      drm/dp: DRM DP helper/macros to get DP sink DSC parameters
      drm/i915/dp: Add helpers for Compressed BPP and Slice Count for DSC
      drm/i915/dp: Validate modes using max Output BPP and slice count when DSC supported
      drm/dp: Define payload size for DP SDP PPS packet
      drm/i915/icl: Fix the macros for DFLEXDPMLE register bits
      drm/i915/ICL: Add pre_pll_enable hook for ICL and set DFLEXDPMLE in this hook

Matthew Auld (1):
      drm/i915/selftest: test aligned offsets for 64K

Michal Wajdeczko (5):
      drm/i915: Fix i915_driver_init_mmio error path
      drm/i915: Inject load failure inside intel_engines_init_mmio
      drm/i915/guc: Fix Gen9 GuC loading workarounds
      drm/i915/huc: Normalize HuC status returned by I915_PARAM_HAS_HUC
      drm/i915/guc: Limit number of scratch registers used for H2G

Mika Kuoppala (3):
      drm/i915/gen8: Disable master intr before reading
      drm/i915/icl: No need to ack intr through master control
      drm/i915/icl: Disable master intr before reading

Oscar Mateo (2):
      drm/i915/icl: WaAllowUMDToModifyHalfSliceChicken7
      drm/i915/icl: WaAllowUMDToModifySamplerMode

Paulo Zanoni (6):
      drm/i915: DRM_FORMAT_C8 is not possible with Yf tiling
      drm/i915: fix the transition minimums for gen9+ watermarks
      drm/i915: fix the watermark result selection on glk/gen10+
      drm/i915: transition WMs ask for Selected Result Blocks
      drm/i915: don't write PLANE_BUF_CFG twice every time
      drm/i915: promote ddb update message to DRM_DEBUG_KMS

Radhakrishna Sripada (3):
      drm/i915/icl: Add Wa_1406609255
      drm/i915/icl: Add WaEnable32PlaneMode
      drm/i915/icl: Implement Display WA_1405510057

Ramalingam C (9):
      drm/i915: Pullout the bksv read and validation
      drm/i915: hdcp_check_link only on CP_IRQ
      drm/i915/debugfs: hdcp capability of a sink
      drm/i915: Move the DDC/AUX failure msgs to debug log
      drm/i915: wrapping all hdcp var into intel_hdcp
      drm/i915: Reassigning log level for HDCP failures
      drm: hdcp2.2 authentication msg definitions
      drm: HDMI and DP specific HDCP2.2 defines
      drm/i915: Define Intel HDCP2.2 registers

Rodrigo Vivi (16):
      drm/i915: Redefine some Whiskey Lake SKUs
      drm/i915/icl: MBUS B credit change
      drm/i915/icl: Fix signal_levels
      drm/i915: ddi_clock_get sort platforms newer-to-older.
      drm/i915: compute_min_voltage_level sort platforms newer-to-older
      drm/i915: digital_port_connected sort platforms newer-to-older
      drm/i915: power_domains_init sort platforms newer-to-older
      drm/i915: uncore_fw_domains_init sort platforms newer-to-older
      drm/i915: Prefer IS_GEN<n> check with bitmask.
      drm/i915: Kill GEN_FOREVER
      drm/i915/glk: Remove 99% limitation.
      drm/i915: Simplify has_sagv function
      drm/i915: Kill WA 0528
      drm/i915: Kill WA 0826
      drm/i915: Define WA 0870 and kill dead code.
      drm/i915: Remove CNL from WA 827

Shashank Sharma (8):
      drm/i915: Introduce CRTC output format
      drm/i915: Add CRTC output format YCBCR 4:2:0
      drm/i915: Add CRTC output format YCBCR 4:4:4
      drm/i915: Check LSPCON vendor OUI
      drm/i915: Add AVI infoframe support for LSPCON
      drm/i915: Write AVI infoframes for MCA LSPCON
      drm/i915: Write AVI infoframes for Parade LSPCON
      drm/i915: Add YCBCR 4:2:0/4:4:4 support for LSPCON

Tvrtko Ursulin (4):
      drm/i915: Trim partial view sg lists
      drm/i915: Log HWS seqno consistently
      drm/i915: GEM_WARN_ON considered harmful
      drm/i915/icl: Store available engine masks in INTEL_INFO

Vandita Kulkarni (3):
      drm/i915/icl: Refactor get_ddi_pll using helper func
      drm/i915/icl: Use helper functions to classify the ports
      drm/i915/icl: Refactor icl pll functions

Ville Syrjälä (28):
      drm/i915: Check fb stride against plane max stride
      drm/i915: Use memmove() for punching the hole into infoframes
      drm/i915: Pass intel_encoder to infoframe functions
      drm/i915: Provide more clues as to why MST is/is not used
      drm/i915: Restore vblank interrupts earlier
      drm/i915: Use the correct crtc when sanitizing plane mapping
      drm/i915: Clean up early plane debugs
      drm/i915: Fix ILK-IVB sprite enable delays
      drm/i915: Constify all plane_funcs structs
      drm/i915: Populate possible_crtcs for primary/cursor planes
      drm/i915: Don't populate plane->i9xx_plane for sprites
      drm/i915: Allow horizontal mirroring for cnl+ "sprite" planes
      drm/i915: Disallow plane scaling with specific pixel formats
      drm/i915: Add missing pixel formats for skl+ "sprites"
      drm/i915: Move plane_state->scaler_id initialization into intel_create_plane_state()
      drm/i915: Introduce intel_plane_alloc()
      drm/i915: Extract skl_universal_plane_init()
      drm/i915: s/intel_plane/plane/ in sprite init
      drm/i915: Rename variables in intel_primary_plane_create()
      drm/i915: Do intel_panel_destroy_backlight() later
      drm/i915: Drop the eDP check from intel_dp_connector_destroy()
      drm/i915: Use i915_gem_object_get_dma_address() to populate rotated vmas
      drm/i915: Relocate SKL+ NV12 src width w/a
      drm/i915: Move the SKL+ zero constant alpha handling
      drm/i915/sdvo: Utilize intel_panel for fixed_mode
      drm/i915: Don't apply the 16Gb DIMM wm latency w/a to BXT/GLK
      drm/i915: Use intel_panel_actually_set_backlight() to disable PWM backlight
      drm/i915: Fix error handling for the NV12 fb dimensions check

Xiong Zhang (1):
      drm/i915: Add ppgtt to GVT GEM context

 drivers/gpu/drm/drm_dp_helper.c                    |   90 ++
 drivers/gpu/drm/i915/Makefile                      |    5 +-
 drivers/gpu/drm/i915/gvt/gtt.h                     |    1 -
 drivers/gpu/drm/i915/gvt/scheduler.c               |   28 +
 drivers/gpu/drm/i915/i915_debugfs.c                |  155 +-
 drivers/gpu/drm/i915/i915_drv.c                    |   87 +-
 drivers/gpu/drm/i915/i915_drv.h                    |   77 +-
 drivers/gpu/drm/i915/i915_gem.c                    |   21 +-
 drivers/gpu/drm/i915/i915_gem.h                    |    4 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |   13 +-
 drivers/gpu/drm/i915/i915_gem_context.h            |    1 +
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |    2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  246 ++-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   19 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |  102 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |    1 +
 drivers/gpu/drm/i915/i915_irq.c                    |  106 +-
 drivers/gpu/drm/i915/i915_oa_bdw.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_bdw.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_bxt.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_bxt.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_cflgt2.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_cflgt2.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_cflgt3.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_cflgt3.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_chv.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_chv.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_cnl.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_cnl.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_glk.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_glk.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_hsw.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_hsw.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_icl.c                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_icl.h                 |   27 +-
 drivers/gpu/drm/i915/i915_oa_kblgt2.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_kblgt2.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_kblgt3.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_kblgt3.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt2.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt2.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt3.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt3.h              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt4.c              |   27 +-
 drivers/gpu/drm/i915/i915_oa_sklgt4.h              |   27 +-
 drivers/gpu/drm/i915/i915_params.c                 |    7 +-
 drivers/gpu/drm/i915/i915_params.h                 |    1 -
 drivers/gpu/drm/i915/i915_pci.c                    |   35 +-
 drivers/gpu/drm/i915/i915_perf.c                   |  149 +-
 drivers/gpu/drm/i915/i915_query.c                  |    2 +-
 drivers/gpu/drm/i915/i915_reg.h                    |  744 ++++++---
 drivers/gpu/drm/i915/i915_request.c                |  118 +-
 drivers/gpu/drm/i915/i915_request.h                |   13 +-
 drivers/gpu/drm/i915/i915_scheduler.c              |  399 +++++
 drivers/gpu/drm/i915/i915_scheduler.h              |   36 +
 drivers/gpu/drm/i915/i915_syncmap.c                |    2 +-
 drivers/gpu/drm/i915/i915_utils.h                  |    2 +-
 drivers/gpu/drm/i915/i915_vma.c                    |    8 +-
 drivers/gpu/drm/i915/icl_dsi.c                     |  858 +++++++++-
 drivers/gpu/drm/i915/intel_atomic.c                |  118 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   80 +-
 drivers/gpu/drm/i915/intel_audio.c                 |   22 +
 drivers/gpu/drm/i915/intel_bios.c                  |   57 +-
 drivers/gpu/drm/i915/intel_cdclk.c                 |   18 +-
 drivers/gpu/drm/i915/intel_color.c                 |    3 +-
 .../drm/i915/{intel_modes.c => intel_connector.c}  |  129 ++
 drivers/gpu/drm/i915/intel_crt.c                   |   11 +-
 drivers/gpu/drm/i915/intel_csr.c                   |  160 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  208 ++-
 drivers/gpu/drm/i915/intel_device_info.c           |   69 +-
 drivers/gpu/drm/i915/intel_device_info.h           |   18 +-
 drivers/gpu/drm/i915/intel_display.c               | 1690 ++++++++------------
 drivers/gpu/drm/i915/intel_display.h               |    9 +-
 drivers/gpu/drm/i915/intel_dp.c                    |  684 ++++----
 drivers/gpu/drm/i915/intel_dp_mst.c                |   15 +-
 drivers/gpu/drm/i915/intel_dpio_phy.c              |    4 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              |  117 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |    8 +-
 drivers/gpu/drm/i915/intel_drv.h                   |  214 ++-
 drivers/gpu/drm/i915/intel_dsi.c                   |  111 ++
 drivers/gpu/drm/i915/intel_dsi.h                   |   28 +
 drivers/gpu/drm/i915/intel_dsi_vbt.c               |  284 +++-
 drivers/gpu/drm/i915/intel_dvo.c                   |   10 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |   23 +-
 drivers/gpu/drm/i915/intel_fbc.c                   |   10 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |    8 +-
 drivers/gpu/drm/i915/intel_guc.c                   |   45 +-
 drivers/gpu/drm/i915/intel_guc.h                   |    5 +
 drivers/gpu/drm/i915/intel_guc_fw.c                |  110 +-
 drivers/gpu/drm/i915/intel_guc_fwif.h              |   41 +-
 drivers/gpu/drm/i915/intel_guc_reg.h               |   12 +
 drivers/gpu/drm/i915/intel_guc_submission.c        |  216 +--
 drivers/gpu/drm/i915/intel_hdcp.c                  |  214 ++-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  208 +--
 drivers/gpu/drm/i915/intel_huc.c                   |    7 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  312 +---
 drivers/gpu/drm/i915/intel_lspcon.c                |  347 +++-
 drivers/gpu/drm/i915/intel_lvds.c                  |   67 +-
 drivers/gpu/drm/i915/intel_opregion.c              |  158 +-
 drivers/gpu/drm/i915/intel_opregion.h              |   15 +
 drivers/gpu/drm/i915/intel_panel.c                 |   13 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  464 ++++--
 drivers/gpu/drm/i915/intel_psr.c                   |   82 +-
 drivers/gpu/drm/i915/intel_quirks.c                |  169 ++
 drivers/gpu/drm/i915/intel_ringbuffer.c            |    7 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |   24 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  152 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |   56 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  615 ++++---
 drivers/gpu/drm/i915/intel_tv.c                    |   10 +-
 drivers/gpu/drm/i915/intel_uc.c                    |    2 +-
 drivers/gpu/drm/i915/intel_uc_fw.h                 |    7 +-
 drivers/gpu/drm/i915/intel_uncore.c                |    2 +-
 drivers/gpu/drm/i915/intel_workarounds.c           |   14 +-
 drivers/gpu/drm/i915/selftests/huge_pages.c        |   36 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |  428 ++++-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |    2 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   10 +-
 drivers/gpu/drm/i915/selftests/intel_guc.c         |   59 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |    4 +-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         |  267 +++-
 drivers/gpu/drm/i915/vlv_dsi.c                     |  134 +-
 include/drm/drm_dp_helper.h                        |   88 +
 include/drm/drm_hdcp.h                             |  212 +++
 include/drm/i915_pciids.h                          |   21 +-
 include/uapi/drm/i915_drm.h                        |   15 +
 126 files changed, 8120 insertions(+), 4726 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_scheduler.c
 rename drivers/gpu/drm/i915/{intel_modes.c => intel_connector.c} (54%)
 create mode 100644 drivers/gpu/drm/i915/intel_dsi.c
 create mode 100644 drivers/gpu/drm/i915/intel_quirks.c

Comments

Dave Airlie Nov. 19, 2018, 1:33 a.m. UTC | #1
On Fri, 2 Nov 2018 at 20:21, Jani Nikula <jani.nikula@intel.com> wrote:
>
>
> Hi Dave -
>
> I just tagged this minutes ago, but I'm sending this now because I'll be
> out for about a week. I don't expect you to pull this until some time
> after -rc1 anyway. I'm asking Joonas and Rodrigo to tell you if this
> one's a go or a no go.
>
> There's a couple of backmerges in there, and I'd probably like to do
> another one once you've backmerged from Linus.
>
> I suck at making myself write proper changelogs. It's a random unordered
> jumble, I'm afraid. One of these days I'll learn to do it
> right. Promise!

So I haven't pulled this for a couple of reasons, mostly my fault, but
it would be nice if you could regenerate it with more of
drm-intel-next-queued pull in.

To explain further:

a) I rebased drm-next to v4.20-rc3 because I was away last week and
had failed to merge anything.
b) I pulled drm-misc-next + amdgpu (nothing major here).
c) I pulled this and got a conflict that nobody else has resolved in
intel_sprite.c and realised it was a pain to resolve with this merge.

intel_sprite.c got a fix in drm-fixes

27971d613fcb5b6ad96320bc4f2c90f4d4fde768    drm/i915: Clean up
skl_program_scaler()

This isn't in this pull request, it's only in drm-intel-next-queued,
so I have to create a new merge state that has never occured anywhere
else, and if I just wait for the next i915 pull has no need to exist
here, the merge looked minorly complicated and it seems likely I'd
probably get it wrong, when waiting will just make it all happen.

So please send me an updated pull and sorry for the delay that caused the noise.

Dave.