Hi Dave, drm-intel-next-2015-09-28: - fastboot by default for some systems (Maarten Lankhorts) - piles of workarounds for bxt and skl - more fbc work from Paulo - fix hdmi hotplug detection (Sonika) - first few patches from Ville to parametrize register macros, prep work for typesafe mmio functions - prep work for nv12 rotation (Tvrtko Ursulin) - various other bugfixes and improvements all over I have another backmerge here since things became messy and I didn't realize you resolved some of them already (usually you complain when there's a conflict ...). For 4.4 I plan one more feature round after this and then that's it. Cheers, Daniel The following changes since commit 2d4df13c0f9ef56452b1d9a9016cb3946e17bfe5: Merge tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-09-30 08:35:45 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-2015-09-28-merged for you to fetch changes up to 44cc6c08da0b6c8321c6740bbb6a0c6feb45b2c2: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next (2015-09-30 08:47:41 +0200) ---------------------------------------------------------------- Andrzej Hajda (1): drm/i915: fix handling gen8_emit_flush_coherentl3_wa result Animesh Manna (3): drm/i915/bxt: Path added of dmc firmware ver1 for BXT. drm/i915/bxt: Stepping info added for bxt. drm/i915/bxt: Modified HAS_CSR, added support for BXT Arun Siluvery (3): drm/i915/gen9: Add WaDisableSamplerPowerBypassForSOPingPong drm/i915/bxt: Add WaSetClckGatingDisableMedia drm/i915/bxt: Update revision id for BXT C0 Bob Paauwe (1): drm/i915/skl: Don't clear all watermarks when updating. (v2) Chris Wilson (1): drm/i915: Defer adding preallocated stolen objects to the VM list Damien Lespiau (1): drm/i915/bxt: Fix wrongly placed ')' in I915_READ() Daniel Vetter (4): Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-intel-next-queued drm/i915: Mark debug mod options as _unsafe drm/i915: Update DRIVER_DATE to 20150928 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Dongwon Kim (1): drm/i915: Do not hardcode s_max, ss_max and eu_mask for BXT Egbert Eich (1): drm/i915: Avoid race of intel_crt_detect_hotplug() with HPD interrupt, v2 Geliang Tang (2): drm/i915: fix kernel-doc warnings in i915_gem.c drm/i915: fix task reference leak in i915_debugfs.c Jani Nikula (1): drm/i915/skl: handle port E in cpt_digital_port_connected Jesse Barnes (5): drm/i915: make CSR firmware messages less verbose drm/i915: don't try to load GuC fw on pre-gen9 drm/i915: add more debug info for when atomic updates fail v3 drm/i915: cleanup pipe_update trace functions with new crtc debug info v3 drm/i915: fix crash in error state readout on non-execlist platforms v2 Lukas Wunner (1): drm/i915: Spell vga_switcheroo consistently Maarten Lankhorst (6): drm/i915: Set csc coefficients in update_pipe_size. drm/i915: Remove references to crtc->active from intel_fbdev.c drm/i915: Always try to inherit the initial fb. drm/i915: Make updating pipe without modeset atomic. drm/i915: skip modeset if compatible for everyone. drm/i915: Fix fastboot scalers for skylake. Masanari Iida (1): drm/i915: Fix warnings while make xmldocs caused by intel_lrc.c Matt Roper (1): drm/i915: Don't leak VBT mode data Michał Winiarski (1): drm/i915/gtt: Do not initialize drm_mm twice. Michel Thierry (2): drm/i915: WaEnableForceRestoreInCtxtDescForVCS is for video engines only drm/i915/lrc: Prevent preemption when lite-restore is disabled Nick Hoath (3): drm/i915/gen9: Add WaDisableMinuteIaClockGating drm/i915: Split alloc from init for lrc drm/i915: Remove extraneous request cancel. Paulo Zanoni (9): drm/i915: fix the FBC work allocation failure path drm/i915: check for the supported strides on HSW+ FBC drm/i915: avoid the last 8mb of stolen on BDW/SKL drm/i915: print the correct amount of bytes allocated for the CFB drm/i915: don't enable FBC when pixel rate exceeds 95% on HSW/BDW drm/i915: apply WaFbcAsynchFlipDisableFbcQueue earlier drm/i915: don't apply WaFbcAsynchFlipDisableFbcQueue on SKL drm/i915: reject invalid formats for FBC drm/i915: fix FBC for cases where crtc->base.y is non-zero Robert Beckett (1): drm/i915/gen9: WA ST Unit Power Optimization Disable Sagar Arun Kamble (8): drm/i915: Fix fb object's frontbuffer-bits drm/i915/bxt: WaGsvDisableTurbo drm/i915: Increase maximum polling time to 50ms for forcewake request/clear ack drm/i915: Add IS_SKL_GT3 and IS_SKL_GT4 macro. drm/i915: WaRsDisableCoarsePowerGating drm/i915: WaRsUseTimeoutMode drm/i915: WaRsDoubleRc6WrlWithCoarsePowerGating drm/i915: Program GuC MAX IDLE Count Shashank Sharma (3): drm/i915/bxt: Enable BXT DSI PLL drm/i915/bxt: Disable DSI PLL for BXT drm/i915/bxt: DSI prepare changes for BXT Sonika Jindal (2): drm/i915/bxt: Use intel_encoder->hpd_pin to check live status drm/i915: Check live status before reading edid Tvrtko Ursulin (4): drm/i915: Support planar formats in tile height calculations drm/i915: Support appending to the rotated pages mapping drm/i915: Support NV12 in rotated GGTT mapping drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset Ville Syrjälä (16): drm/i915: Set stolen reserved to 0 for pre-g4x platforms drm/i915: Assign hwmode after encoder state readout drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc() drm/i915: Move scanline_offset and timestamping constant setup to intel_modeset_readout_hw_state() drm/i915: Implement stolen reserved detection for ctg/elk drm/i915: Make sure we don't detect eDP on g4x drm/i915: Ignore "digital output" and "not HDMI output" bits for eDP detection drm/i915: Don't pass sdvo_reg to intel_sdvo_select_{ddc, i2c}_bus() drm/i915: Parametrize LRC registers drm/i915: Parametrize GEN7_GT_SCRATCH and GEN7_LRA_LIMITS drm/i915: Parametrize FBC_TAG registers drm/i915: Parametrize ILK turbo registers drm/i915: Replace raw numbers with the approproate register name in ILK turbo code drm/i915: Parametrize TV luma/chroma filter registers drm/i915: Parametrize DDI_BUF_TRANS registers drm/i915: Parametrize CSR_PROGRAM registers Documentation/DocBook/drm.tmpl | 14 + drivers/gpu/drm/i915/Makefile | 4 + drivers/gpu/drm/i915/i915_cmd_parser.c | 13 +- drivers/gpu/drm/i915/i915_debugfs.c | 208 ++++++- drivers/gpu/drm/i915/i915_dma.c | 50 +- drivers/gpu/drm/i915/i915_drv.c | 39 +- drivers/gpu/drm/i915/i915_drv.h | 90 ++- drivers/gpu/drm/i915/i915_gem.c | 110 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 7 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_fence.c | 4 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 824 +++++++++++++++++++++----- drivers/gpu/drm/i915/i915_gem_gtt.h | 71 ++- drivers/gpu/drm/i915/i915_gem_stolen.c | 72 ++- drivers/gpu/drm/i915/i915_gem_userptr.c | 4 - drivers/gpu/drm/i915/i915_gpu_error.c | 47 +- drivers/gpu/drm/i915/i915_guc_reg.h | 18 +- drivers/gpu/drm/i915/i915_guc_submission.c | 916 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_irq.c | 576 ++++++++++++------ drivers/gpu/drm/i915/i915_params.c | 38 +- drivers/gpu/drm/i915/i915_reg.h | 235 +++++--- drivers/gpu/drm/i915/i915_trace.h | 58 +- drivers/gpu/drm/i915/i915_vgpu.h | 34 +- drivers/gpu/drm/i915/intel_acpi.c | 2 +- drivers/gpu/drm/i915/intel_atomic.c | 13 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/intel_bios.c | 18 - drivers/gpu/drm/i915/intel_bios.h | 3 - drivers/gpu/drm/i915/intel_crt.c | 11 +- drivers/gpu/drm/i915/intel_csr.c | 32 +- drivers/gpu/drm/i915/intel_ddi.c | 60 +- drivers/gpu/drm/i915/intel_display.c | 585 +++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 773 +++++++++++++++--------- drivers/gpu/drm/i915/intel_dp_mst.c | 21 +- drivers/gpu/drm/i915/intel_drv.h | 76 ++- drivers/gpu/drm/i915/intel_dsi.c | 76 ++- drivers/gpu/drm/i915/intel_dsi.h | 4 +- drivers/gpu/drm/i915/intel_dsi_pll.c | 127 +++- drivers/gpu/drm/i915/intel_dvo.c | 7 + drivers/gpu/drm/i915/intel_fbc.c | 149 ++++- drivers/gpu/drm/i915/intel_fbdev.c | 11 +- drivers/gpu/drm/i915/intel_guc.h | 122 ++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 20 +- drivers/gpu/drm/i915/intel_guc_loader.c | 613 +++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 235 +++++--- drivers/gpu/drm/i915/intel_lrc.c | 412 +++++++------ drivers/gpu/drm/i915/intel_lrc.h | 18 +- drivers/gpu/drm/i915/intel_lvds.c | 17 +- drivers/gpu/drm/i915/intel_panel.c | 236 +++++++- drivers/gpu/drm/i915/intel_pm.c | 125 +++- drivers/gpu/drm/i915/intel_ringbuffer.c | 99 ++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 415 +++++++++++-- drivers/gpu/drm/i915/intel_sdvo.c | 14 +- drivers/gpu/drm/i915/intel_sprite.c | 40 +- drivers/gpu/drm/i915/intel_tv.c | 10 +- drivers/gpu/drm/i915/intel_uncore.c | 12 +- include/drm/drm_dp_helper.h | 7 + 58 files changed, 6027 insertions(+), 1791 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c create mode 100644 drivers/gpu/drm/i915/intel_guc.h create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel