On Mon, 18 Aug 2014, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > While wrestling with the VLV/CHV panel power sequencer I noticed the locking > in our edp vdd code was rather broken. This series aims to fix that by > introducing a power seqeuencer mutex. I was already thinking about using the > aux.hw_mutex for this since it's already locked around the aux ->transfer() > function, but the VLV/CHV multiple power sequencer issue requires a single > lock instead of per-port. > > At the end of the series there's a bit of reordering of the DP port > enable/disable sequences to make subsequent power sequencer kick patches > easier. The last patch fixes the wait_pipe_off() timeouts on my ILK. > Strictly speaking it shouldn't be part of this series, but I couldn't > really test this on my ILK without suffering tons of warnings so I > included it here anyway. This is what I'd like to happen here: 1) Patches [1] from me and [2] from Clinton get reviewed and merged first, through -fixes. 2) The rest of the patches in my series after [1] get reviewed and merged, through dinq. 3) The first part of this series, up to the locking bits, mostly reviewed now, get refreshed on top the above, should not conflict much, and we can start merging them while... 4) The second part of this series, from about the locking on, get reviewed and merged. I want this order to make backporting steps 1 and 2 as painless as possible. Please help review them, and I'll follow through with this series. BR, Jani. [1] http://mid.gmane.org/e7a47b50ed0f25cafdc26711fc09561ea8af3b81.1407849872.git.jani.nikula@xxxxxxxxx [2] http://mid.gmane.org/1408394915-21882-1-git-send-email-clinton.a.taylor@xxxxxxxxx > > Ville Syrjälä (14): > drm/i915: Parametrize PANEL_PORT_SELECT_VLV > drm/i915: Reorganize vlv eDP reboot notifier > drm/i915: Use intel_edp_panel_vdd_on() in intel_dp_probe_mst() > drm/i915: Rename edp vdd funcs for consistency > drm/i915: Add a note explaining vdd on/off handling in > intel_dp_aux_ch() > drm/i915: Replace big nested if block with early return > drm/i915: Warn about want_panel_vdd in edp_panel_vdd_off_sync() > drm/i915: Flatten intel_edp_panel_vdd_on() > drm/i915: Fix edp vdd locking > drm/i915: Track which port is using which pipe's power sequencer > drm/i915: Be more careful when picking the initial power sequencer > pipe > drm/i915: Turn on panel power before doing aux transfers > drm/i915: Enable DP port earlier > drm/i915: Move DP port disable to post_disable for pch platforms > > drivers/gpu/drm/i915/i915_drv.h | 3 + > drivers/gpu/drm/i915/i915_reg.h | 3 +- > drivers/gpu/drm/i915/intel_display.c | 2 + > drivers/gpu/drm/i915/intel_dp.c | 619 +++++++++++++++++++++++++---------- > drivers/gpu/drm/i915/intel_drv.h | 6 + > 5 files changed, 463 insertions(+), 170 deletions(-) > > -- > 1.8.5.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx