diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-06-21 13:59:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-21 14:00:10 +1000 |
| commit | 417f2544f48c19f5958790658c4aa30b0986647f (patch) | |
| tree | bfda8b44038a1b09a793b42898c6f0ebfa22b625 | |
| parent | 39a207d0cfce9b9937864d82bb59745ceae0cf17 (diff) | |
| parent | 1ee008f240ad5401f683ec3b79a2e3b044a82a89 (diff) | |
| download | linux-417f2544f48c19f5958790658c4aa30b0986647f.tar.gz linux-417f2544f48c19f5958790658c4aa30b0986647f.tar.bz2 linux-417f2544f48c19f5958790658c4aa30b0986647f.zip | |
Merge tag 'drm-intel-next-2019-06-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
Features:
- HDR support (Uma, Ville)
- Add I2C symlink under HDMI connector similar to DP (Oleg)
- Add ICL multi-segmented gamma support (Shashank, Uma)
- Update register whitelist support for new hardware (Robert, John)
- GuC firmware update with updated ABI interface (Michal, Oscar)
- Add support for new DMC header versions (Lucas)
- In-kernel blitter client for selftest use (Matthew)
- Add Mule Creec Canyon (MCC) PCH support to go with EHL (Matt)
- EHL platform feature updates (Matt)
- Use Command Transport Buffers with GuC on all gens (Daniele)
- New i915.force_probe module parameter to replace i915.alpha_support (Jani)
Refactoring:
- Better runtime PM code abstraction/encapsulation (Daniele)
- VBT parsing cleanup and improvements (Jani)
- Move display code to its own subdirectory (Jani)
- Header cleanup (Jani, Daniele)
- Prep work for subsclice mask expansion (Stuart)
- Use uncore mmio register accessors more, remove unused macro wrappers (Tvrtko)
- Remove unused atomic property get/set stubs (Maarten)
- GTT cleanups and improvements (Mika)
- Pass intel_ types instead of drm_ types in plenty of display code (Ville)
- Engine reset, hangcheck, fault code cleanups and improvements (Tvrtko)
- Consider AML variants simply as either KBL or CFL ULX (Ville)
- State checker cleanups and improvements (Ville)
- GEM code reorganization to more files under gem subdirectory (Chris)
- Reducing dependency on a coarse struct_mutex (Chris)
Fixes:
- Fix use of uninitialized/incorrect error pointers (Colin, Dan)
- Fix DSI fastboot on some VLV/CHV platforms (Hans)
- Fix DSI error path (Hans)
- Add ICL port A combo PHY HW state check (Imre)
- Fix ICL AUX-B HW not done issue (Imre)
- Fix perf whitelist on gen10+ (Lionel)
- Fix PSR exit by forcing manual exit on older gens (José)
- Match voltage ranges instead of exact values (Lucas)
- Fix SDVO HDMI audio, with cleanups (Ville)
- Fix plane state dumps (Ville)
- Fix driver cleanup code to support driver hot unbind (Janusz)
- Add checks for ICL memory bandwidth requirements (Ville)
- Fix toggling between no C8 planes vs. at least one C8 plane (Ville)
- Improved checks on PLL usage conditions, refactoring (Ville)
- Avoid clobbering M/N values in fastset fuzzy checks (Ville)
- Take a runtime pm wakeref for atomic commits (Chris)
- Do not allow runtime pm autosuspend to remove userspace GGTT mmaps too quickly (Chris)
- Avoid refcount_inc on known zero count to avoid debug flagging (Chris)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87v9x1lpdh.fsf@intel.com
| -rw-r--r-- | Documentation/gpu/i915.rst | 87 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig | 29 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig.debug | 15 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Kconfig.profile | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Makefile | 159 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/Makefile.header-test | 43 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/Makefile.header-test | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_ch7017.c (renamed from drivers/gpu/drm/i915/dvo_ch7017.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_ch7xxx.c (renamed from drivers/gpu/drm/i915/dvo_ch7xxx.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_ivch.c (renamed from drivers/gpu/drm/i915/dvo_ivch.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_ns2501.c (renamed from drivers/gpu/drm/i915/dvo_ns2501.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_sil164.c (renamed from drivers/gpu/drm/i915/dvo_sil164.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/dvo_tfp410.c (renamed from drivers/gpu/drm/i915/dvo_tfp410.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/icl_dsi.c (renamed from drivers/gpu/drm/i915/icl_dsi.c) | 108 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_acpi.c (renamed from drivers/gpu/drm/i915/intel_acpi.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_acpi.h (renamed from drivers/gpu/drm/i915/intel_acpi.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_atomic.c (renamed from drivers/gpu/drm/i915/intel_atomic.c) | 14 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_atomic.h (renamed from drivers/gpu/drm/i915/intel_atomic.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_atomic_plane.c (renamed from drivers/gpu/drm/i915/intel_atomic_plane.c) | 72 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_atomic_plane.h (renamed from drivers/gpu/drm/i915/intel_atomic_plane.h) | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_audio.c (renamed from drivers/gpu/drm/i915/intel_audio.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_audio.h (renamed from drivers/gpu/drm/i915/intel_audio.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.c (renamed from drivers/gpu/drm/i915/intel_bios.c) | 212 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.h (renamed from drivers/gpu/drm/i915/intel_bios.h) | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bw.c | 421 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bw.h | 47 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_cdclk.c (renamed from drivers/gpu/drm/i915/intel_cdclk.c) | 237 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_cdclk.h (renamed from drivers/gpu/drm/i915/intel_cdclk.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_color.c (renamed from drivers/gpu/drm/i915/intel_color.c) | 152 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_color.h (renamed from drivers/gpu/drm/i915/intel_color.h) | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_combo_phy.c (renamed from drivers/gpu/drm/i915/intel_combo_phy.c) | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_combo_phy.h (renamed from drivers/gpu/drm/i915/intel_combo_phy.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_connector.c (renamed from drivers/gpu/drm/i915/intel_connector.c) | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_connector.h (renamed from drivers/gpu/drm/i915/intel_connector.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_crt.c (renamed from drivers/gpu/drm/i915/intel_crt.c) | 41 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_crt.h (renamed from drivers/gpu/drm/i915/intel_crt.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c (renamed from drivers/gpu/drm/i915/intel_ddi.c) | 53 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.h (renamed from drivers/gpu/drm/i915/intel_ddi.h) | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c (renamed from drivers/gpu/drm/i915/intel_display.c) | 772 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.h (renamed from drivers/gpu/drm/i915/intel_display.h) | 82 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_power.c | 4618 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_power.h | 288 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c (renamed from drivers/gpu/drm/i915/intel_dp.c) | 51 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.h (renamed from drivers/gpu/drm/i915/intel_dp.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c (renamed from drivers/gpu/drm/i915/intel_dp_aux_backlight.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h (renamed from drivers/gpu/drm/i915/intel_dp_aux_backlight.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_link_training.c (renamed from drivers/gpu/drm/i915/intel_dp_link_training.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_link_training.h (renamed from drivers/gpu/drm/i915/intel_dp_link_training.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c (renamed from drivers/gpu/drm/i915/intel_dp_mst.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.h (renamed from drivers/gpu/drm/i915/intel_dp_mst.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpio_phy.c (renamed from drivers/gpu/drm/i915/intel_dpio_phy.c) | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpio_phy.h (renamed from drivers/gpu/drm/i915/intel_dpio_phy.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpll_mgr.c (renamed from drivers/gpu/drm/i915/intel_dpll_mgr.c) | 20 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpll_mgr.h (renamed from drivers/gpu/drm/i915/intel_dpll_mgr.h) | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi.c (renamed from drivers/gpu/drm/i915/intel_dsi.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi.h (renamed from drivers/gpu/drm/i915/intel_dsi.h) | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c (renamed from drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.h (renamed from drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi_vbt.c (renamed from drivers/gpu/drm/i915/intel_dsi_vbt.c) | 343 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dvo.c (renamed from drivers/gpu/drm/i915/intel_dvo.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dvo.h (renamed from drivers/gpu/drm/i915/intel_dvo.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dvo_dev.h (renamed from drivers/gpu/drm/i915/intel_dvo_dev.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbc.c (renamed from drivers/gpu/drm/i915/intel_fbc.c) | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbc.h (renamed from drivers/gpu/drm/i915/intel_fbc.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbdev.c (renamed from drivers/gpu/drm/i915/intel_fbdev.c) | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbdev.h (renamed from drivers/gpu/drm/i915/intel_fbdev.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fifo_underrun.c (renamed from drivers/gpu/drm/i915/intel_fifo_underrun.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_fifo_underrun.h (renamed from drivers/gpu/drm/i915/intel_fifo_underrun.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_frontbuffer.c (renamed from drivers/gpu/drm/i915/intel_frontbuffer.c) | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_frontbuffer.h (renamed from drivers/gpu/drm/i915/intel_frontbuffer.h) | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_gmbus.c (renamed from drivers/gpu/drm/i915/intel_gmbus.c) | 67 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_gmbus.h (renamed from drivers/gpu/drm/i915/intel_gmbus.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.c (renamed from drivers/gpu/drm/i915/intel_hdcp.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.h (renamed from drivers/gpu/drm/i915/intel_hdcp.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdmi.c (renamed from drivers/gpu/drm/i915/intel_hdmi.c) | 145 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdmi.h (renamed from drivers/gpu/drm/i915/intel_hdmi.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hotplug.c (renamed from drivers/gpu/drm/i915/intel_hotplug.c) | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hotplug.h (renamed from drivers/gpu/drm/i915/intel_hotplug.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lpe_audio.c (renamed from drivers/gpu/drm/i915/intel_lpe_audio.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lpe_audio.h (renamed from drivers/gpu/drm/i915/intel_lpe_audio.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lspcon.c (renamed from drivers/gpu/drm/i915/intel_lspcon.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lspcon.h (renamed from drivers/gpu/drm/i915/intel_lspcon.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lvds.c (renamed from drivers/gpu/drm/i915/intel_lvds.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_lvds.h (renamed from drivers/gpu/drm/i915/intel_lvds.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_opregion.c (renamed from drivers/gpu/drm/i915/intel_opregion.c) | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_opregion.h (renamed from drivers/gpu/drm/i915/intel_opregion.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_overlay.c (renamed from drivers/gpu/drm/i915/intel_overlay.c) | 31 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_overlay.h (renamed from drivers/gpu/drm/i915/intel_overlay.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_panel.c (renamed from drivers/gpu/drm/i915/intel_panel.c) | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_panel.h (renamed from drivers/gpu/drm/i915/intel_panel.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_pipe_crc.c (renamed from drivers/gpu/drm/i915/intel_pipe_crc.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_pipe_crc.h (renamed from drivers/gpu/drm/i915/intel_pipe_crc.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_psr.c (renamed from drivers/gpu/drm/i915/intel_psr.c) | 39 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_psr.h (renamed from drivers/gpu/drm/i915/intel_psr.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_quirks.c (renamed from drivers/gpu/drm/i915/intel_quirks.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_quirks.h (renamed from drivers/gpu/drm/i915/intel_quirks.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sdvo.c (renamed from drivers/gpu/drm/i915/intel_sdvo.c) | 21 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sdvo.h (renamed from drivers/gpu/drm/i915/intel_sdvo.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sdvo_regs.h (renamed from drivers/gpu/drm/i915/intel_sdvo_regs.h) | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sprite.c (renamed from drivers/gpu/drm/i915/intel_sprite.c) | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sprite.h (renamed from drivers/gpu/drm/i915/intel_sprite.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_tv.c (renamed from drivers/gpu/drm/i915/intel_tv.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_tv.h (renamed from drivers/gpu/drm/i915/intel_tv.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_vbt_defs.h (renamed from drivers/gpu/drm/i915/intel_vbt_defs.h) | 633 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_vdsc.c (renamed from drivers/gpu/drm/i915/intel_vdsc.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_vdsc.h (renamed from drivers/gpu/drm/i915/intel_vdsc.h) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/vlv_dsi.c (renamed from drivers/gpu/drm/i915/vlv_dsi.c) | 196 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/vlv_dsi_pll.c (renamed from drivers/gpu/drm/i915/vlv_dsi_pll.c) | 0 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/Makefile.header-test | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_busy.c | 139 |
