| commit | 19e0b4cab9cf3c07bc84360a854f9040d8c64644 | [log] [tgz] |
|---|---|---|
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | Fri Aug 05 19:05:42 2016 +0300 |
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | Fri Aug 05 19:20:31 2016 +0300 |
| tree | 13939e4752cfd476b23447f062b02d933e7e52fb | |
| parent | 575e3ccbce4582395d57612b289178bad4af3be8 [diff] [blame] |
Revert "drm/i915: Track active streams also for DP SST" This reverts commit f64425a82bdb5c3d7e09ba765716da88a9b00eec. active_streams will get totally out of whack with SST unless we sync up with the hw state at readout, obviously! We don't yet do that, so now the WARNs fire all the time. Let's revert :( Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1470413142-26402-1-git-send-email-ville.syrjala@linux.intel.com References: https://bugs.freedesktop.org/show_bug.cgi?id=95472#c14 Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index a978866..b1fc67e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -894,7 +894,7 @@ bool can_mst; /* this port supports mst */ bool is_mst; - int active_streams; /* number of active streams (for SST and MST both) */ + int active_mst_links; /* connector directly attached - won't be use for modeset in mst world */ struct intel_connector *attached_connector;