[PULL] drm-intel-next

Daniel Vetter
2013-08-20T05:21:47Z

Hi Dave,

New pile of stuff for -next:
- Cleanup of the old crtc helper callbacks, all encoders are now converted
to the i915 modeset infrastructure.
- Massive amount of wm patches from Ville for ilk, snb, ivb, hsw, this is
prep work to eventually get things going for nuclear pageflips where we
need to adjust watermarks on the fly.
- More vm/vma patches from Ben. This refactoring isn't yet fully rolled
out, we miss the execbuf conversion and some of the low-level
bind/unbind support code.
- Convert our hdmi infoframe code to use the new common helper functions
(Damien). This contains some bugfixes for the common infoframe helpers.
- Some cruft removal from Damien.
- Various smaller bits&pieces all over, as usual.

Cheers, Daniel

The following changes since commit cd234b0bfd5ab012e42274b24aae420fa1823d58:

drm/i915: Do not dereference NULL crtc or fb until after checking (2013-08-04 21:13:43 +0200)

are available in the git repository at:

git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-08-09

for you to fetch changes up to 5c536613d8ebda3da0448550d0a997651a6048e2:

drm/i915: Fix FB WM for HSW (2013-08-09 20:27:43 +0200)

----------------------------------------------------------------
Ben Widawsky (22):
drm/i915/hsw: Change default LLC age to 3
drm/i915: Create an init vm
drm/i915: Rework drop caches for checkpatch
drm/i915: Make proper functions for VMs
drm/i915: Use bound list for inactive shrink
drm/i915: Add VM to pin
drm/i915: Use ggtt_vm to save some typing
drm/i915: Update describe_obj
drm/i915: thread address space through execbuf
drm/i915: make caching operate on all address spaces
drm/i915: BUG_ON put_pages later
drm/i915: make reset&hangcheck code VM aware
drm/i915: eliminate dead domain clearing on reset
drm/i915: Improve VMA comments
drm/i915: Rework __i915_gem_shrink
drm/i915: plumb VM into bind/unbind code
drm/i915: Use new bind/unbind in eviction code
drm/i915: turn bound_ggtt checks to bound_any
drm/i915: Fix up map and fenceable for VMA
drm/i915: mm_list is per VMA
drm/i915: Update error capture for VMs
drm/i915: Add vma to list at creation

Chris Wilson (7):
drm/i915: Squelch repeated reasoning for why FBC cannot be activated
drm/i915: Use the same pte_encoding for ppgtt as for gtt
drm/i915: Tidy the macro casting by using an inline function
drm/i915: Acquire dpio_lock for VLV sideband programming in DP/HDMI
drm/i915: Rename I915_CACHE_MLC_LLC to L3_LLC for Ivybridge
drm/i915: Export intel_framebuffer_fini
drm/i915: List objects allocated from stolen memory in debugfs

Damien Lespiau (19):
video/hdmi: Replace the payload length by their defines
video/hdmi: Introduce a generic hdmi_infoframe union
video/hdmi: Add a macro to return the size of a full infoframe
video/hmdi: Clear the whole incoming buffer, not just the infoframe size
drm: Don't generate invalid AVI infoframes for CEA modes
drm/i915/hdmi: Change the write_infoframe vfunc to take a buffer and a type
drm/i915/hdmi: Port the infoframe code to the common hdmi helpers
drm/i915/sdvo: Port the infoframe code to the shared infrastructure
drm/i915: Remove the now obsolete infoframe definitions
drm: Handle the DBLCLK flag in the common infoframe helper
drm: Set aspect ratio fields in the AVI infoframe even for non CEA modes
drm/i915/hmdi: Rename set_infoframe() to write_infoframe()
drm/i915: Remove stale prototypes
drm/i915: Remove i915_gem_object_check_coherency()
drm/i915: Fix #endif comment
drm/i915: Make i915_hangcheck_elapsed() static
drm/i915: Make intel_encoder_dpms() static
drm/i915: Remove intel_modeset_disable()
drm/i915: Make intel_set_mode() static

Dan Carpenter (2):
drm/i915: unbreak i915_gem_object_ggtt_unbind()
drm/i915: fix a limit check in hsw_compute_wm_results()

Daniel Vetter (13):
drm/i915/dvo: use intel_encoder to the upcast macro
drm/i915/dvo: switch ->mode_fixup to ->compute_config
drm/i915: rip out legacy encoder->mode_fixup logic
drm/i915/dvo: use native encoder ->mode_set callback
drm/i915/sdvo: use intel_encoder for upcast helper
drm/i915/tv: Use native encoder->mode_set callback
drm/i915/crt: use native encoder->mode_set callback
drm/i915/hdmi: use native encoder mode_set callback
drm/i915/dp: use native encoder ->mode_set callback
drm/i915/lvds: use the native encoder ->mode_set callback
drm/i915/ddi: use the native encoder ->mode_set callback
drm/i915: rip out legacy encoder->mode_set callback
drm/i915: clean up crtc timings computation

Imre Deak (1):
drm/i915: make user mode sync polarity setting explicit

Jani Nikula (3):
drm/i915: rearrange vlv dp enable and pre_enable callbacks
drm/i915: rearrange vlv hdmi enable and pre_enable callbacks
drm/i915: move encoder->enable callback later in VLV crtc enable

Jesse Barnes (2):
drm/i915: enable IPS for bpp <= 24
drm/i915: expose HDMI connectors on port C on BYT

Paulo Zanoni (2):
drm/i915: silence useless messages about DDI buffer translation
drm/i915: remove use_fdi_mode argument from intel_prepare_ddi_buffers

Peter Wu (1):
i915: fix ACPI _DSM warning

Stéphane Marchesin (1):
drm/i915: Remove useless define

Ville Syrjälä (32):
drm/i915: Add scaled paramater to update_sprite_watermarks()
drm/i915: Pass the actual sprite width to watermarks functions
drm/i915: Calculate the sprite WM based on the source width instead of the destination width
drm/i915: Rename hsw_wm_get_pixel_rate to ilk_pipe_pixel_rate
drm/i915: Rename most wm compute functions to ilk_ prefix
drm/i915: Don't pass "mem_value" to ilk_compute_fbc_wm
drm/i915: Change the watermark latency type to uint16_t
drm/i915: Split out reading of HSW watermark latency values
drm/i915: Don't multiply the watermark latency values too early
drm/i915: Add SNB/IVB support to intel_read_wm_latency
drm/i915: Add ILK support to intel_read_wm_latency
drm/i915: Store the watermark latency values in dev_priv
drm/i915: Use the stored cursor and plane latencies properly
drm/i915: Print the watermark latencies during init
drm/i915: Disable specific watermark levels when latency is zero
drm/i915: Use the watermark latency values from dev_priv for ILK/SNB/IVB too
drm/i915: Add comments about units of latency values
drm/i915: Use 'enabled' instead of 'enable' consistently in sprite WM code
drm/i915: Split watermark level computation from the code
drm/i915: Kill fbc_enable from hsw_lp_wm_results
drm/i915: Rename hsw_data_buf_partitioning to intel_ddb_partitioning
drm/i915: Silence a sparse warning
drm/i915: Pull watermark level validity check out
drm/i915: Rename hsw_lp_wm_result to intel_wm_level
drm/i915: Calculate max watermark levels for ILK+
drm/i915: Pull some watermarks state into a separate structure
drm/i915: Split plane watermark parameters into a separate struct
drm/i915: Pass crtc to our update/disable_plane hooks
drm/i915: Don't try to disable plane if it's already disabled
drm/i915: Pass plane and crtc to intel_update_sprite_watermarks
drm/i915: Always call intel_update_sprite_watermarks() when disabling a plane
drm/i915: Fix FB WM for HSW

drivers/gpu/drm/drm_edid.c | 6 +-
drivers/gpu/drm/i915/i915_debugfs.c | 135 +++++-
drivers/gpu/drm/i915/i915_dma.c | 4 -
drivers/gpu/drm/i915/i915_drv.h | 183 +++++---
drivers/gpu/drm/i915/i915_gem.c | 354 ++++++++++----
drivers/gpu/drm/i915/i915_gem_context.c | 9 +-
drivers/gpu/drm/i915/i915_gem_debug.c | 71 +--
drivers/gpu/drm/i915/i915_gem_evict.c | 55 ++-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 81 ++--
drivers/gpu/drm/i915/i915_gem_gtt.c | 67 +--
drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 9 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 115 +++--
drivers/gpu/drm/i915/i915_irq.c | 2 +-
drivers/gpu/drm/i915/i915_reg.h | 9 -
drivers/gpu/drm/i915/i915_trace.h | 37 +-
drivers/gpu/drm/i915/intel_acpi.c | 14 +-
drivers/gpu/drm/i915/intel_crt.c | 34 +-
drivers/gpu/drm/i915/intel_ddi.c | 67 +--
drivers/gpu/drm/i915/intel_display.c | 104 ++---
drivers/gpu/drm/i915/intel_dp.c | 94 ++--
drivers/gpu/drm/i915/intel_drv.h | 100 +---
drivers/gpu/drm/i915/intel_dvo.c | 56 ++-
drivers/gpu/drm/i915/intel_fb.c | 15 +-
drivers/gpu/drm/i915/intel_hdmi.c | 253 +++++-----
drivers/gpu/drm/i915/intel_lvds.c | 16 +-
drivers/gpu/drm/i915/intel_overlay.c | 2 +-
drivers/gpu/drm/i915/intel_panel.c | 3 -
drivers/gpu/drm/i915/intel_pm.c | 692 +++++++++++++++++++---------
drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +-
drivers/gpu/drm/i915/intel_sdvo.c | 61 +--
drivers/gpu/drm/i915/intel_sprite.c | 51 +-
drivers/gpu/drm/i915/intel_tv.c | 27 +-
drivers/video/hdmi.c | 57 ++-
include/linux/hdmi.h | 20 +
35 files changed, 1679 insertions(+), 1142 deletions(-)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch