Hi all, Mostly just moves the dp code to saner places, but I've also thrown 3 patches on top to remove some bloat around the watermark handling. Right the next patch in my modeset-rework branch after this pile is the introduction of the intel_crtc_config to precompute the pipe config. I'm not yet sure whether that's going in the exact right direction, so still needs more work. Cheers, Daniel Daniel Vetter (9): drm/i915: move set_pll_edp to intel_dp.c drm/i915: rip out pre-production ilk cpu edp w/a drm/i915: use wait_for_vblank instead of msleep(17) drm/i915: WARN on !crtc in intel_dp_link_down drm/i915: drop unnecessary clearing of pch dp transcoder timings drm/i915: extract common link_m_n helpers drm/i915: don't call update_watermark in crtc_mode_set drm/i915: don't call update_watermarks from haswell enable/disable code drm/i915: rip out update_linetime_wm abstraction drivers/gpu/drm/i915/i915_drv.h | 15 +++- drivers/gpu/drm/i915/intel_display.c | 133 ++++++++++------------------------- drivers/gpu/drm/i915/intel_dp.c | 87 +++++++++++------------ drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_pm.c | 37 ---------- 5 files changed, 92 insertions(+), 182 deletions(-) -- 1.7.11.7