Hi Dave,
Last 3.11 feature pull. I have a few odds bits and pieces and fixes in my queue, I'll sort them out later on to see what's for 3.11-fixes and what's for 3.12. But nothing to hold this here up imo.
Highlights: - more hangcheck work from Mika and Chris to prepare for arb robustness - trickle feed fixes from Ville - first parts of the shared pch pll rework, with some basic hw state readout and cross-checking (this shuts up the confused pch pll refcount WARN that Linus just recently forwarded) - Haswell audio power well support from Wang Xingchao (alsa bits acked by Takashi) - some cleanups and asserts sprinkling around the plane/gamma enabling sequence from Ville - more gtt refactoring from Ben - clear up the adjusted->mode vs. pixel clock vs. port clock confusion - 30bpp support, this time for real hopefully
Now that you've backmerged 3.10-rc7 into drm-next the ugly conflicts are gone, on a quick testmerge it was just 2 cases for nearby lines changed. You can't use my -nightly branch though to peek since I first merge in my on -fixes, so the entire sdvo conflict mess is still there.
Cheers, Daniel
The following changes since commit 92d44621ad2d083bc03920c904ca0a5eb10d9ded:
drm/i915: add i915_ips_status debugfs entry (2013-05-31 21:40:20 +0200)
are available in the git repository at:
git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-06-18
for you to fetch changes up to 854c94a7854a4fabdd7db451cf1774e6dcba6bab:
drm/i915: remove a superflous semi-colon (2013-06-18 14:05:22 +0200)
---------------------------------------------------------------- Ben Widawsky (6): drm/i915: Demote unknown param to DRM_DEBUG drm/i915: Make stolen use pin pages drm/i915: Unpin stolen pages drm/i915: unpin pages at unbind drm/i915: Rename the gtt_list to global_list drm/i915: Remove extra "ring" from error message
Chris Wilson (8): drm/i915: Track clients and print their object usage in debugfs drm/i915: Track when we dirty the scanout with render commands drm/i915: Remove dead code from SDVO initialisation drm/i915: Initialize ring->hangcheck upon ring init drm/i915: Only slightly increment hangcheck score if we succesfully kick a ring drm/i915: Don't count semaphore waits towards a stuck ring drm/i915: Eliminate the addr/seqno from the hangcheck warning drm/i915: WARN if the fence pin_count is invalid
Damien Lespiau (3): drm/i915: Use FBINFO_STATE defines instead of 0 and 1 drm/i915: Fix old reference to i830_sdvo_get_capabilities() drm/i915: Initialize active_outputs to never read unitialized values
Dan Carpenter (1): drm/i915: remove a superflous semi-colon
Daniel Vetter (43): drm/i915: optimize vblank waits in set_base_atomic drm/i915: refactor sink bpp clamping drm/i915: fix EDID/sink-based bpp clamping drm/i915: split out intel_pnv_find_best_PLL drm/i915: move find_pll callback to dev_priv->display drm/i915: fold in IS_PNV checks from the split up find_dpll functions drm/i915: clear up the fdi dotclock semantics for M/N computation drm/i915: refactor cpu eDP PLL handling a bit drm/i915: store adjusted dotclock in adjusted_mode->clock drm/i915: Drop some no longer required mode/adjusted_mode parameters drm/i915: check for strange pfit pipe assignemnt on ivb/hsw drm/i915: consolidate and tighten encoder cloning checks drm/i915: set default value for config->pixel_multiplier drm/i915: hw state readout support for pixel_multiplier drm/i915: pipe config quirk infrastructure plus sdvo mode.flags fix drm/i915: enable 30bpp for DP outputs drm/i915: fix up pch pll handling in ->mode_set drm/i915: conditionally disable pch resources in ilk_crtc_disable drm/i915: lock down pch pll accouting some more drm/i915: s/pch_pll/shared_dpll/ drm/i915: switch crtc->shared_dpll from a pointer to an enum drm/i915: move shared_dpll into the pipe config drm/i915: refactor PCH_DPLL_SEL #defines drm/i915: hw state readout for shared pch plls drm/i915: consolidate ->num_shared_dplls assignement drm/i915: metadata for shared dplls drm/i915: scrap register address storage drm/i915: enable/disable hooks for shared dplls drm/i915: drop crtc checking from assert_shared_dpll drm/i915: disable sdvo pixel multiplier cross-check for HAS_PCH_SPLIT drm/i915: pnv dpll doesn't use m1! drm/i915: display pll hw state readout and checking drm/i915: extract readout_hw_state from setup_hw_state drm/i915: split up intel_modeset_check_state drm/i915: WARN on lack of shared dpll drm/i915: hw state readout and cross-checking for shared dplls drm/i915: fix up pch pll enabling for pixel multipliers drm/i915: set up PIPECONF explicitly on ilk-ivb drm/i915: set up PIPECONF explicitly for i9xx/vlv platforms drm/i915: explicitly set up PIPECONF (and gamma table) on haswell drm/i915: stop killing pfit on i9xx drm/i915: simplify the reduced clock handling for pch plls drm/i915: Kill useless "Enable panel fitter" comments
Jani Nikula (1): drm/i915: distinguish between error messages in DIDL initialization
Mika Kuoppala (8): drm/i915: detect hang using per ring hangcheck_score drm/i915: remove i915_hangcheck_hung drm/i915: add struct i915_ctx_hang_stats drm/i915: add i915_gem_context_get_hang_stats() drm/i915: change i915_add_request to macro drm/i915: add batch bo to i915_add_request() drm/i915: store ring hangcheck action drm/i915: find guilty batch buffer on ring resets
Paulo Zanoni (2): drm/i915: add ibx_irq_preinstall drm/i915: update FBC maximum fb sizes
Rodrigo Vivi (1): drm/i915: WA: FBC Render Nuke.
Takashi Iwai (1): ALSA: hda - Move azx_first_init() into azx_probe_continue()
Ville Syrjälä (20): drm/i915: Use container_of() in the fbdev code drm/i915: s/drm_i915_private_t/struct drm_i915_private/ drm/i915: VLV doesn't have the ILK+ style LP watermark registers drm/i915: Fix DSPCLK_GATE_D for VLV Revert "drm/i915: Include display_mmio_offset in sequencer index/data registers" drm/i915: Always load the display palette before enabling the pipe drm/i915: Always enable the cursor right after the primary plane drm/i915: Enable the overlay right after primary and cursor planes drm/i915: Follow the same sequence when disabling planes drm/i915: Drop overlay DPMS call from valleyview_crtc_enable drm/i915: Disable/restore all sprite planes around modeset drm/i915: Improve assert_planes_disabled() drm/i915: Spruce up assert_sprites_disabled() drm/i915: Assert dpll running in intel_crtc_load_lut() on pre-PCH platforms drm/i915: Disable primary plane trickle feed for g4x drm/i915: Disable trickle feed via MI_ARB_STATE for the gen4 drm/i915: Disable trickle feed in ironlake_init_clock_gating() drm/i915: Refactor ctg+ trickle feed disable drm/i915: Make g4x_fixup_plane() operational again drm/i915: Try harder to disable trickle feed on VLV
Wang Xingchao (3): ALSA: hda - Fix runtime PM check ALSA: hda - Add power-welll support for haswell HDA i915/drm: Add private api for power well usage
drivers/gpu/drm/i915/i915_debugfs.c | 53 +- drivers/gpu/drm/i915/i915_dma.c | 11 +- drivers/gpu/drm/i915/i915_drv.c | 13 +- drivers/gpu/drm/i915/i915_drv.h | 105 ++- drivers/gpu/drm/i915/i915_gem.c | 154 +++- drivers/gpu/drm/i915/i915_gem_context.c | 30 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 4 +- drivers/gpu/drm/i915/i915_irq.c | 304 ++++--- drivers/gpu/drm/i915/i915_reg.h | 42 +- drivers/gpu/drm/i915/i915_ums.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 1250 +++++++++++++++++----------- drivers/gpu/drm/i915/intel_dp.c | 52 +- drivers/gpu/drm/i915/intel_drv.h | 46 +- drivers/gpu/drm/i915/intel_fb.c | 21 +- drivers/gpu/drm/i915/intel_hdmi.c | 4 +- drivers/gpu/drm/i915/intel_lvds.c | 23 +- drivers/gpu/drm/i915/intel_opregion.c | 4 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_pm.c | 162 ++-- drivers/gpu/drm/i915/intel_ringbuffer.c | 33 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 7 + drivers/gpu/drm/i915/intel_sdvo.c | 83 +- drivers/gpu/drm/i915/intel_sprite.c | 8 + drivers/gpu/drm/i915/intel_tv.c | 3 - include/drm/i915_powerwell.h | 36 + sound/pci/hda/Kconfig | 10 + sound/pci/hda/Makefile | 2 + sound/pci/hda/hda_i915.c | 75 ++ sound/pci/hda/hda_i915.h | 35 + sound/pci/hda/hda_intel.c | 87 +- 33 files changed, 1799 insertions(+), 881 deletions(-) create mode 100644 include/drm/i915_powerwell.h create mode 100644 sound/pci/hda/hda_i915.c create mode 100644 sound/pci/hda/hda_i915.h