On Tue, Dec 22, 2015 at 11:37:18AM +0100, Daniel Vetter wrote: > Hi Dave, > > Final 4.5 feature pull for drm/i915! > > drm-intel-next-2015-12-18: > - fix atomic watermark recomputation logic (Maarten) > - modeset sequence fixes for LPT (Ville) > - more kbl enabling&prep work (Rodrigo, Wayne) > - first bits for mst audio > - page dirty tracking fixes from Dave Gordon > - new get_eld hook from Takashi, also included in the sound tree > - fixup cursor handling when placed at address 0 (Ville) > - refactor VBT parsing code (Jani) > - rpm wakelock debug infrastructure ( Imre) > - fbdev is pinned again (Chris) > - tune the busywait logic to avoid wasting cpu cycles (Chris) > > Two small caveats as a heads up: > - the runtime pm wakelock debug stuff catches a few bugs. rpm is disabled > by default, but lots enable it (e.g. powertop does), and we iirc have > fixes floating for most. If we can't squeeze them all in for 4.5 because > too big or late we can just tune down the dmesg noise since the > uncovered bugs are all as old as rpm support. > - softpin is still thrashing around: Chris complains that the ABI can't be > used of anything else than beignet, but I think that's ok since easy to > remedy and softpin was done primarily for buffered svm opencl mode. And > then there's some confusion around canonical 48bit addresses that I > don't fully understand myself. I expect Tvrtko to handle this before > your merge window pull goes out. So just with Tvrtko and the canonical address is something userspace/beignet will never hit under legitimate usage. So it's just a bit of closing a corner-case, and the patch+testcase is ready except for bit of final polish and unfortunately people going on holidays already. Summary: I think that part is ok too, and we should have the final bits as soon as folks return next year. Cheers, Daniel > > Looking at -nightly I don't see a conflict with drm-next (but there's some > with Linus' tree). > > I'll also send out another drm-misc before I go on vacations, there's 1-2 > patches in there after the last pull. > > Cheers, Daniel > > > The following changes since commit e876b41ab074561d65f213bf5e0fc68cf5bc7380: > > Back merge tag 'v4.4-rc4' into drm-next (2015-12-08 11:04:26 +1000) > > are available in the git repository at: > > git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-2015-12-18 > > for you to fetch changes up to 7447a2b221cd4df3960e82478a4ee29312589611: > > drm/i915: Update DRIVER_DATE to 20151218 (2015-12-18 20:26:17 +0100) > > ---------------------------------------------------------------- > - fix atomic watermark recomputation logic (Maarten) > - modeset sequence fixes for LPT (Ville) > - more kbl enabling&prep work (Rodrigo, Wayne) > - first bits for mst audio > - page dirty tracking fixes from Dave Gordon > - new get_eld hook from Takashi, also included in the sound tree > - fixup cursor handling when placed at address 0 (Ville) > - refactor VBT parsing code (Jani) > - rpm wakelock debug infrastructure ( Imre) > - fbdev is pinned again (Chris) > - tune the busywait logic to avoid wasting cpu cycles (Chris) > > ---------------------------------------------------------------- > Chris Wilson (6): > drm/i915: Add soft-pinning API for execbuffer > drm/i915: Set the map-and-fenceable flag for preallocated objects > drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping > drm/i915: Break busywaiting for requests on pending signals > drm/i915: Limit the busy wait on requests to 5us not 10ms! > drm/i915: Only spin whilst waiting on the current request > > Daniel Vetter (3): > Merge tag 'drm-i915-get-eld' of tiwai/sound into drm-intel-next-queued > drm/i915: mdelay(10) considered harmful > drm/i915: Update DRIVER_DATE to 20151218 > > Dave Gordon (4): > drm/i915: eliminate 'temp' in gen8_for_each_{pdd, pdpe, pml4e} macros > drm/i915: intel_ring_initialized() must be simple and inline > drm/i915: mark GEM object pages dirty when mapped & written by the CPU > drm/i915: mark a newly-created GEM object dirty when filled with data > > Deepak M (3): > drm/i915: add VBT address and size fields to ASLE mailbox struct > drm/i915: dual link pipe selection for bxt > drm/i915: Add Intel opregion mailbox 5 structure > > Imre Deak (12): > drm/i915: vlv: clamp minimum RPS frequency to what Punit allows > drm/i915: clarify comment about mandatory RPM put/get during driver load/unload > drm/i915: refactor RPM disabling due to RC6 being disabled > drm/i915: get a permanent RPM reference on platforms w/o RPM support > drm/i915: remove HAS_RUNTIME_PM check from RPM get/put/assert helpers > drm/i915: add assert_rpm_wakelock_held helper > drm/i915: use assert_rpm_wakelock_held instead of opencoding it > drm/i915: add support for checking if we hold an RPM reference > drm/i915: check that we hold an RPM wakelock ref before we put it > drm/i915: add support for checking RPM atomic sections > drm/i915: check that we are in an RPM atomic section in GGTT PTE updaters > drm/i915: don't enable autosuspend on platforms without RPM support > > Jani Nikula (16): > drm/i915: move "no VBT in opregion" quirk to intel_opregion_setup() > drm/i915/bios: have functions return vbt, not bdb, header pointer > drm/i915/bios: move debug logging about VBT source to intel_parse_bios() > drm/i915/bios: rename intel_parse_bios to intel_bios_init > drm/i915: refactor VBT validation > drm/i915/opregion: make VBT size limit more strict > drm/i915/opregion: make VBT pointer a const > drm/i915: don't use a temp buffer for opregion debugfs file > drm/i915/debugfs: add a separate debugfs file for VBT > drm/i915: prefer for_each_intel_* macros for iteration > drm/i915: move drmP.h include to i915_drv.h > drm/i915/bios: fix format string of the VBT signature logging > drm/i915/bios: prefer using dev_priv over dev pointer > drm/i915/bios: reduce indent in parse_general_features > drm/i915/opregion: handle VBT sizes bigger than 6 KB > drm/i915/backlight: prefer dev_priv over dev pointer > > Joonas Lahtinen (1): > drm/i915: Cancel hangcheck before GPU is suspended > > Julia Lawall (1): > drm/i915: constify intel_dvo_dev_ops structures > > Libin Yang (2): > dp/mst: add SDP stream support > drm/i915: start adding dp mst audio > > Maarten Lankhorst (5): > drm/i915: Move disable_cxsr to the crtc_state. > drm/i915: Calculate watermark related members in the crtc_state, v4. > drm/i915/skl: Update watermarks before the crtc is disabled. > drm/i915: Remove double wait_for_vblank on broadwell. > drm/i915: Do a better job at disabling primary plane in the noatomic case. > > Matt Roper (1): > drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2) > > Mika Kuoppala (3): > drm/i915/skl: Disable coarse power gating up until F0 > drm/i915/skl: Double RC6 WRL always on > drm/i915/skl: Default to noncoherent access up to F0 > > Rodrigo Vivi (6): > drm/i915: Fix idle_frames counter. > drm/i915/kbl: Use propper ddi buffer translation table for Kabylake ULT and ULX. > drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake. > drm/i915/kbl: Fix DMC load on Kabylake. > drm/i915: Fix random aux transactions failures. > drm/i915: PSR also doesn't have link_entry_time on SKL. > > Sudip Mukherjee (1): > drm/i915: check for return value > > Takashi Iwai (2): > drm/i915: Add get_eld audio component > drm/i915: Add reverse mapping between port and intel_encoder > > Tomas Elf (1): > drm/i915: Update to post-reset execlist queue clean-up > > Ville Syrjälä (9): > drm/i915: Disable CLKOUT_DP bending on LPT/WPT as needed > drm/i915: Round to closest when computing the VGA dotclock for LPT-H > drm/i915: Disable FDI after the CRT port on LPT-H > drm/i915: Refactor LPT-H VGA dotclock disabling > drm/i915: Disable LPT-H VGA dotclock during crtc disable > drm/i915: Leave FDI running after failed link training on LPT-H > drm/i915: Kill intel_crtc->cursor_bo > drm/i915: Drop the broken cursor base==0 special casing > drm/i915: Fix AVI/HDMI/SPD infoframes on HSW+ > > Wayne Boyer (5): > drm/i915: Separate cherryview from valleyview > drm/i915: Use HAS_PCH_SPLIT to determine correct devices > drm/i915: Remove VLV A0 hack > drm/i915: Only set gem object L3 cache level for IVB devices > drm/i915: Remove BUG_ON call in vlv_enable_pll > > Zeng Zhaoxiu (1): > i915: Replace "hweight8(dev_priv->info.subslice_7eu[i]) != 1" with "!is_power_of_2(dev_priv->info.subslice_7eu[i])" > > drivers/gpu/drm/drm_dp_mst_topology.c | 38 +- > drivers/gpu/drm/i915/dvo.h | 12 +- > drivers/gpu/drm/i915/dvo_ch7017.c | 2 +- > drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- > drivers/gpu/drm/i915/dvo_ivch.c | 2 +- > drivers/gpu/drm/i915/dvo_ns2501.c | 2 +- > drivers/gpu/drm/i915/dvo_sil164.c | 2 +- > drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- > drivers/gpu/drm/i915/i915_debugfs.c | 233 +++++----- > drivers/gpu/drm/i915/i915_dma.c | 23 +- > drivers/gpu/drm/i915/i915_drv.c | 249 ++++++----- > drivers/gpu/drm/i915/i915_drv.h | 142 +++++-- > drivers/gpu/drm/i915/i915_gem.c | 218 +++++++--- > drivers/gpu/drm/i915/i915_gem_context.c | 11 +- > drivers/gpu/drm/i915/i915_gem_evict.c | 39 ++ > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 24 +- > drivers/gpu/drm/i915/i915_gem_gtt.c | 76 +++- > drivers/gpu/drm/i915/i915_gem_gtt.h | 49 +-- > drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- > drivers/gpu/drm/i915/i915_gem_stolen.c | 1 + > drivers/gpu/drm/i915/i915_guc_submission.c | 35 +- > drivers/gpu/drm/i915/i915_irq.c | 200 ++++++--- > drivers/gpu/drm/i915/i915_reg.h | 16 +- > drivers/gpu/drm/i915/i915_suspend.c | 4 +- > drivers/gpu/drm/i915/i915_sysfs.c | 10 +- > drivers/gpu/drm/i915/intel_atomic.c | 2 + > drivers/gpu/drm/i915/intel_audio.c | 95 +++-- > drivers/gpu/drm/i915/intel_bios.c | 168 ++++---- > drivers/gpu/drm/i915/intel_bios.h | 4 - > drivers/gpu/drm/i915/intel_crt.c | 35 +- > drivers/gpu/drm/i915/intel_csr.c | 13 +- > drivers/gpu/drm/i915/intel_ddi.c | 57 ++- > drivers/gpu/drm/i915/intel_display.c | 465 ++++++++++++-------- > drivers/gpu/drm/i915/intel_dp.c | 98 +++-- > drivers/gpu/drm/i915/intel_dp_mst.c | 22 + > drivers/gpu/drm/i915/intel_drv.h | 106 ++++- > drivers/gpu/drm/i915/intel_dsi.c | 53 +-- > drivers/gpu/drm/i915/intel_dsi_pll.c | 6 +- > drivers/gpu/drm/i915/intel_fbc.c | 614 +++++++++++++++------------ > drivers/gpu/drm/i915/intel_fbdev.c | 20 +- > drivers/gpu/drm/i915/intel_fifo_underrun.c | 16 +- > drivers/gpu/drm/i915/intel_guc.h | 4 - > drivers/gpu/drm/i915/intel_hdmi.c | 65 ++- > drivers/gpu/drm/i915/intel_hotplug.c | 2 +- > drivers/gpu/drm/i915/intel_i2c.c | 53 ++- > drivers/gpu/drm/i915/intel_lrc.c | 28 +- > drivers/gpu/drm/i915/intel_opregion.c | 77 +++- > drivers/gpu/drm/i915/intel_panel.c | 201 ++++----- > drivers/gpu/drm/i915/intel_pm.c | 57 ++- > drivers/gpu/drm/i915/intel_psr.c | 67 ++- > drivers/gpu/drm/i915/intel_ringbuffer.c | 52 +-- > drivers/gpu/drm/i915/intel_ringbuffer.h | 6 +- > drivers/gpu/drm/i915/intel_runtime_pm.c | 147 +++++-- > drivers/gpu/drm/i915/intel_sprite.c | 4 +- > drivers/gpu/drm/i915/intel_uncore.c | 27 +- > include/drm/drm_dp_mst_helper.h | 7 +- > include/drm/i915_component.h | 14 + > include/drm/i915_pciids.h | 13 +- > include/uapi/drm/i915_drm.h | 12 +- > 59 files changed, 2427 insertions(+), 1577 deletions(-) > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel