Hi Dave, drm-intel-next-2015-10-10: - dmc fixes from Animesh (not yet all) for deeper sleep states - piles of prep patches from Ville to make mmio functions type-safe - more fbc work from Paulo all over - w/a shuffling from Arun Siluvery - first part of atomic watermark updates from Matt and Ville (later parts had to be dropped again unfortunately) - lots of patches to prepare bxt dsi support ( Shashank Sharma) - userptr fixes from Chris - audio rate interface between i915/snd_hda plus kerneldoc (Libin Yang) - shrinker improvements and fixes (Chris Wilson) - lots and lots of small patches all over
Final feature pull for 4.4. As usual I'll follow up with a -next-fixes pull and then hand over to Jani. Note that there's a minor conflict in g4x_get_vblank_counter between drm-next and dinq, the prototype of the function after the merge should be static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe) Otherwise nothing nefarious conflict-wise afaics. Cheers, Daniel The following changes since commit 44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next (2015-09-30 08:47:41 +0200) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-2015-10-10 for you to fetch changes up to 80bea1897d7bc35e2b201847e12029a9d677cf12: drm/i915: Update DRIVER_DATE to 20151010 (2015-10-10 13:35:42 +0200) ---------------------------------------------------------------- - dmc fixes from Animesh (not yet all) for deeper sleep states - piles of prep patches from Ville to make mmio functions type-safe - more fbc work from Paulo all over - w/a shuffling from Arun Siluvery - first part of atomic watermark updates from Matt and Ville (later parts had to be dropped again unfortunately) - lots of patches to prepare bxt dsi support ( Shashank Sharma) - userptr fixes from Chris - audio rate interface between i915/snd_hda plus kerneldoc (Libin Yang) - shrinker improvements and fixes (Chris Wilson) - lots and lots of small patches all over ---------------------------------------------------------------- Akash Goel (1): drm/i915/bxt: Set time interval unit to 0.833us Alex Dai (3): drm/i915/guc: Fix a bug in GuC status check drm/i915/guc: Media domain bit needed when notify GuC rc6 state drm/i915/guc: Add host2guc notification for suspend and resume Ander Conselvan de Oliveira (1): drm/i915: Rename DP link training functions Animesh Manna (4): drm/i915/skl: Added a check for the hardware status of csr fw before loading. drm/i915/skl Remove the call for csr uninitialization from suspend path drm/i915/skl: Do not disable cdclk PLL if csr firmware is present drm/i915/skl: Block disable call for pw1 if dmc firmware is present. Arun Siluvery (15): drm/i915/gen9: Handle error returned by gen9_init_workarounds drm/i915/gen9: Merge two WA as they part of same register drm/i915/bxt: Add WaStoreMultiplePTEenable name drm/i915/skl: Remove WaDisableSDEUnitClockGating drm/i915/skl: Remove WaSetGAPSunitClckGateDisable drm/i915/skl: Remove WaDisableVFUnitClockGating drm/i915/gen8: Add gen8_init_workarounds for common WA drm/i915/gen8: Move INSTPM WA to common function drm/i915/gen8: Move WaDisableAsyncFlipPerfMode to common init fn drm/i915/gen8: Move WaDisablePartialInstShootdown to common init fn drm/i915/gen8: Move HiZ RAW stall optimization disable WA to common init fn drm/i915/gen8: Move Wa4x4STCOptimizationDisable to common init fn drm/i915/gen8: Move GEN7_GT_MODE WA to common init fn drm/i915/gen8: Move WaForceEnableNonCoherent to common init fn drm/i915/gen8: Move WaHdcDisableFetchWhenMasked to common init fn Chris Wilson (9): drm/i915: Only update the current userptr worker drm/i915: Fix userptr deadlock with aliased GTT mmappings drm/i915: Use a task to cancel the userptr on invalidate_range drm/i915: shrinker_control->nr_to_scan is now unsigned long drm/i915: Add a tracepoint for the shrinker drm/i915: During shrink_all we only need to idle the GPU drm/i915: Remove dead i915_gem_evict_everything() drm/i915: Avoid GPU stalls from kswapd drm/i915: Kill DRI1 cliprects Dan Carpenter (1): drm/i915: unlock on error in i915_ppgtt_info() Daniel Vetter (6): drm/i915: Fix kerneldoc for i915_gem_shrink_all Merge remote-tracking branch 'takashi/topic/drm-sync-audio-rate' into drm-intel-next-queued drm/i915: Resurrect golden context on gen6/7 Revert "drm/i915: Add hot_plug hook for hdmi encoder" Revert "drm/i915: Call encoder hotplug for init and resume cases" drm/i915: Update DRIVER_DATE to 20151010 Francisco Jerez (2): drm/i915: Don't warn if the workaround list is empty. drm/i915: Hook up ring workaround writes at context creation time on Gen6-7. Imre Deak (4): drm/i915/bxt: fix RC6 residency time calculation drm/i915: remove duplicate names for the render ring INSTDONE register drm/i915: rename INSTDONE to GEN2_INSTDONE drm/i915: rename INSTDONE1 to GEN4_INSTDONE1 Jani Nikula (5): drm/i915/ddi: warn instead of oops on invalid ddi encoder type drm/i915/ddi: use switch case instead of if ladder for ddi_get_encoder_port drm/i915: make backlight hooks connector specific drm/i915/snb: remove pre-production hardware workaround drm/i915/chv: remove pre-production hardware workarounds Javier Martinez Canillas (2): drm/i915/irq: Fix kernel-doc warnings drm/i915/irq: Fix misspelled word register in kernel-doc Jesse Barnes (1): drm/i915: fixup runtime PM handling v2 Jordan Justen (1): drm/i915: Add GEN7_GPGPU_DISPATCHDIMX/Y/Z to the register whitelist Julia Lawall (1): drm: i915: drop null test before destroy functions Libin Yang (6): drm/i915: Add audio sync_audio_rate callback drm/i915: implement sync_audio_rate callback ALSA: hda - display audio call sync_audio_rate callback drm/i915: set proper N/CTS in modeset drm/i915: add kerneldoc for i915_audio_component drm/i915: DocBook add i915_component.h support Maarten Lankhorst (1): drm/i915: Add primary plane to mask if it's visible Matt Roper (13): drm/i915: Drop redundant watermark programming drm/i915: Eliminate usage of plane_wm_parameters from ILK-style WM code (v2) drm/i915: Eliminate usage of pipe_wm_parameters from ILK-style WM (v2) drm/i915: Determine I915_MAX_PLANES from plane enum drm/i915/skl: Simplify wm structures slightly (v2) drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v3) drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check drm/i915: Drop intel_update_sprite_watermarks drm/i915: Calculate pipe watermarks into CRTC state (v3) drm/i915: Calculate ILK-style watermarks during atomic check (v3) drm/i915: Don't set plane visible during HW readout if CRTC is off drm/i915: Calculate watermark configuration during atomic check (v2) drm/i915: Partial revert of atomic watermark series Michel Thierry (2): drm/i915: Wa32bitGeneralStateOffset & Wa32bitInstructionBaseOffset drm/i915: prevent out of range pt in the PDE macros (take 3) Mika Kahola (1): drm/i915: Add CD and pixel clock information Paulo Zanoni (7): drm/i915: don't use the first stolen page on Broadwell drm/i915: extract fbc_supported() drm/i915: export size_is_valid() from __intel_fbc_update() drm/i915: don't allocate fbcon from stolen memory if it's too big drm/i915: remove pre-atomic check from SKL update_primary_plane drm/i915: fix CFB size calculation drm/i915: fix FBC buffer size checks Rasmus Villemoes (1): drm/i915: Fix comparison bug Robert Beckett (1): drm/i915: Detect virtual south bridge Sagar Arun Kamble (2): drm/i915/guc: Don't forward flip interrupts to GuC drm/i915: Update Promotion timer for RC6 TO Mode Shashank Sharma (6): drm/i915/bxt: DSI encoder support in CRTC modeset drm/i915/bxt: DSI enable for BXT drm/i915/bxt: Program Tx Rx and Dphy clocks drm/i915/bxt: DSI disable and post-disable drm/i915/bxt: get_hw_state for BXT drm/i915/bxt: get DSI pixelclock Sonika Jindal (4): drm/i915/bxt: eDP low vswing support drm/i915/bxt: Set oscaledcompmethod to enable scale value drm/i915: Call encoder hotplug for init and resume cases drm/i915: Add hot_plug hook for hdmi encoder Sudip Mukherjee (1): drm/i915: use error path Sunil Kamath (1): drm/i915/bxt: Modify BXT BLC according to VBT changes Takashi Iwai (1): drm/i915: Add missing const to audio_rate_need_prog() Tomas Elf (1): drm/i915: Early exit from semaphore_waits_for for execlist mode. Tvrtko Ursulin (2): drm/i915: Clean up associated VMAs on context destruction drm/i915: Remove wrong warning from i915_gem_context_clean Vandana Kannan (1): drm/i915: Renaming CCK related reg definitions Ville Syrjälä (26): drm/i915: Use intel_panel for DVO fixed mode handling drm/i915: Always call the adjusted mode 'adjusted_mode' drm/i915: Parametrize fence registers drm/i915: s/mode/adjusted_mode/ in functions that really get passed the adjusted_mode drm/i915: Always use crtc_ timings when dealing with adjustead_mode drm/i915: Move HDMI aspect ratio setup to .compute_config() drm/i915: Constify adjusted_mode drm/i915: Add HDMI aspect ratio property for SDVO drm/i915: Parametrize UOS_RSA_SCRATCH drm/i915: Add LO/HI PRIVATE_PAT registers drm/i915: Always use GEN8_RING_PDP_{LDW, UDW} instead of hand rolling the register offsets drm/i915: Include MCHBAR_MIRROR_BASE in ILK_GDSR drm/i915: Parametrize PALETTE and LGC_PALETTE drm/i915: s/_CURACNTR/CURCNTR(PIPE_A)/ drm/i915: Add VLV_HDMIB etc. which already include VLV_DISPLAY_BASE drm/i915: s/DDI_BUF_CTL_A/DDI_BUF_CTL(PORT_A)/ drm/i915: Read czclk from CCK on vlv/chv drm/i915: Simplify vlv/chv rc6 residency calculation drm/i915: Use czclk_freq in vlv c0 residency calculations drm/i915: s/_FDI_RXA_.../FDI_RX_...(PIPE_A)/ drm/i915: s/_TRANSA_CHICKEN/TRANS_CHICKEN(PIPE_A)/ drm/i915: Refactor ilk_update_wm (v3) drm/i915: s/GET_CFG_CR1_REG/DPLL_CFGCR1/ etc. drm/i915: Don't bypass LRC on CHV drm/i915: Skip CHV PHY asserts until PHY has been fully reset drm/i915: Determine the stolen memory base address on gen2 kbuild test robot (1): drm/i915/bxt: vlv_dsi_reset_clocks() can be static Åukasz Daniluk (1): drm/i915/bdw: Check for slice, subslice and EU count for BDW Documentation/DocBook/drm.tmpl | 1 + drivers/gpu/drm/i915/dvo.h | 4 +- drivers/gpu/drm/i915/dvo_ch7017.c | 4 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +- drivers/gpu/drm/i915/dvo_ivch.c | 12 +- drivers/gpu/drm/i915/dvo_ns2501.c | 4 +- drivers/gpu/drm/i915/dvo_sil164.c | 4 +- drivers/gpu/drm/i915/dvo_tfp410.c | 4 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +- drivers/gpu/drm/i915/i915_debugfs.c | 57 +- drivers/gpu/drm/i915/i915_dma.c | 98 +++- drivers/gpu/drm/i915/i915_drv.c | 44 +- drivers/gpu/drm/i915/i915_drv.h | 59 +-- drivers/gpu/drm/i915/i915_gem.c | 63 ++- drivers/gpu/drm/i915/i915_gem_context.c | 24 + drivers/gpu/drm/i915/i915_gem_evict.c | 45 -- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 165 ++---- drivers/gpu/drm/i915/i915_gem_fence.c | 41 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 14 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 21 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 109 +++- drivers/gpu/drm/i915/i915_gem_userptr.c | 329 ++++++------ drivers/gpu/drm/i915/i915_gpu_error.c | 31 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 +- drivers/gpu/drm/i915/i915_guc_submission.c | 63 ++- drivers/gpu/drm/i915/i915_irq.c | 32 +- drivers/gpu/drm/i915/i915_reg.h | 186 +++++-- drivers/gpu/drm/i915/i915_sysfs.c | 34 +- drivers/gpu/drm/i915/i915_trace.h | 20 + drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_audio.c | 208 +++++++- drivers/gpu/drm/i915/intel_crt.c | 4 +- drivers/gpu/drm/i915/intel_csr.c | 9 + drivers/gpu/drm/i915/intel_ddi.c | 122 +++-- drivers/gpu/drm/i915/intel_display.c | 320 +++++++----- drivers/gpu/drm/i915/intel_dp.c | 54 +- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +- drivers/gpu/drm/i915/intel_drv.h | 28 +- drivers/gpu/drm/i915/intel_dsi.c | 253 +++++---- drivers/gpu/drm/i915/intel_dsi.h | 3 + drivers/gpu/drm/i915/intel_dsi_pll.c | 116 +++++ drivers/gpu/drm/i915/intel_dvo.c | 59 +-- drivers/gpu/drm/i915/intel_fbc.c | 115 +++- drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_guc.h | 2 + drivers/gpu/drm/i915/intel_guc_fwif.h | 11 + drivers/gpu/drm/i915/intel_guc_loader.c | 21 +- drivers/gpu/drm/i915/intel_hdmi.c | 45 +- drivers/gpu/drm/i915/intel_lrc.c | 15 - drivers/gpu/drm/i915/intel_lvds.c | 3 +- drivers/gpu/drm/i915/intel_modes.c | 9 + drivers/gpu/drm/i915/intel_opregion.c | 9 +- drivers/gpu/drm/i915/intel_panel.c | 301 ++++++----- drivers/gpu/drm/i915/intel_pm.c | 812 ++++++++++++----------------- drivers/gpu/drm/i915/intel_ringbuffer.c | 119 ++--- drivers/gpu/drm/i915/intel_runtime_pm.c | 61 ++- drivers/gpu/drm/i915/intel_sdvo.c | 37 +- drivers/gpu/drm/i915/intel_sprite.c | 31 +- drivers/gpu/drm/i915/intel_uncore.c | 10 +- include/drm/i915_component.h | 64 ++- include/uapi/drm/i915_drm.h | 3 +- sound/pci/hda/patch_hdmi.c | 19 + 63 files changed, 2620 insertions(+), 1748 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch