[PULL] drm-intel-fixes

Daniel Vetter
2014-04-04T15:04:15Z

Hi Dave,

Merge window -fixes pull request as usual. Well, I did sneak in Jani's
drm_i915_private_t typedef removal, need to have fun with a big sed job
too ;-)

Otherwise:
- hdmi interlaced fixes (Jesse&Ville)
- pipe error/underrun/crc tracking fixes, regression in late 3.14-rc (but
not cc: stable since only really relevant for igt runs)
- large cursor wm fixes (Chris)
- fix gpu turbo boost/throttle again, was getting stuck due to vlv rps
patches (Chris+Imre)
- fix runtime pm fallout (Paulo)
- bios framebuffer inherit fix (Chris)
- a few smaller things

Also a bunch with cc: stable in here.

Note that I have a 3.14 release backmerge in here because of some vt-d
stuff (which I then actually postponed for 3.16 ...). No conflicts really
with current drm-next nor in the merge commit itself. I've frobbed the
shortlog though to exclude anything already merged into Linus' tree.

Jani and I decided that he'll take care of -fixes for 3.15 again and will
take over after this pull request.

For outstanding issues there's a bit of lifetime fun in the reset stats
code still on older platforms. Chris is working on that and I didn't
really want to delay this pull request.

Cheers, Daniel

The following changes since commit 698b3135acb94e838a33a69f1a7a684fe0d90734:

drm/i915: Include a note about the dangers of I915_READ64/I915_WRITE64 (2014-03-21 16:13:14 +0100)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/drm-intel-fixes-2014-04-04

for you to fetch changes up to 10b6ee4a87811a110cb01eaca01eb04da6801baf:

Skip intel_crt_init for Dell XPS 8700 (2014-04-04 09:30:53 +0200)

----------------------------------------------------------------
Akash Goel (1):
drm/i915: Remove the enabling of VS_TIMER_DISPATCH bit in MI MODE reg

Chris Wilson (8):
drm/i915: Compute WM for current cursor size
drm/i915: Recompute WM when the cursor size changes
drm/i915: Broadwell expands ACTHD to 64bit
drm/i915: Split 64bit hexadecimal addresses to make them easier to read
Revert "drm/i915: Disable/Enable PM Intrrupts based on the current freq."
drm/i915: Refactor gen6_set_rps
drm/i915: Mask PM/RPS interrupt generation based on activity
drm/i915: Fix the computation of required fb size for pipe

Damien Lespiau (1):
drm/i915/bdw: Implement Wa4x4STCOptimizationDisable:bdw

Daniel Vetter (6):
drm/i915: add locking to fixed panel edid probing
drm/i915: fix up semaphore_waits_for
drm/i915: Fix initial pipe underrun state tracking
drm/i915: Undo gtt scratch pte unmapping again
Merge tag 'v3.14' into drm-intel-next-queued
drm/i915: restrict vt-d stolen memory workaround to pre-gen8

Deepak S (2):
drm/i915: Track the enabled PM interrupts in dev_priv.
Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

Giacomo Comes (1):
Skip intel_crt_init for Dell XPS 8700

Imre Deak (3):
drm/i915: vlv: reserve the GT power context only once during driver init
drm/i915: move power domain init earlier during system resume
drm/i915: vlv: fix RPS interrupt mask setting

Jani Nikula (9):
drm/i915/tv: fix gen4 composite s-video tv-out
drm/i915/debugfs: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/dma: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/gem: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/irq: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/display: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/ringbuffer: prefer struct drm_i915_private to drm_i915_private_t
drm/i915/overlay: prefer struct drm_i915_private to drm_i915_private_t
drm/i915: prefer struct drm_i915_private to drm_i915_private_t

Jesse Barnes (1):
drm/i915/vlv: use W_SYNC_SHIFT for interlaced modes on VLV

Paulo Zanoni (7):
drm/i915: don't schedule force_wake_timer at gen6_read
drm/i915: get runtime PM at i915_reg_read_ioctl
drm/i915: don't read pp_ctrl_reg if we're suspended
drm/i915: get runtime PM at i915_display_info
drm/i915: don't read cursor registers on powered down pipes
drm/i915: fix WARNs when reading DDI state while suspended
drm/i915: don't get/put runtime PM at the debugfs forcewake file

Ville Syrjälä (3):
drm/i915: Program VSYNCSHIFT in a more consistent manner
drm/i915: Fix the interlace mode selection for gmch platforms
drm/i915: Make sure vsyncshift is positive

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch