Hi Dave,

drm-intel-next-2014-04-16: - vlv infoframe fixes from Jesse - dsi/mipi fixes from Shobhit - gen8 pageflip fixes for LRI/SRM from Damien - cmd parser fixes from Brad Volkin - some prep patches for CHV, DRRS, ... - and tons of little things all over drm-intel-next-2014-04-04: - cmd parser for gen7 but only in enforcing and not yet granting mode - the batch copying stuff is still missing. Also performance is a bit ... rough (Brad Volkin + OACONTROL fix from Ken). - deprecate UMS harder (i.e. CONFIG_BROKEN) - interrupt rework from Paulo Zanoni - runtime PM support for bdw and snb, again from Paulo - a pile of refactorings from various people all over the place to prep for new stuff (irq reworks, power domain polish, ...)

drm-intel-next-2014-04-04: - cmd parser for gen7 but only in enforcing and not yet granting mode - the batch copying stuff is still missing. Also performance is a bit ... rough (Brad Volkin + OACONTROL fix from Ken). - deprecate UMS harder (i.e. CONFIG_BROKEN) - interrupt rework from Paulo Zanoni - runtime PM support for bdw and snb, again from Paulo - a pile of refactorings from various people all over the place to prep for new stuff (irq reworks, power domain polish, ...)

As discussed on irc this contains a (not yet fully tuned and also not yet in granting mode) cmd parser for gen7. Performance is still a bit rough, but not quite as bad as originally feared (Ken later on discovered that he also changed something in his glamour setup which made things worse). If it doesn't get better (and ofc if we don't get all the missing bits in for granting mode) I'll disable it before 3.16 again. But I want to give this beast as much testing as possible for now to avoid ugly regressions once we switch it on.

Also please don't use the autogenerate merge commit since that'll miss the stuff from the 1st drm-intel-next tag.

If I read the merges in -nightly correctly there's a bit a conflict in i915_gem_context.c. I can provide an example merge if you want (or otherwise just peak at linux-next or drm-intel-nightly).

Cheers, Daniel

The following changes since commit c39b06951f1dc2e384650288676c5b7dcc0ec92c:

DRM: armada: fix corruption while loading cursors (2014-04-08 10:51:03 +1000)

are available in the git repository at:

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

for you to fetch changes up to c79057922ed6c2c6df1214e6ab4414fea1b23db2:

drm/i915: Remove vblank wait from haswell_write_eld (2014-04-16 18:52:47 +0200)

---------------------------------------------------------------- - vlv infoframe fixes from Jesse - dsi/mipi fixes from Shobhit - gen8 pageflip fixes for LRI/SRM from Damien - cmd parser fixes from Brad Volkin - some prep patches for CHV, DRRS, ... - and tons of little things all over

---------------------------------------------------------------- Akash Goel (2): drm/i915: Enabling the TLB invalidate bit in GFX Mode register drm/i915/vlv:Implement the WA 'WaDisable_RenderCache_OperationalFlush'

Ben Widawsky (10): drm/i915: Split out GTT specific header file drm/i915: Allow full PPGTT with param override drm/i915/bdw: Set initial rps freq to RP1 drm/i915/bdw: Extract rp_state_caps logic drm/i915/bdw: RPS frequency bits are the same as HSW drm/i915/bdw: Expand FADD to 64bit drm/i915: Invariably invalidate before ctx switch drm/i915: Unref context on failed eb_create drm/i915: Dump the whole context object. drm/i915/bdw: Add 42ms delay for IPS disable

Brad Volkin (15): drm/i915: Initial command parser table definitions drm/i915: Reject privileged commands drm/i915: Allow some privileged commands from master drm/i915: Add register whitelists for mesa drm/i915: Add register whitelist for DRM master drm/i915: Enable register whitelist checks drm/i915: Reject commands that explicitly generate interrupts drm/i915: Enable PPGTT command parser checks drm/i915: Reject commands that would store to global HWS page drm/i915: Add a CMD_PARSER_VERSION getparam drm/i915: Enable command parsing by default drm/i915: BUG_ON() when cmd/reg tables are not sorted drm/i915: Refactor cmd parser checks into a function drm/i915: Track OACONTROL register enable/disable during parsing drm/i915: Add more registers to the whitelist for mesa

Chris Wilson (4): drm/i915: Rename GFX_TLB_INVALIDATE_ALWAYS drm/i915: Add PM interrupt details and RPS thresholds to debugfs drm/i915: Move all ring resets before setting the HWS page drm/i915: dma_buf_vunmap is presumed not to fail, don't let it

Christoph Jaeger (1): drm/i915: drop __FUNCTION__ as argument to DRM_DEBUG_KMS

Damien Lespiau (10): drm/i915: Don't store the max cursor width/height in the crtc drm/i915: Hide vlv_force_wake_{get, put}() in intel_uncore.c drm/i915: Hide the per forcewake-engine register ranges drm/i915: Use a macro to express the range of valid gens for reg_read drm/i915: Protect the argument expansion in LRI and SRM macros drm/i915/bdw: Provide a gen8 version of SRM drm/i915/bdw: Use the GEN8 SRM when qeueing a flip drm/i915: Rename GEN8_PIPE_FLIP_DONE to PRIMARY_FLIP_DONE drm/i915: Remove misleading debug message drm/i915: Remove spurious semicolons

Daniel Vetter (10): drm/i915: Add FIXME for bdw semaphore detection in hancheck drm/i915: make semaphore signaller detection more robust drm/i915: Deprecate UMS harder drm/i915: Add debug module option for VTd validation drm/i915: dmesg output for VT-d testing Merge remote-tracking branch 'airlied/drm-next' into HEAD Revert "drm/i915: fix infinite loop at gen6_update_ring_freq" drm/i915: Don't set the 8to6 dither flag when not scaling drm/i915: Don't vblank wait on ilk-ivb after pipe enable drm/i915: Remove vblank wait from haswell_write_eld

Deepak S (1): drm/i915: Match debugfs interface name to new RPS naming

Egbert Eich (1): drm/i915/SDVO: For sysfs link put directory and target in correct order

Imre Deak (2): drm/i915: vlv: cache current CD clock rate drm/i915: vlv: get power domain for eDP vdd

Jani Nikula (2): drm/i915: drop the typedef for drm_i915_private_t drm/i915: fix command parser debug print format mismatches

Jesse Barnes (5): drm/i915: warn when a vblank wait times out drm/i915/vlv: write the port field in the per-pipe DIP control reg drm/i915/vlv: disable AVI infoframe emission when writing infoframes drm/i915: enable HDMI mode on VLV when an HDMI sink is detected drm/i915: move infoframe setting to after pll enable v3

Kenneth Graunke (1): drm/i915: Add OACONTROL to the command parser register whitelist.

Mika Kuoppala (1): drm/i915: add flags to i915_ring_stop

Paulo Zanoni (27): drm/i915: add GEN5_IRQ_INIT macro drm/i915: also use GEN5_IRQ_INIT with south display interrupts drm/i915: use GEN8_IRQ_INIT on GEN5 drm/i915: add GEN5_IRQ_FINI drm/i915: don't forget to uninstall the PM IRQs drm/i915: properly clear IIR at irq_uninstall on Gen5+ drm/i915: add GEN5_IRQ_INIT drm/i915: check if IIR is still zero at postinstall on Gen5+ drm/i915: fix SERR_INT init/reset code drm/i915: fix GEN7_ERR_INT init/reset code drm/i915: fix open coded gen5_gt_irq_preinstall drm/i915: extract ibx_irq_uninstall drm/i915: call ibx_irq_uninstall from gen8_irq_uninstall drm/i915: enable SDEIER later drm/i915: remove ibx_irq_uninstall drm/i915: add missing intel_hpd_irq_uninstall drm/i915: add ironlake_irq_reset drm/i915: add gen8_irq_reset drm/i915: only enable HWSTAM interrupts on postinstall on ILK+ drm/i915: kill dev_priv->pm.regsave drm/i915: add gen-specific runtime suspend/resume functions drm/i915: add SNB runtime PM support drm/i915: remove HAS_PC8 check drm/i915: BDW needs D_COMP writes through MCHBAR drm/i915: add BDW runtime PM support drm/i915: only check for irqs_disabled when disabling LCPLL drm/i915: fix infinite loop at gen6_update_ring_freq

Pradeep Bhat (3): drm/i915: Adding VBT fields to support eDP DRRS feature drm/i915: Parse EDID probed modes for DRRS support drm/i915: Add support for DRRS to switch RR

Rafael Barbalho (1): drm/i915: Fix framecount offset

Shobhit Kumar (9): drm/i915: Program Rcomp and band gap reset everytime we resume from power gate drm/i915: Enable MIPI port before the plane and pipe enable drm/i915: Disable DPOunit clock gating drm/i915: Parameterize the Clockstop and escape_clk_div drm/i915: Panel commands can be sent only when clock is in LP11 drm/i915: Send DPI command explicitely in LP mode drm/i915: Enable RANDOM resolution support for MIPI panels drm/i915: Add parsing support for new MIPI blocks in VBT drm/i915: Code cleanup patch to fix checkpatch errors

Ville Syrjälä (17): drm/i915: Kill crtc->plane checks from the primary plane update hooks drm/i915: Split dp post_disable hooks drm/i915: Refactor gmch hpd irq handling drm: Make drm_clflush_virt_range() void* drm/i915: Implement WaProgramMiArbOnOffAroundMiSetContext:bdw drm/i915: Fix debugfs PDP register dump drm/i915: Move DP M/N setup from update_pll to mode_set for gmch platforms drm/i915: Warn when DPIO read returns 0xffffffff drm/i915: Provide a bit more info when pipestat bits are wrong drm/i915: Make contexts non-snooped on non-LLC platforms drm/i915: Don't read sprite LP2+ registers on ILK/SNB drm/i915: Add some more tracked state to intel_pipe_wm drm/i915: Skip watermark merging for inactive pipes drm/i916: Refactor WM register maximums drm/i915/chv: IS_BROADWELL() should not be true for Cherryview drm/i915/chv: Add IS_CHERRYVIEW() macro drm/i915: Disable/enable planes as the first/last thing during modeset on ILK+

Zhenyu Wang (1): drm/i915: Allow i915_pc8_status debug info on BDW

drivers/gpu/drm/drm_cache.c | 4 +- drivers/gpu/drm/i915/Kconfig | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- drivers/gpu/drm/i915/dvo_ivch.c | 2 +- drivers/gpu/drm/i915/dvo_ns2501.c | 24 +- drivers/gpu/drm/i915/dvo_sil164.c | 2 +- drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 616 +++++++++++++++++++++++++---- drivers/gpu/drm/i915/i915_debugfs.c | 25 +- drivers/gpu/drm/i915/i915_dma.c | 3 + drivers/gpu/drm/i915/i915_drv.c | 53 ++- drivers/gpu/drm/i915/i915_drv.h | 265 +++---------- drivers/gpu/drm/i915/i915_gem.c | 5 +- drivers/gpu/drm/i915/i915_gem_context.c | 18 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 6 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 75 +--- drivers/gpu/drm/i915/i915_gem_gtt.h | 283 +++++++++++++ drivers/gpu/drm/i915/i915_gpu_error.c | 23 +- drivers/gpu/drm/i915/i915_irq.c | 504 +++++++++++------------ drivers/gpu/drm/i915/i915_params.c | 8 +- drivers/gpu/drm/i915/i915_reg.h | 117 +++++- drivers/gpu/drm/i915/intel_bios.c | 242 +++++++++++- drivers/gpu/drm/i915/intel_bios.h | 60 +++ drivers/gpu/drm/i915/intel_display.c | 283 ++++++------- drivers/gpu/drm/i915/intel_dp.c | 197 ++++++++- drivers/gpu/drm/i915/intel_drv.h | 35 +- drivers/gpu/drm/i915/intel_dsi.c | 125 ++++-- drivers/gpu/drm/i915/intel_dsi.h | 4 +- drivers/gpu/drm/i915/intel_dsi_cmd.c | 4 +- drivers/gpu/drm/i915/intel_dsi_cmd.h | 5 +- drivers/gpu/drm/i915/intel_hdmi.c | 38 +- drivers/gpu/drm/i915/intel_lvds.c | 7 - drivers/gpu/drm/i915/intel_panel.c | 8 +- drivers/gpu/drm/i915/intel_pm.c | 219 ++++++---- drivers/gpu/drm/i915/intel_ringbuffer.c | 75 ++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_sideband.c | 8 + drivers/gpu/drm/i915/intel_uncore.c | 24 +- include/drm/drmP.h | 2 +- include/uapi/drm/i915_drm.h | 1 + 42 files changed, 2354 insertions(+), 1034 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.h